[geany/geany] e3fad4: Merge branch 'master' into wip/better-php-parser

Colomban Wendling git-noreply at xxxxx
Wed Jul 3 17:26:06 UTC 2013


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Wed, 03 Jul 2013 17:26:06 UTC
Commit:      e3fad4a745fa2f1c8bbee9620876787f6bb029ca
             https://github.com/geany/geany/commit/e3fad4a745fa2f1c8bbee9620876787f6bb029ca

Log Message:
-----------
Merge branch 'master' into wip/better-php-parser


Modified Paths:
--------------
    .gitignore
    Makefile.am
    NEWS
    configure.ac
    data/filetype_extensions.conf
    data/filetypes.c
    data/filetypes.haskell
    data/filetypes.html
    data/filetypes.java
    data/filetypes.pascal
    data/filetypes.python
    data/filetypes.sql
    data/geany.glade
    doc/geany.html
    doc/geany.txt
    plugins/classbuilder.c
    plugins/export.c
    plugins/filebrowser.c
    plugins/geanyfunctions.h
    plugins/htmlchars.c
    plugins/saveactions.c
    po/de.po
    po/fr.po
    po/he.po
    po/it.po
    po/lt.po
    po/sv.po
    scintilla/Makefile.am
    scintilla/gtk/PlatGTK.cxx
    scintilla/gtk/ScintillaGTK.cxx
    scintilla/include/ILexer.h
    scintilla/include/Platform.h
    scintilla/include/SciLexer.h
    scintilla/include/Scintilla.h
    scintilla/include/Scintilla.iface
    scintilla/lexers/LexCPP.cxx
    scintilla/lexers/LexHTML.cxx
    scintilla/lexers/LexHaskell.cxx
    scintilla/lexers/LexLaTeX.cxx
    scintilla/lexers/LexMatlab.cxx
    scintilla/lexers/LexOthers.cxx
    scintilla/lexers/LexPO.cxx
    scintilla/lexers/LexRuby.cxx
    scintilla/lexlib/Accessor.cxx
    scintilla/lexlib/Accessor.h
    scintilla/lexlib/LexAccessor.h
    scintilla/lexlib/LexerBase.cxx
    scintilla/lexlib/LexerModule.cxx
    scintilla/lexlib/OptionSet.h
    scintilla/lexlib/PropSetSimple.cxx
    scintilla/lexlib/PropSetSimple.h
    scintilla/lexlib/StyleContext.h
    scintilla/lexlib/SubStyles.h
    scintilla/lexlib/WordList.cxx
    scintilla/lexlib/WordList.h
    scintilla/makefile.win32
    scintilla/scintilla_changes.patch
    scintilla/src/AutoComplete.cxx
    scintilla/src/AutoComplete.h
    scintilla/src/CallTip.cxx
    scintilla/src/CallTip.h
    scintilla/src/CellBuffer.cxx
    scintilla/src/CellBuffer.h
    scintilla/src/ContractionState.cxx
    scintilla/src/Decoration.cxx
    scintilla/src/Decoration.h
    scintilla/src/Document.cxx
    scintilla/src/Document.h
    scintilla/src/Editor.cxx
    scintilla/src/Editor.h
    scintilla/src/Indicator.cxx
    scintilla/src/KeyMap.cxx
    scintilla/src/KeyMap.h
    scintilla/src/LineMarker.cxx
    scintilla/src/PerLine.cxx
    scintilla/src/PerLine.h
    scintilla/src/PositionCache.cxx
    scintilla/src/PositionCache.h
    scintilla/src/RESearch.cxx
    scintilla/src/RESearch.h
    scintilla/src/RunStyles.cxx
    scintilla/src/RunStyles.h
    scintilla/src/ScintillaBase.cxx
    scintilla/src/ScintillaBase.h
    scintilla/src/Selection.cxx
    scintilla/src/SplitVector.h
    scintilla/src/Style.cxx
    scintilla/src/Style.h
    scintilla/src/UniConversion.h
    scintilla/src/ViewStyle.cxx
    scintilla/src/ViewStyle.h
    scintilla/src/XPM.cxx
    scintilla/src/XPM.h
    scintilla/version.txt
    scripts/update-scintilla.sh
    src/build.c
    src/callbacks.c
    src/dialogs.c
    src/document.c
    src/document.h
    src/editor.c
    src/highlighting.c
    src/highlightingmappings.h
    src/keybindings.c
    src/keybindings.h
    src/main.c
    src/plugindata.h
    src/plugins.c
    src/pluginutils.c
    src/pluginutils.h
    src/prefs.c
    src/prefs.h
    src/project.c
    src/sciwrappers.c
    src/sciwrappers.h
    src/search.c
    src/search.h
    src/sidebar.c
    src/socket.c
    src/symbols.c
    src/tools.c
    src/ui_utils.c
    src/ui_utils.h
    src/vte.c
    src/win32.c
    tagmanager/ctags/asciidoc.c
    tagmanager/ctags/c.c
    tagmanager/ctags/fortran.c
    tagmanager/ctags/js.c
    tagmanager/ctags/read.c
    tagmanager/ctags/read.h
    tagmanager/ctags/sql.c
    tests/Makefile.am
    tests/ctags/1795612.js
    tests/ctags/1795612.js.tags
    tests/ctags/1850914.js
    tests/ctags/1850914.js.tags
    tests/ctags/1878155.js
    tests/ctags/1878155.js.tags
    tests/ctags/1880687.js
    tests/ctags/1880687.js.tags
    tests/ctags/2023624.js
    tests/ctags/2023624.js.tags
    tests/ctags/3184782.sql
    tests/ctags/3184782.sql.tags
    tests/ctags/3470609.js
    tests/ctags/3470609.js.tags
    tests/ctags/3526726.tex
    tests/ctags/3526726.tex.tags
    tests/ctags/68hc11.asm
    tests/ctags/68hc11.asm.tags
    tests/ctags/Makefile.am
    tests/ctags/Package.pm
    tests/ctags/Package.pm.tags
    tests/ctags/angle_bracket.cpp
    tests/ctags/angle_bracket.cpp.tags
    tests/ctags/array-spec.f90
    tests/ctags/array-spec.f90.tags
    tests/ctags/array_ref_and_out.cs
    tests/ctags/array_ref_and_out.cs.tags
    tests/ctags/array_spec.f90
    tests/ctags/array_spec.f90.tags
    tests/ctags/attributes.cs
    tests/ctags/attributes.cs.tags
    tests/ctags/auto.f
    tests/ctags/auto.f.tags
    tests/ctags/bit_field.c
    tests/ctags/bit_field.c.tags
    tests/ctags/bracematch.js
    tests/ctags/bracematch.js.tags
    tests/ctags/bug1020715.c
    tests/ctags/bug1020715.c.tags
    tests/ctags/bug1020715.cpp
    tests/ctags/bug1020715.cpp.tags
    tests/ctags/bug1086609.c
    tests/ctags/bug1086609.c.tags
    tests/ctags/bug1093123.cpp
    tests/ctags/bug1093123.cpp.tags
    tests/ctags/bug1111214-j-chan.v
    tests/ctags/bug1111214-j-chan.v.tags
    tests/ctags/bug1111214.v
    tests/ctags/bug1111214.v.tags
    tests/ctags/bug1201689.c
    tests/ctags/bug1201689.c.tags
    tests/ctags/bug1447756.java
    tests/ctags/bug1447756.java.tags
    tests/ctags/bug1458930.c
    tests/ctags/bug1458930.c.tags
    tests/ctags/bug1466117.c
    tests/ctags/bug1466117.c.tags
    tests/ctags/bug1491666.c
    tests/ctags/bug1491666.c.tags
    tests/ctags/bug1515910.cs
    tests/ctags/bug1515910.cs.tags
    tests/ctags/bug1548443.cpp
    tests/ctags/bug1548443.cpp.tags
    tests/ctags/bug1563476.cpp
    tests/ctags/bug1563476.cpp.tags
    tests/ctags/bug1570779.sql
    tests/ctags/bug1570779.sql.tags
    tests/ctags/bug1575055.cpp
    tests/ctags/bug1575055.cpp.tags
    tests/ctags/bug1585745.cpp
    tests/ctags/bug1585745.cpp.tags
    tests/ctags/bug1611054.cs
    tests/ctags/bug1611054.cs.tags
    tests/ctags/bug1691412.java
    tests/ctags/bug1691412.java.tags
    tests/ctags/bug1742588.rb
    tests/ctags/bug1742588.rb.tags
    tests/ctags/bug1743330.v
    tests/ctags/bug1743330.v.tags
    tests/ctags/bug1764143.h
    tests/ctags/bug1764143.h.tags
    tests/ctags/bug1764148.py
    tests/ctags/bug1764148.py.tags
    tests/ctags/bug1770479.cpp
    tests/ctags/bug1770479.cpp.tags
    tests/ctags/bug1773926.cpp
    tests/ctags/bug1773926.cpp.tags
    tests/ctags/bug1777344.java
    tests/ctags/bug1777344.java.tags
    tests/ctags/bug1799340.cpp
    tests/ctags/bug1799340.cpp.tags
    tests/ctags/bug1799343-1.cpp
    tests/ctags/bug1799343-1.cpp.tags
    tests/ctags/bug1799343-2.cpp
    tests/ctags/bug1799343-2.cpp.tags
    tests/ctags/bug1800065.cs
    tests/ctags/bug1800065.cs.tags
    tests/ctags/bug1809024.py
    tests/ctags/bug1809024.py.tags
    tests/ctags/bug1830343.cs
    tests/ctags/bug1830343.cs.tags
    tests/ctags/bug1830344.cs
    tests/ctags/bug1830344.cs.tags
    tests/ctags/bug1856363.py
    tests/ctags/bug1856363.py.tags
    tests/ctags/bug1906062.py
    tests/ctags/bug1906062.py.tags
    tests/ctags/bug1907083.cpp
    tests/ctags/bug1907083.cpp.tags
    tests/ctags/bug1924919.cpp
    tests/ctags/bug1924919.cpp.tags
    tests/ctags/bug1938565.sql
    tests/ctags/bug1938565.sql.tags
    tests/ctags/bug1944150.sql
    tests/ctags/bug1944150.sql.tags
    tests/ctags/bug1950327.js
    tests/ctags/bug1950327.js.tags
    tests/ctags/bug1988026.py
    tests/ctags/bug1988026.py.tags
    tests/ctags/bug1988027.py
    tests/ctags/bug1988027.py.tags
    tests/ctags/bug1988130.py
    tests/ctags/bug1988130.py.tags
    tests/ctags/bug2049723.java
    tests/ctags/bug2049723.java.tags
    tests/ctags/bug2075402.py
    tests/ctags/bug2075402.py.tags
    tests/ctags/bug2117073.java
    tests/ctags/bug2117073.java.tags
    tests/ctags/bug2374109.vhd
    tests/ctags/bug2374109.vhd.tags
    tests/ctags/bug2411878.cs
    tests/ctags/bug2411878.cs.tags
    tests/ctags/bug2747828.v
    tests/ctags/bug2747828.v.tags
    tests/ctags/bug2777310.js
    tests/ctags/bug2777310.js.tags
    tests/ctags/bug2781264.rb
    tests/ctags/bug2781264.rb.tags
    tests/ctags/bug2886870.tex
    tests/ctags/bug2886870.tex.tags
    tests/ctags/bug2888482.js
    tests/ctags/bug2888482.js.tags
    tests/ctags/bug3036476.js
    tests/ctags/bug3036476.js.tags
    tests/ctags/bug3168705.py
    tests/ctags/bug3168705.py.tags
    tests/ctags/bug3571233.js
    tests/ctags/bug3571233.js.tags
    tests/ctags/bug507864.c
    tests/ctags/bug507864.c.tags
    tests/ctags/bug538629.asm
    tests/ctags/bug538629.asm.tags
    tests/ctags/bug556645.c
    tests/ctags/bug556645.c.tags
    tests/ctags/bug556646.c
    tests/ctags/bug556646.c.tags
    tests/ctags/bug565813.f90
    tests/ctags/bug565813.f90.tags
    tests/ctags/bug612019.pas
    tests/ctags/bug612019.pas.tags
    tests/ctags/bug612621.pl
    tests/ctags/bug612621.pl.tags
    tests/ctags/bug620288.f
    tests/ctags/bug620288.f.tags
    tests/ctags/bug639639.h
    tests/ctags/bug639639.h.tags
    tests/ctags/bug639644.hpp
    tests/ctags/bug639644.hpp.tags
    tests/ctags/bug665086.cpp
    tests/ctags/bug665086.cpp.tags
    tests/ctags/bug670433.f90
    tests/ctags/bug670433.f90.tags
    tests/ctags/bug699171.py
    tests/ctags/bug699171.py.tags
    tests/ctags/bug722501.sql
    tests/ctags/bug722501.sql.tags
    tests/ctags/bug726712.f90
    tests/ctags/bug726712.f90.tags
    tests/ctags/bug726875.f90
    tests/ctags/bug726875.f90.tags
    tests/ctags/bug734933.f90
    tests/ctags/bug734933.f90.tags
    tests/ctags/bug762027.v
    tests/ctags/bug762027.v.tags
    tests/ctags/bug814263.java
    tests/ctags/bug814263.java.tags
    tests/ctags/bug823000.sql
    tests/ctags/bug823000.sql.tags
    tests/ctags/bug842077.pl
    tests/ctags/bug842077.pl.tags
    tests/ctags/bug849591.cpp
    tests/ctags/bug849591.cpp.tags
    tests/ctags/bug852368.cpp
    tests/ctags/bug852368.cpp.tags
    tests/ctags/bug858165.f90
    tests/ctags/bug858165.f90.tags
    tests/ctags/bug872494.cpp
    tests/ctags/bug872494.cpp.tags
    tests/ctags/bug877956.f90
    tests/ctags/bug877956.f90.tags
    tests/ctags/bug960316.v
    tests/ctags/bug960316.v.tags
    tests/ctags/bug961001.v
    tests/ctags/bug961001.v.tags
    tests/ctags/byte.f
    tests/ctags/byte.f.tags
    tests/ctags/char-selector.f90
    tests/ctags/char-selector.f90.tags
    tests/ctags/classes.php
    tests/ctags/classes.php.tags
    tests/ctags/common.f
    tests/ctags/common.f.tags
    tests/ctags/continuation.f90
    tests/ctags/continuation.f90.tags
    tests/ctags/countall.sql
    tests/ctags/countall.sql.tags
    tests/ctags/cpp_destructor.cpp
    tests/ctags/cpp_destructor.cpp.tags
    tests/ctags/cython_sample.pyx
    tests/ctags/cython_sample.pyx.tags
    tests/ctags/db-trig.sql
    tests/ctags/db-trig.sql.tags
    tests/ctags/debian_432872.f90
    tests/ctags/debian_432872.f90.tags
    tests/ctags/directives.c
    tests/ctags/directives.c.tags
    tests/ctags/dopbl2.f
    tests/ctags/dopbl2.f.tags
    tests/ctags/enum.c
    tests/ctags/enum.c.tags
    tests/ctags/enum.java
    tests/ctags/enum.java.tags
    tests/ctags/events.cs
    tests/ctags/events.cs.tags
    tests/ctags/extern_variable.h
    tests/ctags/extern_variable.h.tags
    tests/ctags/forall_module.f90
    tests/ctags/forall_module.f90.tags
    tests/ctags/format.pl
    tests/ctags/format.pl.tags
    tests/ctags/func_typedef.h
    tests/ctags/func_typedef.h.tags
    tests/ctags/general.cs
    tests/ctags/general.cs.tags
    tests/ctags/hex2dec.sql
    tests/ctags/hex2dec.sql.tags
    tests/ctags/implied_program.f
    tests/ctags/implied_program.f.tags
    tests/ctags/indexer.cs
    tests/ctags/indexer.cs.tags
    tests/ctags/infinite_loop.java
    tests/ctags/infinite_loop.java.tags
    tests/ctags/ingres_procedures.sql
    tests/ctags/ingres_procedures.sql.tags
    tests/ctags/initialization.f90
    tests/ctags/initialization.f90.tags
    tests/ctags/interface_indexers.cs
    tests/ctags/interface_indexers.cs.tags
    tests/ctags/interface_properties.cs
    tests/ctags/interface_properties.cs.tags
    tests/ctags/internal.cs
    tests/ctags/internal.cs.tags
    tests/ctags/intro.tex
    tests/ctags/intro.tex.tags
    tests/ctags/intro_orig.tex
    tests/ctags/intro_orig.tex.tags
    tests/ctags/invalid_name.f90
    tests/ctags/invalid_name.f90.tags
    tests/ctags/java_enum.java
    tests/ctags/java_enum.java.tags
    tests/ctags/jsFunc_tutorial.js
    tests/ctags/jsFunc_tutorial.js.tags
    tests/ctags/keyword_abstract.cs
    tests/ctags/keyword_abstract.cs.tags
    tests/ctags/keyword_catch_try.cs
    tests/ctags/keyword_catch_try.cs.tags
    tests/ctags/keyword_class.cs
    tests/ctags/keyword_class.cs.tags
    tests/ctags/keyword_const.cs
    tests/ctags/keyword_const.cs.tags
    tests/ctags/keyword_delegate.cs
    tests/ctags/keyword_delegate.cs.tags
    tests/ctags/keyword_enum.cs
    tests/ctags/keyword_enum.cs.tags
    tests/ctags/keyword_event.cs
    tests/ctags/keyword_event.cs.tags
    tests/ctags/keyword_explicit.cs
    tests/ctags/keyword_explicit.cs.tags
    tests/ctags/keyword_extern.cs
    tests/ctags/keyword_extern.cs.tags
    tests/ctags/keyword_implicit.cs
    tests/ctags/keyword_implicit.cs.tags
    tests/ctags/keyword_interface.cs
    tests/ctags/keyword_interface.cs.tags
    tests/ctags/keyword_namespace.cs
    tests/ctags/keyword_namespace.cs.tags
    tests/ctags/keyword_out.cs
    tests/ctags/keyword_out.cs.tags
    tests/ctags/keyword_override.cs
    tests/ctags/keyword_override.cs.tags
    tests/ctags/keyword_params.cs
    tests/ctags/keyword_params.cs.tags
    tests/ctags/keyword_private.cs
    tests/ctags/keyword_private.cs.tags
    tests/ctags/keyword_protected.cs
    tests/ctags/keyword_protected.cs.tags
    tests/ctags/keyword_public.cs
    tests/ctags/keyword_public.cs.tags
    tests/ctags/keyword_sealed.cs
    tests/ctags/keyword_sealed.cs.tags
    tests/ctags/keyword_static.cs
    tests/ctags/keyword_static.cs.tags
    tests/ctags/keyword_struct.cs
    tests/ctags/keyword_struct.cs.tags
    tests/ctags/keyword_virtual.cs
    tests/ctags/keyword_virtual.cs.tags
    tests/ctags/keyword_volatile.cs
    tests/ctags/keyword_volatile.cs.tags
    tests/ctags/labels.sql
    tests/ctags/labels.sql.tags
    tests/ctags/lanus.for
    tests/ctags/lanus.for.tags
    tests/ctags/line_directives.c
    tests/ctags/line_directives.c.tags
    tests/ctags/local.c
    tests/ctags/local.c.tags
    tests/ctags/macros.c
    tests/ctags/macros.c.tags
    tests/ctags/masm.asm
    tests/ctags/masm.asm.tags
    tests/ctags/matlab_backtracking.m
    tests/ctags/matlab_backtracking.m.tags
    tests/ctags/matlab_test.m
    tests/ctags/matlab_test.m.tags
    tests/ctags/maze.erl
    tests/ctags/maze.erl.tags
    tests/ctags/misc_types.f
    tests/ctags/misc_types.f.tags
    tests/ctags/misc_types.f90
    tests/ctags/misc_types.f90.tags
    tests/ctags/mode.php
    tests/ctags/mode.php.tags
    tests/ctags/moniker.x68.asm
    tests/ctags/moniker.x68.asm.tags
    tests/ctags/namelist.f
    tests/ctags/namelist.f.tags
    tests/ctags/namespace.cpp
    tests/ctags/namespace.cpp.tags
    tests/ctags/namespaces.php
    tests/ctags/namespaces.php.tags
    tests/ctags/namespaces2.php
    tests/ctags/namespaces2.php.tags
    tests/ctags/no_terminator.js
    tests/ctags/no_terminator.js.tags
    tests/ctags/numlib.f90
    tests/ctags/numlib.f90.tags
    tests/ctags/objectivec_implementation.mm
    tests/ctags/objectivec_implementation.mm.tags
    tests/ctags/objectivec_interface.mm
    tests/ctags/objectivec_interface.mm.tags
    tests/ctags/objectivec_property.mm
    tests/ctags/objectivec_property.mm.tags
    tests/ctags/objectivec_protocol.mm
    tests/ctags/objectivec_protocol.mm.tags
    tests/ctags/procedure_pointer_module.f90
    tests/ctags/procedure_pointer_module.f90.tags
    tests/ctags/property.cs
    tests/ctags/property.cs.tags
    tests/ctags/prototype.h
    tests/ctags/prototype.h.tags
    tests/ctags/pure_elem.f95
    tests/ctags/pure_elem.f95.tags
    tests/ctags/random.sql
    tests/ctags/random.sql.tags
    tests/ctags/readlob.sql
    tests/ctags/readlob.sql.tags
    tests/ctags/readlong.sql
    tests/ctags/readlong.sql.tags
    tests/ctags/recursive.f95
    tests/ctags/recursive.f95.tags
    tests/ctags/refcurs.sql
    tests/ctags/refcurs.sql.tags
    tests/ctags/regexp.js
    tests/ctags/regexp.js.tags
    tests/ctags/runner.sh
    tests/ctags/secondary_fcn_name.js
    tests/ctags/secondary_fcn_name.js.tags
    tests/ctags/semicolon.f90
    tests/ctags/semicolon.f90.tags
    tests/ctags/signature.cpp
    tests/ctags/signature.cpp.tags
    tests/ctags/simple.bas
    tests/ctags/simple.bas.tags
    tests/ctags/simple.cbl
    tests/ctags/simple.cbl.tags
    tests/ctags/simple.html
    tests/ctags/simple.html.tags
    tests/ctags/simple.js
    tests/ctags/simple.js.tags
    tests/ctags/simple.ksh
    tests/ctags/simple.ksh.tags
    tests/ctags/simple.lua
    tests/ctags/simple.lua.tags
    tests/ctags/simple.mak
    tests/ctags/simple.mak.tags
    tests/ctags/simple.php
    tests/ctags/simple.php.tags
    tests/ctags/simple.pl
    tests/ctags/simple.pl.tags
    tests/ctags/simple.py
    tests/ctags/simple.py.tags
    tests/ctags/simple.rb
    tests/ctags/simple.rb.tags
    tests/ctags/simple.sh
    tests/ctags/simple.sh.tags
    tests/ctags/simple.tcl
    tests/ctags/simple.tcl.tags
    tests/ctags/spurious_label_tags.c
    tests/ctags/spurious_label_tags.c.tags
    tests/ctags/sql_single_quote.sql
    tests/ctags/sql_single_quote.sql.tags
    tests/ctags/state_machine.v
    tests/ctags/state_machine.v.tags
    tests/ctags/static_array.c
    tests/ctags/static_array.c.tags
    tests/ctags/stdcall.f
    tests/ctags/stdcall.f.tags
    tests/ctags/strings.rb
    tests/ctags/strings.rb.tags
    tests/ctags/structure.f
    tests/ctags/structure.f.tags
    tests/ctags/tabindent.py
    tests/ctags/tabindent.py.tags
    tests/ctags/test.py
    tests/ctags/test.py.tags
    tests/ctags/test.vhd
    tests/ctags/test.vhd.tags
    tests/ctags/traffic_signal.v
    tests/ctags/traffic_signal.v.tags
    tests/ctags/traits.php
    tests/ctags/traits.php.tags
    tests/ctags/union.f
    tests/ctags/union.f.tags
    tests/ctags/value.f
    tests/ctags/value.f.tags
    waf
    wscript

Modified: .gitignore
7 files changed, 7 insertions(+), 0 deletions(-)
===================================================================
@@ -10,6 +10,7 @@
 deps.mak
 .deps/
 .libs/
+.lock-waf_*
 Makefile
 Makefile.in
 
@@ -96,3 +97,9 @@ Makefile.in
 /doc/hacking.html
 /doc/*.pdf
 /doc/reference
+
+#-----------------------------------------------------------------------
+# /tests/
+#-----------------------------------------------------------------------
+/tests/**/*.trs
+/tests/**/*.log


Modified: Makefile.am
3 files changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = tagmanager scintilla src plugins icons po doc
+SUBDIRS = tagmanager scintilla src plugins icons po doc tests
 
 AUTOMAKE_OPTIONS =	1.7
 
@@ -8,6 +8,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 WIN32_BUILD_FILES = \
 	geany_private.rc \
+	geany.exe.manifest \
 	win32-config.h \
 	makefile.win32
 


Modified: NEWS
17 files changed, 17 insertions(+), 0 deletions(-)
===================================================================
@@ -6,6 +6,23 @@ Geany 1.24 (unreleased)
     Interface
     * Fix custom GTK styles under KDE (#3607935).
 
+    Editor
+    * Update Scintilla to version 3.3.3.
+
+    Filetypes
+    * Extend list of recognized keywords for SQL
+
+    Internationalization
+    * Update translations: de, he
+
+
+Geany 1.23.1 (May 19, 2013)
+
+    Bug fixes
+    * Fix custom styles under KDE and for people using gtk-chtheme
+      (corrects tab coloring, #3607935).
+    * Fix broken opening files from command line on Windows (#3613096).
+
 
 Geany 1.23 (March 10, 2013)
 


Modified: configure.ac
2 files changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -139,6 +139,8 @@ AC_CONFIG_FILES([
 		geany.spec
 		geany.pc
 		doc/Doxyfile
+		tests/Makefile
+		tests/ctags/Makefile
 ])
 AC_OUTPUT
 


Modified: data/filetype_extensions.conf
8 files changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -21,10 +21,10 @@ D=*.d;*.di;
 Diff=*.diff;*.patch;*.rej;
 Docbook=*.docbook;
 Erlang=*.erl;
-F77=*.f;*.for;*.ftn;*.f77;
+F77=*.f;*.for;*.ftn;*.f77;*.F;*.FOR;*.FTN;*.fpp;*.FPP
 Ferite=*.fe;
 Forth=*.fs;*.fth;
-Fortran=*.f90;*.f95;*.f03;
+Fortran=*.f90;*.f95;*.f03;*.f08;*.F90;*.F95;*.F03;*.F08
 FreeBasic=*.bas;*.bi;
 Genie=*.gs;
 GLSL=*.glsl;*.frag;*.vert;
@@ -34,7 +34,7 @@ Haxe=*.hx;
 HTML=*.htm;*.html;*.shtml;*.hta;*.htd;*.htt;*.cfm;
 Java=*.java;*.jsp;
 Javascript=*.js;
-LaTeX=*.tex;*.sty;*.idx;*.ltx;*.latex;
+LaTeX=*.tex;*.sty;*.idx;*.ltx;*.latex;*.aux;*.bib;
 Lisp=*.lisp;
 Lua=*.lua;
 Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*;
@@ -46,7 +46,7 @@ Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk;
 Perl=*.pl;*.perl;*.pm;*.agi;*.pod;
 PHP=*.php;*.php3;*.php4;*.php5;*.phtml;
 Po=*.po;*.pot;
-Python=*.py;*.pyw;SConstruct;SConscript;
+Python=*.py;*.pyw;SConstruct;SConscript;wscript;
 reStructuredText=*.rest;*.reST;*.rst;
 R=*.R;*.r;
 Rust=*.rs


Modified: data/filetypes.c
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -6,6 +6,7 @@
 commentline=comment_line
 commentdoc=comment_doc
 preprocessorcomment=comment
+preprocessorcommentdoc=comment_doc
 number=number_1
 word=keyword_1
 word2=keyword_2


Modified: data/filetypes.haskell
6 files changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -18,6 +18,12 @@ instance=type
 capital=string_2
 module=function
 data=number_2
+pragma=preprocessor
+preprocessor=preprocessor
+stringeol=string_eol
+reserved_operator=operator
+literate_comment=comment
+literate_codedelim=other
 
 [keywords]
 # all items must be in one line


Modified: data/filetypes.html
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -81,7 +81,7 @@
 javascript=abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with
 vbscript=and as boolean byref byte byval call case class const continue currency date dim do double each else elseif empty end error exit false for function get global goto if in integer long loop me new next not nothing object on optional or private property public put redim rem resume select set single string sub then to true type until variant wend while with
 python=and assert break class continue complex def del elif else except exec finally for from global if import in inherit is int lambda not or pass print raise return tuple try unicode while yield long float str list
-php=abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die __dir__ directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function goto global if implements include include_once instanceof int integer interface isset __line__ list __method__ namespace __namespace__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor insteadof trait
+php=abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die __dir__ directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function goto global if implements include include_once instanceof int integer interface isset __line__ list __method__ namespace __namespace__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return self __sleep static stdclass string switch this throw true try unset use var __wakeup while xor insteadof trait
 sgml=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
 
 


Modified: data/filetypes.java
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
 [styling=C]
 
 [keywords]
-primary=abstract assert break case catch class const continue default do else enum extends final finally for future generic goto if implements import inner instanceof interface native new outer package private protected public rest return static super switch synchronized this throw throws transient try var volatile while true false null
+primary=abstract assert break case catch class const continue default do else enum extends final finally for future generic goto if implements import inner instanceof interface native new outer package private protected public rest return static strictfp super switch synchronized this throw throws transient try var volatile while true false null
 secondary=boolean byte char double float int long short void
 # documentation keywords for javadoc
 doccomment=author deprecated exception param return see serial serialData serialField since throws todo version


Modified: data/filetypes.pascal
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -20,7 +20,7 @@ asm=number_2
 
 [keywords]
 # all items must be in one line
-primary=absolute abstract add and array as asm assembler automated begin byte case cdecl char class const constructor contains default deprecated destructor dispid dispinterface div do downto dynamic else end except export exports external far file final finalization finally for forward function goto if implementation implements in index inherited initialization inline integer interface is label library message mod name near nil nodefault not object of on or out overload override package packed pascal platform private procedure program property protected public published raise read readonly real record register reintroduce remove repeat requires resourcestring safecall sealed set shl shr static stdcall stored strict string then threadvar to try type unit unsafe until uses var varargs virtual while with word write writeonly xor
+primary=absolute abstract add and array as asm assembler automated begin break byte case cdecl char class const constructor contains default deprecated destructor dispid dispinterface div do downto dynamic else end except export exports external far file final finalization finally for forward function goto if implementation implements in index inherited initialization inline integer interface is label library message mod name near nil nodefault not object of on or out overload override package packed pascal platform private procedure program property protected public published raise read readonly real record register reintroduce remove repeat requires resourcestring safecall sealed set shl shr static stdcall stored strict string then threadvar to try type unit unsafe until uses var varargs virtual while with word write writeonly xor
 
 [lexer_properties]
 # only highlight keywords like read,write if in appropriate context


Modified: data/filetypes.python
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -23,7 +23,7 @@ decorator=decorator
 primary=and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True
 # additional keywords, will be highlighted with style "word2"
 # these are the builtins for Python 2.7 created with ' '.join(dir(__builtins__))
-identifiers=ArithmeticError AssertionError AttributeError BaseException BufferError BytesWarning DeprecationWarning EOFError Ellipsis EnvironmentError Exception False FloatingPointError FutureWarning GeneratorExit IOError ImportError ImportWarning IndentationError IndexError KeyError KeyboardInterrupt LookupError MemoryError NameError None NotImplemented NotImplementedError OSError OverflowError PendingDeprecationWarning ReferenceError RuntimeError RuntimeWarning StandardError StopIteration SyntaxError SyntaxWarning SystemError SystemExit TabError True TypeError UnboundLocalError UnicodeDecodeError UnicodeEncodeError UnicodeError UnicodeTranslateError UnicodeWarning UserWarning ValueError Warning ZeroDivisionError __debug__ __doc__ __import__ __name__ __package__ abs all any apply basestring bin bool buffer bytearray bytes callable chr classmethod cmp coerce compile complex copyright credits delattr dict dir divmod enumerate eval execfile exit file filter float format frozenset getattr globals hasattr hash help hex id input int intern isinstance issubclass iter len license list locals long map max memoryview min next object oct open ord pow print property quit range raw_input reduce reload repr reversed round set setattr slice sorted staticmethod str sum super tuple type unichr unicode vars xrange zip
+identifiers=ArithmeticError AssertionError AttributeError BaseException BufferError BytesWarning DeprecationWarning EOFError Ellipsis EnvironmentError Exception FloatingPointError FutureWarning GeneratorExit IOError ImportError ImportWarning IndentationError IndexError KeyError KeyboardInterrupt LookupError MemoryError NameError NotImplemented NotImplementedError OSError OverflowError PendingDeprecationWarning ReferenceError RuntimeError RuntimeWarning StandardError StopIteration SyntaxError SyntaxWarning SystemError SystemExit TabError TypeError UnboundLocalError UnicodeDecodeError UnicodeEncodeError UnicodeError UnicodeTranslateError UnicodeWarning UserWarning ValueError Warning ZeroDivisionError __debug__ __doc__ __import__ __name__ __package__ abs all any apply basestring bin bool buffer bytearray bytes callable chr classmethod cmp coerce compile complex copyright credits delattr dict dir divmod enumerate eval execfile exit file filter float format frozenset getattr globals hasattr hash help hex id input int intern isinstance issubclass iter len license list locals long map max memoryview min next object oct open ord pow print property quit range raw_input reduce reload repr reversed round set setattr slice sorted staticmethod str sum super tuple type unichr unicode vars xrange zip
 
 [lexer_properties]
 fold.comment.python=1


Modified: data/filetypes.sql
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -22,7 +22,7 @@ quotedidentifier=identifier_2
 
 [keywords]
 # all items must be in one line
-keywords=absolute action add admin after aggregate alias all allocate alter and any are array as asc assertion at authorization before begin bfile bigint binary bit blob bool boolean both breadth by call cascade cascaded case cast catalog char character check class clob close cluster collate collation column commit completion connect connection constraint constraints constructor continue corresponding create cross cube current current_date current_path current_role current_time current_timestamp current_user cursor cycle data date day deallocate dec decimal declare default deferrable deferred delete depth deref desc describe descriptor destroy destructor deterministic diagnostics dictionary dimension disconnect diskgroup distinct domain double drop dynamic each else end end-exec equals escape every except exception exec execute exists explain external false fetch first fixed flashback float for foreign found from free full function general get global go goto grant group grouping having host hour identity if ignore immediate in index indextype indicator initialize initially inner inout input insert int integer intersect interval into is isolation iterate join key language large last lateral leading left less level like limit local localtime localtimestamp locator long map match materialized mediumblob mediumint mediumtext merge middleint minus minute modifies modify module month names national natural nchar nclob new next no noaudit none not null numeric nvarchar2 object of off old on only open operation option or order ordinality out outer output package pad parameter parameters partial path postfix precision prefix preorder prepare preserve primary prior privileges procedure profile public purge read reads real recursive ref references referencing regexp regexp_like relative rename restrict result return returning returns revoke right role rollback rollup routine row rows savepoint schema scroll scope search second section select sequence session session_user set sets size smallint some space specific specifictype sql sqlexception sqlstate sqlwarning start state statement static structure synonym system_user table tablespace temporary terminate than then time timestamp timezone_hour timezone_minute tinyint to trailing transaction translation  treat trigger true truncate type under union unique unknown unnest update usage user using value values varchar varchar2 variable varying view when whenever where with without work write year zone
+keywords=absolute action add admin after aggregate alias all allocate alter and any are array as asc assertion at authorization auto_increment before begin bfile bigint binary bit blob bool boolean both breadth by call cascade cascaded case cast catalog char charset character check class clob close cluster collate collation column comment commit completion connect connection constraint constraints constructor continue corresponding create cross cube current current_date current_path current_role current_time current_timestamp current_user cursor cycle data date day deallocate dec decimal declare default deferrable deferred delete depth deref desc describe descriptor destroy destructor deterministic diagnostics dictionary dimension disconnect diskgroup distinct domain double drop dynamic each else elsif end end-exec engine equals escape every except exception exec execute exists explain external false fetch first fixed flashback float for foreign found from free full function general get global go goto grant group grouping having host hour identity if ignore immediate in index indextype indicator initialize initially inner inout input insert int integer intersect interval into is isolation iterate join key language large last lateral leading left less level like limit local localtime localtimestamp locator long map match materialized mediumblob mediumint mediumtext merge middleint minus minute modifies modify module month names national natural nchar nclob new next no noaudit none not null numeric nvarchar2 object of off old on only open operation option or order ordinality out outer output owner package pad parameter parameters partial path postfix precision prefix preorder prepare preserve primary prior privileges procedure profile public purge raise read reads real recursive ref references referencing regexp regexp_like relative rename restrict result return returning returns revoke right role rollback rollup routine row rows savepoint schema scroll scope search second section select sequence session session_user serial set sets size smallint some space specific specifictype sql sqlexception sqlstate sqlwarning start state statement static structure synonym system_user table tablespace temporary terminate text than then time timestamp timezone_hour timezone_minute tinyint to trailing transaction translation treat trigger true truncate type under union unique unknown unnest unsigned update usage user using value values varchar varchar2 variable varying view when whenever where with without work write year zone
 
 
 [settings]


Modified: data/geany.glade
1251 files changed, 935 insertions(+), 316 deletions(-)
===================================================================
@@ -458,6 +458,30 @@
     <property name="stock">gtk-select-color</property>
     <property name="icon-size">1</property>
   </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-open</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image4">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-save-as</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image5">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-print</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="image6">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-find</property>
+    <property name="icon-size">1</property>
+  </object>
   <object class="GtkImage" id="image4060">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -2118,7 +2142,7 @@
                                     <property name="draw_indicator">True</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">4</property>
                                   </packing>
@@ -2547,7 +2571,7 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
@@ -2657,7 +2681,7 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
@@ -2893,7 +2917,7 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">7</property>
                                   </packing>
@@ -2933,7 +2957,7 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">8</property>
                                   </packing>
@@ -4278,7 +4302,7 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -4363,14 +4387,14 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
@@ -4430,14 +4454,14 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
+                                    <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
@@ -4659,7 +4683,7 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
@@ -5733,7 +5757,7 @@
                                                     </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="expand">True</property>
+                                                    <property name="expand">False</property>
                                                     <property name="fill">True</property>
                                                     <property name="position">1</property>
                                                   </packing>
@@ -7227,219 +7251,826 @@
       <action-widget response="-5">okbutton1</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="tab_pos_list">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Left</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Right</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Top</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Bottom</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkTextBuffer" id="textbuffer1"/>
-  <object class="GtkMenu" id="toolbar_popup_menu1">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkImageMenuItem" id="customize_toolbar1">
-        <property name="label" translatable="yes">_Toolbar Preferences</property>
-        <property name="use_action_appearance">False</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_underline">True</property>
-        <property name="image">image3192</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_customize_toolbar1_activate" swapped="no"/>
-      </object>
-    </child>
-    <child>
-      <object class="GtkSeparatorMenuItem" id="separator53">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImageMenuItem" id="hide_toolbar1">
-        <property name="label" translatable="yes">_Hide Toolbar</property>
-        <property name="use_action_appearance">False</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="use_underline">True</property>
-        <property name="image">image3193</property>
-        <property name="use_stock">False</property>
-        <signal name="activate" handler="on_hide_toolbar1_activate" swapped="no"/>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="window1">
+  <object class="GtkDialog" id="properties_dialog">
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Geany</property>
-    <property name="icon_name">geany</property>
-    <child internal-child="accessible">
-      <object class="AtkObject" id="window1-atkobject">
-        <property name="AtkObject::accessible-name" translatable="yes">Geany</property>
-      </object>
-    </child>
-    <accel-groups>
-      <group name="accelgroup1"/>
-    </accel-groups>
-    <child>
-      <object class="GtkVBox" id="vbox1">
+    <property name="border_width">5</property>
+    <property name="default_width">300</property>
+    <property name="type_hint">dialog</property>
+    <property name="transient_for">window1</property>
+    <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
+    <signal name="response" handler="gtk_widget_hide" swapped="no"/>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
-          <object class="GtkHBox" id="hbox_menubar">
+          <object class="GtkVBox" id="vbox7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="border_width">6</property>
+            <property name="spacing">12</property>
             <child>
-              <object class="GtkMenuBar" id="menubar1">
+              <object class="GtkHBox" id="hbox3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="spacing">6</property>
                 <child>
-                  <object class="GtkMenuItem" id="file1">
-                    <property name="use_action_appearance">False</property>
+                  <object class="GtkImage" id="file_type_image">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_File</property>
-                    <property name="use_underline">True</property>
-                    <signal name="activate" handler="on_file1_activate" swapped="no"/>
-                    <child type="submenu">
-                      <object class="GtkMenu" id="file1_menu">
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkImageMenuItem" id="menu_new1">
-                            <property name="label">gtk-new</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_stock">True</property>
-                            <signal name="activate" handler="on_new1_activate" swapped="no"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkImageMenuItem" id="menu_new_with_template1">
-                            <property name="label" translatable="yes">New (with _Template)</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="image">image4056</property>
-                            <property name="use_stock">False</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSeparatorMenuItem" id="separator12">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkImageMenuItem" id="menu_open1">
-                            <property name="label">gtk-open</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_stock">True</property>
-                            <signal name="activate" handler="on_open1_activate" swapped="no"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="menu_open_selected_file1">
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Open Selected F_ile</property>
-                            <property name="use_underline">True</property>
-                            <signal name="activate" handler="on_menu_open_selected_file1_activate" swapped="no"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkMenuItem" id="recent_files1">
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Recent _Files</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSeparatorMenuItem" id="separator13">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkImageMenuItem" id="menu_save1">
-                            <property name="label">gtk-save</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_stock">True</property>
-                            <signal name="activate" handler="on_save1_activate" swapped="no"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkImageMenuItem" id="menu_save_as1">
-                            <property name="label">gtk-save-as</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_stock">True</property>
-                            <signal name="activate" handler="on_save_as1_activate" swapped="no"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkImageMenuItem" id="menu_save_all1">
-                            <property name="label" translatable="yes">Save A_ll</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="image">image4057</property>
-                            <property name="use_stock">False</property>
-                            <signal name="activate" handler="on_save_all1_activate" swapped="no"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkImageMenuItem" id="menu_reload1">
-                            <property name="label" translatable="yes">_Reload</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="image">image4058</property>
-                            <property name="use_stock">False</property>
-                            <signal name="activate" handler="on_toolbutton_reload_clicked" swapped="no"/>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkImageMenuItem" id="menu_reload_as1">
-                            <property name="label" translatable="yes">R_eload As</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="image">image4059</property>
-                            <property name="use_stock">False</property>
-                            <child type="submenu">
-                              <object class="GtkMenu" id="menu_reload_as1_menu">
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkMenuItem" id="invisible7">
+                    <property name="xalign">1</property>
+                    <property name="stock">gtk-file</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="file_name_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label">file name</property>
+                    <property name="selectable">True</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkTable" id="table3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="n_rows">8</property>
+                <property name="n_columns">2</property>
+                <property name="column_spacing">10</property>
+                <property name="row_spacing">10</property>
+                <child>
+                  <object class="GtkLabel" id="label6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Type:</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="file_type_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label">file type</property>
+                    <property name="selectable">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Size:</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label9">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Location:</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label10">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Read-only:</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label11">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Encoding:</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label12">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Modified:</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label13">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Changed:</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label14">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Accessed:</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="top_attach">7</property>
+                    <property name="bottom_attach">8</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="file_size_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label">file size</property>
+                    <property name="selectable">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="file_location_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label">file path</property>
+                    <property name="selectable">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="file_read_only_check">
+                    <property name="label" translatable="yes">(only inside Geany)</property>
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">False</property>
+                    <property name="receives_default">False</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="file_encoding_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label">file encoding</property>
+                    <property name="selectable">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="file_modified_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label">file mdate</property>
+                    <property name="selectable">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="file_changed_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label">file cdate</property>
+                    <property name="selectable">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="file_accessed_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label">file adate</property>
+                    <property name="selectable">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">7</property>
+                    <property name="bottom_attach">8</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkTable" id="table5">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="n_rows">5</property>
+                <property name="n_columns">4</property>
+                <property name="column_spacing">5</property>
+                <property name="row_spacing">5</property>
+                <property name="homogeneous">True</property>
+                <child>
+                  <object class="GtkLabel" id="label15">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Permissions:</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="right_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label16">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Read:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label17">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Write:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label18">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Execute:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">3</property>
+                    <property name="right_attach">4</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label20">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Owner:</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label21">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Group:</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label22">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">Other:</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="file_perm_owner_r_check">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="file_perm_owner_w_check">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="file_perm_owner_x_check">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">3</property>
+                    <property name="right_attach">4</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="file_perm_group_r_check">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="file_perm_group_w_check">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="file_perm_group_x_check">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">3</property>
+                    <property name="right_attach">4</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="file_perm_other_r_check">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="file_perm_other_w_check">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="file_perm_other_x_check">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">3</property>
+                    <property name="right_attach">4</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">button1</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkListStore" id="tab_pos_list">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Left</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Right</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Top</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bottom</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkTextBuffer" id="textbuffer1"/>
+  <object class="GtkMenu" id="toolbar_popup_menu1">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="customize_toolbar1">
+        <property name="label" translatable="yes">_Toolbar Preferences</property>
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="image">image3192</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_customize_toolbar1_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="separator53">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="hide_toolbar1">
+        <property name="label" translatable="yes">_Hide Toolbar</property>
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="image">image3193</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="on_hide_toolbar1_activate" swapped="no"/>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Geany</property>
+    <property name="icon_name">geany</property>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="window1-atkobject">
+        <property name="AtkObject::accessible-name" translatable="yes">Geany</property>
+      </object>
+    </child>
+    <accel-groups>
+      <group name="accelgroup1"/>
+    </accel-groups>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkHBox" id="hbox_menubar">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkMenuBar" id="menubar1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkMenuItem" id="file1">
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">_File</property>
+                    <property name="use_underline">True</property>
+                    <signal name="activate" handler="on_file1_activate" swapped="no"/>
+                    <child type="submenu">
+                      <object class="GtkMenu" id="file1_menu">
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkImageMenuItem" id="menu_new1">
+                            <property name="label">gtk-new</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_stock">True</property>
+                            <signal name="activate" handler="on_new1_activate" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImageMenuItem" id="menu_new_with_template1">
+                            <property name="label" translatable="yes">New (with _Template)</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="image">image4056</property>
+                            <property name="use_stock">False</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparatorMenuItem" id="separator12">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImageMenuItem" id="menu_open1">
+                            <property name="label" translatable="yes">_Open...</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="image">image3</property>
+                            <property name="use_stock">False</property>
+                            <signal name="activate" handler="on_open1_activate" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkMenuItem" id="menu_open_selected_file1">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Open Selected F_ile</property>
+                            <property name="use_underline">True</property>
+                            <signal name="activate" handler="on_menu_open_selected_file1_activate" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkMenuItem" id="recent_files1">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Recent _Files</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparatorMenuItem" id="separator13">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImageMenuItem" id="menu_save1">
+                            <property name="label">gtk-save</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="use_stock">True</property>
+                            <signal name="activate" handler="on_save1_activate" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImageMenuItem" id="menu_save_as1">
+                            <property name="label" translatable="yes">Save _As...</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="image">image4</property>
+                            <property name="use_stock">False</property>
+                            <signal name="activate" handler="on_save_as1_activate" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImageMenuItem" id="menu_save_all1">
+                            <property name="label" translatable="yes">Save A_ll</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="image">image4057</property>
+                            <property name="use_stock">False</property>
+                            <signal name="activate" handler="on_save_all1_activate" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImageMenuItem" id="menu_reload1">
+                            <property name="label" translatable="yes">_Reload</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="image">image4058</property>
+                            <property name="use_stock">False</property>
+                            <signal name="activate" handler="on_toolbutton_reload_clicked" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImageMenuItem" id="menu_reload_as1">
+                            <property name="label" translatable="yes">R_eload As</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="image">image4059</property>
+                            <property name="use_stock">False</property>
+                            <child type="submenu">
+                              <object class="GtkMenu" id="menu_reload_as1_menu">
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkMenuItem" id="invisible7">
                                     <property name="use_action_appearance">False</property>
                                     <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">invisible</property>
@@ -7485,12 +8116,13 @@
                         </child>
                         <child>
                           <object class="GtkImageMenuItem" id="print1">
-                            <property name="label">gtk-print</property>
+                            <property name="label" translatable="yes">_Print...</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="use_underline">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="image">image5</property>
+                            <property name="use_stock">False</property>
                             <signal name="activate" handler="on_print1_activate" swapped="no"/>
                           </object>
                         </child>
@@ -8119,12 +8751,13 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkImageMenuItem" id="find1">
-                            <property name="label">gtk-find</property>
+                            <property name="label" translatable="yes">_Find...</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="use_underline">True</property>
-                            <property name="use_stock">True</property>
+                            <property name="image">image6</property>
+                            <property name="use_stock">False</property>
                             <signal name="activate" handler="on_find1_activate" swapped="no"/>
                           </object>
                         </child>
@@ -8156,7 +8789,7 @@
                         </child>
                         <child>
                           <object class="GtkImageMenuItem" id="find_in_files1">
-                            <property name="label" translatable="yes">Find in F_iles</property>
+                            <property name="label" translatable="yes">Find in F_iles...</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -8168,7 +8801,7 @@
                         </child>
                         <child>
                           <object class="GtkImageMenuItem" id="replace1">
-                            <property name="label" translatable="yes">_Replace</property>
+                            <property name="label" translatable="yes">_Replace...</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -8242,7 +8875,7 @@
                         </child>
                         <child>
                           <object class="GtkImageMenuItem" id="go_to_line1">
-                            <property name="label" translatable="yes">_Go to Line</property>
+                            <property name="label" translatable="yes">_Go to Line...</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -8370,7 +9003,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkImageMenuItem" id="menu_change_font1">
-                            <property name="label" translatable="yes">Change _Font</property>
+                            <property name="label" translatable="yes">Change _Font...</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -8381,19 +9014,80 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkSeparatorMenuItem" id="menu_separator4">
+                          <object class="GtkImageMenuItem" id="menu_color_schemes">
+                            <property name="label" translatable="yes">Change _Color Scheme...</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="image">image2</property>
+                            <property name="use_stock">False</property>
+                            <signal name="activate" handler="on_menu_color_schemes_activate" swapped="no"/>
                           </object>
                         </child>
                         <child>
-                          <object class="GtkMenuItem" id="menu_toggle_all_additional_widgets1">
+                          <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">To_ggle All Additional Widgets</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkCheckMenuItem" id="menu_markers_margin1">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Show _Markers Margin</property>
                             <property name="use_underline">True</property>
-                            <signal name="activate" handler="on_menu_toggle_all_additional_widgets1_activate" swapped="no"/>
+                            <property name="active">True</property>
+                            <signal name="toggled" handler="on_markers_margin1_toggled" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkCheckMenuItem" id="menu_linenumber_margin1">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Show _Line Numbers</property>
+                            <property name="use_underline">True</property>
+                            <property name="active">True</property>
+                            <signal name="toggled" handler="on_show_line_numbers1_toggled" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkCheckMenuItem" id="menu_show_white_space1">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Show _White Space</property>
+                            <property name="use_underline">True</property>
+                            <signal name="toggled" handler="on_menu_show_white_space1_toggled" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkCheckMenuItem" id="menu_show_line_endings1">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Show Line _Endings</property>
+                            <property name="use_underline">True</property>
+                            <signal name="toggled" handler="on_menu_show_line_endings1_toggled" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkCheckMenuItem" id="menu_show_indentation_guides1">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Show _Indentation Guides</property>
+                            <property name="use_underline">True</property>
+                            <signal name="toggled" handler="on_menu_show_indentation_guides1_toggled" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSeparatorMenuItem" id="menu_separator4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                           </object>
                         </child>
                         <child>
@@ -8407,6 +9101,16 @@
                           </object>
                         </child>
                         <child>
+                          <object class="GtkMenuItem" id="menu_toggle_all_additional_widgets1">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">To_ggle All Additional Widgets</property>
+                            <property name="use_underline">True</property>
+                            <signal name="activate" handler="on_menu_toggle_all_additional_widgets1_activate" swapped="no"/>
+                          </object>
+                        </child>
+                        <child>
                           <object class="GtkCheckMenuItem" id="menu_show_messages_window1">
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
@@ -8440,91 +9144,6 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkMenuItem" id="menu_view_editor1">
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Editor</property>
-                            <property name="use_underline">True</property>
-                            <child type="submenu">
-                              <object class="GtkMenu" id="menu_view_editor1_menu">
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkImageMenuItem" id="menu_color_schemes">
-                                    <property name="label" translatable="yes">_Color Schemes</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="image">image2</property>
-                                    <property name="use_stock">False</property>
-                                    <signal name="activate" handler="on_menu_color_schemes_activate" swapped="no"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckMenuItem" id="menu_markers_margin1">
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Show _Markers Margin</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="active">True</property>
-                                    <signal name="toggled" handler="on_markers_margin1_toggled" swapped="no"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckMenuItem" id="menu_linenumber_margin1">
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Show _Line Numbers</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="active">True</property>
-                                    <signal name="toggled" handler="on_show_line_numbers1_toggled" swapped="no"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckMenuItem" id="menu_show_white_space1">
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Show _White Space</property>
-                                    <property name="use_underline">True</property>
-                                    <signal name="toggled" handler="on_menu_show_white_space1_toggled" swapped="no"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckMenuItem" id="menu_show_line_endings1">
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Show Line _Endings</property>
-                                    <property name="use_underline">True</property>
-                                    <signal name="toggled" handler="on_menu_show_line_endings1_toggled" swapped="no"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckMenuItem" id="menu_show_indentation_guides1">
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Show _Indentation Guides</property>
-                                    <property name="use_underline">True</property>
-                                    <signal name="toggled" handler="on_menu_show_indentation_guides1_toggled" swapped="no"/>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
                           <object class="GtkSeparatorMenuItem" id="menu_separator5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -8954,7 +9573,7 @@
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Replace Spaces b_y Tabs</property>
+                            <property name="label" translatable="yes">Replace Spaces b_y Tabs...</property>
                             <property name="use_underline">True</property>
                             <signal name="activate" handler="on_replace_spaces_activate" swapped="no"/>
                           </object>
@@ -9028,7 +9647,7 @@
                         <property name="can_focus">False</property>
                         <child>
                           <object class="GtkImageMenuItem" id="project_new1">
-                            <property name="label" translatable="yes">_New</property>
+                            <property name="label" translatable="yes">_New...</property>
                             <property name="use_action_appearance">False</property>
    @@ Diff output truncated at 100000 characters. @@

--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list