Plugins-Commits October 2013

plugins-commits@lists.geany.org

1 participants
51 discussions

[geany/geany-plugins] a46a55: Merge pull request #122 from vmkononenko/master
by Frank Lanitz 31 Oct '13

31 Oct '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 31 Oct 2013 07:55:15 UTC Commit: a46a5500c5eb0679251438740d55a4e707fe8e52 https://github.com/geany/geany-plugins/commit/a46a5500c5eb0679251438740d55a… Log Message: ----------- Merge pull request #122 from vmkononenko/master PairTagHighlighter: add empty tags checking Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 22 files changed, 20 insertions(+), 2 deletions(-) =================================================================== @@ -138,6 +138,23 @@ static gboolean is_tag_self_closing(ScintillaObject *sci, gint closingBracket) } +static gboolean is_tag_empty(gchar *tagName) +{ + const char *emptyTags[] = {"area", "base", "br", "col", "embed", + "hr", "img", "input", "keygen", "link", "meta", + "param", "source", "track", "wbr", "!DOCTYPE"}; + + int i; + for(i=0; i<(sizeof(emptyTags)/sizeof(emptyTags[0])); i++) + { + if(strcmp(tagName, emptyTags[i]) == 0) + return TRUE; + } + + return FALSE; +} + + static gboolean is_tag_opening(ScintillaObject *sci, gint openingBracket) { gboolean isTagOpening = TRUE; @@ -281,10 +298,11 @@ static void findMatchingTag(ScintillaObject *sci, gint openingBracket, gint clos gchar tagName[MAX_TAG_NAME]; gboolean isTagOpening = is_tag_opening(sci, openingBracket); - if(is_tag_self_closing(sci, closingBracket)) { + get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); + + if(is_tag_self_closing(sci, closingBracket) || is_tag_empty(tagName)) { highlight_tag(sci, openingBracket, closingBracket, EMPTY_TAG_COLOR); } else { - get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); if(isTagOpening) findMatchingClosingTag(sci, tagName, closingBracket); else -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 32dbb1: PairTagHighlighter: add empty tags checking
by Volodymyr Kononenko 30 Oct '13

30 Oct '13

Branch: refs/heads/master Author: Volodymyr Kononenko <vm(a)kononenko.ws> Committer: Volodymyr Kononenko <vm(a)kononenko.ws> Date: Wed, 30 Oct 2013 21:21:40 UTC Commit: 32dbb1561889dd0d728ce62e6443e59f8bbc489c https://github.com/geany/geany-plugins/commit/32dbb1561889dd0d728ce62e6443e… Log Message: ----------- PairTagHighlighter: add empty tags checking All empty tags according to html5 standard + <!DOCTYPE> Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 22 files changed, 20 insertions(+), 2 deletions(-) =================================================================== @@ -138,6 +138,23 @@ static gboolean is_tag_self_closing(ScintillaObject *sci, gint closingBracket) } +static gboolean is_tag_empty(gchar *tagName) +{ + const char *emptyTags[] = {"area", "base", "br", "col", "embed", + "hr", "img", "input", "keygen", "link", "meta", + "param", "source", "track", "wbr", "!DOCTYPE"}; + + int i; + for(i=0; i<(sizeof(emptyTags)/sizeof(emptyTags[0])); i++) + { + if(strcmp(tagName, emptyTags[i]) == 0) + return TRUE; + } + + return FALSE; +} + + static gboolean is_tag_opening(ScintillaObject *sci, gint openingBracket) { gboolean isTagOpening = TRUE; @@ -281,10 +298,11 @@ static void findMatchingTag(ScintillaObject *sci, gint openingBracket, gint clos gchar tagName[MAX_TAG_NAME]; gboolean isTagOpening = is_tag_opening(sci, openingBracket); - if(is_tag_self_closing(sci, closingBracket)) { + get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); + + if(is_tag_self_closing(sci, closingBracket) || is_tag_empty(tagName)) { highlight_tag(sci, openingBracket, closingBracket, EMPTY_TAG_COLOR); } else { - get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); if(isTagOpening) findMatchingClosingTag(sci, tagName, closingBracket); else -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c5482d: Merge pull request #121 from vmkononenko/master
by Frank Lanitz 30 Oct '13

30 Oct '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 30 Oct 2013 21:16:04 UTC Commit: c5482de6262aa64ac7c6df73d4ce2a393c5e9e48 https://github.com/geany/geany-plugins/commit/c5482de6262aa64ac7c6df73d4ce2… Log Message: ----------- Merge pull request #121 from vmkononenko/master PairTagHighlighter: changes in highlighting Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 70 files changed, 49 insertions(+), 21 deletions(-) =================================================================== @@ -14,11 +14,13 @@ #include "Scintilla.h" /* for the SCNotification struct */ #include "SciLexer.h" -/* If to set indicator >8, highlighting will be of grey color. - * Light grey line highlighter covers higher values of indicator. */ -#define INDICATOR_TAGMATCH 0 +#define INDICATOR_TAGMATCH 9 #define MAX_TAG_NAME 64 +#define MATCHING_PAIR_COLOR 0x00ff00 /* green */ +#define NONMATCHING_PAIR_COLOR 0xff0000 /* red */ +#define EMPTY_TAG_COLOR 0xffff00 /* yellow */ + /* These items are set by Geany before plugin_init() is called. */ GeanyPlugin *geany_plugin; GeanyData *geany_data; @@ -82,18 +84,42 @@ static gint findBracket(ScintillaObject *sci, gint position, gint endOfSearchPos } -static void highlight_tag(ScintillaObject *sci, gint openingBracket, gint closingBracket) +static gint rgb2bgr(gint color) +{ + guint r, g, b; + + r = color >> 16; + g = (0x00ff00 & color) >> 8; + b = (0x0000ff & color); + + color = (r | (g << 8) | (b << 16)); + + return color; +} + + +static void highlight_tag(ScintillaObject *sci, gint openingBracket, + gint closingBracket, gint color) { scintilla_send_message(sci, SCI_SETINDICATORCURRENT, INDICATOR_TAGMATCH, 0); scintilla_send_message(sci, SCI_INDICSETSTYLE, INDICATOR_TAGMATCH, INDIC_ROUNDBOX); - scintilla_send_message(sci, SCI_INDICSETFORE, 0, 0x00d000); /* green */ + scintilla_send_message(sci, SCI_INDICSETFORE, INDICATOR_TAGMATCH, rgb2bgr(color)); scintilla_send_message(sci, SCI_INDICSETALPHA, INDICATOR_TAGMATCH, 60); scintilla_send_message(sci, SCI_INDICATORFILLRANGE, openingBracket, closingBracket-openingBracket+1); } +static void highlight_matching_pair(ScintillaObject *sci) +{ + highlight_tag(sci, highlightedBrackets[0], highlightedBrackets[1], + MATCHING_PAIR_COLOR); + highlight_tag(sci, highlightedBrackets[2], highlightedBrackets[3], + MATCHING_PAIR_COLOR); +} + + static void clear_previous_highlighting(ScintillaObject *sci, gint rangeStart, gint rangeEnd) { scintilla_send_message(sci, SCI_SETINDICATORCURRENT, INDICATOR_TAGMATCH, 0); @@ -184,12 +210,14 @@ static void findMatchingOpeningTag(ScintillaObject *sci, gchar *tagName, gint op if(openingTagsCount == closingTagsCount) { /* matching tag is found */ - highlight_tag(sci, matchingOpeningBracket, matchingClosingBracket); highlightedBrackets[2] = matchingOpeningBracket; highlightedBrackets[3] = matchingClosingBracket; - break; + highlight_matching_pair(sci); + return; } } + highlight_tag(sci, highlightedBrackets[0], highlightedBrackets[1], + NONMATCHING_PAIR_COLOR); } @@ -237,12 +265,14 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl if(openingTagsCount == closingTagsCount) { /* matching tag is found */ - highlight_tag(sci, matchingOpeningBracket, matchingClosingBracket); highlightedBrackets[2] = matchingOpeningBracket; highlightedBrackets[3] = matchingClosingBracket; - break; + highlight_matching_pair(sci); + return; } } + highlight_tag(sci, highlightedBrackets[0], highlightedBrackets[1], + NONMATCHING_PAIR_COLOR); } @@ -250,12 +280,16 @@ static void findMatchingTag(ScintillaObject *sci, gint openingBracket, gint clos { gchar tagName[MAX_TAG_NAME]; gboolean isTagOpening = is_tag_opening(sci, openingBracket); - get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); - if(TRUE == isTagOpening) - findMatchingClosingTag(sci, tagName, closingBracket); - else - findMatchingOpeningTag(sci, tagName, openingBracket); + if(is_tag_self_closing(sci, closingBracket)) { + highlight_tag(sci, openingBracket, closingBracket, EMPTY_TAG_COLOR); + } else { + get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); + if(isTagOpening) + findMatchingClosingTag(sci, tagName, closingBracket); + else + findMatchingOpeningTag(sci, tagName, openingBracket); + } } @@ -290,13 +324,7 @@ static void run_tag_highlighter(ScintillaObject *sci) highlightedBrackets[0] = openingBracket; highlightedBrackets[1] = closingBracket; - /* Highlight current tag. Matching tag will be highlighted from - * findMatchingTag() functiong */ - highlight_tag(sci, openingBracket, closingBracket); - - /* Find matching tag only if a tag is not self-closing */ - if(FALSE == is_tag_self_closing(sci, closingBracket)) - findMatchingTag(sci, openingBracket, closingBracket); + findMatchingTag(sci, openingBracket, closingBracket); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 9586c5: PairTagHighlighter: changes in highlighting
by Volodymyr Kononenko 30 Oct '13

30 Oct '13

Branch: refs/heads/master Author: Volodymyr Kononenko <vm(a)kononenko.ws> Committer: Volodymyr Kononenko <volodymyr.kononenko(a)globallogic.com> Date: Wed, 30 Oct 2013 17:31:47 UTC Commit: 9586c577b2987f29dc82b9b08166b1000a1a8436 https://github.com/geany/geany-plugins/commit/9586c577b2987f29dc82b9b08166b… Log Message: ----------- PairTagHighlighter: changes in highlighting * use scintilla indicator #9 to avoid conflicts with lexers * if matching pair is not found, highlight tag with red * if tag is self-closing, highlight it with yellow Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 70 files changed, 49 insertions(+), 21 deletions(-) =================================================================== @@ -14,11 +14,13 @@ #include "Scintilla.h" /* for the SCNotification struct */ #include "SciLexer.h" -/* If to set indicator >8, highlighting will be of grey color. - * Light grey line highlighter covers higher values of indicator. */ -#define INDICATOR_TAGMATCH 0 +#define INDICATOR_TAGMATCH 9 #define MAX_TAG_NAME 64 +#define MATCHING_PAIR_COLOR 0x00ff00 /* green */ +#define NONMATCHING_PAIR_COLOR 0xff0000 /* red */ +#define EMPTY_TAG_COLOR 0xffff00 /* yellow */ + /* These items are set by Geany before plugin_init() is called. */ GeanyPlugin *geany_plugin; GeanyData *geany_data; @@ -82,18 +84,42 @@ static gint findBracket(ScintillaObject *sci, gint position, gint endOfSearchPos } -static void highlight_tag(ScintillaObject *sci, gint openingBracket, gint closingBracket) +static gint rgb2bgr(gint color) +{ + guint r, g, b; + + r = color >> 16; + g = (0x00ff00 & color) >> 8; + b = (0x0000ff & color); + + color = (r | (g << 8) | (b << 16)); + + return color; +} + + +static void highlight_tag(ScintillaObject *sci, gint openingBracket, + gint closingBracket, gint color) { scintilla_send_message(sci, SCI_SETINDICATORCURRENT, INDICATOR_TAGMATCH, 0); scintilla_send_message(sci, SCI_INDICSETSTYLE, INDICATOR_TAGMATCH, INDIC_ROUNDBOX); - scintilla_send_message(sci, SCI_INDICSETFORE, 0, 0x00d000); /* green */ + scintilla_send_message(sci, SCI_INDICSETFORE, INDICATOR_TAGMATCH, rgb2bgr(color)); scintilla_send_message(sci, SCI_INDICSETALPHA, INDICATOR_TAGMATCH, 60); scintilla_send_message(sci, SCI_INDICATORFILLRANGE, openingBracket, closingBracket-openingBracket+1); } +static void highlight_matching_pair(ScintillaObject *sci) +{ + highlight_tag(sci, highlightedBrackets[0], highlightedBrackets[1], + MATCHING_PAIR_COLOR); + highlight_tag(sci, highlightedBrackets[2], highlightedBrackets[3], + MATCHING_PAIR_COLOR); +} + + static void clear_previous_highlighting(ScintillaObject *sci, gint rangeStart, gint rangeEnd) { scintilla_send_message(sci, SCI_SETINDICATORCURRENT, INDICATOR_TAGMATCH, 0); @@ -184,12 +210,14 @@ static void findMatchingOpeningTag(ScintillaObject *sci, gchar *tagName, gint op if(openingTagsCount == closingTagsCount) { /* matching tag is found */ - highlight_tag(sci, matchingOpeningBracket, matchingClosingBracket); highlightedBrackets[2] = matchingOpeningBracket; highlightedBrackets[3] = matchingClosingBracket; - break; + highlight_matching_pair(sci); + return; } } + highlight_tag(sci, highlightedBrackets[0], highlightedBrackets[1], + NONMATCHING_PAIR_COLOR); } @@ -237,12 +265,14 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl if(openingTagsCount == closingTagsCount) { /* matching tag is found */ - highlight_tag(sci, matchingOpeningBracket, matchingClosingBracket); highlightedBrackets[2] = matchingOpeningBracket; highlightedBrackets[3] = matchingClosingBracket; - break; + highlight_matching_pair(sci); + return; } } + highlight_tag(sci, highlightedBrackets[0], highlightedBrackets[1], + NONMATCHING_PAIR_COLOR); } @@ -250,12 +280,16 @@ static void findMatchingTag(ScintillaObject *sci, gint openingBracket, gint clos { gchar tagName[MAX_TAG_NAME]; gboolean isTagOpening = is_tag_opening(sci, openingBracket); - get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); - if(TRUE == isTagOpening) - findMatchingClosingTag(sci, tagName, closingBracket); - else - findMatchingOpeningTag(sci, tagName, openingBracket); + if(is_tag_self_closing(sci, closingBracket)) { + highlight_tag(sci, openingBracket, closingBracket, EMPTY_TAG_COLOR); + } else { + get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); + if(isTagOpening) + findMatchingClosingTag(sci, tagName, closingBracket); + else + findMatchingOpeningTag(sci, tagName, openingBracket); + } } @@ -290,13 +324,7 @@ static void run_tag_highlighter(ScintillaObject *sci) highlightedBrackets[0] = openingBracket; highlightedBrackets[1] = closingBracket; - /* Highlight current tag. Matching tag will be highlighted from - * findMatchingTag() functiong */ - highlight_tag(sci, openingBracket, closingBracket); - - /* Find matching tag only if a tag is not self-closing */ - if(FALSE == is_tag_self_closing(sci, closingBracket)) - findMatchingTag(sci, openingBracket, closingBracket); + findMatchingTag(sci, openingBracket, closingBracket); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] fa3190: Another small update of German translation
by Frank Lanitz 28 Oct '13

28 Oct '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 28 Oct 2013 11:05:43 UTC Commit: fa3190d9dfc2c605fe6378d3c69e7c1a85e101c5 https://github.com/geany/geany-plugins/commit/fa3190d9dfc2c605fe6378d3c69e7… Log Message: ----------- Another small update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 21 files changed, 13 insertions(+), 8 deletions(-) =================================================================== @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Geany-plugins 1.24\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-27 11:36+0100\n" -"PO-Revision-Date: 2013-10-27 11:40+0100\n" +"PO-Revision-Date: 2013-10-28 12:05+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "Language: de\n" @@ -4440,6 +4440,12 @@ msgid "" "To view the differences, cancel this dialog and open the differences in " "Geany directly by using the GeanyVC menu (Base Dirrectory -> Diff)." msgstr "" +"Die Veränderungen können hier nicht angezeigt werden, da sie zu viele " +"sind. Andernfalls könnte es passieren, dass die Anzeige unbenutzbar " +"wird.\n" +"Um sich dennoch die Änderungen anzeigen zu lessen, benutzen Sie " +"einfach die Diff-Funktion aus dem GeanyVC-Unterpunktes innerhalb des " +"Werkzeuge-Menüs." #: ../geanyvc/src/geanyvc.c:1243 msgid "Commit Y/N" @@ -5018,7 +5024,7 @@ msgstr "" #: ../pairtaghighlighter/src/pair_tag_highlighter.c:34 msgid "Finds and highlights matching opening/closing HTML tag" -msgstr "" +msgstr "Findet und hebt passende öffende und schließende HTML-Tags" #: ../pohelper/data/menus.ui.h:1 msgid "_Translation Helper" @@ -5042,19 +5048,19 @@ msgstr "Zur nächsten String gehen" #: ../pohelper/data/menus.ui.h:6 msgid "Pre_vious Untranslated" -msgstr "" +msgstr "_Vorheringe nicht übersetze Zeichenkette" #: ../pohelper/data/menus.ui.h:7 ../pohelper/src/gph-plugin.c:1037 msgid "Go to previous untranslated string" -msgstr "" +msgstr "Geht zu der vorherigen, noch nicht übersetzen Zeichenkette." #: ../pohelper/data/menus.ui.h:8 msgid "Next _Untranslated" -msgstr "" +msgstr "Nächste nicht übersetzte Zeichenkette" #: ../pohelper/data/menus.ui.h:9 ../pohelper/src/gph-plugin.c:1040 msgid "Go to next untranslated string" -msgstr "" +msgstr "Geht zu der nächsten, noch nicht übersetzten Zeichenkette." #: ../pohelper/data/menus.ui.h:10 msgid "Previous Fu_zzy" @@ -5106,9 +5112,8 @@ msgid "Paste the original untranslated string to the translation" msgstr "" #: ../pohelper/data/menus.ui.h:22 ../pohelper/src/gph-plugin.c:1061 -#, fuzzy msgid "Reflow the current translation string" -msgstr "Zur aktuellen Anweisung springen" +msgstr "Aktuelle Übersetzungen neu umbrechen" #: ../pohelper/data/menus.ui.h:23 msgid "_Reflow Translation" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e0a630: treebrowser: sensible left/right arrows
by Roland Pallai 28 Oct '13

28 Oct '13

Branch: refs/heads/master Author: Roland Pallai <rpallai(a)magex.hu> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 28 Oct 2013 07:14:55 UTC Commit: e0a630ef51ff284f0aba990fa55ea38576bd07ba https://github.com/geany/geany-plugins/commit/e0a630ef51ff284f0aba990fa55ea… Log Message: ----------- treebrowser: sensible left/right arrows Collapse- or select parent row on left arrow, expand row on right arrow. Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 36 files changed, 29 insertions(+), 7 deletions(-) =================================================================== @@ -1428,12 +1428,12 @@ enum static gboolean on_treeview_keypress(GtkWidget *widget, GdkEventKey *event) { + GtkTreeIter iter; + GtkTreeModel *model; + GtkTreePath *path; + if (event->keyval == GDK_space) { - GtkTreeIter iter; - GtkTreeModel *model; - GtkTreePath *path; - if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), &model, &iter)) { path = gtk_tree_model_get_path(model, &iter); @@ -1451,9 +1451,6 @@ enum } if (event->keyval == GDK_Menu) { - GtkTreeIter iter; - GtkTreeModel *model; - GtkTreePath *path; gchar *name = NULL, *uri = NULL; GtkWidget *menu; @@ -1471,6 +1468,31 @@ enum return TRUE; } + if (event->keyval == GDK_Left) + { + if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), &model, &iter)) + { + path = gtk_tree_model_get_path(model, &iter); + if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path)) + gtk_tree_view_collapse_row(GTK_TREE_VIEW(widget), path); + else if (gtk_tree_path_get_depth(path) > 1) { + gtk_tree_path_up(path); + gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), path, NULL, FALSE); + gtk_tree_selection_select_path(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), path); + } + } + return TRUE; + } + if (event->keyval == GDK_Right) + { + if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), &model, &iter)) + { + path = gtk_tree_model_get_path(model, &iter); + if (!gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget), path)) + gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path, FALSE); + } + return TRUE; + } return FALSE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 258895: treebrowser: Focus editor on file open
by Roland Pallai 28 Oct '13

28 Oct '13

Branch: refs/heads/master Author: Roland Pallai <rpallai(a)magex.hu> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 28 Oct 2013 07:14:55 UTC Commit: 258895458811761c4daa3e15bef220e474c5f834 https://github.com/geany/geany-plugins/commit/258895458811761c4daa3e15bef22… Log Message: ----------- treebrowser: Focus editor on file open Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 15 files changed, 14 insertions(+), 1 deletions(-) =================================================================== @@ -73,6 +73,7 @@ static gboolean CONFIG_CHROOT_ON_DCLICK = FALSE; static gboolean CONFIG_FOLLOW_CURRENT_DOC = TRUE; static gboolean CONFIG_ON_DELETE_CLOSE_FILE = TRUE; +static gboolean CONFIG_ON_OPEN_FOCUS_EDITOR = FALSE; static gboolean CONFIG_SHOW_TREE_LINES = TRUE; static gboolean CONFIG_SHOW_BOOKMARKS = FALSE; static gint CONFIG_SHOW_ICONS = 2; @@ -1544,8 +1545,11 @@ enum treebrowser_browse(uri, &iter); gtk_tree_view_expand_row(GTK_TREE_VIEW(widget), path, FALSE); } - else + else { document_open_file(uri, FALSE, NULL, NULL); + if (CONFIG_ON_OPEN_FOCUS_EDITOR) + keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR); + } g_free(uri); } @@ -1825,6 +1829,7 @@ enum GtkWidget *CHROOT_ON_DCLICK; GtkWidget *FOLLOW_CURRENT_DOC; GtkWidget *ON_DELETE_CLOSE_FILE; + GtkWidget *ON_OPEN_FOCUS_EDITOR; GtkWidget *SHOW_TREE_LINES; GtkWidget *SHOW_BOOKMARKS; GtkWidget *SHOW_ICONS; @@ -1847,6 +1852,7 @@ enum CONFIG_CHROOT_ON_DCLICK = utils_get_setting_boolean(config, "treebrowser", "chroot_on_dclick", CONFIG_CHROOT_ON_DCLICK); CONFIG_FOLLOW_CURRENT_DOC = utils_get_setting_boolean(config, "treebrowser", "follow_current_doc", CONFIG_FOLLOW_CURRENT_DOC); CONFIG_ON_DELETE_CLOSE_FILE = utils_get_setting_boolean(config, "treebrowser", "on_delete_close_file", CONFIG_ON_DELETE_CLOSE_FILE); + CONFIG_ON_OPEN_FOCUS_EDITOR = utils_get_setting_boolean(config, "treebrowser", "on_open_focus_editor", CONFIG_ON_OPEN_FOCUS_EDITOR); CONFIG_SHOW_TREE_LINES = utils_get_setting_boolean(config, "treebrowser", "show_tree_lines", CONFIG_SHOW_TREE_LINES); CONFIG_SHOW_BOOKMARKS = utils_get_setting_boolean(config, "treebrowser", "show_bookmarks", CONFIG_SHOW_BOOKMARKS); CONFIG_SHOW_ICONS = utils_get_setting_integer(config, "treebrowser", "show_icons", CONFIG_SHOW_ICONS); @@ -1879,6 +1885,7 @@ enum g_key_file_set_boolean(config, "treebrowser", "chroot_on_dclick", CONFIG_CHROOT_ON_DCLICK); g_key_file_set_boolean(config, "treebrowser", "follow_current_doc", CONFIG_FOLLOW_CURRENT_DOC); g_key_file_set_boolean(config, "treebrowser", "on_delete_close_file", CONFIG_ON_DELETE_CLOSE_FILE); + g_key_file_set_boolean(config, "treebrowser", "on_open_focus_editor", CONFIG_ON_OPEN_FOCUS_EDITOR); g_key_file_set_boolean(config, "treebrowser", "show_tree_lines", CONFIG_SHOW_TREE_LINES); g_key_file_set_boolean(config, "treebrowser", "show_bookmarks", CONFIG_SHOW_BOOKMARKS); g_key_file_set_integer(config, "treebrowser", "show_icons", CONFIG_SHOW_ICONS); @@ -1910,6 +1917,7 @@ enum CONFIG_CHROOT_ON_DCLICK = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.CHROOT_ON_DCLICK)); CONFIG_FOLLOW_CURRENT_DOC = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.FOLLOW_CURRENT_DOC)); CONFIG_ON_DELETE_CLOSE_FILE = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_DELETE_CLOSE_FILE)); + CONFIG_ON_OPEN_FOCUS_EDITOR = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_OPEN_FOCUS_EDITOR)); CONFIG_SHOW_TREE_LINES = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_TREE_LINES)); CONFIG_SHOW_BOOKMARKS = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_BOOKMARKS)); CONFIG_SHOW_ICONS = gtk_combo_box_get_active(GTK_COMBO_BOX(configure_widgets.SHOW_ICONS)); @@ -2014,6 +2022,11 @@ enum gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_DELETE_CLOSE_FILE), CONFIG_ON_DELETE_CLOSE_FILE); gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.ON_DELETE_CLOSE_FILE, FALSE, FALSE, 0); + configure_widgets.ON_OPEN_FOCUS_EDITOR = gtk_check_button_new_with_label(_("Focus editor on file open")); + gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.ON_OPEN_FOCUS_EDITOR), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_OPEN_FOCUS_EDITOR), CONFIG_ON_OPEN_FOCUS_EDITOR); + gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.ON_OPEN_FOCUS_EDITOR, FALSE, FALSE, 0); + configure_widgets.SHOW_TREE_LINES = gtk_check_button_new_with_label(_("Show tree lines")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_TREE_LINES), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_TREE_LINES), CONFIG_SHOW_TREE_LINES); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 612f05: Treebrwoser: Removing some unused code
by Frank Lanitz 28 Oct '13

28 Oct '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 28 Oct 2013 07:14:55 UTC Commit: 612f05b0038b0e107fb92c8fce663b866812ad7e https://github.com/geany/geany-plugins/commit/612f05b0038b0e107fb92c8fce663… Log Message: ----------- Treebrwoser: Removing some unused code Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 15 files changed, 5 insertions(+), 10 deletions(-) =================================================================== @@ -603,7 +603,6 @@ enum gchar **lines, **line; GtkTreeIter iter; gchar *pos; - gchar *name; GdkPixbuf *icon = NULL; if (! CONFIG_SHOW_BOOKMARKS) @@ -646,10 +645,7 @@ enum if (pos != NULL) { *pos = '\0'; - name = pos + 1; } - else - name = NULL; } path_full = g_filename_from_uri(*line, NULL, NULL); if (path_full != NULL) @@ -809,12 +805,11 @@ enum gboolean founded = FALSE, global_founded = FALSE; gchar *new = NULL; gchar **root_segments = NULL, **find_segments = NULL; - guint root_segments_n = 0, find_segments_n = 0; + guint find_segments_n = 0; root_segments = g_strsplit(root, G_DIR_SEPARATOR_S, 0); find_segments = g_strsplit(find, G_DIR_SEPARATOR_S, 0); - root_segments_n = g_strv_length(root_segments)-1; find_segments_n = g_strv_length(find_segments)-1; @@ -1432,7 +1427,7 @@ enum GtkTreeIter iter; GtkTreeModel *model; GtkTreePath *path; - + if (event->keyval == GDK_space) { if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), &model, &iter)) @@ -1454,7 +1449,7 @@ enum { gchar *name = NULL, *uri = NULL; GtkWidget *menu; - + if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), &model, &iter)) gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, TREEBROWSER_COLUMN_NAME, &name, @@ -1466,7 +1461,7 @@ enum g_free(name); g_free(uri); - + return TRUE; } if (event->keyval == GDK_Left) @@ -2038,7 +2033,7 @@ enum gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_BOOKMARKS), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_BOOKMARKS), CONFIG_SHOW_BOOKMARKS); gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.SHOW_BOOKMARKS, FALSE, FALSE, 0); - + configure_widgets.OPEN_NEW_FILES = gtk_check_button_new_with_label(_("Open new files")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.OPEN_NEW_FILES ), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.OPEN_NEW_FILES ), CONFIG_OPEN_NEW_FILES); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 529340: GeanyVC: Making interactiv with VCS a bit more verbose. Patch by James Brierley
by Frank Lanitz 28 Oct '13

28 Oct '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 28 Oct 2013 07:14:55 UTC Commit: 5293407abfc3e34324e53eb0cac6f99811824a7b https://github.com/geany/geany-plugins/commit/5293407abfc3e34324e53eb0cac6f… Log Message: ----------- GeanyVC: Making interactiv with VCS a bit more verbose. Patch by James Brierley Modified Paths: -------------- geanyvc/src/geanyvc.c Modified: geanyvc/src/geanyvc.c 5 files changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -527,6 +527,7 @@ GSList *get_commit_files_null(G_GNUC_UNUSED const gchar * dir) { gchar *dir = NULL; gint ret; + const gint action_command_cell = 1; if (std_out) *std_out = NULL; @@ -556,6 +557,10 @@ GSList *get_commit_files_null(G_GNUC_UNUSED const gchar * dir) ret = execute_custom_command(dir, vc->commands[cmd].command, vc->commands[cmd].env, std_out, std_err, filename, list, message); + + ui_set_statusbar(TRUE, _("File %s: action %s executed via %s."), + filename, vc->commands[cmd].command[action_command_cell], vc->program); + g_free(dir); return ret; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 5fd70c: GeanyMiniScript: Fixing some tralling spaces
by Frank Lanitz 28 Oct '13

28 Oct '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 28 Oct 2013 07:14:55 UTC Commit: 5fd70cd211a6c408b132340bf57d981ae11917ce https://github.com/geany/geany-plugins/commit/5fd70cd211a6c408b132340bf57d9… Log Message: ----------- GeanyMiniScript: Fixing some tralling spaces Modified Paths: -------------- geanyminiscript/src/gms_gui.c Modified: geanyminiscript/src/gms_gui.c 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -127,15 +127,15 @@ /**< \brief It's the information message about geany mini script */ const char *geany_info = N_("<b>GMS : Geany Mini-Script filter Plugin</b>\n" -"This plugin is a tool to apply a script filter on :\n" +"This plugin is a tool to apply a script filter on:\n" " o the text selection,\n" " o the current document,\n" " o all documents of the current session.\n" "\n" -"The filter type can be : \n" -" o Unix shell script, \n" -" o perl script, \n" -" o python script, \n" +"The filter type can be:\n" +" o Unix shell script,\n" +" o perl script,\n" +" o python script,\n" " o sed commands,\n" " o awk script.\n" "\n" -------------- 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

Plugins-Commits October 2013