Plugins-Commits March 2013

plugins-commits@lists.geany.org

1 participants
77 discussions

[geany/geany-plugins] 4bec48: Merge pull request #97 from earshinov/geanyminiscript-gtk3
by Frank Lanitz 31 Mar '13

31 Mar '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 31 Mar 2013 10:50:27 UTC Commit: 4bec4897a72ae2da0b1d60441ad3a2fc57ff9cfa https://github.com/geany/geany-plugins/commit/4bec4897a72ae2da0b1d60441ad3a… Log Message: ----------- Merge pull request #97 from earshinov/geanyminiscript-gtk3 GeanyMiniScript: make the plugin compile against GTK3 Modified Paths: -------------- build/geanyminiscript.m4 geanyminiscript/src/gms_gui.c Modified: build/geanyminiscript.m4 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYMINISCRIPT], [ GP_ARG_DISABLE([GeanyMiniScript], [auto]) - GP_CHECK_PLUGIN_GTK2_ONLY([GeanyMiniScript]) GP_COMMIT_PLUGIN_STATUS([GeanyMiniScript]) AC_CONFIG_FILES([ geanyminiscript/Makefile Modified: geanyminiscript/src/gms_gui.c 41 files changed, 19 insertions(+), 22 deletions(-) =================================================================== @@ -56,7 +56,7 @@ #include "gms_debug.h" #include "gms.h" #include "gms_gui.h" - + /* * ***************************************************************************** * Local Macro and new local type definition @@ -82,7 +82,6 @@ GtkWidget *rb_ndoc ; /*!< radio button : the filter output is in the current document */ GtkWidget *e_script[GMS_NB_TYPE_SCRIPT] ; /*!< entry for script configuration */ - GtkTooltips *tips ; /*!< tips of button of the top bar */ PangoFontDescription *fontdesc; } gms_gui_t ; @@ -200,7 +199,7 @@ static void save_prefs_file( if ( g_file_test( this->config_dir, G_FILE_TEST_EXISTS ) != TRUE ) g_mkdir( this->config_dir, 0755 ) ; - + if ( g_file_test( gms_pref->str, G_FILE_TEST_EXISTS ) != TRUE ) g_mkdir( gms_pref->str, 0755 ) ; @@ -250,7 +249,7 @@ static void gms_cb_load( { gms_private_t *this = GMS_PRIVATE(data) ; GtkWidget *p_dialog ; - + p_dialog = gtk_file_chooser_dialog_new (_("Load Mini-Script File"), GTK_WINDOW(this->mw) , GTK_FILE_CHOOSER_ACTION_OPEN, @@ -307,7 +306,7 @@ static void gms_cb_save( { gms_private_t *this = GMS_PRIVATE(data) ; GtkWidget *p_dialog ; - + p_dialog = gtk_file_chooser_dialog_new (_("Save Mini-Script File"), GTK_WINDOW(this->mw) , GTK_FILE_CHOOSER_ACTION_SAVE, @@ -355,7 +354,7 @@ static void gms_cb_info( GTK_BUTTONS_CLOSE, NULL); gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dlg), _(geany_info)); - + gtk_dialog_run(GTK_DIALOG(dlg)); GMS_FREE_WIDGET(dlg); } @@ -424,7 +423,7 @@ gms_handle_t gms_new( GTK_STOCK_EXECUTE,GTK_RESPONSE_APPLY, NULL ) ; - vb_dlg = GTK_BOX (GTK_DIALOG(this->w.dlg)->vbox) ; + vb_dlg = GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(this->w.dlg))) ; if ( width > 800 ) width = 800 ; @@ -434,9 +433,7 @@ gms_handle_t gms_new( gtk_window_set_default_size( GTK_WINDOW(this->w.dlg) , width/2 , height/2 ) ; - - this->w.tips = gtk_tooltips_new (); - + /* Hbox : type de script */ hb_st = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hb_st), 0); @@ -445,30 +442,30 @@ gms_handle_t gms_new( b_new = new_button_from_stock( mode_txt_icon, GTK_STOCK_CLEAR ) ; gtk_box_pack_start( GTK_BOX (hb_st), b_new, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_new), "clicked",G_CALLBACK (gms_cb_new), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_new, _("Clear the mini-script window") , ""); + gtk_widget_set_tooltip_text(b_new, _("Clear the mini-script window")); b_open = new_button_from_stock( mode_txt_icon, GTK_STOCK_OPEN ) ; gtk_box_pack_start( GTK_BOX (hb_st), b_open, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_open), "clicked",G_CALLBACK (gms_cb_load), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_open, _("Load a mini-script into this window"), ""); + gtk_widget_set_tooltip_text(b_open, _("Load a mini-script into this window")); b_save = new_button_from_stock( mode_txt_icon, GTK_STOCK_SAVE_AS ) ; gtk_box_pack_start( GTK_BOX (hb_st),b_save, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_save), "clicked",G_CALLBACK (gms_cb_save), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_save, _("Save the mini-script into a file"), ""); + gtk_widget_set_tooltip_text(b_save, _("Save the mini-script into a file")); b_info = new_button_from_stock( mode_txt_icon, GTK_STOCK_INFO ) ; gtk_box_pack_end( GTK_BOX (hb_st), b_info, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_info), "clicked",G_CALLBACK (gms_cb_info), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_info, _("Display a information about the mini-script plugin"), ""); + gtk_widget_set_tooltip_text(b_info, _("Display a information about the mini-script plugin")); - this->w.cb_st = gtk_combo_box_new_text() ; + this->w.cb_st = gtk_combo_box_text_new() ; for ( i=0;i<GMS_NB_TYPE_SCRIPT ; i++ ) - gtk_combo_box_append_text( GTK_COMBO_BOX(this->w.cb_st), label_script_cmd[i] ) ; - gtk_combo_box_set_active(GTK_COMBO_BOX(this->w.cb_st), 0 ); + gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(this->w.cb_st), label_script_cmd[i] ) ; + gtk_combo_box_set_active(GTK_COMBO_BOX(this->w.cb_st), 0); gtk_box_pack_start(GTK_BOX(hb_st), this->w.cb_st, FALSE, FALSE, 0); - GTK_WIDGET_SET_FLAGS (this->w.cb_st, GTK_CAN_DEFAULT); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), this->w.cb_st, _("select the mini-script type"), ""); + gtk_widget_set_can_default(this->w.cb_st, TRUE); + gtk_widget_set_tooltip_text(this->w.cb_st, _("select the mini-script type")); /* Scroll Box : script */ sb_script = gtk_scrolled_window_new (NULL,NULL); @@ -501,7 +498,7 @@ gms_handle_t gms_new( * selection/current document/all documents of the current session */ f_rbi = gtk_frame_new (_("filter input") ); gtk_box_pack_start( GTK_BOX (hb_rb), f_rbi, FALSE, FALSE, 0); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), f_rbi, _("select the input of mini-script filter"), ""); + gtk_widget_set_tooltip_text(f_rbi, _("select the input of mini-script filter")); hb_rbi = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hb_rbi), 0); @@ -520,7 +517,7 @@ gms_handle_t gms_new( * current document/ or new document */ f_rbo = gtk_frame_new (_("filter output") ); gtk_box_pack_start( GTK_BOX(hb_rb), f_rbo, FALSE, FALSE, 0); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), f_rbo, _("select the output of mini-script filter"), ""); + gtk_widget_set_tooltip_text(f_rbo, _("select the output of mini-script filter")); hb_rbo = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER(hb_rbo), 0); @@ -588,7 +585,7 @@ void gms_delete( for ( i=0;i<GMS_NB_TYPE_SCRIPT ; i++ ) g_string_free(this->script_cmd[i] ,flag) ; - + GMS_G_FREE( this ) ; } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] a7d2fd: GeanyMiniScript: make the plugin compile against GTK3
by Eugene Arshinov 31 Mar '13

31 Mar '13

Branch: refs/heads/master Author: Eugene Arshinov <earshinov(a)gmail.com> Committer: Eugene Arshinov <earshinov(a)gmail.com> Date: Sat, 30 Mar 2013 20:33:54 UTC Commit: a7d2fd1ca5cc4476602df70c16a1f371176d6bdf https://github.com/geany/geany-plugins/commit/a7d2fd1ca5cc4476602df70c16a1f… Log Message: ----------- GeanyMiniScript: make the plugin compile against GTK3 Modified Paths: -------------- build/geanyminiscript.m4 geanyminiscript/src/gms_gui.c Modified: build/geanyminiscript.m4 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYMINISCRIPT], [ GP_ARG_DISABLE([GeanyMiniScript], [auto]) - GP_CHECK_PLUGIN_GTK2_ONLY([GeanyMiniScript]) GP_COMMIT_PLUGIN_STATUS([GeanyMiniScript]) AC_CONFIG_FILES([ geanyminiscript/Makefile Modified: geanyminiscript/src/gms_gui.c 41 files changed, 19 insertions(+), 22 deletions(-) =================================================================== @@ -56,7 +56,7 @@ #include "gms_debug.h" #include "gms.h" #include "gms_gui.h" - + /* * ***************************************************************************** * Local Macro and new local type definition @@ -82,7 +82,6 @@ GtkWidget *rb_ndoc ; /*!< radio button : the filter output is in the current document */ GtkWidget *e_script[GMS_NB_TYPE_SCRIPT] ; /*!< entry for script configuration */ - GtkTooltips *tips ; /*!< tips of button of the top bar */ PangoFontDescription *fontdesc; } gms_gui_t ; @@ -200,7 +199,7 @@ static void save_prefs_file( if ( g_file_test( this->config_dir, G_FILE_TEST_EXISTS ) != TRUE ) g_mkdir( this->config_dir, 0755 ) ; - + if ( g_file_test( gms_pref->str, G_FILE_TEST_EXISTS ) != TRUE ) g_mkdir( gms_pref->str, 0755 ) ; @@ -250,7 +249,7 @@ static void gms_cb_load( { gms_private_t *this = GMS_PRIVATE(data) ; GtkWidget *p_dialog ; - + p_dialog = gtk_file_chooser_dialog_new (_("Load Mini-Script File"), GTK_WINDOW(this->mw) , GTK_FILE_CHOOSER_ACTION_OPEN, @@ -307,7 +306,7 @@ static void gms_cb_save( { gms_private_t *this = GMS_PRIVATE(data) ; GtkWidget *p_dialog ; - + p_dialog = gtk_file_chooser_dialog_new (_("Save Mini-Script File"), GTK_WINDOW(this->mw) , GTK_FILE_CHOOSER_ACTION_SAVE, @@ -355,7 +354,7 @@ static void gms_cb_info( GTK_BUTTONS_CLOSE, NULL); gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dlg), _(geany_info)); - + gtk_dialog_run(GTK_DIALOG(dlg)); GMS_FREE_WIDGET(dlg); } @@ -424,7 +423,7 @@ gms_handle_t gms_new( GTK_STOCK_EXECUTE,GTK_RESPONSE_APPLY, NULL ) ; - vb_dlg = GTK_BOX (GTK_DIALOG(this->w.dlg)->vbox) ; + vb_dlg = GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(this->w.dlg))) ; if ( width > 800 ) width = 800 ; @@ -434,9 +433,7 @@ gms_handle_t gms_new( gtk_window_set_default_size( GTK_WINDOW(this->w.dlg) , width/2 , height/2 ) ; - - this->w.tips = gtk_tooltips_new (); - + /* Hbox : type de script */ hb_st = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hb_st), 0); @@ -445,30 +442,30 @@ gms_handle_t gms_new( b_new = new_button_from_stock( mode_txt_icon, GTK_STOCK_CLEAR ) ; gtk_box_pack_start( GTK_BOX (hb_st), b_new, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_new), "clicked",G_CALLBACK (gms_cb_new), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_new, _("Clear the mini-script window") , ""); + gtk_widget_set_tooltip_text(b_new, _("Clear the mini-script window")); b_open = new_button_from_stock( mode_txt_icon, GTK_STOCK_OPEN ) ; gtk_box_pack_start( GTK_BOX (hb_st), b_open, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_open), "clicked",G_CALLBACK (gms_cb_load), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_open, _("Load a mini-script into this window"), ""); + gtk_widget_set_tooltip_text(b_open, _("Load a mini-script into this window")); b_save = new_button_from_stock( mode_txt_icon, GTK_STOCK_SAVE_AS ) ; gtk_box_pack_start( GTK_BOX (hb_st),b_save, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_save), "clicked",G_CALLBACK (gms_cb_save), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_save, _("Save the mini-script into a file"), ""); + gtk_widget_set_tooltip_text(b_save, _("Save the mini-script into a file")); b_info = new_button_from_stock( mode_txt_icon, GTK_STOCK_INFO ) ; gtk_box_pack_end( GTK_BOX (hb_st), b_info, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (b_info), "clicked",G_CALLBACK (gms_cb_info), (gpointer) this ); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), b_info, _("Display a information about the mini-script plugin"), ""); + gtk_widget_set_tooltip_text(b_info, _("Display a information about the mini-script plugin")); - this->w.cb_st = gtk_combo_box_new_text() ; + this->w.cb_st = gtk_combo_box_text_new() ; for ( i=0;i<GMS_NB_TYPE_SCRIPT ; i++ ) - gtk_combo_box_append_text( GTK_COMBO_BOX(this->w.cb_st), label_script_cmd[i] ) ; - gtk_combo_box_set_active(GTK_COMBO_BOX(this->w.cb_st), 0 ); + gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(this->w.cb_st), label_script_cmd[i] ) ; + gtk_combo_box_set_active(GTK_COMBO_BOX(this->w.cb_st), 0); gtk_box_pack_start(GTK_BOX(hb_st), this->w.cb_st, FALSE, FALSE, 0); - GTK_WIDGET_SET_FLAGS (this->w.cb_st, GTK_CAN_DEFAULT); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), this->w.cb_st, _("select the mini-script type"), ""); + gtk_widget_set_can_default(this->w.cb_st, TRUE); + gtk_widget_set_tooltip_text(this->w.cb_st, _("select the mini-script type")); /* Scroll Box : script */ sb_script = gtk_scrolled_window_new (NULL,NULL); @@ -501,7 +498,7 @@ gms_handle_t gms_new( * selection/current document/all documents of the current session */ f_rbi = gtk_frame_new (_("filter input") ); gtk_box_pack_start( GTK_BOX (hb_rb), f_rbi, FALSE, FALSE, 0); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), f_rbi, _("select the input of mini-script filter"), ""); + gtk_widget_set_tooltip_text(f_rbi, _("select the input of mini-script filter")); hb_rbi = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (hb_rbi), 0); @@ -520,7 +517,7 @@ gms_handle_t gms_new( * current document/ or new document */ f_rbo = gtk_frame_new (_("filter output") ); gtk_box_pack_start( GTK_BOX(hb_rb), f_rbo, FALSE, FALSE, 0); - gtk_tooltips_set_tip (GTK_TOOLTIPS (this->w.tips), f_rbo, _("select the output of mini-script filter"), ""); + gtk_widget_set_tooltip_text(f_rbo, _("select the output of mini-script filter")); hb_rbo = gtk_hbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER(hb_rbo), 0); @@ -588,7 +585,7 @@ void gms_delete( for ( i=0;i<GMS_NB_TYPE_SCRIPT ; i++ ) g_string_free(this->script_cmd[i] ,flag) ; - + GMS_G_FREE( this ) ; } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 5d8854: spellcheck: Fix check for default language if LANG contains UTF-8
by Colomban Wendling 28 Mar '13

28 Mar '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 28 Mar 2013 14:50:06 UTC Commit: 5d88549932587699b8719e27aed0bb6f936c8b5c https://github.com/geany/geany-plugins/commit/5d88549932587699b8719e27aed0b… Log Message: ----------- spellcheck: Fix check for default language if LANG contains UTF-8 g_strndup() copies bytes, not UTF-8 characters. Modified Paths: -------------- spellcheck/src/speller.c Modified: spellcheck/src/speller.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -267,7 +267,7 @@ gchar *sc_speller_get_default_lang(void) { /* if we have something like de_DE.UTF-8, strip everything from the period to the end */ gchar *period = strchr(lang, '.'); if (period != NULL) - result = g_strndup(lang, g_utf8_pointer_to_offset(lang, period)); + result = g_strndup(lang, period - lang); } } else -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 0d04f9: GeanyGenDoc: fix a memory leak when saving the configuration
by Colomban Wendling 28 Mar '13

28 Mar '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 28 Mar 2013 14:48:12 UTC Commit: 0d04f9e8596a18e39b32ee80bba29659c802c75e https://github.com/geany/geany-plugins/commit/0d04f9e8596a18e39b32ee80bba29… Log Message: ----------- GeanyGenDoc: fix a memory leak when saving the configuration Modified Paths: -------------- geanygendoc/src/ggd-options.c Modified: geanygendoc/src/ggd-options.c 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -619,6 +619,7 @@ struct _GgdOptGroup data = g_key_file_to_data (key_file, &data_length, error); if (data) { success = g_file_set_contents (filename, data, data_length, error); + g_free (data); } g_key_file_free (key_file); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ff92be: Autotools: honor --with-geany-libdir when checking whether to enable GTK3
by Colomban Wendling 28 Mar '13

28 Mar '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 28 Mar 2013 14:46:14 UTC Commit: ff92beb7c505054e54cd4d80c5c5f53ce6b194a2 https://github.com/geany/geany-plugins/commit/ff92beb7c505054e54cd4d80c5c5f… Log Message: ----------- Autotools: honor --with-geany-libdir when checking whether to enable GTK3 Modified Paths: -------------- build/geany.m4 build/gtk.m4 Modified: build/geany.m4 30 files changed, 27 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -AC_DEFUN([GP_CHECK_GEANY], +AC_DEFUN([_GP_GEANY_LIBDIR], [ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_ARG_WITH([geany-libdir], @@ -6,8 +6,33 @@ AC_DEFUN([GP_CHECK_GEANY], [Set Geany's installation libdir [[default=auto]]]), [geany_libdir=${withval}], [geany_libdir=$(${PKG_CONFIG} --variable=libdir geany)]) +]) +dnl GP_GEANY_PKG_CONFIG_PATH_PUSH +dnl Updates PKG_CONFIG_PATH to include the appropriate directory to match +dnl --with-geany-libdir option. This is useful when calling PKG_CONFIG on the +dnl geany package but should be avoided for any other package. +dnl Call GP_GEANY_PKG_CONFIG_PATH_POP to undo the action +AC_DEFUN([GP_GEANY_PKG_CONFIG_PATH_PUSH], +[ + AC_REQUIRE([_GP_GEANY_LIBDIR]) export PKG_CONFIG_PATH="$geany_libdir/pkgconfig:$PKG_CONFIG_PATH" +]) + +dnl GP_GEANY_PKG_CONFIG_PATH_POP +dnl Undoes what GP_GEANY_PKG_CONFIG_PATH_PUSH did +AC_DEFUN([GP_GEANY_PKG_CONFIG_PATH_POP], +[ + AC_REQUIRE([_GP_GEANY_LIBDIR]) + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH#*:}" + test -z "${PKG_CONFIG_PATH}" && unset PKG_CONFIG_PATH +]) + +AC_DEFUN([GP_CHECK_GEANY], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + + GP_GEANY_PKG_CONFIG_PATH_PUSH PKG_CHECK_MODULES([GEANY], [geany >= $1]) geanypluginsdir=$geany_libdir/geany @@ -15,6 +40,5 @@ AC_DEFUN([GP_CHECK_GEANY], AC_SUBST([geanypluginsdir]) AC_SUBST([GEANY_VERSION]) - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH#*:}" - test -z "${PKG_CONFIG_PATH}" && unset PKG_CONFIG_PATH + GP_GEANY_PKG_CONFIG_PATH_POP ]) Modified: build/gtk.m4 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -6,6 +6,8 @@ AC_DEFUN([GP_CHECK_GTK_VERSION], AC_REQUIRE([AC_PROG_AWK]) AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + GP_GEANY_PKG_CONFIG_PATH_PUSH + _gtk_req=$(${PKG_CONFIG} --print-requires geany | ${AWK} '/^gtk\+-/{print}') GP_GTK_PACKAGE=$(echo ${_gtk_req} | ${AWK} '{print $[]1}') GP_GTK_VERSION=$(echo ${_gtk_req} | ${AWK} '{print $[]3}') @@ -15,6 +17,8 @@ AC_DEFUN([GP_CHECK_GTK_VERSION], AC_SUBST([GP_GTK_VERSION_MAJOR]) AM_CONDITIONAL([GP_GTK3], [test "x$GP_GTK_VERSION_MAJOR" = x3]) + + GP_GEANY_PKG_CONFIG_PATH_POP ]) dnl executes $1 if GTK3 is used, and $2 otherwise -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 58d089: Autotools: define GP_GTK3 as an AM conditional
by Colomban Wendling 20 Mar '13

20 Mar '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 19 Mar 2013 23:08:57 UTC Commit: 58d089708aea4e2f1488f88d7d63236efba9b104 https://github.com/geany/geany-plugins/commit/58d089708aea4e2f1488f88d7d632… Log Message: ----------- Autotools: define GP_GTK3 as an AM conditional This allows plugins to have conditionals in their Makefiles depending on whether they are built against GTK2 or GTK3. Modified Paths: -------------- build/gtk.m4 Modified: build/gtk.m4 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,6 @@ dnl checks for the GTK version to build against (2 or 3) dnl defines GP_GTK_PACKAGE (e.g. "gtk+-2.0"), GP_GTK_VERSION (e.g. "2.24") and -dnl GP_GTK_VERSION_MAJOR (e.g. "2") +dnl GP_GTK_VERSION_MAJOR (e.g. "2"); and defines the GP_GTK3 AM conditional AC_DEFUN([GP_CHECK_GTK_VERSION], [ AC_REQUIRE([AC_PROG_AWK]) @@ -13,6 +13,8 @@ AC_DEFUN([GP_CHECK_GTK_VERSION], AC_SUBST([GP_GTK_PACKAGE]) AC_SUBST([GP_GTK_VERSION]) AC_SUBST([GP_GTK_VERSION_MAJOR]) + + AM_CONDITIONAL([GP_GTK3], [test "x$GP_GTK_VERSION_MAJOR" = x3]) ]) dnl executes $1 if GTK3 is used, and $2 otherwise -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 819bb0: geanyextrasel - increased version to 0.51
by Dimitar Zhekov 19 Mar '13

19 Mar '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Tue, 19 Mar 2013 18:08:20 UTC Commit: 819bb002d7b969019729e989b3cfbb0afa34bf50 https://github.com/geany/geany-plugins/commit/819bb002d7b969019729e989b3cfb… Log Message: ----------- geanyextrasel - increased version to 0.51 Modified Paths: -------------- geanyextrasel/src/extrasel.c Modified: geanyextrasel/src/extrasel.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,7 @@ PLUGIN_VERSION_CHECK(189) PLUGIN_SET_INFO(_("Extra Selection"), _("Column mode, select to line / brace / anchor."), - "0.5", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") + "0.51", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ enum -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 23ce0c: geanyextrasel - added "Toggle Rectangular/Stream"
by Dimitar Zhekov 19 Mar '13

19 Mar '13

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Tue, 19 Mar 2013 18:03:43 UTC Commit: 23ce0cd4dc74d0bebba38aec827d50dbbcb9d5cd https://github.com/geany/geany-plugins/commit/23ce0cd4dc74d0bebba38aec827d5… Log Message: ----------- geanyextrasel - added "Toggle Rectangular/Stream" Modified Paths: -------------- geanyextrasel/ChangeLog geanyextrasel/README geanyextrasel/src/extrasel.c Modified: geanyextrasel/ChangeLog 7 files changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -1,7 +1,11 @@ -2012-06-13 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> +2013-03-19 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * src/extrasel.c: + Added "Toggle Rectangular/Stream". + +2012-06-13 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + * src/extrasel.c: Fixed the prototype of on_column_mode_toggled(). Partially restored ignore_callback to avoid delay on document activation. @@ -9,7 +13,6 @@ 2012-06-13 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * src/extrasel.c: - Fixed on_settings_change() prototype. Fixed on settings changed to reassign the selection keys for all documents, not the current document only. Modified: geanyextrasel/README 17 files changed, 11 insertions(+), 6 deletions(-) =================================================================== @@ -3,12 +3,15 @@ Extra Selection Plugin About ----- -The Extra Selection adds the following functions: +The Extra Selection plugin adds the following functions to Geany: Goto matching brace and select (Select to Matching Brace). Goto line and select (Select to Line). +Toggle the current selection type between stream and rectangular +(without changing column mode, can be invoked while drag-selecting). + Ctrl-Shift-Alt-Left/Right/Home/End keys - same as Ctrl-Shift, but for rectangular selection. @@ -17,6 +20,8 @@ selection instead of stream. Selection with anchor instead of the Shift-movement keys. +-- + "Movement keys" refers to the arrows, Home, End, Page Up and Page Down. For more information, see the Usage section below. @@ -35,11 +40,11 @@ See the README file of that package. Usage ----- -Under Tools -> Extra Selection, there are 6 new items: "Column Mode", -"Select to Line" and "Select to Matching Brace", "Set Anchor", "Select to -Anchor" and "Rectangle Select to Anchor". Normally these should be bound -to keys, for example Alt-C, Alt-Shift-L, Ctrl-Shift-B, F12, Shift-F12 and -Alt-Shift-F12. Now: +Under Tools -> Extra Selection, there are 7 new items: "Column Mode", +"Select to Line", "Select to Matching Brace", "Toggle Rectangular/Stream", +"Set Anchor", "Select to Anchor" and "Rectangle Select to Anchor". +Normally these should be bound to keys, for example Alt-C, Alt-Shift-L, +Ctrl-Shift-B, Ctrl+2, F12, Shift-F12 and Alt-Shift-F12. Now: 1. Position the cursor on an opening brace and invoke "Select to Matching Brace". The cursor will move to the closing brace, and the braced area Modified: geanyextrasel/src/extrasel.c 29 files changed, 28 insertions(+), 1 deletions(-) =================================================================== @@ -40,6 +40,7 @@ enum COLUMN_MODE_KB, GOTO_LINE_EXTEND_KB, BRACE_MATCH_EXTEND_KB, + CONVERT_SELECTION_KB, SET_ANCHOR_KB, ANCHOR_EXTEND_KB, ANCHOR_RECTEXTEND_KB, @@ -193,7 +194,7 @@ static gboolean on_key_press_event(GtkWidget *widget, GdkEventKey *event, if (sci && sci_has_selection(sci) && sci_rectangle_selection(sci) && gtk_window_get_focus(GTK_WINDOW(widget)) == GTK_WIDGET(sci)) { - /* not exactly a bug, yet... */ + /* not exactly a bug, but... */ convert_selection(sci, FALSE); } break; @@ -372,6 +373,20 @@ static void on_brace_match_key(G_GNUC_UNUSED guint key_id) on_brace_match_activate(NULL, NULL); } +static void on_convert_selection_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, + G_GNUC_UNUSED gpointer gdata) +{ + ScintillaObject *sci = scintilla_get_current(); + + if (sci) + convert_selection(sci, !sci_rectangle_selection(sci)); +} + +static void on_convert_selection_key(G_GNUC_UNUSED guint key_id) +{ + on_convert_selection_activate(NULL, NULL); +} + /* Set anchor / select to anchor */ static void save_selection(ScintillaObject *sci) @@ -472,6 +487,11 @@ static void on_select_rectangle_key(G_GNUC_UNUSED guint key_id) { NULL, NULL, FALSE, NULL } }; +static void on_extra_select_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, gpointer gdata) +{ + gtk_widget_set_sensitive(GTK_WIDGET(gdata), sci_has_selection(scintilla_get_current())); +} + void plugin_init(G_GNUC_UNUSED GeanyData *data) { GtkContainer *menu; @@ -505,6 +525,13 @@ void plugin_init(G_GNUC_UNUSED GeanyData *data) keybindings_set_item(plugin_key_group, BRACE_MATCH_EXTEND_KB, on_brace_match_key, 0, 0, "brace_match_extend", _("Select to matching brace"), item); + item = gtk_menu_item_new_with_mnemonic(_("_Toggle Stream/Rectangular")); + gtk_container_add(menu, item); + g_signal_connect(item, "activate", G_CALLBACK(on_convert_selection_activate), NULL); + keybindings_set_item(plugin_key_group, CONVERT_SELECTION_KB, on_convert_selection_key, + 0, 0, "convert_selection", _("Convert selection"), item); + g_signal_connect(main_menu_item, "activate", G_CALLBACK(on_extra_select_activate), item); + gtk_container_add(menu, gtk_separator_menu_item_new()); item = gtk_menu_item_new_with_mnemonic(_("_Set Anchor")); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 1da79c: Add information on pohelper plugin in MAINTAINERS
by Colomban Wendling 19 Mar '13

19 Mar '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 19 Mar 2013 01:03:41 UTC Commit: 1da79ca30d22957640f4620616a64d2a4924ff16 https://github.com/geany/geany-plugins/commit/1da79ca30d22957640f4620616a64… Log Message: ----------- Add information on pohelper plugin in MAINTAINERS Modified Paths: -------------- MAINTAINERS Modified: MAINTAINERS 6 files changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -156,6 +156,12 @@ M: W: S: Orphan +pohelper +P: Colomban Wendling <ban(a)herbesfolles.org> +M: Colomban Wendling <ban(a)herbesfolles.org> +W: http://plugins.geany.org/pohelper.html +S: Maintained + scope P: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> M: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 08afa9: Pre release version bump. Next major will be 1.24
by Frank Lanitz 18 Mar '13

18 Mar '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 18 Mar 2013 16:31:07 UTC Commit: 08afa91b8eb6cafe60813b52c443406e5d94395b https://github.com/geany/geany-plugins/commit/08afa91b8eb6cafe60813b52c4434… Log Message: ----------- Pre release version bump. Next major will be 1.24 Modified Paths: -------------- configure.ac wscript Modified: configure.ac 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,6 @@ AC_PREREQ([2.61]) dnl Don't forget when updating version number to do GP_CHECK_GEANY also -AC_INIT([geany-plugins], [1.23]) +AC_INIT([geany-plugins], [1.24]) AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) Modified: wscript 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -60,7 +60,7 @@ from build.wafutils import ( APPNAME = 'geany-plugins' -VERSION = '1.23' +VERSION = '1.24' LINGUAS_FILE = 'po/LINGUAS' top = '.' @@ -87,7 +87,7 @@ def configure(conf): args='--cflags --libs') check_cfg_cached(conf, package='geany', - atleast_version='1.23', + atleast_version='1.24', uselib_store='GEANY', mandatory=True, args='--cflags --libs') -------------- 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 March 2013