Permalink
Browse files

Merge branch 'master' into gtk3-support

  • Loading branch information...
2 parents 1f244e0 + bd7b56a commit 8ece89096d38d5870ac73697bd17d870deaeac34 @b4n b4n committed Jan 29, 2013
Showing with 11,698 additions and 4,928 deletions.
  1. +3 −1 .gitignore
  2. +2 −1 NEWS
  3. +8 −0 configure.ac
  4. +1 −0 data/filetype_extensions.conf
  5. +35 −0 data/filetypes.asciidoc
  6. +1 −0 data/filetypes.c
  7. +1 −1 data/filetypes.conf
  8. +8 −1 data/filetypes.po
  9. +1 −1 data/filetypes.restructuredtext
  10. +116 −23 data/geany.glade
  11. +458 −435 doc/geany.html
  12. +29 −9 doc/geany.txt
  13. +8 −5 icons/16x16/Makefile.am
  14. BIN icons/16x16/classviewer-macro.png
  15. +0 −27 icons/16x16/classviewer-method.xpm
  16. BIN icons/16x16/classviewer-other.png
  17. +0 −27 icons/16x16/classviewer-var.xpm
  18. BIN icons/16x16/geany-build.png
  19. BIN icons/16x16/geany-close-all.png
  20. BIN icons/16x16/geany-save-all.png
  21. +6 −0 icons/24x24/Makefile.am
  22. BIN icons/24x24/geany-build.png
  23. BIN icons/24x24/geany-close-all.png
  24. BIN icons/24x24/geany-save-all.png
  25. +6 −0 icons/32x32/Makefile.am
  26. BIN icons/32x32/geany-build.png
  27. BIN icons/32x32/geany-close-all.png
  28. BIN icons/32x32/geany-save-all.png
  29. +10 −3 icons/48x48/Makefile.am
  30. BIN icons/48x48/geany-build.png
  31. BIN icons/48x48/geany-close-all.png
  32. BIN icons/48x48/geany-save-all.png
  33. BIN icons/48x48/geany.png
  34. +15 −6 icons/Makefile.am
  35. +60 −0 icons/index.theme
  36. +10 −3 icons/scalable/Makefile.am
  37. +162 −0 icons/scalable/geany-build.svg
  38. +446 −0 icons/scalable/geany-close-all.svg
  39. +657 −0 icons/scalable/geany-save-all.svg
  40. +7 −0 icons/tango/16x16/Makefile.am
  41. BIN icons/tango/16x16/geany-save-all.png
  42. BIN icons/tango/16x16/geany-save-all.xcfgz
  43. +4 −0 icons/tango/24x24/Makefile.am
  44. BIN icons/tango/24x24/geany-save-all.png
  45. +4 −0 icons/tango/32x32/Makefile.am
  46. BIN icons/tango/32x32/geany-save-all.png
  47. +4 −0 icons/tango/48x48/Makefile.am
  48. BIN icons/tango/48x48/geany-save-all.png
  49. +7 −0 icons/tango/Makefile.am
  50. +33 −0 icons/tango/index.theme
  51. +4 −0 icons/tango/scalable/Makefile.am
  52. +613 −0 icons/tango/scalable/geany-save-all.svg
  53. +2 −3 plugins/filebrowser.c
  54. +0 −1 po/POTFILES.in
  55. +50 −63 po/cs.po
  56. +5,539 −0 po/et.po
  57. +1,063 −1,032 po/he.po
  58. +1,011 −1,015 po/nl.po
  59. +1 −1 po/tr.po
  60. +1 −0 scintilla/Makefile.am
  61. +4 −0 scintilla/gtk/PlatGTK.cxx
  62. +4 −0 scintilla/gtk/ScintillaGTK.cxx
  63. +7 −0 scintilla/include/SciLexer.h
  64. +7 −0 scintilla/include/Scintilla.iface
  65. +144 −12 scintilla/lexers/LexBash.cxx
  66. +11 −4 scintilla/lexers/LexCPP.cxx
  67. +0 −73 scintilla/lexers/LexOthers.cxx
  68. +149 −0 scintilla/lexers/LexPO.cxx
  69. +11 −3 scintilla/lexers/LexRuby.cxx
  70. +16 −17 scintilla/lexers/LexSQL.cxx
  71. +1 −0 scintilla/makefile.win32
  72. +1 −1 scintilla/scintilla_changes.patch
  73. +1 −1 scintilla/src/Catalogue.cxx
  74. +23 −1 scintilla/src/Document.cxx
  75. +5 −1 scintilla/src/Document.h
  76. +18 −27 scintilla/src/Editor.cxx
  77. +1 −0 scintilla/src/Editor.h
  78. +1 −1 scintilla/src/RESearch.cxx
  79. +1 −0 scintilla/src/RunStyles.cxx
  80. +1 −1 scintilla/version.txt
  81. +1 −1 src/Makefile.am
  82. +2 −8 src/about.c
  83. +8 −8 src/build.c
  84. +9 −3 src/callbacks.c
  85. +0 −4 src/callbacks.h
  86. +19 −69 src/dialogs.c
  87. +35 −12 src/document.c
  88. +2 −2 src/document.h
  89. +129 −69 src/editor.c
  90. +8 −0 src/filetypes.c
  91. +1 −0 src/filetypes.h
  92. +10 −1 src/highlighting.c
  93. +17 −9 src/highlightingmappings.h
  94. +0 −1,690 src/images.c
  95. +20 −8 src/keybindings.c
  96. +1 −0 src/keybindings.h
  97. +2 −0 src/keyfile.c
  98. +11 −9 src/main.c
  99. +7 −4 src/prefs.c
  100. +47 −26 src/printing.c
  101. +9 −6 src/project.c
  102. +15 −10 src/sciwrappers.c
  103. +1 −1 src/sciwrappers.h
  104. +7 −5 src/search.c
  105. +18 −12 src/symbols.c
  106. +2 −4 src/tools.c
  107. +9 −104 src/ui_utils.c
  108. +0 −13 src/ui_utils.h
  109. +9 −1 src/utils.c
  110. +14 −0 src/vte.c
  111. +1 −0 src/vte.h
  112. +71 −1 src/win32.c
  113. +1 −0 tagmanager/ctags/Makefile.am
  114. +206 −0 tagmanager/ctags/asciidoc.c
  115. +49 −16 tagmanager/ctags/c.c
  116. +53 −2 tagmanager/ctags/js.c
  117. +1 −1 tagmanager/ctags/makefile.win32
  118. +3 −1 tagmanager/ctags/parsers.h
  119. +17 −8 tagmanager/ctags/python.c
  120. +35 −1 tagmanager/ctags/rest.c
  121. +56 −19 wscript
View
@@ -46,7 +46,9 @@ Makefile.in
/localwin32.mk
/.lock-wscript
/ltmain.sh
-/m4/
+/m4/lt*.m4
+/m4/intltool.m4
+/m4/libtool.m4
/make_deb.sh
/missing
/mkinstalldirs
View
@@ -7,7 +7,8 @@ Geany 1.23 (unreleased)
* Fix too aggressive scope caching (#2142789, #2667917, #2868850).
Editor
- * Update Scintilla to version 3.2.2 (#2808638, #3540469).
+ * Update Scintilla to version 3.2.3 (#2808638, #2909124, #3094431,
+ #3233160, #3540469).
Search
* 'Mark All' now also uses the fully-featured PCRE engine (#3564132).
View
@@ -115,8 +115,16 @@ AC_CONFIG_FILES([
Makefile
icons/Makefile
icons/16x16/Makefile
+ icons/24x24/Makefile
+ icons/32x32/Makefile
icons/48x48/Makefile
icons/scalable/Makefile
+ icons/tango/Makefile
+ icons/tango/16x16/Makefile
+ icons/tango/24x24/Makefile
+ icons/tango/32x32/Makefile
+ icons/tango/48x48/Makefile
+ icons/tango/scalable/Makefile
tagmanager/Makefile
tagmanager/ctags/Makefile
tagmanager/mio/Makefile
@@ -5,6 +5,7 @@
Abc=*.abc;*.abp;
ActionScript=*.as;
Ada=*.adb;*.ads;
+Asciidoc=*.asciidoc;
ASM=*.asm;
CAML=*.ml;*.mli;
C=*.c;*.h;
@@ -0,0 +1,35 @@
+# For complete documentation of this file, please see Geany's main documentation
+[styling]
+# no syntax highlighting yet
+
+[settings]
+# default extension used when saving files
+extension=asciidoc
+
+# the following characters are these which a "word" can contains, see documentation
+#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+
+# single comments, like # in this file
+comment_single=//
+# multiline comments
+#comment_open=////
+#comment_close=////
+
+# set to false if a comment character/string should start at column 0 of a line, true uses any
+# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d
+ #command_example();
+# setting to false would generate this
+# command_example();
+# This setting works only for single line comments
+comment_use_indent=false
+
+# context action command (please see Geany's main documentation for details)
+context_action_cmd=
+
+# sort tags by appearance
+symbol_list_sort_mode=1
+
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
View
@@ -10,6 +10,7 @@ number=number_1
word=keyword_1
word2=keyword_2
string=string_1
+stringraw=string_2
character=character
uuid=other
preprocessor=preprocessor
View
@@ -1,7 +1,7 @@
# For complete documentation of this file, please see Geany's main documentation
[styling]
# Edit these in the colorscheme .conf file instead
-default=value
+default=default
comment=comment
section=tag
key=attribute
View
@@ -3,13 +3,20 @@
# Edit these in the colorscheme .conf file instead
default=default
comment=comment
+programmer_comment=comment_doc
+reference=comment
+flags=comment
+fuzzy=comment_doc_keyword
msgid=keyword_1
msgid_text=string_1
+msgid_text_eol=string_eol
msgstr=keyword_2
msgstr_text=string_1
+msgstr_text_eol=string_eol
msgctxt=keyword_3
msgctxt_text=string_1
-fuzzy=comment_doc_keyword
+msgctxt_text_eol=string_eol
+error=error
[settings]
# default extension used when saving files
@@ -10,7 +10,7 @@ extension=rst
#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# single comments, like # in this file
-comment_single=..
+comment_single=..\s
# multiline comments
#comment_open=
#comment_close=
View
Oops, something went wrong.
View
Oops, something went wrong.
View
@@ -565,6 +565,14 @@ order. It is not alphabetical as shown in the documents list
See the `Notebook tab keybindings`_ section for useful
shortcuts including for Most-Recently-Used document switching.
+Cloning documents
+^^^^^^^^^^^^^^^^^
+The `Document->Clone` menu item copies the current document's text,
+cursor position and properties into a new untitled document. If
+there is a selection, only the selected text is copied. This can be
+useful when making temporary copies of text or for creating
+documents with similar or identical contents.
+
Character sets and Unicode Byte-Order-Mark (BOM)
------------------------------------------------
@@ -2011,9 +2019,9 @@ Use indicators to show compile errors
Underline lines with compile errors using red squiggles to indicate
them in the editor area.
-Newline strip trailing spaces
- Remove any white space at the end of the line when you hit the
- Enter/Return key.
+Newline strips trailing spaces
+ Remove any whitespace at the end of the line when you hit the
+ Enter/Return key. See also `Strip trailing spaces`_.
Line breaking column
The editor column number to insert a newline at when Line Breaking
@@ -2297,8 +2305,13 @@ Ensure consistent line endings
Ensures that newline characters always get converted before
saving, avoiding mixed line endings in the same file.
+.. _Strip trailing spaces:
+
Strip trailing spaces
- Remove the trailing spaces on each line of the document.
+ Remove any whitespace at the end of each document line.
+
+ .. note::
+ This does not apply to Diff documents, e.g. patch files.
Replace tabs by space
Replace all tabs in the document with the equivalent number of spaces.
@@ -2476,10 +2489,11 @@ indent_hard_tab_width The size of a tab character. Don't change 8
**Interface related**
show_symbol_list_expanders Whether to show or hide the small true to new
expander icons on the symbol list documents
-allow_always_save treeview. Whether files can be saved false immediately
- always, even if they don't have any
- changes. By default, the Save button and
- menu item are disabled when a file is
+ treeview.
+allow_always_save Whether files can be saved always, even false immediately
+ if they don't have any changes.
+ By default, the Save button and menu
+ item are disabled when a file is
unchanged. When setting this option to
true, the Save button and menu item are
always active and files can be saved.
@@ -2590,6 +2604,9 @@ Foreground color
Background color
Select the background color of the terminal.
+Background image
+ Select the background image to show behind the terminal's text.
+
Scrollback lines
The number of lines buffered so that you can scroll though the history.
@@ -3462,7 +3479,8 @@ Find Document Usage Ctrl-Shift-D Finds all occurrences
Mark All Ctrl-Shift-M Highlight all matches of the current
word/selection in the current document
with a colored box. If there's nothing to
- find, highlighted matches will be cleared.
+ find, or the cursor is next to an existing match,
+ the highlighted matches will be cleared.
=============================== ========================= ==================================================
@@ -3610,6 +3628,8 @@ Document keybindings
==================================== ==================== ==================================================
Action Default shortcut Description
==================================== ==================== ==================================================
+Clone See `Cloning documents`_.
+
Replace tabs by space Replaces all tabs with the right amount of spaces.
Replace spaces by tabs Replaces leading spaces with tab characters.
@@ -1,6 +1,8 @@
-iconsdir = $(datadir)/icons/hicolor/16x16/apps
+iconsdir = $(datadir)/icons/hicolor/16x16
+icons_appsdir = $(iconsdir)/apps
+icons_actionsdir = $(iconsdir)/actions
-icons_DATA = \
+dist_icons_apps_DATA = \
classviewer-class.png \
classviewer-macro.png \
classviewer-member.png \
@@ -11,6 +13,7 @@ icons_DATA = \
classviewer-var.png \
geany.png
-EXTRA_DIST = $(icons_DATA) \
- classviewer-var.xpm \
- classviewer-method.xpm
+dist_icons_actions_DATA = \
+ geany-build.png \
+ geany-close-all.png \
+ geany-save-all.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,27 +0,0 @@
-/* XPM */
-static char *classviewer_method[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 5 1",
-" c black",
-". c #E0BC38",
-"X c #F0DC5C",
-"o c #FCFC80",
-"O c None",
-/* pixels */
-"OOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOO",
-"OOOOOOOOOO OOOO",
-"OOOOOOOOO oo OO",
-"OOOOOOOO ooooo O",
-"OOOOOOO ooooo. O",
-"OOOO O XXoo.. O",
-"OOO oo XXX... O",
-"OO ooooo XX.. OO",
-"O ooooo. X. OOO",
-"O XXoo.. O OOOO",
-"O XXX... OOOOOOO",
-"O XXX.. OOOOOOOO",
-"OO X. OOOOOOOOO",
-"OOOO OOOOOOOOOO"
-};
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,27 +0,0 @@
-/* XPM */
-static char *classviewer_var[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 5 1",
-" c black",
-". c #8C748C",
-"X c #9C94A4",
-"o c #ACB4C0",
-"O c None",
-/* pixels */
-"OOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOO",
-"OOOOOOOOO OOOOO",
-"OOOOOOOO oo OOO",
-"OOOOOOO ooooo OO",
-"OOOOOO ooooo. OO",
-"OOOOOO XXoo.. OO",
-"OOOOOO XXX... OO",
-"OOOOOO XXX.. OOO",
-"OOOOOOO X. OOOO",
-"OOOOOOOOO OOOOO",
-"OOOOOOOOOOOOOOOO"
-};
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,6 @@
+icons_actionsdir = $(datadir)/icons/hicolor/24x24/actions
+
+dist_icons_actions_DATA = \
+ geany-build.png \
+ geany-close-all.png \
+ geany-save-all.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,6 @@
+icons_actionsdir = $(datadir)/icons/hicolor/32x32/actions
+
+dist_icons_actions_DATA = \
+ geany-build.png \
+ geany-close-all.png \
+ geany-save-all.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,4 +1,11 @@
-iconsdir = $(datadir)/icons/hicolor/48x48/apps
-icons_DATA = geany.png
+iconsdir = $(datadir)/icons/hicolor/48x48
+icons_appsdir = $(iconsdir)/apps
+icons_actionsdir = $(iconsdir)/actions
-EXTRA_DIST = $(icons_DATA)
+dist_icons_apps_DATA = \
+ geany.png
+
+dist_icons_actions_DATA = \
+ geany-build.png \
+ geany-close-all.png \
+ geany-save-all.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -1,20 +1,29 @@
-SUBDIRS = 16x16 48x48 scalable
+SUBDIRS = 16x16 24x24 32x32 48x48 scalable tango
-EXTRA_DIST = geany.ico
+# only install index.theme on Windows
+if MINGW
+iconsdir = $(datadir)/icons/hicolor
+dist_icons_DATA = index.theme
+endif
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+dist_noinst_DATA = geany.ico
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
install-data-hook:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
- $(gtk_update_icon_cache); \
+ $(gtk_update_icon_cache) "$(datadir)/icons/hicolor"; \
+ $(gtk_update_icon_cache) "$(datadir)/icons/Tango"; \
else \
echo "*** Icon cache not updated. Remember to run:"; \
echo "***"; \
- echo "*** $(gtk_update_icon_cache)"; \
+ echo "*** $(gtk_update_icon_cache) '$(datadir)/icons/hicolor'";\
+ echo "*** $(gtk_update_icon_cache) '$(datadir)/icons/Tango'";\
echo "***"; \
fi
uninstall-local:
- rm -f $(DESTDIR)$(datadir)/icons/hicolor/icon-theme.cache;
+ rm -f $(DESTDIR)$(datadir)/icons/hicolor/icon-theme.cache
+ rm -f $(DESTDIR)$(datadir)/icons/Tango/icon-theme.cache
Oops, something went wrong.

0 comments on commit 8ece890

Please sign in to comment.