Commits February 2015

commits@lists.geany.org

1 participants
43 discussions

[geany/geany] e613d9: Revert some OS X keybinding changes for VTE
by Jiří Techet 13 Feb '15

13 Feb '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 12 Feb 2015 23:37:21 UTC Commit: e613d931878a98118f39c8f2f92fe4ec23508c4c https://github.com/geany/geany/commit/e613d931878a98118f39c8f2f92fe4ec23508… Log Message: ----------- Revert some OS X keybinding changes for VTE While all normal keybindings use the Command key instead of control key on OS X, all the command-line applications and terminal emulators use the Ctrl key like on Linux. This includes Ctrl+C (SIGINT) and Ctrl+D (EOF) for which there is some special handling in the VTE support in Geany and which should use GDK_CONTROL_MASK instead of GEANY_PRIMARY_MOD_MASK. Modified Paths: -------------- src/vte.c Modified: src/vte.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -329,7 +329,7 @@ void vte_close(void) static gboolean vte_keyrelease_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { if (ui_is_keyval_enter_or_return(event->keyval) || - ((event->keyval == GDK_c) && (event->state & GEANY_PRIMARY_MOD_MASK))) + ((event->keyval == GDK_c) && (event->state & GDK_CONTROL_MASK))) { /* assume any text on the prompt has been executed when pressing Enter/Return */ clean = TRUE; @@ -350,7 +350,7 @@ static gboolean vte_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer event->keyval == GDK_d || event->keyval == GDK_C || event->keyval == GDK_D) && - event->state & GEANY_PRIMARY_MOD_MASK && + event->state & GDK_CONTROL_MASK && ! (event->state & GDK_SHIFT_MASK) && ! (event->state & GDK_MOD1_MASK)) { vte_restart(widget); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 308041: Merge branch 'ctags/python'
by Colomban Wendling 11 Feb '15

11 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 11 Feb 2015 17:33:19 UTC Commit: 308041da8d0f7ee938a075cae5d84d90da91c5eb https://github.com/geany/geany/commit/308041da8d0f7ee938a075cae5d84d90da91c… Log Message: ----------- Merge branch 'ctags/python' Import Python changes from https://github.com/fishman/ctags/ Modified Paths: -------------- tagmanager/ctags/python.c tests/ctags/Makefile.am tests/ctags/py-skipped-string.py tests/ctags/py-skipped-string.py.tags Modified: tagmanager/ctags/python.c 52 lines changed, 38 insertions(+), 14 deletions(-) =================================================================== @@ -91,32 +91,49 @@ static const char *get_class_name_from_parent (const char *parent) * - http://www.python.org/dev/peps/pep-0008/#method-names-and-instance-variables * - http://www.python.org/dev/peps/pep-0008/#designing-for-inheritance */ -static pythonAccess accessFromIdentifier (const vString *const ident) +static pythonAccess accessFromIdentifier (const vString *const ident, + pythonKind kind, boolean has_parent, boolean parent_is_class) { const char *const p = vStringValue (ident); const size_t len = vStringLength (ident); + /* inside a function/method, private */ + if (has_parent && !parent_is_class) + return A_PRIVATE; /* not starting with "_", public */ - if (len < 1 || p[0] != '_') + else if (len < 1 || p[0] != '_') return A_PUBLIC; /* "__...__": magic methods */ - else if (len > 3 && p[1] == '_' && p[len - 2] == '_' && p[len - 1] == '_') + else if (kind == K_METHOD && parent_is_class && + len > 3 && p[1] == '_' && p[len - 2] == '_' && p[len - 1] == '_') return A_PUBLIC; /* "__...": name mangling */ - else if (len > 1 && p[1] == '_') + else if (parent_is_class && len > 1 && p[1] == '_') return A_PRIVATE; /* "_...": suggested as non-public, but easily accessible */ else return A_PROTECTED; } +static void addAccessFields (tagEntryInfo *const entry, + const vString *const ident, pythonKind kind, + boolean has_parent, boolean parent_is_class) +{ + pythonAccess access; + + access = accessFromIdentifier (ident, kind, has_parent, parent_is_class); + entry->extensionFields.access = PythonAccesses [access]; + /* FIXME: should we really set isFileScope in addition to access? */ + if (access == A_PRIVATE) + entry->isFileScope = TRUE; +} + /* Given a string with the contents of a line directly after the "def" keyword, * extract all relevant information and create a tag. */ static void makeFunctionTag (vString *const function, vString *const parent, int is_class_parent, const char *arglist) { - pythonAccess access; tagEntryInfo tag; initTagEntry (&tag, vStringValue (function)); @@ -147,11 +164,8 @@ static void makeFunctionTag (vString *const function, } } - access = accessFromIdentifier (function); - tag.extensionFields.access = PythonAccesses [access]; - /* FIXME: should we really set isFileScope in addition to access? */ - if (access == A_PRIVATE) - tag.isFileScope = TRUE; + addAccessFields (&tag, function, is_class_parent ? K_METHOD : K_FUNCTION, + vStringLength (parent) > 0, is_class_parent); makeTagEntry (&tag); } @@ -180,10 +194,13 @@ static void makeClassTag (vString *const class, vString *const inheritance, } } tag.extensionFields.inheritance = vStringValue (inheritance); + addAccessFields (&tag, class, K_CLASS, vStringLength (parent) > 0, + is_class_parent); makeTagEntry (&tag); } -static void makeVariableTag (vString *const var, vString *const parent) +static void makeVariableTag (vString *const var, vString *const parent, + boolean is_class_parent) { tagEntryInfo tag; initTagEntry (&tag, vStringValue (var)); @@ -194,6 +211,8 @@ static void makeVariableTag (vString *const var, vString *const parent) tag.extensionFields.scope [0] = PythonKinds[K_CLASS].name; tag.extensionFields.scope [1] = vStringValue (parent); } + addAccessFields (&tag, var, K_VARIABLE, vStringLength (parent) > 0, + is_class_parent); makeTagEntry (&tag); } @@ -247,6 +266,8 @@ static const char *skipEverything (const char *cp) } if (isIdentifierFirstCharacter ((int) *cp)) return cp; + if (match) + cp--; /* avoid jumping over the character after a skipped string */ } return cp; } @@ -517,6 +538,7 @@ static char const *find_triple_start(char const *string, char const **which) } cp = skipString(cp); if (!*cp) break; + cp--; /* avoid jumping over the character after a skipped string */ } } return NULL; @@ -603,9 +625,11 @@ static const char *skipTypeDecl (const char *cp, boolean *is_class) while (*ptr && *ptr != '=' && *ptr != '(' && !isspace(*ptr)) { /* skip over e.g. 'cpdef numpy.ndarray[dtype=double, ndim=1]' */ if(*ptr == '[') { - while(*ptr && *ptr != ']') ptr++; + while (*ptr && *ptr != ']') ptr++; + if (*ptr) ptr++; + } else { + ptr++; } - ptr++; } if (!*ptr || *ptr == '=') return NULL; if (*ptr == '(') { @@ -755,7 +779,7 @@ static void findPythonTags (void) { /* skip variables in methods */ if (parent_is_class || vStringLength(parent) == 0) - makeVariableTag (name, parent); + makeVariableTag (name, parent, parent_is_class); } } Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -228,6 +228,7 @@ test_sources = \ prototype.h \ pure_elem.f95 \ py_constructor_arglist.py \ + py-skipped-string.py \ qualified_types.f90 \ random.sql \ readlob.sql \ Modified: tests/ctags/py-skipped-string.py 30 lines changed, 30 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,30 @@ +# triple start string immediately after a normal string not detected + +def f1(): + ''""" + The string above was not detected as triple start string, + but the one below instead. + """ + print "f1" + +def f2(): + ''""" + The string above was then detected as end string, + and the one below as start string again. + """ + print "f2" + +def f3(): + """ + The string below is prepared so that ctags with the bug does not start a + new triple string. For a clean precondition for the next test. + ''""" + print "f3" + +# normal string immediately after a normal string not detected + +''" import os\ +" + +""' def fX():\ +' Modified: tests/ctags/py-skipped-string.py.tags 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,4 @@ +# format=tagmanager +f1�16�()�0 +f2�16�()�0 +f3�16�()�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] be2b28: python: do not ignore the character after a skipped string
by Markus Heidelberg 11 Feb '15

11 Feb '15

Branch: refs/heads/master Author: Markus Heidelberg <markus.heidelberg(a)web.de> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 11 Feb 2015 17:28:59 UTC Commit: be2b280377b0479db749cfcf573ff7b35d70693b https://github.com/geany/geany/commit/be2b280377b0479db749cfcf573ff7b35d706… Log Message: ----------- python: do not ignore the character after a skipped string Regression for the triple start string issue has been introduced in SVN revision 669 (fishman git a314e11158307db84c0dadb758846b2302fe69cd) on 2008-06-11. In ctags 5.7 it did work, in 5.8 not anymore. See also http://sourceforge.net/p/ctags/bugs/229/ for the original bug, which led to the old fix. The other issue with normal strings in skipEverything() is even older. Modified Paths: -------------- tagmanager/ctags/python.c tests/ctags/Makefile.am tests/ctags/py-skipped-string.py tests/ctags/py-skipped-string.py.tags Modified: tagmanager/ctags/python.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -266,6 +266,8 @@ static const char *skipEverything (const char *cp) } if (isIdentifierFirstCharacter ((int) *cp)) return cp; + if (match) + cp--; /* avoid jumping over the character after a skipped string */ } return cp; } @@ -536,6 +538,7 @@ static char const *find_triple_start(char const *string, char const **which) } cp = skipString(cp); if (!*cp) break; + cp--; /* avoid jumping over the character after a skipped string */ } } return NULL; Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -228,6 +228,7 @@ test_sources = \ prototype.h \ pure_elem.f95 \ py_constructor_arglist.py \ + py-skipped-string.py \ qualified_types.f90 \ random.sql \ readlob.sql \ Modified: tests/ctags/py-skipped-string.py 30 lines changed, 30 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,30 @@ +# triple start string immediately after a normal string not detected + +def f1(): + ''""" + The string above was not detected as triple start string, + but the one below instead. + """ + print "f1" + +def f2(): + ''""" + The string above was then detected as end string, + and the one below as start string again. + """ + print "f2" + +def f3(): + """ + The string below is prepared so that ctags with the bug does not start a + new triple string. For a clean precondition for the next test. + ''""" + print "f3" + +# normal string immediately after a normal string not detected + +''" import os\ +" + +""' def fX():\ +' Modified: tests/ctags/py-skipped-string.py.tags 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,4 @@ +# format=tagmanager +f1�16�()�0 +f2�16�()�0 +f3�16�()�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 99a509: python: Fix out of bounds access on unmatched Cython array declaration
by Colomban Wendling 11 Feb '15

11 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 11 Feb 2015 17:22:55 UTC Commit: 99a509de7e6dce381e8bc23c5d080f8c8e5c5e12 https://github.com/geany/geany/commit/99a509de7e6dce381e8bc23c5d080f8c8e5c5… Log Message: ----------- python: Fix out of bounds access on unmatched Cython array declaration Modified Paths: -------------- tagmanager/ctags/python.c Modified: tagmanager/ctags/python.c 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -622,9 +622,11 @@ static const char *skipTypeDecl (const char *cp, boolean *is_class) while (*ptr && *ptr != '=' && *ptr != '(' && !isspace(*ptr)) { /* skip over e.g. 'cpdef numpy.ndarray[dtype=double, ndim=1]' */ if(*ptr == '[') { - while(*ptr && *ptr != ']') ptr++; + while (*ptr && *ptr != ']') ptr++; + if (*ptr) ptr++; + } else { + ptr++; } - ptr++; } if (!*ptr || *ptr == '=') return NULL; if (*ptr == '(') { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0a9743: python: Improve and generalize access reporting
by Colomban Wendling 11 Feb '15

11 Feb '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 11 Feb 2015 17:21:14 UTC Commit: 0a97439701466011cf4231b838860c543d442e17 https://github.com/geany/geany/commit/0a97439701466011cf4231b838860c543d442… Log Message: ----------- python: Improve and generalize access reporting Anything at the module/file level: * _... is protected * rest is public Anything at the class level: * __...__ is public (magic method) * __... is private * _... is protected * rest is public Anything at the function/method level: * everything is private Closes https://github.com/fishman/ctags/issues/216. Modified Paths: -------------- tagmanager/ctags/python.c Modified: tagmanager/ctags/python.c 43 lines changed, 31 insertions(+), 12 deletions(-) =================================================================== @@ -91,32 +91,49 @@ static const char *get_class_name_from_parent (const char *parent) * - http://www.python.org/dev/peps/pep-0008/#method-names-and-instance-variables * - http://www.python.org/dev/peps/pep-0008/#designing-for-inheritance */ -static pythonAccess accessFromIdentifier (const vString *const ident) +static pythonAccess accessFromIdentifier (const vString *const ident, + pythonKind kind, boolean has_parent, boolean parent_is_class) { const char *const p = vStringValue (ident); const size_t len = vStringLength (ident); + /* inside a function/method, private */ + if (has_parent && !parent_is_class) + return A_PRIVATE; /* not starting with "_", public */ - if (len < 1 || p[0] != '_') + else if (len < 1 || p[0] != '_') return A_PUBLIC; /* "__...__": magic methods */ - else if (len > 3 && p[1] == '_' && p[len - 2] == '_' && p[len - 1] == '_') + else if (kind == K_METHOD && parent_is_class && + len > 3 && p[1] == '_' && p[len - 2] == '_' && p[len - 1] == '_') return A_PUBLIC; /* "__...": name mangling */ - else if (len > 1 && p[1] == '_') + else if (parent_is_class && len > 1 && p[1] == '_') return A_PRIVATE; /* "_...": suggested as non-public, but easily accessible */ else return A_PROTECTED; } +static void addAccessFields (tagEntryInfo *const entry, + const vString *const ident, pythonKind kind, + boolean has_parent, boolean parent_is_class) +{ + pythonAccess access; + + access = accessFromIdentifier (ident, kind, has_parent, parent_is_class); + entry->extensionFields.access = PythonAccesses [access]; + /* FIXME: should we really set isFileScope in addition to access? */ + if (access == A_PRIVATE) + entry->isFileScope = TRUE; +} + /* Given a string with the contents of a line directly after the "def" keyword, * extract all relevant information and create a tag. */ static void makeFunctionTag (vString *const function, vString *const parent, int is_class_parent, const char *arglist) { - pythonAccess access; tagEntryInfo tag; initTagEntry (&tag, vStringValue (function)); @@ -147,11 +164,8 @@ static void makeFunctionTag (vString *const function, } } - access = accessFromIdentifier (function); - tag.extensionFields.access = PythonAccesses [access]; - /* FIXME: should we really set isFileScope in addition to access? */ - if (access == A_PRIVATE) - tag.isFileScope = TRUE; + addAccessFields (&tag, function, is_class_parent ? K_METHOD : K_FUNCTION, + vStringLength (parent) > 0, is_class_parent); makeTagEntry (&tag); } @@ -180,10 +194,13 @@ static void makeClassTag (vString *const class, vString *const inheritance, } } tag.extensionFields.inheritance = vStringValue (inheritance); + addAccessFields (&tag, class, K_CLASS, vStringLength (parent) > 0, + is_class_parent); makeTagEntry (&tag); } -static void makeVariableTag (vString *const var, vString *const parent) +static void makeVariableTag (vString *const var, vString *const parent, + boolean is_class_parent) { tagEntryInfo tag; initTagEntry (&tag, vStringValue (var)); @@ -194,6 +211,8 @@ static void makeVariableTag (vString *const var, vString *const parent) tag.extensionFields.scope [0] = PythonKinds[K_CLASS].name; tag.extensionFields.scope [1] = vStringValue (parent); } + addAccessFields (&tag, var, K_VARIABLE, vStringLength (parent) > 0, + is_class_parent); makeTagEntry (&tag); } @@ -755,7 +774,7 @@ static void findPythonTags (void) { /* skip variables in methods */ if (parent_is_class || vStringLength(parent) == 0) - makeVariableTag (name, parent); + makeVariableTag (name, parent, parent_is_class); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7b17db: Small update of German translation
by Frank Lanitz 10 Feb '15

10 Feb '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 10 Feb 2015 17:56:42 UTC Commit: 7b17db666eb7a17fcfd33ebe6dba5bf528c3485a https://github.com/geany/geany/commit/7b17db666eb7a17fcfd33ebe6dba5bf528c34… Log Message: ----------- Small update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 550 lines changed, 275 insertions(+), 275 deletions(-) =================================================================== @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-01 22:06+0100\n" -"PO-Revision-Date: 2015-02-01 22:07+0100\n" +"POT-Creation-Date: 2015-02-10 18:55+0100\n" +"PO-Revision-Date: 2015-02-10 18:56+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "Language: de\n" @@ -96,7 +96,7 @@ msgstr "unsichtbar" msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: ../data/geany.glade.h:16 ../src/keybindings.c:411 +#: ../data/geany.glade.h:16 ../src/keybindings.c:430 msgid "Insert Alternative _White Space" msgstr "Alternatives _Leerzeichen einfügen" @@ -165,7 +165,7 @@ msgstr "Oben" msgid "Bottom" msgstr "Unten" -#: ../data/geany.glade.h:31 ../src/keybindings.c:421 +#: ../data/geany.glade.h:31 ../src/keybindings.c:440 msgid "Preferences" msgstr "Einstellungen" @@ -1141,7 +1141,7 @@ msgstr "Virtuelle Leerzeichen" msgid "Display" msgstr "Ansicht" -#: ../data/geany.glade.h:228 ../src/keybindings.c:226 ../src/prefs.c:1605 +#: ../data/geany.glade.h:228 ../src/keybindings.c:245 ../src/prefs.c:1605 msgid "Editor" msgstr "Editor" @@ -1229,7 +1229,7 @@ msgstr "Leerzeichen und Tabulatoren am Zeilenende entfernen" msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen und Tabulatoren am Ende einer Zeile" -#: ../data/geany.glade.h:246 ../src/keybindings.c:566 +#: ../data/geany.glade.h:246 ../src/keybindings.c:585 msgid "Replace tabs with space" msgstr "Tabulatoren durch Leerzeichen ersetzen" @@ -1262,7 +1262,7 @@ msgstr "" "deaktiviert die Funktion." #: ../data/geany.glade.h:253 ../src/prefs.c:1607 ../src/symbols.c:601 -#: ../plugins/filebrowser.c:1123 +#: ../plugins/filebrowser.c:1125 msgid "Files" msgstr "Dateien" @@ -1311,7 +1311,7 @@ msgstr "" msgid "Commands" msgstr "Befehle" -#: ../data/geany.glade.h:265 ../src/keybindings.c:238 ../src/prefs.c:1609 +#: ../data/geany.glade.h:265 ../src/keybindings.c:257 ../src/prefs.c:1609 msgid "Tools" msgstr "Werkzeuge" @@ -1410,7 +1410,7 @@ msgstr "Ä_ndern" msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: ../data/geany.glade.h:286 ../src/plugins.c:1519 ../src/prefs.c:1613 +#: ../data/geany.glade.h:286 ../src/plugins.c:1520 ../src/prefs.c:1613 msgid "Keybindings" msgstr "Tastenkürzel" @@ -1641,7 +1641,7 @@ msgstr "" msgid "Terminal" msgstr "Terminal" -#: ../data/geany.glade.h:334 ../src/prefs.c:1619 ../src/vte.c:300 +#: ../data/geany.glade.h:334 ../src/prefs.c:1619 ../src/vte.c:301 msgid "Terminal" msgstr "Terminal" @@ -1684,7 +1684,7 @@ msgid "Sa_ve All" msgstr "A_lle speichern" #: ../data/geany.glade.h:345 ../src/document.c:1534 ../src/document.c:3466 -#: ../src/sidebar.c:709 +#: ../src/sidebar.c:710 msgid "_Reload" msgstr "Neu _laden" @@ -1712,27 +1712,27 @@ msgstr "_Alle schließen" msgid "Co_mmands" msgstr "_Kommandos" -#: ../data/geany.glade.h:352 ../src/keybindings.c:346 +#: ../data/geany.glade.h:352 ../src/keybindings.c:365 msgid "Cu_t Current Line(s)" msgstr "Aktuelle Zeile(n) _ausschneiden" -#: ../data/geany.glade.h:353 ../src/keybindings.c:343 +#: ../data/geany.glade.h:353 ../src/keybindings.c:362 msgid "_Copy Current Line(s)" msgstr "Aktuelle Zeile(n) _kopieren" -#: ../data/geany.glade.h:354 ../src/keybindings.c:299 +#: ../data/geany.glade.h:354 ../src/keybindings.c:318 msgid "_Delete Current Line(s)" msgstr "Aktuelle Zeile(n) _löschen" -#: ../data/geany.glade.h:355 ../src/keybindings.c:296 +#: ../data/geany.glade.h:355 ../src/keybindings.c:315 msgid "D_uplicate Line or Selection" msgstr "_Zeile oder Auswahl duplizieren" -#: ../data/geany.glade.h:356 ../src/keybindings.c:356 +#: ../data/geany.glade.h:356 ../src/keybindings.c:375 msgid "S_elect Current Line(s)" msgstr "Aktuelle Zeile(n) a_uswählen" -#: ../data/geany.glade.h:357 ../src/keybindings.c:359 +#: ../data/geany.glade.h:357 ../src/keybindings.c:378 msgid "Se_lect Current Paragraph" msgstr "Aktuellen Absatz au_swählen" @@ -1744,15 +1744,15 @@ msgstr "Zeile(n) nach _oben bewegen" msgid "M_ove Line(s) Down" msgstr "Zeile(n) nach _unten bewegen" -#: ../data/geany.glade.h:360 ../src/keybindings.c:398 +#: ../data/geany.glade.h:360 ../src/keybindings.c:417 msgid "_Send Selection to Terminal" msgstr "_Auswahl an Terminal senden" -#: ../data/geany.glade.h:361 ../src/keybindings.c:400 +#: ../data/geany.glade.h:361 ../src/keybindings.c:419 msgid "_Reflow Lines/Block" msgstr "_Neuformatieren der Zeile/des Abschnitts" -#: ../data/geany.glade.h:362 ../src/keybindings.c:370 +#: ../data/geany.glade.h:362 ../src/keybindings.c:389 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" @@ -1776,7 +1776,7 @@ msgstr "Einzug _erhöhen" msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../data/geany.glade.h:368 ../src/keybindings.c:389 +#: ../data/geany.glade.h:368 ../src/keybindings.c:408 msgid "S_mart Line Indent" msgstr "Intelligentes _Einrücken" @@ -1792,7 +1792,7 @@ msgstr "K_ommentare einfügen" msgid "Preference_s" msgstr "E_instellungen" -#: ../data/geany.glade.h:372 ../src/keybindings.c:424 +#: ../data/geany.glade.h:372 ../src/keybindings.c:443 msgid "P_lugin Preferences" msgstr "Plugin-_Einstellungen" @@ -1824,11 +1824,11 @@ msgstr "Nä_chste Nachricht" msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../data/geany.glade.h:380 ../src/keybindings.c:473 +#: ../data/geany.glade.h:380 ../src/keybindings.c:492 msgid "Go to Ne_xt Marker" msgstr "Zur _nächsten Markierung springen" -#: ../data/geany.glade.h:381 ../src/keybindings.c:476 +#: ../data/geany.glade.h:381 ../src/keybindings.c:495 msgid "Go to Pre_vious Marker" msgstr "Zur _vorherigen Markierung springen" @@ -1836,15 +1836,15 @@ msgstr "Zur _vorherigen Markierung springen" msgid "_Go to Line..." msgstr "_Gehe zu Zeile..." -#: ../data/geany.glade.h:383 ../src/keybindings.c:436 +#: ../data/geany.glade.h:383 ../src/keybindings.c:455 msgid "Find Next _Selection" msgstr "Auswahl _vorwärts im Dokument finden " -#: ../data/geany.glade.h:384 ../src/keybindings.c:438 +#: ../data/geany.glade.h:384 ../src/keybindings.c:457 msgid "Find Pre_vious Selection" msgstr "Auswahl _rückwärts im Dokument finden" -#: ../data/geany.glade.h:385 ../src/keybindings.c:455 +#: ../data/geany.glade.h:385 ../src/keybindings.c:474 msgid "_Mark All" msgstr "_Alles markieren" @@ -1997,10 +1997,10 @@ msgid "Convert and Set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" #: ../data/geany.glade.h:423 -msgid "Convert and Set to CR (_Mac)" -msgstr "Auf CR setzen und umwandeln (_Mac)" +msgid "Convert and Set to CR (Classic _Mac)" +msgstr "Auf CR setzen und umwandeln (Klassischer _Apple)" -#: ../data/geany.glade.h:424 ../src/keybindings.c:564 +#: ../data/geany.glade.h:424 ../src/keybindings.c:583 msgid "_Clone" msgstr "_Klonen" @@ -2057,7 +2057,7 @@ msgid "_Apply Default Indentation" msgstr "_Standardeinrückung anwenden" #. build the code -#: ../data/geany.glade.h:438 ../src/build.c:2579 ../src/build.c:2856 +#: ../data/geany.glade.h:438 ../src/build.c:2591 ../src/build.c:2868 msgid "_Build" msgstr "_Erstellen" @@ -2113,7 +2113,7 @@ msgstr "Einen Fehler _berichten..." msgid "_Donate..." msgstr "_Spenden..." -#: ../data/geany.glade.h:452 ../src/sidebar.c:125 +#: ../data/geany.glade.h:452 ../src/sidebar.c:126 msgid "Symbols" msgstr "Symbole" @@ -2181,7 +2181,7 @@ msgstr "" "Verzeichnis angeben. Weiterhin kann es sowohl in relativer als auch " "absoluter Form eingegeben werden." -#: ../data/geany.glade.h:466 ../src/keybindings.c:236 +#: ../data/geany.glade.h:466 ../src/keybindings.c:255 msgid "Project" msgstr "Projekt" @@ -2409,142 +2409,142 @@ msgstr "Kompilierung fehlgeschlagen." msgid "Compilation finished successfully." msgstr "Kompilierung erfolgreich beendet." -#: ../src/build.c:1402 +#: ../src/build.c:1414 msgid "Custom Text" msgstr "Freitext" -#: ../src/build.c:1403 +#: ../src/build.c:1415 msgid "Enter custom text here, all entered text is appended to the command." msgstr "" "Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt " "wird." -#: ../src/build.c:1481 +#: ../src/build.c:1493 msgid "_Next Error" msgstr "Nächster _Fehler" -#: ../src/build.c:1483 +#: ../src/build.c:1495 msgid "_Previous Error" msgstr "_Vorheriger Fehler" #. arguments -#: ../src/build.c:1493 ../src/build.c:2896 +#: ../src/build.c:1505 ../src/build.c:2908 msgid "_Set Build Commands" msgstr "_Kommandos zum Erstellen konfigurieren" -#: ../src/build.c:1779 ../src/toolbar.c:376 +#: ../src/build.c:1791 ../src/toolbar.c:376 msgid "Build the current file" msgstr "Erstellt die aktuelle Datei" -#: ../src/build.c:1790 +#: ../src/build.c:1802 msgid "Build the current file with Make and the default target" msgstr "Erstellt die aktuelle Datei mit »make« und dem Standard-Target" -#: ../src/build.c:1792 +#: ../src/build.c:1804 msgid "Build the current file with Make and the specified target" msgstr "Erstellt die aktuelle Datei mit »make« und dem angegebenem Target" -#: ../src/build.c:1794 +#: ../src/build.c:1806 msgid "Compile the current file with Make" msgstr "Kompiliert die aktuelle Datei mit make" -#: ../src/build.c:1818 +#: ../src/build.c:1830 #, c-format msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: ../src/build.c:1835 ../src/build.c:1847 +#: ../src/build.c:1847 ../src/build.c:1859 msgid "No more build errors." msgstr "Keine weiteren Fehlermeldungen." -#: ../src/build.c:1946 ../src/build.c:1948 +#: ../src/build.c:1958 ../src/build.c:1960 msgid "Set menu item label" msgstr "Bezeichnung für den Menüeintrag definieren" -#: ../src/build.c:1973 ../src/symbols.c:656 ../src/tools.c:589 +#: ../src/build.c:1985 ../src/symbols.c:656 ../src/tools.c:589 msgid "Label" msgstr "Label" #. command column, holding status and command display -#: ../src/build.c:1974 ../src/symbols.c:651 ../src/tools.c:574 +#: ../src/build.c:1986 ../src/symbols.c:651 ../src/tools.c:574 msgid "Command" msgstr "Kommando" -#: ../src/build.c:1975 +#: ../src/build.c:1987 msgid "Working directory" msgstr "Arbeitsverzeichnis" -#: ../src/build.c:1976 +#: ../src/build.c:1988 msgid "Reset" msgstr "Zurücksetzen" -#: ../src/build.c:2023 +#: ../src/build.c:2035 msgid "Click to set menu item label" msgstr "Klicken, um die Bezeichnung für den Menüeintrag zu definieren" -#: ../src/build.c:2107 ../src/build.c:2109 +#: ../src/build.c:2119 ../src/build.c:2121 #, c-format msgid "%s commands" msgstr "Kommandos für %s" -#: ../src/build.c:2109 +#: ../src/build.c:2121 msgid "No filetype" msgstr "Kein Dateityp" -#: ../src/build.c:2118 ../src/build.c:2153 +#: ../src/build.c:2130 ../src/build.c:2165 msgid "Error regular expression:" msgstr "Regulärer Ausdruck für Fehlermeldungen:" -#: ../src/build.c:2146 +#: ../src/build.c:2158 msgid "Independent commands" msgstr "Dateitypunabhängige Befehle" -#: ../src/build.c:2178 +#: ../src/build.c:2190 msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "" "Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des " "Kommandos an" -#: ../src/build.c:2187 +#: ../src/build.c:2199 msgid "Execute commands" msgstr "Befehle zum Ausführen" -#: ../src/build.c:2199 +#: ../src/build.c:2211 msgid "" "%d, %e, %f, %p, %l are substituted in command and directory fields, see " "manual for details." msgstr "" -"%d, %e, %f, %p, %l werden innerhalb der Kommando- und " -"Verzeichnisfelder ersetzt - Details gibt es in der Dokumentation." +"%d, %e, %f, %p, %l werden innerhalb der Kommando- und Verzeichnisfelder " +"ersetzt - Details gibt es in der Dokumentation." -#: ../src/build.c:2357 +#: ../src/build.c:2369 msgid "Set Build Commands" msgstr "Kommandos zum Erstellen konfigurieren" -#: ../src/build.c:2572 +#: ../src/build.c:2584 msgid "_Compile" msgstr "_Kompilieren" -#: ../src/build.c:2586 ../src/build.c:2616 ../src/build.c:2824 +#: ../src/build.c:2598 ../src/build.c:2628 ../src/build.c:2836 msgid "_Execute" msgstr "_Ausführen" #. build the code with make custom -#: ../src/build.c:2631 ../src/build.c:2822 ../src/build.c:2876 +#: ../src/build.c:2643 ../src/build.c:2834 ../src/build.c:2888 msgid "Make Custom _Target..." msgstr "Make (eigenes _Target)..." #. build the code with make object -#: ../src/build.c:2633 ../src/build.c:2823 ../src/build.c:2884 +#: ../src/build.c:2645 ../src/build.c:2835 ../src/build.c:2896 msgid "Make _Object" msgstr "Make _Objekt-Datei" -#: ../src/build.c:2635 ../src/build.c:2821 +#: ../src/build.c:2647 ../src/build.c:2833 msgid "_Make" msgstr "_Make" #. build the code with make all -#: ../src/build.c:2868 +#: ../src/build.c:2880 msgid "_Make All" msgstr "_Make all" @@ -2555,7 +2555,7 @@ msgid_plural "%d files saved." msgstr[0] "%d Datei gespeichert." msgstr[1] "%d Dateien gespeichert." -#: ../src/callbacks.c:990 ../src/keybindings.c:464 +#: ../src/callbacks.c:990 ../src/keybindings.c:483 msgid "Go to Line" msgstr "Gehe zu Zeile" @@ -2936,7 +2936,7 @@ msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" #: ../src/document.c:2352 ../src/search.c:1368 ../src/search.c:1421 -#: ../src/search.c:2265 ../src/search.c:2266 +#: ../src/search.c:2269 ../src/search.c:2270 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für »%s« gefunden." @@ -3223,529 +3223,529 @@ msgid "Color Schemes" msgstr "Farbschemata" #. visual group order -#: ../src/keybindings.c:225 ../src/symbols.c:628 +#: ../src/keybindings.c:244 ../src/symbols.c:628 msgid "File" msgstr "Datei" -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:246 msgid "Clipboard" msgstr "Zwischenablage" -#: ../src/keybindings.c:228 +#: ../src/keybindings.c:247 msgid "Select" msgstr "Auswahl" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:248 msgid "Format" msgstr "Formatierung" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:249 msgid "Insert" msgstr "Einfügen" -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:250 msgid "Settings" msgstr "Einstellungen" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:251 msgid "Search" msgstr "Suchen" -#: ../src/keybindings.c:233 +#: ../src/keybindings.c:252 msgid "Go to" msgstr "Gehe zu" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:253 msgid "View" msgstr "Ansicht" -#: ../src/keybindings.c:235 ../src/symbols.c:773 +#: ../src/keybindings.c:254 ../src/symbols.c:773 msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:237 ../src/keybindings.c:589 ../src/project.c:511 +#: ../src/keybindings.c:256 ../src/keybindings.c:608 ../src/project.c:511 #: ../src/ui_utils.c:2115 msgid "Build" msgstr "Erstellen" -#: ../src/keybindings.c:239 ../src/keybindings.c:614 +#: ../src/keybindings.c:258 ../src/keybindings.c:633 msgid "Help" msgstr "Hilfe" -#: ../src/keybindings.c:240 +#: ../src/keybindings.c:259 msgid "Focus" msgstr "Fokus" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:260 msgid "Notebook tab" msgstr "Dateireiter" -#: ../src/keybindings.c:250 ../src/keybindings.c:280 +#: ../src/keybindings.c:269 ../src/keybindings.c:299 msgid "New" msgstr "Neu" -#: ../src/keybindings.c:252 ../src/keybindings.c:282 +#: ../src/keybindings.c:271 ../src/keybindings.c:301 msgid "Open" msgstr "Öffnen" -#: ../src/keybindings.c:255 +#: ../src/keybindings.c:274 msgid "Open selected file" msgstr "Markierte Datei öffnen" -#: ../src/keybindings.c:257 +#: ../src/keybindings.c:276 msgid "Save" msgstr "Speichern" -#: ../src/keybindings.c:259 ../src/toolbar.c:59 +#: ../src/keybindings.c:278 ../src/toolbar.c:59 msgid "Save as" msgstr "Speichern unter" -#: ../src/keybindings.c:261 +#: ../src/keybindings.c:280 msgid "Save all" msgstr "Alle speichern" -#: ../src/keybindings.c:264 +#: ../src/keybindings.c:283 msgid "Print" msgstr "Drucken" -#: ../src/keybindings.c:266 ../src/keybindings.c:287 +#: ../src/keybindings.c:285 ../src/keybindings.c:306 msgid "Close" msgstr "Schließen" -#: ../src/keybindings.c:268 +#: ../src/keybindings.c:287 msgid "Close all" msgstr "Alle Schließen" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:290 msgid "Reload file" msgstr "Neu laden" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:292 msgid "Re-open last closed tab" msgstr "Zuletzt geschlossenes Dokument wieder öffnen" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:294 msgid "Quit" msgstr "Beenden" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:311 msgid "Undo" msgstr "Zurück" -#: ../src/keybindings.c:294 +#: ../src/keybindings.c:313 msgid "Redo" msgstr "Wiederholen" -#: ../src/keybindings.c:303 +#: ../src/keybindings.c:322 msgid "Delete to line end" msgstr "Bis zum Ende der Zeile löschen" -#: ../src/keybindings.c:306 +#: ../src/keybindings.c:325 msgid "_Transpose Current Line" msgstr "Aktuelle Zeile _tauschen" -#: ../src/keybindings.c:308 +#: ../src/keybindings.c:327 msgid "Scroll to current line" msgstr "Zu der aktuellen Zeile rollen" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:329 msgid "Scroll up the view by one line" msgstr "Rollt um eine Zeile nach oben" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:331 msgid "Scroll down the view by one line" msgstr "Rollt um eine Zeile nach unten" -#: ../src/keybindings.c:314 +#: ../src/keybindings.c:333 msgid "Complete snippet" msgstr "Vervollständige (Code-)Schnipsel" -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:335 msgid "Move cursor in snippet" msgstr "Bewege den Cursor im Schnipsel" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:337 msgid "Suppress snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln unterdrücken" -#: ../src/keybindings.c:320 +#: ../src/keybindings.c:339 msgid "Context Action" msgstr "Kontextaktion" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:341 msgid "Complete word" msgstr "Vervollständige Wort" -#: ../src/keybindings.c:324 +#: ../src/keybindings.c:343 msgid "Show calltip" msgstr "Calltip anzeigen" -#: ../src/keybindings.c:326 +#: ../src/keybindings.c:345 msgid "Word part completion" msgstr "Automatische Wortergänzung" -#: ../src/keybindings.c:329 +#: ../src/keybindings.c:348 msgid "Move line(s) up" msgstr "Zeile(n) nach oben bewegen" -#: ../src/keybindings.c:332 +#: ../src/keybindings.c:351 msgid "Move line(s) down" msgstr "Zeile(n) nach unten bewegen" -#: ../src/keybindings.c:337 +#: ../src/keybindings.c:356 msgid "Cut" msgstr "Ausschneiden" -#: ../src/keybindings.c:339 +#: ../src/keybindings.c:358 msgid "Copy" msgstr "Kopieren" -#: ../src/keybindings.c:341 +#: ../src/keybindings.c:360 msgid "Paste" msgstr "Einfügen" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:371 msgid "Select All" msgstr "Alles ersetzen" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:373 msgid "Select current word" msgstr "Aktuelles Wort auswählen" -#: ../src/keybindings.c:362 +#: ../src/keybindings.c:381 msgid "Select to previous word part" msgstr "Zum vorherigen Teilwort springen" -#: ../src/keybindings.c:364 +#: ../src/keybindings.c:383 msgid "Select to next word part" msgstr "Zum nächsten Teilwort springen" -#: ../src/keybindings.c:372 +#: ../src/keybindings.c:391 msgid "Toggle line commentation" msgstr "Kommentierung umschalten" -#: ../src/keybindings.c:375 +#: ../src/keybindings.c:394 msgid "Comment line(s)" msgstr "Zeile(n) kommentieren" -#: ../src/keybindings.c:377 +#: ../src/keybindings.c:396 msgid "Uncomment line(s)" msgstr "Kommentarzeichen entfernen" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:398 msgid "Increase indent" msgstr "Einzug erhöhen" -#: ../src/keybindings.c:382 +#: ../src/keybindings.c:401 msgid "Decrease indent" msgstr "Einzug verringern" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:404 msgid "Increase indent by one space" msgstr "Einzug um ein Leerzeichen erhöhen" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:406 msgid "Decrease indent by one space" msgstr "Einzug um ein Leerzeichen verringern" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:410 msgid "Send to Custom Command 1" msgstr "Zum 1. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:412 msgid "Send to Custom Command 2" msgstr "Zum 2. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:395 +#: ../src/keybindings.c:414 msgid "Send to Custom Command 3" msgstr "Zum 3. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:403 +#: ../src/keybindings.c:422 msgid "Join lines" msgstr "Zeilen zusammenführen" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:427 msgid "Insert date" msgstr "Datum einfügen" -#: ../src/keybindings.c:414 +#: ../src/keybindings.c:433 msgid "Insert New Line Before Current" msgstr "Neue Zeile vor der aktuellen einfügen" -#: ../src/keybindings.c:416 +#: ../src/keybindings.c:435 msgid "Insert New Line After Current" msgstr "Neue Zeile hinter der aktuellen Einfügen" -#: ../src/keybindings.c:429 ../src/search.c:467 +#: ../src/keybindings.c:448 ../src/search.c:467 msgid "Find" msgstr "Suchen" -#: ../src/keybindings.c:431 +#: ../src/keybindings.c:450 msgid "Find Next" msgstr "Weitersuchen" -#: ../src/keybindings.c:433 +#: ../src/keybindings.c:452 msgid "Find Previous" msgstr "Vorheriges" -#: ../src/keybindings.c:440 ../src/search.c:620 +#: ../src/keybindings.c:459 ../src/search.c:620 msgid "Replace" msgstr "Ersetzen" -#: ../src/keybindings.c:442 ../src/search.c:870 +#: ../src/keybindings.c:461 ../src/search.c:870 msgid "Find in Files" msgstr "In Dateien suchen" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:464 msgid "Next Message" msgstr "Nächste Nachricht" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:466 msgid "Previous Message" msgstr "Vorherige Nachricht" -#: ../src/keybindings.c:450 +#: ../src/keybindings.c:469 msgid "Find Usage" msgstr "Auftreten finden" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:472 msgid "Find Document Usage" msgstr "Auftreten im Dokument finden" -#: ../src/keybindings.c:460 ../src/toolbar.c:70 +#: ../src/keybindings.c:479 ../src/toolbar.c:70 msgid "Navigate back a location" msgstr "Navigiert eine Position nach hinten" -#: ../src/keybindings.c:462 ../src/toolbar.c:71 +#: ../src/keybindings.c:481 ../src/toolbar.c:71 msgid "Navigate forward a location" msgstr "Navigiert eine Position nach vorne" -#: ../src/keybindings.c:467 +#: ../src/keybindings.c:486 msgid "Go to matching brace" msgstr "Springe zur passenden Klammer" -#: ../src/keybindings.c:470 +#: ../src/keybindings.c:489 msgid "Toggle marker" msgstr "Markierung setzen" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:498 msgid "Go to Tag Definition" msgstr "Gehe zur Tagdefinition" -#: ../src/keybindings.c:482 +#: ../src/keybindings.c:501 msgid "Go to Tag Declaration" msgstr "Gehe zur Tagdeklaration" -#: ../src/keybindings.c:484 +#: ../src/keybindings.c:503 msgid "Go to Start of Line" msgstr "Gehe zum Zeilenanfang" -#: ../src/keybindings.c:486 +#: ../src/keybindings.c:505 msgid "Go to End of Line" msgstr "Gehe zum Zeilenende" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:507 msgid "Go to Start of Display Line" msgstr "Gehe zum sichtbaren Zeilenbeginn" -#: ../src/keybindings.c:490 +#: ../src/keybindings.c:509 msgid "Go to End of Display Line" msgstr "Gehe zum angezeigten Zeilenende" -#: ../src/keybindings.c:492 +#: ../src/keybindings.c:511 msgid "Go to Previous Word Part" msgstr "Zum vorherigen Teilwort springen" -#: ../src/keybindings.c:494 +#: ../src/keybindings.c:513 msgid "Go to Next Word Part" msgstr "Zum nächsten Teilwort springen" -#: ../src/keybindings.c:499 +#: ../src/keybindings.c:518 msgid "Toggle All Additional Widgets" msgstr "Zusätzliche Infofenster ein-/ausblenden" -#: ../src/keybindings.c:502 +#: ../src/keybindings.c:521 msgid "Fullscreen" msgstr "Vollbild" -#: ../src/keybindings.c:504 +#: ../src/keybindings.c:523 msgid "Toggle Messages Window" msgstr "Meldungsfenster verstecken" -#: ../src/keybindings.c:507 +#: ../src/keybindings.c:526 msgid "Toggle Sidebar" msgstr "Seitenleiste ausblenden" -#: ../src/keybindings.c:509 +#: ../src/keybindings.c:528 msgid "Zoom In" msgstr "Hineinzoomen" -#: ../src/keybindings.c:511 +#: ../src/keybindings.c:530 msgid "Zoom Out" msgstr "Herauszoomen" -#: ../src/keybindings.c:513 +#: ../src/keybindings.c:532 msgid "Zoom Reset" msgstr "Vergrößerung zurücksetzen" -#: ../src/keybindings.c:518 +#: ../src/keybindings.c:537 msgid "Switch to Editor" msgstr "Zum Editor wechseln" -#: ../src/keybindings.c:520 +#: ../src/keybindings.c:539 msgid "Switch to Search Bar" msgstr "Zu dem Suchfenster wechseln" -#: ../src/keybindings.c:522 +#: ../src/keybindings.c:541 msgid "Switch to Message Window" msgstr "Meldungsfenster anzeigen" -#: ../src/keybindings.c:524 +#: ../src/keybindings.c:543 msgid "Switch to Compiler" msgstr "Wechsle zum Compiler" -#: ../src/keybindings.c:526 +#: ../src/keybindings.c:545 msgid "Switch to Messages" msgstr "Zu den Meldungen wechseln" -#: ../src/keybindings.c:528 +#: ../src/keybindings.c:547 msgid "Switch to Scribble" msgstr "Zu den Notizen wechseln" -#: ../src/keybindings.c:530 +#: ../src/keybindings.c:549 msgid "Switch to VTE" msgstr "Zur VTE wechseln" -#: ../src/keybindings.c:532 +#: ../src/keybindings.c:551 msgid "Switch to Sidebar" msgstr "Zur Seitenleiste wechseln" -#: ../src/keybindings.c:534 +#: ../src/keybindings.c:553 msgid "Switch to Sidebar Symbol List" msgstr "Zur Symbolliste der Seitenleiste springen" -#: ../src/keybindings.c:536 +#: ../src/keybindings.c:555 msgid "Switch to Sidebar Document List" msgstr "Zur Dokumentenliste der Seitenleiste springen" -#: ../src/keybindings.c:541 +#: ../src/keybindings.c:560 msgid "Switch to left document" msgstr "Zum linken Dokument wechseln" -#: ../src/keybindings.c:543 +#: ../src/keybindings.c:562 msgid "Switch to right document" msgstr "Zum rechten Dokument wechseln" -#: ../src/keybindings.c:545 +#: ../src/keybindings.c:564 msgid "Switch to last used document" msgstr "Zum letzten Dokument wechseln" -#: ../src/keybindings.c:548 +#: ../src/keybindings.c:567 msgid "Move document left" msgstr "Dateireiter nach links verschieben" -#: ../src/keybindings.c:551 +#: ../src/keybindings.c:570 msgid "Move document right" msgstr "Dateireiter nach rechts verschieben" -#: ../src/keybindings.c:553 +#: ../src/keybindings.c:572 msgid "Move document first" msgstr "Dateireiter an den Anfang verschieben" -#: ../src/keybindings.c:555 +#: ../src/keybindings.c:574 msgid "Move document last" msgstr "Dateireiter ans Ende verschieben" -#: ../src/keybindings.c:560 +#: ../src/keybindings.c:579 msgid "Toggle Line wrapping" msgstr "Visuellen Zeilenumbruch umschalten" -#: ../src/keybindings.c:562 +#: ../src/keybindings.c:581 msgid "Toggle Line breaking" msgstr "Automatischen Zeilenumbruch umschalten" -#: ../src/keybindings.c:568 +#: ../src/keybindings.c:587 msgid "Replace spaces with tabs" msgstr "Leerzeichen durch Tabulatoren ersetzen" -#: ../src/keybindings.c:570 +#: ../src/keybindings.c:589 msgid "Toggle current fold" msgstr "Aktuelle Faltung umschalten" -#: ../src/keybindings.c:572 +#: ../src/keybindings.c:591 msgid "Fold all" msgstr "Alle einblenden" -#: ../src/keybindings.c:574 +#: ../src/keybindings.c:593 msgid "Unfold all" msgstr "Alle ausblenden" -#: ../src/keybindings.c:576 +#: ../src/keybindings.c:595 msgid "Reload symbol list" msgstr "Symbolliste neuladen" -#: ../src/keybindings.c:578 +#: ../src/keybindings.c:597 msgid "Remove Markers" msgstr "Markierungen entfernen" -#: ../src/keybindings.c:580 +#: ../src/keybindings.c:599 msgid "Remove Error Indicators" msgstr "Fehlermarkierungen entfernen" -#: ../src/keybindings.c:582 +#: ../src/keybindings.c:601 msgid "Remove Markers and Error Indicators" msgstr "Fehlermarkierungen und andere Markierungen entfernen" -#: ../src/keybindings.c:587 ../src/toolbar.c:72 +#: ../src/keybindings.c:606 ../src/toolbar.c:72 msgid "Compile" msgstr "Kompilieren" -#: ../src/keybindings.c:591 +#: ../src/keybindings.c:610 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:594 +#: ../src/keybindings.c:613 msgid "Make custom target" msgstr "Make mit eigenem Target" -#: ../src/keybindings.c:596 +#: ../src/keybindings.c:615 msgid "Make object" msgstr "Make Objekt-Datei" -#: ../src/keybindings.c:598 +#: ../src/keybindings.c:617 msgid "Next error" msgstr "Nächster Fehler" -#: ../src/keybindings.c:600 +#: ../src/keybindings.c:619 msgid "Previous error" msgstr "Vorheriger Fehler" -#: ../src/keybindings.c:602 +#: ../src/keybindings.c:621 msgid "Run" msgstr "Ausführen" -#: ../src/keybindings.c:604 +#: ../src/keybindings.c:623 msgid "Build options" msgstr "Optionen bei der Erzeugung" -#: ../src/keybindings.c:609 +#: ../src/keybindings.c:628 msgid "Show Color Chooser" msgstr "Farbwähler öffnen" -#: ../src/keybindings.c:862 +#: ../src/keybindings.c:881 msgid "Keyboard Shortcuts" msgstr "Tastenkürzel" -#: ../src/keybindings.c:874 +#: ../src/keybindings.c:893 msgid "The following keyboard shortcuts are configurable:" msgstr "Die folgenden Tastenkürzel sind frei definierbar:" -#: ../src/keyfile.c:997 +#: ../src/keyfile.c:1006 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." -#: ../src/keyfile.c:1224 +#: ../src/keyfile.c:1233 msgid "Failed to load one or more session files." msgstr "" "Eine oder mehrere Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " @@ -3946,7 +3946,7 @@ msgstr "Das Dokument wurde bereits geschlossen." msgid "Switch to Document" msgstr "Zum Dokument wechseln" -#: ../src/plugins.c:502 +#: ../src/plugins.c:503 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3955,11 +3955,11 @@ msgstr "" "Das Plugin »%s« ist nicht kompatibel mit dieser Version von Geany. Bitte neu " "kompilieren." -#: ../src/plugins.c:1080 +#: ../src/plugins.c:1081 msgid "_Plugin Manager" msgstr "_Plugin-Verwaltung" -#: ../src/plugins.c:1321 +#: ../src/plugins.c:1322 #, c-format msgid "" "Version:\t%s\n" @@ -3970,23 +3970,23 @@ msgstr "" "Autoren(s):\t%s\n" "Dateiname:\t%s" -#: ../src/plugins.c:1346 +#: ../src/plugins.c:1347 msgid "No plugins available." msgstr "Keine Plugins gefunden." -#: ../src/plugins.c:1386 +#: ../src/plugins.c:1387 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1392 +#: ../src/plugins.c:1393 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1497 +#: ../src/plugins.c:1498 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1517 +#: ../src/plugins.c:1518 msgid "Choose which plugins should be loaded at startup:" msgstr "Plugins, die beim Starten geladen werden sollen:" @@ -4003,11 +4003,11 @@ msgstr "Tasten festlegen" msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Welche Tastenkombination soll für »%s« genutzt werden?" -#: ../src/prefs.c:225 ../src/symbols.c:2301 ../src/sidebar.c:743 +#: ../src/prefs.c:225 ../src/symbols.c:2301 ../src/sidebar.c:744 msgid "_Expand All" msgstr "Alle a_usklappen" -#: ../src/prefs.c:230 ../src/symbols.c:2306 ../src/sidebar.c:749 +#: ../src/prefs.c:230 ../src/symbols.c:2306 ../src/sidebar.c:750 msgid "_Collapse All" msgstr "Alle _einklappen" @@ -4451,7 +4451,7 @@ msgstr "_Zus. Optionen:" msgid "Other options to pass to Grep" msgstr "Andere Argumente, die an grep übergeben werden sollen" -#: ../src/search.c:1371 ../src/search.c:2271 ../src/search.c:2274 +#: ../src/search.c:1371 ../src/search.c:2275 ../src/search.c:2278 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." @@ -4497,22 +4497,22 @@ msgstr "%s %s -- %s (im Verzeichnis: %s)" msgid "Could not open directory (%s)" msgstr "Konnte Verzeichnis nicht öffnen (%s)." -#: ../src/search.c:1891 +#: ../src/search.c:1895 msgid "Search failed." msgstr "Suche fehlgeschlagen." -#: ../src/search.c:1915 +#: ../src/search.c:1919 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Suche mit %d Treffer abgeschlossen." msgstr[1] "Suche mit %d Treffern abgeschlossen." -#: ../src/search.c:1923 +#: ../src/search.c:1927 msgid "No matches found." msgstr "Keine Treffer gefunden." -#: ../src/search.c:1953 +#: ../src/search.c:1957 #, c-format msgid "Bad regex: %s" msgstr "Fehler in Ausdruck: %s" @@ -5150,27 +5150,27 @@ msgstr "Wörter:" msgid "Characters:" msgstr "Buchstaben:" -#: ../src/sidebar.c:176 +#: ../src/sidebar.c:177 msgid "No tags found" msgstr "Keine Symbole gefunden" -#: ../src/sidebar.c:593 +#: ../src/sidebar.c:594 msgid "Show S_ymbol List" msgstr "S_ymbolliste anzeigen" -#: ../src/sidebar.c:605 +#: ../src/sidebar.c:606 msgid "Show _Document List" msgstr "_Dokumentenliste anzeigen" -#: ../src/sidebar.c:617 ../plugins/filebrowser.c:663 +#: ../src/sidebar.c:618 ../plugins/filebrowser.c:665 msgid "H_ide Sidebar" msgstr "Seitenleiste _verstecken" -#: ../src/sidebar.c:722 ../plugins/filebrowser.c:634 +#: ../src/sidebar.c:723 ../plugins/filebrowser.c:636 msgid "_Find in Files..." msgstr "In _Dateien suchen..." -#: ../src/sidebar.c:732 +#: ../src/sidebar.c:733 msgid "Show _Paths" msgstr "_Pfade anzeigen" @@ -5335,31 +5335,31 @@ msgid "Win (CRLF)" msgstr "Win (CRLF)" #: ../src/utils.c:377 -msgid "Mac (CR)" -msgstr "Mac (CR)" +msgid "Classic Mac (CR)" +msgstr "Klassischer Apple (CR)" #: ../src/utils.c:378 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:439 +#: ../src/vte.c:440 #, c-format msgid "invalid VTE library \"%s\": missing symbol \"%s\"" msgstr "Ungültige VTE-Bibliothek \"%s\": Es fehlt das Symbol \"%s\"" -#: ../src/vte.c:588 +#: ../src/vte.c:589 msgid "_Set Path From Document" msgstr "Pfad des Dokumentes _übernehmen" -#: ../src/vte.c:593 +#: ../src/vte.c:594 msgid "_Restart Terminal" msgstr "Terminal _neustarten" -#: ../src/vte.c:616 +#: ../src/vte.c:617 msgid "_Input Methods" msgstr "Eingabe_methoden" -#: ../src/vte.c:710 +#: ../src/vte.c:711 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." @@ -5497,7 +5497,7 @@ msgid "Inserts HTML character entities like '&'." msgstr "Fügt HTML-Sonderzeichen wie »&« ein." #: ../plugins/htmlchars.c:41 ../plugins/export.c:39 -#: ../plugins/filebrowser.c:50 ../plugins/saveactions.c:43 +#: ../plugins/filebrowser.c:52 ../plugins/saveactions.c:45 #: ../plugins/splitwindow.c:35 msgid "The Geany developer team" msgstr "Das Geany-Entwicklerteam" @@ -5534,8 +5534,8 @@ msgstr "Zeichen für Interpunktion" msgid "Miscellaneous characters" msgstr "Sonstige Zeichen" -#: ../plugins/htmlchars.c:369 ../plugins/filebrowser.c:1157 -#: ../plugins/saveactions.c:525 +#: ../plugins/htmlchars.c:369 ../plugins/filebrowser.c:1159 +#: ../plugins/saveactions.c:539 msgid "Plugin configuration directory could not be created." msgstr "Plugin-Konfigurationsverzeichnis konnte nicht erstellt werden." @@ -5646,56 +5646,56 @@ msgstr "Als _HTML exportieren..." msgid "As _LaTeX..." msgstr "Als _LaTeX exportieren..." -#: ../plugins/filebrowser.c:49 +#: ../plugins/filebrowser.c:51 msgid "File Browser" msgstr "Dateibrowser" -#: ../plugins/filebrowser.c:49 +#: ../plugins/filebrowser.c:51 msgid "Adds a file browser tab to the sidebar." msgstr "Fügt einen Dateimanager in die Seitenleiste ein." -#: ../plugins/filebrowser.c:373 +#: ../plugins/filebrowser.c:375 msgid "Too many items selected!" msgstr "Zu viele Elemente ausgewählt!" -#: ../plugins/filebrowser.c:449 +#: ../plugins/filebrowser.c:451 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Kann angegebenen externen Befehl »%s« nicht ausführen (%s)." -#: ../plugins/filebrowser.c:613 +#: ../plugins/filebrowser.c:615 msgid "Open in _Geany" msgstr "Datei in _Geany öffnen" -#: ../plugins/filebrowser.c:619 +#: ../plugins/filebrowser.c:621 msgid "Open _Externally" msgstr "Mit _externer Anwendung öffnen" -#: ../plugins/filebrowser.c:644 +#: ../plugins/filebrowser.c:646 msgid "Show _Hidden Files" msgstr "V_ersteckte Dateien anzeigen" -#: ../plugins/filebrowser.c:874 +#: ../plugins/filebrowser.c:876 msgid "Up" msgstr "Aufwärts" -#: ../plugins/filebrowser.c:879 +#: ../plugins/filebrowser.c:881 msgid "Refresh" msgstr "Neu laden" -#: ../plugins/filebrowser.c:884 +#: ../plugins/filebrowser.c:886 msgid "Home" msgstr "Persönliches Verzeichnis" -#: ../plugins/filebrowser.c:889 +#: ../plugins/filebrowser.c:891 msgid "Set path from document" msgstr "Pfad des Dokumentes übernehmen" -#: ../plugins/filebrowser.c:903 +#: ../plugins/filebrowser.c:905 msgid "Filter:" msgstr "Filter:" -#: ../plugins/filebrowser.c:912 +#: ../plugins/filebrowser.c:914 msgid "" "Filter your files with the usual wildcards. Separate multiple patterns with " "a space." @@ -5703,19 +5703,19 @@ msgstr "" "Filtern der Dateien mit den gewohnten Platzhaltern. Verschiedene Filter " "mittels Leerzeichen trennen." -#: ../plugins/filebrowser.c:1127 +#: ../plugins/filebrowser.c:1129 msgid "Focus File List" msgstr "Dateiliste in den Vordergrund" -#: ../plugins/filebrowser.c:1129 +#: ../plugins/filebrowser.c:1131 msgid "Focus Path Entry" msgstr "Pfad in den Vordergrund" -#: ../plugins/filebrowser.c:1222 +#: ../plugins/filebrowser.c:1224 msgid "External open command:" msgstr "Externes öffnen Kommando:" -#: ../plugins/filebrowser.c:1230 +#: ../plugins/filebrowser.c:1232 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -5730,54 +5730,54 @@ msgstr "" "%d wird durch den Pfadnamen der ausgewählten Datei ersetzt (ohne den " "Dateinamen)." -#: ../plugins/filebrowser.c:1238 +#: ../plugins/filebrowser.c:1240 msgid "Show hidden files" msgstr "Versteckte Dateien anzeigen" -#: ../plugins/filebrowser.c:1246 +#: ../plugins/filebrowser.c:1248 msgid "Hide file extensions:" msgstr "Dateiendung für versteckte Dateien:" -#: ../plugins/filebrowser.c:1265 +#: ../plugins/filebrowser.c:1267 msgid "Follow the path of the current file" msgstr "Pfad der aktuellen Datei setzen" -#: ../plugins/filebrowser.c:1271 +#: ../plugins/filebrowser.c:1273 msgid "Use the project's base directory" msgstr "Das Projekt-Basisverzeichnis nutzen" -#: ../plugins/filebrowser.c:1275 +#: ../plugins/filebrowser.c:1277 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "" "Das aktuelle Verzeichnis beim Öffnen eines Projekts dem Basisverzeichnis des " "Projekts anpassen" -#: ../plugins/saveactions.c:42 +#: ../plugins/saveactions.c:44 msgid "Save Actions" msgstr "Speicheraktionen" -#: ../plugins/saveactions.c:42 +#: ../plugins/saveactions.c:44 msgid "This plugin provides different actions related to saving of files." msgstr "Bietet verschiedene Funktionen rund um das Speichern von Dateien." -#: ../plugins/saveactions.c:174 +#: ../plugins/saveactions.c:176 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Backup Copy: Verzeichnis konnte nicht erstellt werden (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:207 +#: ../plugins/saveactions.c:210 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Backup Copy: Datei konnte nicht gelesen werden (%s)." -#: ../plugins/saveactions.c:225 +#: ../plugins/saveactions.c:235 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Backup Copy: Datei konnte nicht gespeichert werden (%s)." -#: ../plugins/saveactions.c:358 +#: ../plugins/saveactions.c:372 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5785,68 +5785,68 @@ msgstr[0] "Automatisches Speichern: %d Datei wurde gespeichert." msgstr[1] "Automatisches Speichern: %d Dateien wurden gespeichert." #. initialize the dialog -#: ../plugins/saveactions.c:429 +#: ../plugins/saveactions.c:443 msgid "Select Directory" msgstr "Verzeichnis wählen" -#: ../plugins/saveactions.c:517 +#: ../plugins/saveactions.c:531 msgid "Backup directory does not exist or is not writable." msgstr "Sicherungsverzeichnis existiert nicht oder ist nicht beschreibbar." -#: ../plugins/saveactions.c:598 +#: ../plugins/saveactions.c:612 msgid "Auto Save" msgstr "Automatisches Speichern" -#: ../plugins/saveactions.c:600 +#: ../plugins/saveactions.c:614 msgid "Enable save when losing _focus" msgstr "Speichern bei _Fokusverlust" -#: ../plugins/saveactions.c:606 ../plugins/saveactions.c:668 -#: ../plugins/saveactions.c:709 +#: ../plugins/saveactions.c:620 ../plugins/saveactions.c:682 +#: ../plugins/saveactions.c:723 msgid "_Enable" msgstr "A_ktivieren" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:628 msgid "Auto save _interval:" msgstr "_Interval für Autospeicherung:" -#: ../plugins/saveactions.c:622 +#: ../plugins/saveactions.c:636 msgid "seconds" msgstr "Sekunden" -#: ../plugins/saveactions.c:631 +#: ../plugins/saveactions.c:645 msgid "_Print status message if files have been automatically saved" msgstr "_Statusmeldung ausgeben, wenn Dateien automatisch gespeichert wurden" -#: ../plugins/saveactions.c:639 +#: ../plugins/saveactions.c:653 msgid "Save only current open _file" msgstr "_Nur aktuell aktive Datei speichern" -#: ../plugins/saveactions.c:646 +#: ../plugins/saveactions.c:660 msgid "Sa_ve all open files" msgstr "A_lle geöffneten Dateien speichern" -#: ../plugins/saveactions.c:666 +#: ../plugins/saveactions.c:680 msgid "Instant Save" msgstr "Instant Save" -#: ../plugins/saveactions.c:676 +#: ../plugins/saveactions.c:690 msgid "_Filetype to use for newly opened files:" msgstr "_Dateityp der zu öffnenden Datei:" -#: ../plugins/saveactions.c:707 +#: ../plugins/saveactions.c:721 msgid "Backup Copy" msgstr "Backup Copy" -#: ../plugins/saveactions.c:717 +#: ../plugins/saveactions.c:731 msgid "_Directory to save backup files in:" msgstr "_Verzeichnis zum Speichern der Sicherheitskopien" -#: ../plugins/saveactions.c:740 +#: ../plugins/saveactions.c:754 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "_Datums- und Zeitformat für Sicherungsdateien:" -#: ../plugins/saveactions.c:753 +#: ../plugins/saveactions.c:767 msgid "Directory _levels to include in the backup destination:" msgstr "Verzeichnis_ebenen die im Zielpfad übernommen werden sollen:" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ae68b1: Merge branch 'master' of github.com:geany/geany
by Frank Lanitz 10 Feb '15

10 Feb '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 10 Feb 2015 17:55:00 UTC Commit: ae68b10b04aad477efb29acc1d547dac0ff30c1e https://github.com/geany/geany/commit/ae68b10b04aad477efb29acc1d547dac0ff30… Log Message: ----------- Merge branch 'master' of github.com:geany/geany Modified Paths: -------------- data/geany.glade doc/geany.txt m4/geany-status.m4 plugins/filebrowser.c plugins/geanyfunctions.h plugins/saveactions.c po/intl_stats.sh src/build.c src/callbacks.c src/document.h src/editor.c src/keybindings.c src/keybindings.h src/keyfile.c src/notebook.c src/plugindata.h src/plugins.c src/prefs.c src/search.c src/sidebar.c src/ui_utils.c src/utils.c src/vte.c tagmanager/ctags/options.c Modified: data/geany.glade 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -7726,7 +7726,7 @@ <object class="GtkRadioMenuItem" id="cr"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Convert and Set to CR (_Mac)</property> + <property name="label" translatable="yes">Convert and Set to CR (Classic _Mac)</property> <property name="use_underline">True</property> <property name="group">crlf</property> <signal name="activate" handler="on_cr_activate" swapped="no"/> Modified: doc/geany.txt 19 lines changed, 17 insertions(+), 2 deletions(-) =================================================================== @@ -5176,8 +5176,23 @@ you can configure the automatically added extension in the configure dialog in Geany's plugin manager. After the plugin was loaded in Geany's plugin manager, every file is -copied into the configured backup directory when the file is saved in Geany. - +copied into the configured backup directory *after* the file has been saved +in Geany. + +The created backup copy file permissions are set to read-write only for +the user. This should help to not create world-readable files on possibly +unsecure destination directories like /tmp (especially useful +on multi-user systems). +This applies only to non-Windows systems. On Windows, no explicit file +permissions are set. + + +Additionally, you can define how many levels of the original file's +directory structure should be replicated in the backup copy path. +For example, setting the option +*Directory levels to include in the backup destination* to *2* +cause the plugin to create the last two components of the original +file's path in the backup copy path and place the new file there. Contributing to this document Modified: m4/geany-status.m4 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -27,7 +27,7 @@ EOF # Print a nice top bar # description + ' : ' + value total=`expr $dlen + 3 + $vlen` - for i in `seq 1 $total`; do echo -n '-'; done + for i in `seq 1 $total`; do printf '-'; done echo # And print the actual content Modified: plugins/filebrowser.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -35,6 +35,8 @@ # include <windows.h> # define OPEN_CMD "explorer \"%d\"" +#elif defined(__APPLE__) +# define OPEN_CMD "open \"%d\"" #else # define OPEN_CMD "nautilus \"%d\"" #endif Modified: plugins/geanyfunctions.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -342,6 +342,8 @@ geany_functions->p_keybindings->keybindings_set_item #define keybindings_get_item \ geany_functions->p_keybindings->keybindings_get_item +#define keybindings_get_modifiers \ + geany_functions->p_keybindings->keybindings_get_modifiers #define tm_get_real_path \ geany_functions->p_tm->tm_get_real_path #define tm_source_file_new \ Modified: plugins/saveactions.c 14 lines changed, 14 insertions(+), 0 deletions(-) =================================================================== @@ -27,6 +27,8 @@ #include "geanyplugin.h" #include "gtkcompat.h" +#include <stdio.h> +#include <fcntl.h> #include <unistd.h> #include <errno.h> #include <glib/gstdio.h> @@ -195,6 +197,7 @@ static void backupcopy_document_save_cb(GObject *obj, GeanyDocument *doc, gpoint gchar *dir_parts_src; gchar *stamp; gchar buf[512]; + gint fd_dst = -1; if (! enable_backupcopy) return; @@ -220,7 +223,14 @@ static void backupcopy_document_save_cb(GObject *obj, GeanyDocument *doc, gpoint g_free(basename_src); g_free(dir_parts_src); +#ifdef G_OS_WIN32 if ((dst = g_fopen(locale_filename_dst, "wb")) == NULL) +#else + /* Use g_open() on non-Windows to set file permissions to 600 atomically. + * On Windows, seting file permissions would require specific Windows API. */ + fd_dst = g_open(locale_filename_dst, O_CREAT | O_WRONLY, S_IWUSR | S_IRUSR); + if (fd_dst == -1 || (dst = fdopen(fd_dst, "w")) == NULL) +#endif { ui_set_statusbar(FALSE, _("Backup Copy: File could not be saved (%s)."), g_strerror(errno)); @@ -228,6 +238,8 @@ static void backupcopy_document_save_cb(GObject *obj, GeanyDocument *doc, gpoint g_free(locale_filename_dst); g_free(stamp); fclose(src); + if (fd_dst != -1) + close(fd_dst); return; } @@ -238,6 +250,8 @@ static void backupcopy_document_save_cb(GObject *obj, GeanyDocument *doc, gpoint fclose(src); fclose(dst); + if (fd_dst != -1) + close(fd_dst); g_free(locale_filename_src); g_free(locale_filename_dst); g_free(stamp); Modified: po/intl_stats.sh 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -92,7 +92,7 @@ else do # maybe the regexp can be optimized, regexps are not my best friends creationdate=`grep "PO-Revision-Date:" po/$lang.po | sed 's/.*: $[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}[+|-][0-9]\{4\}$.*/\1/'` - echo -n $eswitch $lang"\t("$creationdate"):\t" + printf "%s %s\t(%s):\t" "$eswitch" "$lang" "$creationdate" msgfmt --check --statistics po/$lang.po; done fi Modified: src/build.c 22 lines changed, 17 insertions(+), 5 deletions(-) =================================================================== @@ -128,7 +128,7 @@ static guint build_items_count = 9; static void build_exit_cb(GPid child_pid, gint status, gpointer user_data); static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data); #endif -static gboolean build_create_shellscript(const gchar *fname, const gchar *cmd, gboolean autoclose, GError **error); +static gboolean build_create_shellscript(const gchar *fname, const gchar *working_dir, const gchar *cmd, gboolean autoclose, GError **error); static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir); static void set_stop_button(gboolean stop); static void run_exit_cb(GPid child_pid, gint status, gpointer user_data); @@ -937,7 +937,7 @@ static gchar *prepare_run_script(GeanyDocument *doc, gchar **vte_cmd_nonscript, /* RUN_SCRIPT_CMD should be ok in UTF8 without converting in locale because it * contains no umlauts */ tmp = g_build_filename(working_dir, RUN_SCRIPT_CMD, NULL); - result = build_create_shellscript(tmp, cmd_string, autoclose, &error); + result = build_create_shellscript(tmp, working_dir, cmd_string, autoclose, &error); if (! result) { ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created: %s)"), @@ -1279,13 +1279,15 @@ static void set_file_error_from_errno(GError **error, gint err, const gchar *pre /* write a little shellscript to call the executable (similar to anjuta_launcher but "internal") * fname is the full file name (including path) for the script to create */ -static gboolean build_create_shellscript(const gchar *fname, const gchar *cmd, gboolean autoclose, GError **error) +static gboolean build_create_shellscript(const gchar *fname, const gchar *working_dir, const gchar *cmd, gboolean autoclose, GError **error) { FILE *fp; gchar *str; gboolean success = TRUE; #ifdef G_OS_WIN32 gchar *expanded_cmd; +#else + gchar *escaped_dir; #endif fp = g_fopen(fname, "w"); @@ -1300,11 +1302,13 @@ static gboolean build_create_shellscript(const gchar *fname, const gchar *cmd, g str = g_strdup_printf("%s\n\n%s\ndel \"%%0\"\n\npause\n", expanded_cmd, (autoclose) ? "" : "pause"); g_free(expanded_cmd); #else + escaped_dir = g_strescape(working_dir, NULL); str = g_strdup_printf( - "#!/bin/sh\n\nrm $0\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \ - \n\n%s\n", cmd, (autoclose) ? "" : + "#!/bin/sh\n\nrm $0\n\ncd \'%s\'\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \ + \n\n%s\n", escaped_dir, cmd, (autoclose) ? "" : "\necho \"Press return to continue\"\n#to be more compatible with shells like " "dash\ndummy_var=\"\"\nread dummy_var"); + g_free(escaped_dir); #endif if (fputs(str, fp) < 0) @@ -1320,6 +1324,14 @@ static gboolean build_create_shellscript(const gchar *fname, const gchar *cmd, g set_file_error_from_errno(error, errno, "Failed to close file"); success = FALSE; } +#ifdef __APPLE__ + if (g_chmod(fname, 0777) != 0) + { + if (error && ! *error) /* don't set error twice */ + set_file_error_from_errno(error, errno, "Failed to make file executable"); + success = FALSE; + } +#endif return success; } Modified: src/callbacks.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1697,7 +1697,7 @@ G_MODULE_EXPORT void on_page_setup1_activate(GtkMenuItem *menuitem, gpointer use G_MODULE_EXPORT gboolean on_escape_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - guint state = event->state & gtk_accelerator_get_default_mod_mask(); + guint state = keybindings_get_modifiers(event->state); /* make pressing escape in the sidebar and toolbar focus the editor */ if (event->keyval == GDK_Escape && state == 0) Modified: src/document.h 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -223,10 +223,8 @@ GeanyDocument *document_find_by_id(guint id); #if defined(G_OS_WIN32) # define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_CRLF -#elif defined(G_OS_UNIX) -# define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_LF #else -# define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_CR +# define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_LF #endif extern GeanyFilePrefs file_prefs; Modified: src/editor.c 9 lines changed, 7 insertions(+), 2 deletions(-) =================================================================== @@ -313,14 +313,14 @@ static gboolean on_editor_button_press_event(GtkWidget *widget, GdkEventButton * if (event->button == 1) { - guint state = event->state & gtk_accelerator_get_default_mod_mask(); + guint state = keybindings_get_modifiers(event->state); if (event->type == GDK_BUTTON_PRESS && editor_prefs.disable_dnd) { gint ss = sci_get_selection_start(editor->sci); sci_set_selection_end(editor->sci, ss); } - if (event->type == GDK_BUTTON_PRESS && state == GDK_CONTROL_MASK) + if (event->type == GDK_BUTTON_PRESS && state == GEANY_PRIMARY_MOD_MASK) { sci_set_current_position(editor->sci, editor_info.click_pos, FALSE); @@ -4779,6 +4779,11 @@ static ScintillaObject *create_new_sci(GeanyEditor *editor) /* virtual space */ SSM(sci, SCI_SETVIRTUALSPACEOPTIONS, editor_prefs.show_virtual_space, 0); + +#ifdef GDK_WINDOWING_QUARTZ + /* "retina" (HiDPI) display support on OS X - requires disabling buffered draw */ + SSM(sci, SCI_SETBUFFEREDDRAW, 0, 0); +#endif /* only connect signals if this is for the document notebook, not split window */ if (editor->sci == NULL) Modified: src/keybindings.c 147 lines changed, 83 insertions(+), 64 deletions(-) =================================================================== @@ -110,6 +110,25 @@ static void cb_func_move_tab(guint key_id); static void add_popup_menu_accels(void); +/** Gets significant modifiers from a GdkModifierType mask. The set of + * significant modifiers corresponds to the default modifier mask as returned + * by @c gtk_accelerator_get_default_mod_mask(). In addition, it improves + * the Command key handling on OS X by adding @c GEANY_PRIMARY_MOD_MASK + * when needed. For this reason it is preferred to use this function + * instead of @c gtk_accelerator_set_default_mod_mask(). + * @param mods GdkModifierType mask. + * @return Significant modifiers from the mask. + * @since 1.25. */ +GdkModifierType keybindings_get_modifiers(GdkModifierType mods) +{ +#ifdef __APPLE__ + if (mods & GDK_MOD2_MASK) + mods |= GEANY_PRIMARY_MOD_MASK; +#endif + return mods & gtk_accelerator_get_default_mod_mask(); +} + + /** Looks up a keybinding item. * @param group Group. * @param key_id Keybinding index for the group. @@ -247,32 +266,32 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_FILE); add_kb(group, GEANY_KEYS_FILE_NEW, NULL, - GDK_n, GDK_CONTROL_MASK, "menu_new", _("New"), "menu_new1"); + GDK_n, GEANY_PRIMARY_MOD_MASK, "menu_new", _("New"), "menu_new1"); add_kb(group, GEANY_KEYS_FILE_OPEN, NULL, - GDK_o, GDK_CONTROL_MASK, "menu_open", _("Open"), "menu_open1"); + GDK_o, GEANY_PRIMARY_MOD_MASK, "menu_open", _("Open"), "menu_open1"); add_kb(group, GEANY_KEYS_FILE_OPENSELECTED, NULL, - GDK_o, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_open_selected", + GDK_o, GDK_SHIFT_MASK | GEANY_PRIMARY_MOD_MASK, "menu_open_selected", _("Open selected file"), "menu_open_selected_file1"); add_kb(group, GEANY_KEYS_FILE_SAVE, NULL, - GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save"), "menu_save1"); + GDK_s, GEANY_PRIMARY_MOD_MASK, "menu_save", _("Save"), "menu_save1"); add_kb(group, GEANY_KEYS_FILE_SAVEAS, NULL, 0, 0, "menu_saveas", _("Save as"), "menu_save_as1"); add_kb(group, GEANY_KEYS_FILE_SAVEALL, NULL, - GDK_s, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_saveall", _("Save all"), + GDK_s, GDK_SHIFT_MASK | GEANY_PRIMARY_MOD_MASK, "menu_saveall", _("Save all"), "menu_save_all1"); add_kb(group, GEANY_KEYS_FILE_PRINT, NULL, - GDK_p, GDK_CONTROL_MASK, "menu_print", _("Print"), "print1"); + GDK_p, GEANY_PRIMARY_MOD_MASK, "menu_print", _("Print"), "print1"); add_kb(group, GEANY_KEYS_FILE_CLOSE, NULL, - GDK_w, GDK_CONTROL_MASK, "menu_close", _("Close"), "menu_close1"); + GDK_w, GEANY_PRIMARY_MOD_MASK, "menu_close", _("Close"), "menu_close1"); add_kb(group, GEANY_KEYS_FILE_CLOSEALL, NULL, - GDK_w, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_closeall", _("Close all"), + GDK_w, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "menu_closeall", _("Close all"), "menu_close_all1"); add_kb(group, GEANY_KEYS_FILE_RELOAD, NULL, - GDK_r, GDK_CONTROL_MASK, "menu_reloadfile", _("Reload file"), "menu_reload1"); + GDK_r, GEANY_PRIMARY_MOD_MASK, "menu_reloadfile", _("Reload file"), "menu_reload1"); add_kb(group, GEANY_KEYS_FILE_OPENLASTTAB, NULL, 0, 0, "file_openlasttab", _("Re-open last closed tab"), NULL); add_kb(group, GEANY_KEYS_FILE_QUIT, NULL, - GDK_q, GDK_CONTROL_MASK, "menu_quit", _("Quit"), "menu_quit1"); + GDK_q, GEANY_PRIMARY_MOD_MASK, "menu_quit", _("Quit"), "menu_quit1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_PROJECT); @@ -289,23 +308,23 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_EDITOR); add_kb(group, GEANY_KEYS_EDITOR_UNDO, NULL, - GDK_z, GDK_CONTROL_MASK, "menu_undo", _("Undo"), "menu_undo2"); + GDK_z, GEANY_PRIMARY_MOD_MASK, "menu_undo", _("Undo"), "menu_undo2"); add_kb(group, GEANY_KEYS_EDITOR_REDO, NULL, - GDK_y, GDK_CONTROL_MASK, "menu_redo", _("Redo"), "menu_redo2"); + GDK_y, GEANY_PRIMARY_MOD_MASK, "menu_redo", _("Redo"), "menu_redo2"); add_kb(group, GEANY_KEYS_EDITOR_DUPLICATELINE, NULL, - GDK_d, GDK_CONTROL_MASK, "edit_duplicateline", _("D_uplicate Line or Selection"), + GDK_d, GEANY_PRIMARY_MOD_MASK, "edit_duplicateline", _("D_uplicate Line or Selection"), "duplicate_line_or_selection1"); add_kb(group, GEANY_KEYS_EDITOR_DELETELINE, NULL, - GDK_k, GDK_CONTROL_MASK, "edit_deleteline", _("_Delete Current Line(s)"), + GDK_k, GEANY_PRIMARY_MOD_MASK, "edit_deleteline", _("_Delete Current Line(s)"), "delete_current_lines1"); add_kb(group, GEANY_KEYS_EDITOR_DELETELINETOEND, NULL, - GDK_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_deletelinetoend", + GDK_Delete, GDK_SHIFT_MASK | GEANY_PRIMARY_MOD_MASK, "edit_deletelinetoend", _("Delete to line end"), NULL); /* Note: transpose may fit better in format group, but that would break the API */ add_kb(group, GEANY_KEYS_EDITOR_TRANSPOSELINE, NULL, 0, 0, "edit_transposeline", _("_Transpose Current Line"), NULL); add_kb(group, GEANY_KEYS_EDITOR_SCROLLTOLINE, NULL, - GDK_l, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_scrolltoline", _("Scroll to current line"), NULL); + GDK_l, GDK_SHIFT_MASK | GEANY_PRIMARY_MOD_MASK, "edit_scrolltoline", _("Scroll to current line"), NULL); add_kb(group, GEANY_KEYS_EDITOR_SCROLLLINEUP, NULL, GDK_Up, GDK_MOD1_MASK, "edit_scrolllineup", _("Scroll up the view by one line"), NULL); add_kb(group, GEANY_KEYS_EDITOR_SCROLLLINEDOWN, NULL, @@ -319,9 +338,9 @@ static void init_default_kb(void) add_kb(group, GEANY_KEYS_EDITOR_CONTEXTACTION, NULL, 0, 0, "popup_contextaction", _("Context Action"), NULL); add_kb(group, GEANY_KEYS_EDITOR_AUTOCOMPLETE, NULL, - GDK_space, GDK_CONTROL_MASK, "edit_autocomplete", _("Complete word"), NULL); + GDK_space, GEANY_PRIMARY_MOD_MASK, "edit_autocomplete", _("Complete word"), NULL); add_kb(group, GEANY_KEYS_EDITOR_CALLTIP, NULL, - GDK_space, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_calltip", _("Show calltip"), NULL); + GDK_space, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "edit_calltip", _("Show calltip"), NULL); add_kb(group, GEANY_KEYS_EDITOR_WORDPARTCOMPLETION, NULL, GDK_Tab, 0, "edit_wordpartcompletion", _("Word part completion"), NULL); add_kb(group, GEANY_KEYS_EDITOR_MOVELINEUP, NULL, @@ -334,22 +353,22 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_CLIPBOARD); add_kb(group, GEANY_KEYS_CLIPBOARD_CUT, NULL, - GDK_x, GDK_CONTROL_MASK, "menu_cut", _("Cut"), "menu_cut1"); + GDK_x, GEANY_PRIMARY_MOD_MASK, "menu_cut", _("Cut"), "menu_cut1"); add_kb(group, GEANY_KEYS_CLIPBOARD_COPY, NULL, - GDK_c, GDK_CONTROL_MASK, "menu_copy", _("Copy"), "menu_copy1"); + GDK_c, GEANY_PRIMARY_MOD_MASK, "menu_copy", _("Copy"), "menu_copy1"); add_kb(group, GEANY_KEYS_CLIPBOARD_PASTE, NULL, - GDK_v, GDK_CONTROL_MASK, "menu_paste", _("Paste"), "menu_paste1"); + GDK_v, GEANY_PRIMARY_MOD_MASK, "menu_paste", _("Paste"), "menu_paste1"); add_kb(group, GEANY_KEYS_CLIPBOARD_COPYLINE, NULL, - GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_copyline", _("_Copy Current Line(s)"), + GDK_c, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "edit_copyline", _("_Copy Current Line(s)"), "copy_current_lines1"); add_kb(group, GEANY_KEYS_CLIPBOARD_CUTLINE, NULL, - GDK_x, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_cutline", _("Cu_t Current Line(s)"), + GDK_x, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "edit_cutline", _("Cu_t Current Line(s)"), "cut_current_lines1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_SELECT); add_kb(group, GEANY_KEYS_SELECT_ALL, NULL, - GDK_a, GDK_CONTROL_MASK, "menu_selectall", _("Select All"), "menu_select_all1"); + GDK_a, GEANY_PRIMARY_MOD_MASK, "menu_selectall", _("Select All"), "menu_select_all1"); add_kb(group, GEANY_KEYS_SELECT_WORD, NULL, GDK_w, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectword", _("Select current word"), NULL); add_kb(group, GEANY_KEYS_SELECT_LINE, NULL, @@ -366,20 +385,20 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_FORMAT); add_kb(group, GEANY_KEYS_FORMAT_TOGGLECASE, NULL, - GDK_u, GDK_CONTROL_MASK | GDK_MOD1_MASK, "edit_togglecase", + GDK_u, GEANY_PRIMARY_MOD_MASK | GDK_MOD1_MASK, "edit_togglecase", _("T_oggle Case of Selection"), "menu_toggle_case2"); add_kb(group, GEANY_KEYS_FORMAT_COMMENTLINETOGGLE, NULL, - GDK_e, GDK_CONTROL_MASK, "edit_commentlinetoggle", _("Toggle line commentation"), + GDK_e, GEANY_PRIMARY_MOD_MASK, "edit_commentlinetoggle", _("Toggle line commentation"), "menu_toggle_line_commentation1"); add_kb(group, GEANY_KEYS_FORMAT_COMMENTLINE, NULL, 0, 0, "edit_commentline", _("Comment line(s)"), "menu_comment_line1"); add_kb(group, GEANY_KEYS_FORMAT_UNCOMMENTLINE, NULL, 0, 0, "edit_uncommentline", _("Uncomment line(s)"), "menu_uncomment_line1"); add_kb(group, GEANY_KEYS_FORMAT_INCREASEINDENT, NULL, - GDK_i, GDK_CONTROL_MASK, "edit_increaseindent", _("Increase indent"), + GDK_i, GEANY_PRIMARY_MOD_MASK, "edit_increaseindent", _("Increase indent"), "menu_increase_indent1"); add_kb(group, GEANY_KEYS_FORMAT_DECREASEINDENT, NULL, - GDK_u, GDK_CONTROL_MASK, "edit_decreaseindent", _("Decrease indent"), + GDK_u, GEANY_PRIMARY_MOD_MASK, "edit_decreaseindent", _("Decrease indent"), "menu_decrease_indent1"); add_kb(group, GEANY_KEYS_FORMAT_INCREASEINDENTBYSPACE, NULL, 0, 0, "edit_increaseindentbyspace", _("Increase indent by one space"), NULL); @@ -388,16 +407,16 @@ static void init_default_kb(void) add_kb(group, GEANY_KEYS_FORMAT_AUTOINDENT, NULL, 0, 0, "edit_autoindent", _("S_mart Line Indent"), "smart_line_indent1"); add_kb(group, GEANY_KEYS_FORMAT_SENDTOCMD1, NULL, - GDK_1, GDK_CONTROL_MASK, "edit_sendtocmd1", _("Send to Custom Command 1"), NULL); + GDK_1, GEANY_PRIMARY_MOD_MASK, "edit_sendtocmd1", _("Send to Custom Command 1"), NULL); add_kb(group, GEANY_KEYS_FORMAT_SENDTOCMD2, NULL, - GDK_2, GDK_CONTROL_MASK, "edit_sendtocmd2", _("Send to Custom Command 2"), NULL); + GDK_2, GEANY_PRIMARY_MOD_MASK, "edit_sendtocmd2", _("Send to Custom Command 2"), NULL); add_kb(group, GEANY_KEYS_FORMAT_SENDTOCMD3, NULL, - GDK_3, GDK_CONTROL_MASK, "edit_sendtocmd3", _("Send to Custom Command 3"), NULL); + GDK_3, GEANY_PRIMARY_MOD_MASK, "edit_sendtocmd3", _("Send to Custom Command 3"), NULL); /* may fit better in editor group */ add_kb(group, GEANY_KEYS_FORMAT_SENDTOVTE, NULL, 0, 0, "edit_sendtovte", _("_Send Selection to Terminal"), "send_selection_to_vte1"); add_kb(group, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH, NULL, - GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("_Reflow Lines/Block"), + GDK_j, GEANY_PRIMARY_MOD_MASK, "format_reflowparagraph", _("_Reflow Lines/Block"), "reflow_lines_block1"); keybindings_set_item(group, GEANY_KEYS_FORMAT_JOINLINES, NULL, 0, 0, "edit_joinlines", _("Join lines"), NULL); @@ -418,7 +437,7 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_SETTINGS); add_kb(group, GEANY_KEYS_SETTINGS_PREFERENCES, cb_func_menu_preferences, - GDK_p, GDK_CONTROL_MASK | GDK_MOD1_MASK, "menu_preferences", _("Preferences"), + GDK_p, GEANY_PRIMARY_MOD_MASK | GDK_MOD1_MASK, "menu_preferences", _("Preferences"), "preferences1"); add_kb(group, GEANY_KEYS_SETTINGS_PLUGINPREFERENCES, cb_func_menu_preferences, 0, 0, "menu_pluginpreferences", _("P_lugin Preferences"), "plugin_preferences1"); @@ -426,33 +445,33 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_SEARCH); add_kb(group, GEANY_KEYS_SEARCH_FIND, NULL, - GDK_f, GDK_CONTROL_MASK, "menu_find", _("Find"), "find1"); + GDK_f, GEANY_PRIMARY_MOD_MASK, "menu_find", _("Find"), "find1"); add_kb(group, GEANY_KEYS_SEARCH_FINDNEXT, NULL, - GDK_g, GDK_CONTROL_MASK, "menu_findnext", _("Find Next"), "find_next1"); + GDK_g, GEANY_PRIMARY_MOD_MASK, "menu_findnext", _("Find Next"), "find_next1"); add_kb(group, GEANY_KEYS_SEARCH_FINDPREVIOUS, NULL, - GDK_g, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_findprevious", _("Find Previous"), + GDK_g, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "menu_findprevious", _("Find Previous"), "find_previous1"); add_kb(group, GEANY_KEYS_SEARCH_FINDNEXTSEL, NULL, 0, 0, "menu_findnextsel", _("Find Next _Selection"), "find_nextsel1"); add_kb(group, GEANY_KEYS_SEARCH_FINDPREVSEL, NULL, 0, 0, "menu_findprevsel", _("Find Pre_vious Selection"), "find_prevsel1"); add_kb(group, GEANY_KEYS_SEARCH_REPLACE, NULL, - GDK_h, GDK_CONTROL_MASK, "menu_replace", _("Replace"), "replace1"); + GDK_h, GEANY_PRIMARY_MOD_MASK, "menu_replace", _("Replace"), "replace1"); add_kb(group, GEANY_KEYS_SEARCH_FINDINFILES, NULL, GDK_f, - GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_findinfiles", _("Find in Files"), + GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "menu_findinfiles", _("Find in Files"), "find_in_files1"); add_kb(group, GEANY_KEYS_SEARCH_NEXTMESSAGE, NULL, 0, 0, "menu_nextmessage", _("Next Message"), "next_message1"); add_kb(group, GEANY_KEYS_SEARCH_PREVIOUSMESSAGE, NULL, 0, 0, "menu_previousmessage", _("Previous Message"), "previous_message1"); add_kb(group, GEANY_KEYS_SEARCH_FINDUSAGE, NULL, - GDK_e, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "popup_findusage", + GDK_e, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "popup_findusage", _("Find Usage"), "find_usage1"); add_kb(group, GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, NULL, - GDK_d, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "popup_finddocumentusage", + GDK_d, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "popup_finddocumentusage", _("Find Document Usage"), "find_document_usage1"); add_kb(group, GEANY_KEYS_SEARCH_MARKALL, NULL, - GDK_m, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "find_markall", _("_Mark All"), "mark_all1"); + GDK_m, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "find_markall", _("_Mark All"), "mark_all1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_GOTO); @@ -461,24 +480,24 @@ static void init_default_kb(void) add_kb(group, GEANY_KEYS_GOTO_FORWARD, NULL, GDK_Right, GDK_MOD1_MASK, "nav_forward", _("Navigate forward a location"), NULL); add_kb(group, GEANY_KEYS_GOTO_LINE, NULL, - GDK_l, GDK_CONTROL_MASK, "menu_gotoline", _("Go to Line"), "go_to_line1"); + GDK_l, GEANY_PRIMARY_MOD_MASK, "menu_gotoline", _("Go to Line"), "go_to_line1"); add_kb(group, GEANY_KEYS_GOTO_MATCHINGBRACE, NULL, - GDK_b, GDK_CONTROL_MASK, "edit_gotomatchingbrace", + GDK_b, GEANY_PRIMARY_MOD_MASK, "edit_gotomatchingbrace", _("Go to matching brace"), NULL); add_kb(group, GEANY_KEYS_GOTO_TOGGLEMARKER, NULL, - GDK_m, GDK_CONTROL_MASK, "edit_togglemarker", + GDK_m, GEANY_PRIMARY_MOD_MASK, "edit_togglemarker", _("Toggle marker"), NULL); add_kb(group, GEANY_KEYS_GOTO_NEXTMARKER, NULL, - GDK_period, GDK_CONTROL_MASK, "edit_gotonextmarker", + GDK_period, GEANY_PRIMARY_MOD_MASK, "edit_gotonextmarker", _("Go to Ne_xt Marker"), "go_to_next_marker1"); add_kb(group, GEANY_KEYS_GOTO_PREVIOUSMARKER, NULL, - GDK_comma, GDK_CONTROL_MASK, "edit_gotopreviousmarker", + GDK_comma, GEANY_PRIMARY_MOD_MASK, "edit_gotopreviousmarker", _("Go to Pre_vious Marker"), "go_to_previous_marker1"); add_kb(group, GEANY_KEYS_GOTO_TAGDEFINITION, NULL, - GDK_t, GDK_CONTROL_MASK, "popup_gototagdefinition", + GDK_t, GEANY_PRIMARY_MOD_MASK, "popup_gototagdefinition", _("Go to Tag Definition"), "goto_tag_definition1"); add_kb(group, GEANY_KEYS_GOTO_TAGDECLARATION, NULL, - GDK_t, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "popup_gototagdeclaration", + GDK_t, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "popup_gototagdeclaration", _("Go to Tag Declaration"), "goto_tag_declaration1"); add_kb(group, GEANY_KEYS_GOTO_LINESTART, NULL, GDK_Home, 0, "edit_gotolinestart", _("Go to Start of Line"), NULL); @@ -489,9 +508,9 @@ static void init_default_kb(void) add_kb(group, GEANY_KEYS_GOTO_LINEENDVISUAL, NULL, GDK_End, GDK_MOD1_MASK, "edit_gotolineendvisual", _("Go to End of Display Line"), NULL); add_kb(group, GEANY_KEYS_GOTO_PREVWORDPART, NULL, - GDK_slash, GDK_CONTROL_MASK, "edit_prevwordstart", _("Go to Previous Word Part"), NULL); + GDK_slash, GEANY_PRIMARY_MOD_MASK, "edit_prevwordstart", _("Go to Previous Word Part"), NULL); add_kb(group, GEANY_KEYS_GOTO_NEXTWORDPART, NULL, - GDK_backslash, GDK_CONTROL_MASK, "edit_nextwordstart", _("Go to Next Word Part"), NULL); + GDK_backslash, GEANY_PRIMARY_MOD_MASK, "edit_nextwordstart", _("Go to Next Word Part"), NULL); group = keybindings_get_core_group(GEANY_KEY_GROUP_VIEW); @@ -506,11 +525,11 @@ static void init_default_kb(void) add_kb(group, GEANY_KEYS_VIEW_SIDEBAR, NULL, 0, 0, "toggle_sidebar", _("Toggle Sidebar"), "menu_show_sidebar1"); add_kb(group, GEANY_KEYS_VIEW_ZOOMIN, NULL, - GDK_plus, GDK_CONTROL_MASK, "menu_zoomin", _("Zoom In"), "menu_zoom_in1"); + GDK_plus, GEANY_PRIMARY_MOD_MASK, "menu_zoomin", _("Zoom In"), "menu_zoom_in1"); add_kb(group, GEANY_KEYS_VIEW_ZOOMOUT, NULL, - GDK_minus, GDK_CONTROL_MASK, "menu_zoomout", _("Zoom Out"), "menu_zoom_out1"); + GDK_minus, GEANY_PRIMARY_MOD_MASK, "menu_zoomout", _("Zoom Out"), "menu_zoom_out1"); add_kb(group, GEANY_KEYS_VIEW_ZOOMRESET, NULL, - GDK_0, GDK_CONTROL_MASK, "normal_size", _("Zoom Reset"), "normal_size1"); + GDK_0, GEANY_PRIMARY_MOD_MASK, "normal_size", _("Zoom Reset"), "normal_size1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_FOCUS); @@ -538,16 +557,16 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_NOTEBOOK); add_kb(group, GEANY_KEYS_NOTEBOOK_SWITCHTABLEFT, cb_func_switch_tableft, - GDK_Page_Up, GDK_CONTROL_MASK, "switch_tableft", _("Switch to left document"), NULL); + GDK_Page_Up, GEANY_PRIMARY_MOD_MASK, "switch_tableft", _("Switch to left document"), NULL); add_kb(group, GEANY_KEYS_NOTEBOOK_SWITCHTABRIGHT, cb_func_switch_tabright, - GDK_Page_Down, GDK_CONTROL_MASK, "switch_tabright", _("Switch to right document"), NULL); + GDK_Page_Down, GEANY_PRIMARY_MOD_MASK, "switch_tabright", _("Switch to right document"), NULL); add_kb(group, GEANY_KEYS_NOTEBOOK_SWITCHTABLASTUSED, cb_func_switch_tablastused, - GDK_Tab, GDK_CONTROL_MASK, "switch_tablastused", _("Switch to last used document"), NULL); + GDK_Tab, GEANY_PRIMARY_MOD_MASK, "switch_tablastused", _("Switch to last used document"), NULL); add_kb(group, GEANY_KEYS_NOTEBOOK_MOVETABLEFT, cb_func_move_tab, - GDK_Page_Up, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "move_tableft", + GDK_Page_Up, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "move_tableft", _("Move document left"), NULL); add_kb(group, GEANY_KEYS_NOTEBOOK_MOVETABRIGHT, cb_func_move_tab, - GDK_Page_Down, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "move_tabright", + GDK_Page_Down, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, "move_tabright", _("Move document right"), NULL); add_kb(group, GEANY_KEYS_NOTEBOOK_MOVETABFIRST, cb_func_move_tab, 0, 0, "move_tabfirst", _("Move document first"), NULL); @@ -573,7 +592,7 @@ static void init_default_kb(void) add_kb(group, GEANY_KEYS_DOCUMENT_UNFOLDALL, NULL, 0, 0, "menu_unfoldall", _("Unfold all"), "menu_unfold_all1"); add_kb(group, GEANY_KEYS_DOCUMENT_RELOADTAGLIST, NULL, - GDK_r, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "reloadtaglist", _("Reload symbol list"), NULL); + GDK_r, GDK_SHIFT_MASK | GEANY_PRIMARY_MOD_MASK, "reloadtaglist", _("Reload symbol list"), NULL); add_kb(group, GEANY_KEYS_DOCUMENT_REMOVE_MARKERS, NULL, 0, 0, "remove_markers", _("Remove Markers"), "remove_markers1"); add_kb(group, GEANY_KEYS_DOCUMENT_REMOVE_ERROR_INDICATORS, NULL, @@ -590,7 +609,7 @@ static void init_default_kb(void) add_kb(group, GEANY_KEYS_BUILD_MAKE, NULL, GDK_F9, GDK_SHIFT_MASK, "build_make", _("Make all"), NULL); add_kb(group, GEANY_KEYS_BUILD_MAKEOWNTARGET, NULL, - GDK_F9, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "build_makeowntarget", + GDK_F9, GDK_SHIFT_MASK | GEANY_PRIMARY_MOD_MASK, "build_makeowntarget", _("Make custom target"), NULL); add_kb(group, GEANY_KEYS_BUILD_MAKEOBJECT, NULL, GDK_F8, GDK_SHIFT_MASK, "build_makeobject", _("Make object"), NULL); @@ -975,7 +994,7 @@ static gboolean check_fixed_kb(guint keyval, guint state) if (keyval == GDK_Page_Up || keyval == GDK_Page_Down) { /* switch to first or last document */ - if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) + if (state == (GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK)) { if (keyval == GDK_Page_Up) gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), 0); @@ -1116,7 +1135,7 @@ static gboolean check_vte(GdkModifierType state, guint keyval) if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != vc->vte) return FALSE; /* let VTE copy/paste override any user keybinding */ - if (state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK) && (keyval == GDK_c || keyval == GDK_v)) + if (state == (GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK) && (keyval == GDK_c || keyval == GDK_v)) return TRUE; if (! vc->enable_bash_keys) return FALSE; @@ -1198,7 +1217,7 @@ gboolean keybindings_check_event(GdkEventKey *ev, GeanyKeyBinding *kb) return FALSE; keyval = ev->keyval; - state = ev->state & gtk_accelerator_get_default_mod_mask(); + state = keybindings_get_modifiers(ev->state); /* hack to get around that CTRL+Shift+r results in GDK_R not GDK_r */ if ((ev->state & GDK_SHIFT_MASK) || (ev->state & GDK_LOCK_MASK)) if (keyval >= GDK_A && keyval <= GDK_Z) @@ -1228,7 +1247,7 @@ static gboolean on_key_press_event(GtkWidget *widget, GdkEventKey *ev, gpointer document_check_disk_status(doc, FALSE); keyval = ev->keyval; - state = ev->state & gtk_accelerator_get_default_mod_mask(); + state = keybindings_get_modifiers(ev->state); /* hack to get around that CTRL+Shift+r results in GDK_R not GDK_r */ if ((ev->state & GDK_SHIFT_MASK) || (ev->state & GDK_LOCK_MASK)) if (keyval >= GDK_A && keyval <= GDK_Z) Modified: src/keybindings.h 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -26,6 +26,17 @@ G_BEGIN_DECLS +/** Defines the primary modifier mask which is the Ctrl key mask on + * UNIX/Windows and Command key mask on OS X. When testing for the mask + * presence, use together with keybindings_get_modifiers() which adds + * @c GEANY_PRIMARY_MOD_MASK when needed. + * @since 1.25. */ +#ifdef __APPLE__ +#define GEANY_PRIMARY_MOD_MASK GDK_META_MASK +#else +#define GEANY_PRIMARY_MOD_MASK GDK_CONTROL_MASK +#endif + /** Function pointer type used for keybinding callbacks. */ typedef void (*GeanyKeyCallback) (guint key_id); @@ -246,6 +257,7 @@ GeanyKeyBinding *keybindings_set_item(GeanyKeyGroup *group, gsize key_id, GeanyKeyBinding *keybindings_get_item(GeanyKeyGroup *group, gsize key_id); +GdkModifierType keybindings_get_modifiers(GdkModifierType mods); #ifdef GEANY_PRIVATE Modified: src/keyfile.c 15 lines changed, 12 insertions(+), 3 deletions(-) =================================================================== @@ -74,16 +74,25 @@ #define GEANY_DEFAULT_TOOLS_MAKE "make" #ifdef G_OS_WIN32 #define GEANY_DEFAULT_TOOLS_TERMINAL "cmd.exe /Q /C %c" +#elif defined(__APPLE__) +#define GEANY_DEFAULT_TOOLS_TERMINAL "open -a terminal %c" #else #define GEANY_DEFAULT_TOOLS_TERMINAL "xterm -e \"/bin/sh %c\"" #endif +#ifdef __APPLE__ +#define GEANY_DEFAULT_TOOLS_BROWSER "open -a safari" +#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Helvetica Medium 12" +#define GEANY_DEFAULT_FONT_MSG_WINDOW "Helvetica Medium 12" +#define GEANY_DEFAULT_FONT_EDITOR "Menlo Medium 12" +#else #define GEANY_DEFAULT_TOOLS_BROWSER "firefox" -#define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr" -#define GEANY_DEFAULT_TOOLS_GREP "grep" -#define GEANY_DEFAULT_MRU_LENGTH 10 #define GEANY_DEFAULT_FONT_SYMBOL_LIST "Sans 9" #define GEANY_DEFAULT_FONT_MSG_WINDOW "Sans 9" #define GEANY_DEFAULT_FONT_EDITOR "Monospace 10" +#endif +#define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr" +#define GEANY_DEFAULT_TOOLS_GREP "grep" +#define GEANY_DEFAULT_MRU_LENGTH 10 #define GEANY_TOGGLE_MARK "~ " #define GEANY_MAX_AUTOCOMPLETE_WORDS 30 #define GEANY_MAX_SYMBOLS_UPDATE_FREQ 250 Modified: src/notebook.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -617,8 +617,8 @@ static gboolean notebook_tab_click(GtkWidget *widget, GdkEventButton *event, gpo return TRUE; /* stop other handlers like notebook_tab_bar_click_cb() */ } /* switch last used tab on ctrl-click */ - state = event->state & gtk_accelerator_get_default_mod_mask(); - if (event->button == 1 && state == GDK_CONTROL_MASK) + state = keybindings_get_modifiers(event->state); + if (event->button == 1 && state == GEANY_PRIMARY_MOD_MASK) { keybindings_send_command(GEANY_KEY_GROUP_NOTEBOOK, GEANY_KEYS_NOTEBOOK_SWITCHTABLASTUSED); Modified: src/plugindata.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -565,7 +565,7 @@ typedef struct KeybindingFuncs _GeanyKeyCallback callback, guint key, GdkModifierType mod, const gchar *name, const gchar *label, GtkWidget *menu_item); struct GeanyKeyBinding* (*keybindings_get_item)(struct GeanyKeyGroup *group, gsize key_id); - + GdkModifierType (*keybindings_get_modifiers)(GdkModifierType mods); } KeybindingFuncs; Modified: src/plugins.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -284,7 +284,8 @@ static EncodingFuncs encoding_funcs = { static KeybindingFuncs keybindings_funcs = { &keybindings_send_command, &keybindings_set_item, - &keybindings_get_item + &keybindings_get_item, + &keybindings_get_modifiers }; static TagManagerFuncs tagmanager_funcs = { Modified: src/prefs.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1414,7 +1414,7 @@ static gboolean kb_grab_key_dialog_key_press_cb(GtkWidget *dialog, GdkEventKey * g_return_val_if_fail(GTK_IS_LABEL(label), FALSE); - state = event->state & gtk_accelerator_get_default_mod_mask(); + state = keybindings_get_modifiers(event->state); if (event->keyval == GDK_Escape) return FALSE; /* close the dialog, don't allow escape when detecting keybindings. */ Modified: src/search.c 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1841,8 +1841,10 @@ static gboolean read_fif_io(GIOChannel *source, GIOCondition condition, gchar *e if (condition & (G_IO_IN | G_IO_PRI)) { gchar *msg, *utf8_msg; + GIOStatus st; - while (g_io_channel_read_line(source, &msg, NULL, NULL, NULL) && msg) + while ((st = g_io_channel_read_line(source, &msg, NULL, NULL, NULL)) != G_IO_STATUS_ERROR && + st != G_IO_STATUS_EOF && msg) { utf8_msg = NULL; @@ -1866,6 +1868,8 @@ static gboolean read_fif_io(GIOChannel *source, GIOCondition condition, gchar *e g_free(utf8_msg); g_free(msg); } + if (st == G_IO_STATUS_ERROR || st == G_IO_STATUS_EOF) + return FALSE; } if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) return FALSE; Modified: src/sidebar.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -41,6 +41,7 @@ #include "symbols.h" #include "ui_utils.h" #include "utils.h" +#include "keybindings.h" #include <string.h> @@ -912,7 +913,8 @@ static gboolean taglist_go_to_selection(GtkTreeSelection *selection, guint keyva if (doc != NULL) { navqueue_goto_line(doc, doc, line); - if (keyval != GDK_space && ! (state & GDK_CONTROL_MASK)) + state = keybindings_get_modifiers(state); + if (keyval != GDK_space && ! (state & GEANY_PRIMARY_MOD_MASK)) change_focus_to_editor(doc, NULL); else handled = FALSE; Modified: src/ui_utils.c 20 lines changed, 17 insertions(+), 3 deletions(-) =================================================================== @@ -2893,18 +2893,32 @@ GIcon *ui_get_mime_icon(const gchar *mime_type) if (ctype) { icon = g_content_type_get_icon(ctype); + if (icon) + { + GtkIconInfo *icon_info; + + icon_info = gtk_icon_theme_lookup_by_gicon(gtk_icon_theme_get_default(), icon, 16, 0); + if (!icon_info) + { + g_object_unref(icon); + icon = NULL; + } + else + gtk_icon_info_free(icon_info); + } + g_free(ctype); } /* fallback if icon lookup failed, like it might happen on Windows (?) */ if (! icon) { - const gchar *stock_id = GTK_STOCK_FILE; + const gchar *icon_name = "text-x-generic"; if (strstr(mime_type, "directory")) - stock_id = GTK_STOCK_DIRECTORY; + icon_name = "folder"; - icon = g_themed_icon_new(stock_id); + icon = g_themed_icon_new(icon_name); } return icon; } Modified: src/utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -374,7 +374,7 @@ const gchar *utils_get_eol_name(gint eol_mode) switch (eol_mode) { case SC_EOL_CRLF: return _("Win (CRLF)"); break; - case SC_EOL_CR: return _("Mac (CR)"); break; + case SC_EOL_CR: return _("Classic Mac (CR)"); break; default: return _("Unix (LF)"); break; } } Modified: src/vte.c 13 lines changed, 7 insertions(+), 6 deletions(-) =================================================================== @@ -39,6 +39,7 @@ #include "support.h" #include "ui_utils.h" #include "utils.h" +#include "keybindings.h" #include "gtkcompat.h" @@ -205,9 +206,9 @@ void vte_init(void) gint i; const gchar *sonames[] = { #if GTK_CHECK_VERSION(3, 0, 0) - "libvte2_90.so", "libvte2_90.so.9", + "libvte2_90.so", "libvte2_90.so.9", "libvte2_90.dylib", #else - "libvte.so", "libvte.so.4", "libvte.so.8", "libvte.so.9", + "libvte.so", "libvte.so.4", "libvte.so.8", "libvte.so.9", "libvte.dylib", #endif NULL }; @@ -328,7 +329,7 @@ void vte_close(void) static gboolean vte_keyrelease_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { if (ui_is_keyval_enter_or_return(event->keyval) || - ((event->keyval == GDK_c) && (event->state & GDK_CONTROL_MASK))) + ((event->keyval == GDK_c) && (event->state & GEANY_PRIMARY_MOD_MASK))) { /* assume any text on the prompt has been executed when pressing Enter/Return */ clean = TRUE; @@ -349,7 +350,7 @@ static gboolean vte_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer event->keyval == GDK_d || event->keyval == GDK_C || event->keyval == GDK_D) && - event->state & GDK_CONTROL_MASK && + event->state & GEANY_PRIMARY_MOD_MASK && ! (event->state & GDK_SHIFT_MASK) && ! (event->state & GDK_MOD1_MASK)) { vte_restart(widget); @@ -560,14 +561,14 @@ static GtkWidget *vte_create_popup_menu(void) item = gtk_image_menu_item_new_from_stock(GTK_STOCK_COPY, NULL); gtk_widget_add_accelerator(item, "activate", accel_group, - GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); + GDK_c, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_COPY)); item = gtk_image_menu_item_new_from_stock(GTK_STOCK_PASTE, NULL); gtk_widget_add_accelerator(item, "activate", accel_group, - GDK_v, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); + GDK_v, GEANY_PRIMARY_MOD_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_PASTE)); Modified: tagmanager/ctags/options.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -77,7 +77,6 @@ optionValues Option = { NULL, /* -I */ FALSE, /* -a */ FALSE, /* -B */ - FALSE, /* -e */ #ifdef MACROS_USE_PATTERNS EX_PATTERN, /* -n, --excmd */ #else @@ -90,6 +89,7 @@ optionValues Option = { NULL, /* -L */ NULL, /* -o */ NULL, /* -h */ + NULL, /* --etags-include */ DEFAULT_FILE_FORMAT,/* --format */ FALSE, /* --if0 */ FALSE, /* --kind-long */ @@ -101,7 +101,7 @@ optionValues Option = { FALSE, /* --tag-relative */ FALSE, /* --totals */ FALSE, /* --line-directives */ - FALSE, + FALSE, /* --nest */ }; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 508216: Use the open command to open a directory in Finder on OS X
by Jiří Techet 10 Feb '15

10 Feb '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 20 Jan 2015 18:33:06 UTC Commit: 508216b7b47fba88c35c3b4af25a4a1e245f222d https://github.com/geany/geany/commit/508216b7b47fba88c35c3b4af25a4a1e245f2… Log Message: ----------- Use the open command to open a directory in Finder on OS X Modified Paths: -------------- plugins/filebrowser.c Modified: plugins/filebrowser.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -35,6 +35,8 @@ # include <windows.h> # define OPEN_CMD "explorer \"%d\"" +#elif defined(__APPLE__) +# define OPEN_CMD "open \"%d\"" #else # define OPEN_CMD "nautilus \"%d\"" #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 47a5b9: Use better default fonts on OS X
by Jiří Techet 10 Feb '15

10 Feb '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 20 Jan 2015 18:33:06 UTC Commit: 47a5b9fc5fdbd5060671413565f354247f678f75 https://github.com/geany/geany/commit/47a5b9fc5fdbd5060671413565f354247f678… Log Message: ----------- Use better default fonts on OS X Fonts are rendered much smaller on OS X so use bigger sizes by default. Also, by default they use the Light style which is extremely thin - use Medium instead. Finally, use better monospace font than the default Courier (Menlo is derived from Dejavu Sans Mono and is used by XCode and other editors). Modified Paths: -------------- src/keyfile.c Modified: src/keyfile.c 9 lines changed, 6 insertions(+), 3 deletions(-) =================================================================== @@ -81,15 +81,18 @@ #endif #ifdef __APPLE__ #define GEANY_DEFAULT_TOOLS_BROWSER "open -a safari" +#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Helvetica Medium 12" +#define GEANY_DEFAULT_FONT_MSG_WINDOW "Helvetica Medium 12" +#define GEANY_DEFAULT_FONT_EDITOR "Menlo Medium 12" #else #define GEANY_DEFAULT_TOOLS_BROWSER "firefox" +#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Sans 9" +#define GEANY_DEFAULT_FONT_MSG_WINDOW "Sans 9" +#define GEANY_DEFAULT_FONT_EDITOR "Monospace 10" #endif #define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr" #define GEANY_DEFAULT_TOOLS_GREP "grep" #define GEANY_DEFAULT_MRU_LENGTH 10 -#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Sans 9" -#define GEANY_DEFAULT_FONT_MSG_WINDOW "Sans 9" -#define GEANY_DEFAULT_FONT_EDITOR "Monospace 10" #define GEANY_TOGGLE_MARK "~ " #define GEANY_MAX_AUTOCOMPLETE_WORDS 30 #define GEANY_MAX_SYMBOLS_UPDATE_FREQ 250 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] daecf6: Make keybindings_get_modifiers() part of plugin API
by Jiří Techet 10 Feb '15

10 Feb '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 20 Jan 2015 18:33:06 UTC Commit: daecf69c9cd29891c661d3c52dd0fa7ba451d972 https://github.com/geany/geany/commit/daecf69c9cd29891c661d3c52dd0fa7ba451d… Log Message: ----------- Make keybindings_get_modifiers() part of plugin API Modified Paths: -------------- plugins/geanyfunctions.h src/keybindings.c src/keybindings.h src/plugindata.h src/plugins.c Modified: plugins/geanyfunctions.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -342,6 +342,8 @@ geany_functions->p_keybindings->keybindings_set_item #define keybindings_get_item \ geany_functions->p_keybindings->keybindings_get_item +#define keybindings_get_modifiers \ + geany_functions->p_keybindings->keybindings_get_modifiers #define tm_get_real_path \ geany_functions->p_tm->tm_get_real_path #define tm_source_file_new \ Modified: src/keybindings.c 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -110,6 +110,15 @@ static void cb_func_move_tab(guint key_id); static void add_popup_menu_accels(void); +/** Gets significant modifiers from a GdkModifierType mask. The set of + * significant modifiers corresponds to the default modifier mask as returned + * by @c gtk_accelerator_get_default_mod_mask(). In addition, it improves + * the Command key handling on OS X by adding @c GEANY_PRIMARY_MOD_MASK + * when needed. For this reason it is preferred to use this function + * instead of @c gtk_accelerator_set_default_mod_mask(). + * @param mods GdkModifierType mask. + * @return Significant modifiers from the mask. + * @since 1.25. */ GdkModifierType keybindings_get_modifiers(GdkModifierType mods) { #ifdef __APPLE__ Modified: src/keybindings.h 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -26,6 +26,11 @@ G_BEGIN_DECLS +/** Defines the primary modifier mask which is the Ctrl key mask on + * UNIX/Windows and Command key mask on OS X. When testing for the mask + * presence, use together with keybindings_get_modifiers() which adds + * @c GEANY_PRIMARY_MOD_MASK when needed. + * @since 1.25. */ #ifdef __APPLE__ #define GEANY_PRIMARY_MOD_MASK GDK_META_MASK #else Modified: src/plugindata.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -565,7 +565,7 @@ typedef struct KeybindingFuncs _GeanyKeyCallback callback, guint key, GdkModifierType mod, const gchar *name, const gchar *label, GtkWidget *menu_item); struct GeanyKeyBinding* (*keybindings_get_item)(struct GeanyKeyGroup *group, gsize key_id); - + GdkModifierType (*keybindings_get_modifiers)(GdkModifierType mods); } KeybindingFuncs; Modified: src/plugins.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -284,7 +284,8 @@ static EncodingFuncs encoding_funcs = { static KeybindingFuncs keybindings_funcs = { &keybindings_send_command, &keybindings_set_item, - &keybindings_get_item + &keybindings_get_item, + &keybindings_get_modifiers }; static TagManagerFuncs tagmanager_funcs = { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2015