Plugins-Commits

plugins-commits@lists.geany.org

1 participants
5473 discussions

[geany/geany-plugins] 9497d8: Make libgit2 version preprocessor conditionals compatible with libgit2-0.99
by Dominik Schmidt 23 Feb '20

23 Feb '20

Branch: refs/heads/master Author: Dominik Schmidt <dominik(a)schm1dt.ch> Committer: Dominik Schmidt <dominik(a)schm1dt.ch> Date: Sun, 23 Feb 2020 18:20:35 UTC Commit: 9497d829e1b207eb83575dc6f617feecfb89bc16 https://github.com/geany/geany-plugins/commit/9497d829e1b207eb83575dc6f617f… Log Message: ----------- Make libgit2 version preprocessor conditionals compatible with libgit2-0.99 LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99", from libgit2-0.99 and beyond. Arithmetic checks against this variable whill hence fail. This patch switches the checks to compare against the LIBGIT2_VER_* family, which should be more stable. Modified Paths: -------------- git-changebar/src/gcb-plugin.c workbench/src/plugin_main.c Modified: git-changebar/src/gcb-plugin.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -32,11 +32,11 @@ #include <geany.h> #include <document.h> -#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 +#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) ) # define git_libgit2_init git_threads_init # define git_libgit2_shutdown git_threads_shutdown #endif -#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23 +#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) ) /* 0.23 added @p binary_cb */ # define git_diff_buffers(old_buffer, old_len, old_as_path, \ new_buffer, new_len, new_as_path, options, \ @@ -45,7 +45,7 @@ new_buffer, new_len, new_as_path, options, \ file_cb, hunk_cb, line_cb, payload) #endif -#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28 +#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) ) # define git_buf_dispose git_buf_free # define git_error_last giterr_last #endif Modified: workbench/src/plugin_main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -36,7 +36,7 @@ #include "tm_control.h" -#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22 +#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22)) # define git_libgit2_init git_threads_init # define git_libgit2_shutdown git_threads_shutdown #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 1f8bb8: Merge pull request #947 from b4n/cppcheck-include
by Colomban Wendling 07 Feb '20

07 Feb '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 07 Feb 2020 18:54:50 UTC Commit: 1f8bb80fff647fb031211f3bf1f470304a3c2c14 https://github.com/geany/geany-plugins/commit/1f8bb80fff647fb031211f3bf1f47… Log Message: ----------- Merge pull request #947 from b4n/cppcheck-include cppcheck: Set Geany include path for it to find header files Modified Paths: -------------- build/compat.m4 build/cppcheck.m4 build/cppcheck.mk Modified: build/compat.m4 18 lines changed, 18 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,18 @@ +dnl taken from Autoconf's m4sh.m4, GPLv3+ +m4_ifndef([AS_VAR_COPY], [ +m4_define([AS_VAR_COPY], +[AS_LITERAL_WORD_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])]) +]) + +dnl taken from pkg-config's pkg.m4, GPLv2+ +m4_ifndef([PKG_CHECK_VAR], [ +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR +]) Modified: build/cppcheck.m4 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -21,4 +21,8 @@ AC_DEFUN([GP_CHECK_CPPCHECK], AM_CONDITIONAL([HAVE_CPPCHECK], [test "x$gp_have_cppcheck" = xyes]) GP_STATUS_BUILD_FEATURE_ADD([Static code checking], [$gp_have_cppcheck]) + + GP_GEANY_PKG_CONFIG_PATH_PUSH + PKG_CHECK_VAR([GEANY_INCLUDEDIR], [geany], [includedir], [], []) + GP_GEANY_PKG_CONFIG_PATH_POP ]) Modified: build/cppcheck.mk 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -4,6 +4,7 @@ if HAVE_CPPCHECK check-cppcheck: $(srcdir) $(CPPCHECK) \ -q --template gcc --error-exitcode=2 \ + -I$(GEANY_INCLUDEDIR)/geany \ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ $(srcdir) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e07cba: Define AS_VAR_COPY for old Autoconf
by Colomban Wendling 02 Feb '20

02 Feb '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 02 Feb 2020 20:11:07 UTC Commit: e07cba1e1a8b13ab70afe69bd4b0d55a5aa3a60a https://github.com/geany/geany-plugins/commit/e07cba1e1a8b13ab70afe69bd4b0d… Log Message: ----------- Define AS_VAR_COPY for old Autoconf Implementation shamelessly copied over from Autoconf's m4sh.m4, GPLv3+. Modified Paths: -------------- build/compat.m4 Modified: build/compat.m4 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,9 @@ +dnl taken from Autoconf's m4sh.m4, GPLv3+ +m4_ifndef([AS_VAR_COPY], [ +m4_define([AS_VAR_COPY], +[AS_LITERAL_WORD_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])]) +]) + dnl taken from pkg-config's pkg.m4, GPLv2+ m4_ifndef([PKG_CHECK_VAR], [ AC_DEFUN([PKG_CHECK_VAR], -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 10a261: Define PKG_CHECK_VAR for old pkg-config (<= 0.28)
by Colomban Wendling 02 Feb '20

02 Feb '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 02 Feb 2020 20:09:28 UTC Commit: 10a26171e92c525f567fe0e8902f1e2779acdcb5 https://github.com/geany/geany-plugins/commit/10a26171e92c525f567fe0e8902f1… Log Message: ----------- Define PKG_CHECK_VAR for old pkg-config (<= 0.28) Implementation shamelessly copied over from pkg-config's pkg.m4, GPLv2+. Modified Paths: -------------- build/compat.m4 Modified: build/compat.m4 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,12 @@ +dnl taken from pkg-config's pkg.m4, GPLv2+ +m4_ifndef([PKG_CHECK_VAR], [ +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR +]) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3d0c51: cppcheck: Set Geany include path for it to find header files
by Colomban Wendling 02 Feb '20

02 Feb '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 02 Feb 2020 19:19:45 UTC Commit: 3d0c513d57f5de8bf568dd642e330a746439759f https://github.com/geany/geany-plugins/commit/3d0c513d57f5de8bf568dd642e330… Log Message: ----------- cppcheck: Set Geany include path for it to find header files This fixes build with recent versions of cppcheck with some plugins using PLUGIN_VERSION_CHECK() macro, like the latex plugin. Modified Paths: -------------- build/cppcheck.m4 build/cppcheck.mk Modified: build/cppcheck.m4 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -21,4 +21,8 @@ AC_DEFUN([GP_CHECK_CPPCHECK], AM_CONDITIONAL([HAVE_CPPCHECK], [test "x$gp_have_cppcheck" = xyes]) GP_STATUS_BUILD_FEATURE_ADD([Static code checking], [$gp_have_cppcheck]) + + GP_GEANY_PKG_CONFIG_PATH_PUSH + PKG_CHECK_VAR([GEANY_INCLUDEDIR], [geany], [includedir], [], []) + GP_GEANY_PKG_CONFIG_PATH_POP ]) Modified: build/cppcheck.mk 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -4,6 +4,7 @@ if HAVE_CPPCHECK check-cppcheck: $(srcdir) $(CPPCHECK) \ -q --template gcc --error-exitcode=2 \ + -I$(GEANY_INCLUDEDIR)/geany \ $(AM_CPPCHECKFLAGS) $(CPPCHECKFLAGS) \ $(srcdir) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e3d7f3: jump on 0 line if not selecting
by Sagar Chalise 19 Jan '20

19 Jan '20

Branch: refs/heads/master Author: Sagar Chalise <chalisesagar(a)gmail.com> Committer: Sagar Chalise <chalisesagar(a)gmail.com> Date: Tue, 15 Oct 2019 14:10:56 UTC Commit: e3d7f37ecb5bf394f329b7f94ff86aabac45ba32 https://github.com/geany/geany-plugins/commit/e3d7f37ecb5bf394f329b7f94ff86… Log Message: ----------- jump on 0 line if not selecting Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -411,7 +411,7 @@ static void select_or_match_tag (gboolean select) { gint cur_line; - gint jump_line=0, select_start=0, select_end=0; + gint jump_line=-5, select_start=0, select_end=0; GeanyDocument *doc = document_get_current(); if(highlightedBrackets[0] != highlightedBrackets[2]){ cur_line = sci_get_current_position(doc->editor->sci); @@ -434,7 +434,7 @@ select_or_match_tag (gboolean select) sci_set_selection_start(doc->editor->sci, select_start); sci_set_selection_end(doc->editor->sci, select_end); } - if(!select && jump_line != 0){ + else if (jump_line >= 0){ sci_set_current_position(doc->editor->sci, jump_line, TRUE); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d2f2a0: jump to matching tag and select matching tag
by Sagar Chalise 19 Jan '20

19 Jan '20

Branch: refs/heads/master Author: Sagar Chalise <chalisesagar(a)gmail.com> Committer: Sagar Chalise <chalisesagar(a)gmail.com> Date: Fri, 11 Oct 2019 05:02:18 UTC Commit: d2f2a050b70d13ea2863b02ee95c5487bc2daf0b https://github.com/geany/geany-plugins/commit/d2f2a050b70d13ea2863b02ee95c5… Log Message: ----------- jump to matching tag and select matching tag Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 90 lines changed, 77 insertions(+), 13 deletions(-) =================================================================== @@ -24,6 +24,7 @@ /* Keyboard Shortcut */ enum { KB_MATCH_TAG, + KB_SELECT_TAG, KB_COUNT }; @@ -34,6 +35,8 @@ GeanyData *geany_data; /* Is needed for clearing highlighting after moving cursor out * from the tag */ static gint highlightedBrackets[] = {0, 0, 0, 0}; +static GtkWidget *goto_matching_tag = NULL; +static GtkWidget *select_matching_tag = NULL; PLUGIN_VERSION_CHECK(224) @@ -404,40 +407,101 @@ static gboolean on_editor_notify(GObject *obj, GeanyEditor *editor, /* returning FALSE to allow Geany processing the event */ return FALSE; } - static void -on_kb_goto_matching_tag (guint key_id) +select_or_match_tag (gboolean select) { gint cur_line; - gint jump_line = 0; - if(highlightedBrackets[0] != highlightedBrackets[2] && highlightedBrackets[0] != 0){ - GeanyDocument *doc = document_get_current(); + gint jump_line=0, select_start=0, select_end=0; + GeanyDocument *doc = document_get_current(); + if(highlightedBrackets[0] != highlightedBrackets[2]){ cur_line = sci_get_current_position(doc->editor->sci); if(cur_line >= highlightedBrackets[0] && cur_line <= highlightedBrackets[1]){ - jump_line = highlightedBrackets[2]; + if (!select){ + jump_line = highlightedBrackets[2]; + } } else if(cur_line >= highlightedBrackets[2] && cur_line <= highlightedBrackets[3]){ - jump_line = highlightedBrackets[0]; + if(!select){ + jump_line = highlightedBrackets[0]; + } } - if(jump_line != 0){ - sci_set_current_position(doc->editor->sci, jump_line, TRUE); + if(select){ + select_end = (highlightedBrackets[0] < highlightedBrackets[2])?highlightedBrackets[3]+1:highlightedBrackets[1]+1; + select_start = (highlightedBrackets[0] < highlightedBrackets[2])?highlightedBrackets[0]:highlightedBrackets[2]; } } + if (select){ + sci_set_selection_start(doc->editor->sci, select_start); + sci_set_selection_end(doc->editor->sci, select_end); + } + if(!select && jump_line != 0){ + sci_set_current_position(doc->editor->sci, jump_line, TRUE); + } +} + + +static void +on_goto_matching_tag(GtkWidget *widget, gpointer user_data) +{ + select_or_match_tag(FALSE); + return; } +static void +on_select_matching_tag(GtkWidget *widget, gpointer user_data) +{ + select_or_match_tag(TRUE); + return; +} +static void +on_editor_menu_popup (GObject *object, + const gchar *word, + gint pos, + GeanyDocument *doc, + gpointer user_data) +{ + + if(DOC_VALID(doc) && (doc->file_type->id == GEANY_FILETYPES_HTML || doc->file_type->id == GEANY_FILETYPES_PHP || doc->file_type->id == GEANY_FILETYPES_XML)) + { + gtk_widget_set_sensitive (goto_matching_tag, TRUE); + gtk_widget_set_sensitive (select_matching_tag, TRUE); + gtk_widget_show(select_matching_tag); + gtk_widget_show(goto_matching_tag); + } + else{ + gtk_widget_set_sensitive (goto_matching_tag, FALSE); + gtk_widget_set_sensitive (select_matching_tag, FALSE); + gtk_widget_hide(select_matching_tag); + gtk_widget_hide(goto_matching_tag); + } +} + PluginCallback plugin_callbacks[] = { { "editor-notify", (GCallback) &on_editor_notify, FALSE, NULL }, + { "update-editor-menu", (GCallback) &on_editor_menu_popup, FALSE, NULL }, { NULL, NULL, FALSE, NULL } }; void plugin_init(GeanyData *data) { - GeanyKeyGroup *group; - group = plugin_set_key_group (geany_plugin, "Pair Tag Highlighter", KB_COUNT, NULL); - keybindings_set_item (group, KB_MATCH_TAG, on_kb_goto_matching_tag, - 0, 0, "goto_matching_tag", _("Go To Matching Tag"), NULL); + GeanyKeyGroup *kb_group; + goto_matching_tag = gtk_menu_item_new_with_label (_("Goto Matching XML Tag")); + select_matching_tag = gtk_menu_item_new_with_label (_("Select Matching XML Tag")); + g_signal_connect (goto_matching_tag, "activate", + G_CALLBACK (on_goto_matching_tag), NULL); + g_signal_connect (select_matching_tag, "activate", + G_CALLBACK (on_select_matching_tag), NULL); + gtk_container_add (GTK_CONTAINER (data->main_widgets->editor_menu), + goto_matching_tag); + gtk_container_add (GTK_CONTAINER (data->main_widgets->editor_menu), + select_matching_tag); + kb_group = plugin_set_key_group (geany_plugin, PLUGIN, KB_COUNT, NULL); + keybindings_set_item (kb_group, KB_MATCH_TAG, NULL, + 0, 0, "goto_matching_tag", _("Go To Matching Tag"), goto_matching_tag); + keybindings_set_item (kb_group, KB_SELECT_TAG, NULL, + 0, 0, "select_matching_tag", _("Select To Matching Tag"), select_matching_tag); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 48342c: Merge pull request #926 from sagarchalise/pt-utils
by Frank Lanitz 19 Jan '20

19 Jan '20

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 19 Jan 2020 09:00:07 UTC Commit: 48342cf02875ceb6670d530f54bdd7cf2e96df0d https://github.com/geany/geany-plugins/commit/48342cf02875ceb6670d530f54bdd… Log Message: ----------- Merge pull request #926 from sagarchalise/pt-utils Utilities for Pair Tag Highlighter Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 90 lines changed, 77 insertions(+), 13 deletions(-) =================================================================== @@ -24,6 +24,7 @@ /* Keyboard Shortcut */ enum { KB_MATCH_TAG, + KB_SELECT_TAG, KB_COUNT }; @@ -34,6 +35,8 @@ GeanyData *geany_data; /* Is needed for clearing highlighting after moving cursor out * from the tag */ static gint highlightedBrackets[] = {0, 0, 0, 0}; +static GtkWidget *goto_matching_tag = NULL; +static GtkWidget *select_matching_tag = NULL; PLUGIN_VERSION_CHECK(224) @@ -404,40 +407,101 @@ static gboolean on_editor_notify(GObject *obj, GeanyEditor *editor, /* returning FALSE to allow Geany processing the event */ return FALSE; } - static void -on_kb_goto_matching_tag (guint key_id) +select_or_match_tag (gboolean select) { gint cur_line; - gint jump_line = 0; - if(highlightedBrackets[0] != highlightedBrackets[2] && highlightedBrackets[0] != 0){ - GeanyDocument *doc = document_get_current(); + gint jump_line=-5, select_start=0, select_end=0; + GeanyDocument *doc = document_get_current(); + if(highlightedBrackets[0] != highlightedBrackets[2]){ cur_line = sci_get_current_position(doc->editor->sci); if(cur_line >= highlightedBrackets[0] && cur_line <= highlightedBrackets[1]){ - jump_line = highlightedBrackets[2]; + if (!select){ + jump_line = highlightedBrackets[2]; + } } else if(cur_line >= highlightedBrackets[2] && cur_line <= highlightedBrackets[3]){ - jump_line = highlightedBrackets[0]; + if(!select){ + jump_line = highlightedBrackets[0]; + } } - if(jump_line != 0){ - sci_set_current_position(doc->editor->sci, jump_line, TRUE); + if(select){ + select_end = (highlightedBrackets[0] < highlightedBrackets[2])?highlightedBrackets[3]+1:highlightedBrackets[1]+1; + select_start = (highlightedBrackets[0] < highlightedBrackets[2])?highlightedBrackets[0]:highlightedBrackets[2]; } } + if (select){ + sci_set_selection_start(doc->editor->sci, select_start); + sci_set_selection_end(doc->editor->sci, select_end); + } + else if (jump_line >= 0){ + sci_set_current_position(doc->editor->sci, jump_line, TRUE); + } +} + + +static void +on_goto_matching_tag(GtkWidget *widget, gpointer user_data) +{ + select_or_match_tag(FALSE); + return; } +static void +on_select_matching_tag(GtkWidget *widget, gpointer user_data) +{ + select_or_match_tag(TRUE); + return; +} +static void +on_editor_menu_popup (GObject *object, + const gchar *word, + gint pos, + GeanyDocument *doc, + gpointer user_data) +{ + + if(DOC_VALID(doc) && (doc->file_type->id == GEANY_FILETYPES_HTML || doc->file_type->id == GEANY_FILETYPES_PHP || doc->file_type->id == GEANY_FILETYPES_XML)) + { + gtk_widget_set_sensitive (goto_matching_tag, TRUE); + gtk_widget_set_sensitive (select_matching_tag, TRUE); + gtk_widget_show(select_matching_tag); + gtk_widget_show(goto_matching_tag); + } + else{ + gtk_widget_set_sensitive (goto_matching_tag, FALSE); + gtk_widget_set_sensitive (select_matching_tag, FALSE); + gtk_widget_hide(select_matching_tag); + gtk_widget_hide(goto_matching_tag); + } +} + PluginCallback plugin_callbacks[] = { { "editor-notify", (GCallback) &on_editor_notify, FALSE, NULL }, + { "update-editor-menu", (GCallback) &on_editor_menu_popup, FALSE, NULL }, { NULL, NULL, FALSE, NULL } }; void plugin_init(GeanyData *data) { - GeanyKeyGroup *group; - group = plugin_set_key_group (geany_plugin, "Pair Tag Highlighter", KB_COUNT, NULL); - keybindings_set_item (group, KB_MATCH_TAG, on_kb_goto_matching_tag, - 0, 0, "goto_matching_tag", _("Go To Matching Tag"), NULL); + GeanyKeyGroup *kb_group; + goto_matching_tag = gtk_menu_item_new_with_label (_("Goto Matching XML Tag")); + select_matching_tag = gtk_menu_item_new_with_label (_("Select Matching XML Tag")); + g_signal_connect (goto_matching_tag, "activate", + G_CALLBACK (on_goto_matching_tag), NULL); + g_signal_connect (select_matching_tag, "activate", + G_CALLBACK (on_select_matching_tag), NULL); + gtk_container_add (GTK_CONTAINER (data->main_widgets->editor_menu), + goto_matching_tag); + gtk_container_add (GTK_CONTAINER (data->main_widgets->editor_menu), + select_matching_tag); + kb_group = plugin_set_key_group (geany_plugin, PLUGIN, KB_COUNT, NULL); + keybindings_set_item (kb_group, KB_MATCH_TAG, NULL, + 0, 0, "goto_matching_tag", _("Go To Matching Tag"), goto_matching_tag); + keybindings_set_item (kb_group, KB_SELECT_TAG, NULL, + 0, 0, "select_matching_tag", _("Select To Matching Tag"), select_matching_tag); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e2e854: projectorganizer: don't use stock icons
by Jiří Techet 19 Jan '20

19 Jan '20

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 29 Oct 2019 18:30:06 UTC Commit: e2e854b6e10b2008ba1166d954502ac23e327b98 https://github.com/geany/geany-plugins/commit/e2e854b6e10b2008ba1166d954502… Log Message: ----------- projectorganizer: don't use stock icons There is more choice when using icons based on freedesktop icon name so we can use better icons. Modified Paths: -------------- projectorganizer/src/prjorg-menu.c projectorganizer/src/prjorg-sidebar.c projectorganizer/src/prjorg-utils.c projectorganizer/src/prjorg-utils.h Modified: projectorganizer/src/prjorg-menu.c 18 lines changed, 3 insertions(+), 15 deletions(-) =================================================================== @@ -380,31 +380,19 @@ void prjorg_menu_init(void) gtk_widget_show(s_sep_item); gtk_container_add(GTK_CONTAINER(geany->main_widgets->project_menu), s_sep_item); - image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - s_fif_item = gtk_image_menu_item_new_with_mnemonic(_("Find in Project Files...")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(s_fif_item), image); - gtk_widget_show(s_fif_item); + s_fif_item = menu_item_new("edit-find", _("Find in Project Files...")); gtk_container_add(GTK_CONTAINER(geany->main_widgets->project_menu), s_fif_item); g_signal_connect((gpointer) s_fif_item, "activate", G_CALLBACK(on_find_in_project), NULL); keybindings_set_item(key_group, KB_FIND_IN_PROJECT, NULL, 0, 0, "find_in_project", _("Find in project files"), s_fif_item); - image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - s_ff_item = gtk_image_menu_item_new_with_mnemonic(_("Find Project File...")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(s_ff_item), image); - gtk_widget_show(s_ff_item); + s_ff_item = menu_item_new("edit-find", _("Find Project File...")); gtk_container_add(GTK_CONTAINER(geany->main_widgets->project_menu), s_ff_item); g_signal_connect((gpointer) s_ff_item, "activate", G_CALLBACK(on_find_file), NULL); keybindings_set_item(key_group, KB_FIND_FILE, NULL, 0, 0, "find_file", _("Find project file"), s_ff_item); - image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - s_ft_item = gtk_image_menu_item_new_with_mnemonic(_("Find Project Symbol...")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(s_ft_item), image); - gtk_widget_show(s_ft_item); + s_ft_item = menu_item_new("edit-find", _("Find Project Symbol...")); gtk_container_add(GTK_CONTAINER(geany->main_widgets->project_menu), s_ft_item); g_signal_connect((gpointer) s_ft_item, "activate", G_CALLBACK(on_find_tag), NULL); keybindings_set_item(key_group, KB_FIND_TAG, NULL, Modified: projectorganizer/src/prjorg-sidebar.c 59 lines changed, 10 insertions(+), 49 deletions(-) =================================================================== @@ -1610,38 +1610,22 @@ void prjorg_sidebar_init(void) s_popup_menu.widget = gtk_menu_new(); - image = gtk_image_new_from_icon_name("list-add", GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - item = gtk_image_menu_item_new_with_mnemonic(_("Expand All")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - gtk_widget_show(item); + item = menu_item_new("list-add", _("Expand All")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(expand_all), NULL); s_popup_menu.expand = item; - image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - item = gtk_image_menu_item_new_with_mnemonic(_("Find in Files...")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - gtk_widget_show(item); + item = menu_item_new("edit-find", _("Find in Files...")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_find_in_files), NULL); s_popup_menu.find_in_directory = item; - image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - item = gtk_image_menu_item_new_with_mnemonic(_("Find File...")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - gtk_widget_show(item); + item = menu_item_new("edit-find", _("Find File...")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_find_file), NULL); s_popup_menu.find_file = item; - image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - item = gtk_image_menu_item_new_with_mnemonic(_("Find Symbol...")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - gtk_widget_show(item); + item = menu_item_new("edit-find", _("Find Symbol...")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_find_tag), NULL); s_popup_menu.find_tag = item; @@ -1650,11 +1634,7 @@ void prjorg_sidebar_init(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); - image = gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - item = gtk_image_menu_item_new_with_mnemonic(_("Remove External Directory")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - gtk_widget_show(item); + item = menu_item_new("list-remove", _("Remove External Directory")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_remove_external_dir), NULL); s_popup_menu.remove_external_dir = item; @@ -1663,38 +1643,22 @@ void prjorg_sidebar_init(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); - image = gtk_image_new_from_stock(GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - item = gtk_image_menu_item_new_with_mnemonic(_("New File...")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - gtk_widget_show(item); + item = menu_item_new("document-new", _("New File...")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_create_file), NULL); s_popup_menu.create_file = item; - image = gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - item = gtk_image_menu_item_new_with_mnemonic(_("New Directory...")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - gtk_widget_show(item); + item = menu_item_new("folder-new", _("New Directory...")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_create_dir), NULL); s_popup_menu.create_dir = item; - image = gtk_image_new_from_stock(GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - item = gtk_image_menu_item_new_with_mnemonic(_("Rename...")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - gtk_widget_show(item); + item = menu_item_new(NULL, _("Rename...")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_rename), NULL); s_popup_menu.rename = item; - image = gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - item = gtk_image_menu_item_new_with_mnemonic(_("Delete")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - gtk_widget_show(item); + item = menu_item_new("list-remove", _("Delete")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_delete), NULL); s_popup_menu.delete = item; @@ -1703,10 +1667,7 @@ void prjorg_sidebar_init(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); - item = gtk_image_menu_item_new_with_mnemonic(_("H_ide Sidebar")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), - gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU)); - gtk_widget_show(item); + item = menu_item_new("window-close", _("H_ide Sidebar")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect_swapped((gpointer) item, "activate", G_CALLBACK(keybindings_send_command), Modified: projectorganizer/src/prjorg-utils.c 15 lines changed, 15 insertions(+), 0 deletions(-) =================================================================== @@ -226,3 +226,18 @@ gchar *get_project_base_path(void) } return NULL; } + + +GtkWidget *menu_item_new(const gchar *icon_name, const gchar *label) +{ + GtkWidget *item = gtk_image_menu_item_new_with_mnemonic(label); + + if (icon_name != NULL) + { + GtkWidget *image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + gtk_widget_show(image); + } + gtk_widget_show(item); + return item; +} Modified: projectorganizer/src/prjorg-utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -35,4 +35,6 @@ gboolean rename_file_or_dir(gchar *utf8_oldname, gchar *utf8_newname); gchar *get_selection(void); gchar *get_project_base_path(void); +GtkWidget *menu_item_new(const gchar *icon_name, const gchar *label); + #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f01e07: projectorganizer: use better icons
by Jiří Techet 19 Jan '20

19 Jan '20

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 29 Oct 2019 20:14:56 UTC Commit: f01e071c46b51c3805487191f4c2e9688a807626 https://github.com/geany/geany-plugins/commit/f01e071c46b51c3805487191f4c2e… Log Message: ----------- projectorganizer: use better icons This makes the icons more consistent with the treebrowser plugin. For expanding/collapsing use go-down/go-up icons which should look similar to each other (using list-add/list-remove is usually shown as +/- but with some themes the remove action is shown as a red cross) Modified Paths: -------------- projectorganizer/src/prjorg-menu.c projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-menu.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -373,7 +373,6 @@ static void on_open_selected_file(GtkMenuItem *menuitem, gpointer user_data) void prjorg_menu_init(void) { - GtkWidget *image; GeanyKeyGroup *key_group = plugin_set_key_group(geany_plugin, "ProjectOrganizer", KB_COUNT, kb_callback); s_sep_item = gtk_separator_menu_item_new(); Modified: projectorganizer/src/prjorg-sidebar.c 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -1537,14 +1537,14 @@ void prjorg_sidebar_init(void) item = GTK_WIDGET(gtk_separator_tool_item_new()); gtk_container_add(GTK_CONTAINER(s_toolbar), item); - image = gtk_image_new_from_icon_name("list-add", GTK_ICON_SIZE_SMALL_TOOLBAR); + image = gtk_image_new_from_icon_name("go-down", GTK_ICON_SIZE_SMALL_TOOLBAR); item = GTK_WIDGET(gtk_tool_button_new(image, NULL)); gtk_widget_set_tooltip_text(item, _("Expand all")); g_signal_connect(item, "clicked", G_CALLBACK(on_expand_all), NULL); gtk_container_add(GTK_CONTAINER(s_toolbar), item); s_project_toolbar.expand = item; - image = gtk_image_new_from_icon_name("list-remove", GTK_ICON_SIZE_SMALL_TOOLBAR); + image = gtk_image_new_from_icon_name("go-up", GTK_ICON_SIZE_SMALL_TOOLBAR); item = GTK_WIDGET(gtk_tool_button_new(image, NULL)); gtk_widget_set_tooltip_text(item, _("Collapse to project root")); g_signal_connect(item, "clicked", G_CALLBACK(on_collapse_all), NULL); @@ -1610,7 +1610,7 @@ void prjorg_sidebar_init(void) s_popup_menu.widget = gtk_menu_new(); - item = menu_item_new("list-add", _("Expand All")); + item = menu_item_new("go-down", _("Expand All")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(expand_all), NULL); s_popup_menu.expand = item; @@ -1653,12 +1653,12 @@ void prjorg_sidebar_init(void) g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_create_dir), NULL); s_popup_menu.create_dir = item; - item = menu_item_new(NULL, _("Rename...")); + item = menu_item_new("document-save-as", _("Rename...")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_rename), NULL); s_popup_menu.rename = item; - item = menu_item_new("list-remove", _("Delete")); + item = menu_item_new("edit-delete", _("Delete")); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_delete), NULL); s_popup_menu.delete = item; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits