Revision: 4386 http://geany.svn.sourceforge.net/geany/?rev=4386&view=rev Author: ntrel Date: 2009-10-28 18:06:16 +0000 (Wed, 28 Oct 2009)
Log Message: ----------- Add 'Edit->Plugin Preferences' menu item and keybinding. Don't include plugindata.h in pluginutils.h because it redefines the GEANY() macro for plugin use.
Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/pluginprivate.h trunk/src/pluginutils.c trunk/src/pluginutils.h
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/ChangeLog 2009-10-28 18:06:16 UTC (rev 4386) @@ -8,6 +8,12 @@ * src/sciwrappers.c, src/sciwrappers.h, src/editor.c: Add general function sci_get_string() that works with any string buffer messages that follow the Windows message convention. + * src/pluginprivate.h, src/interface.c, src/keybindings.c, + src/keybindings.h, src/callbacks.c, src/callbacks.h, + src/pluginutils.c, src/pluginutils.h, geany.glade: + Add 'Edit->Plugin Preferences' menu item and keybinding. + Don't include plugindata.h in pluginutils.h because it redefines the + GEANY() macro for plugin use.
2009-10-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/geany.glade 2009-10-28 18:06:16 UTC (rev 4386) @@ -67,7 +67,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3072"> + <widget class="GtkImage" id="image3141"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -144,7 +144,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3073"> + <widget class="GtkImage" id="image3142"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -165,7 +165,7 @@ <signal name="activate" handler="on_toolbutton_reload_clicked" last_modification_time="Mon, 01 Sep 2008 16:57:06 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3074"> + <widget class="GtkImage" id="image3143"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -185,7 +185,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3075"> + <widget class="GtkImage" id="image3144"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -272,7 +272,7 @@ <signal name="activate" handler="on_close_other_documents1_activate" last_modification_time="Fri, 27 Jun 2008 15:19:28 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3076"> + <widget class="GtkImage" id="image3145"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -293,7 +293,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3077"> + <widget class="GtkImage" id="image3146"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -499,7 +499,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3078"> + <widget class="GtkImage" id="image3147"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -520,7 +520,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3079"> + <widget class="GtkImage" id="image3148"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -598,7 +598,7 @@ <signal name="activate" handler="on_cut_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3080"> + <widget class="GtkImage" id="image3149"> <property name="visible">True</property> <property name="stock">gtk-cut</property> <property name="icon_size">1</property> @@ -619,7 +619,7 @@ <signal name="activate" handler="on_copy_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3081"> + <widget class="GtkImage" id="image3150"> <property name="visible">True</property> <property name="stock">gtk-copy</property> <property name="icon_size">1</property> @@ -730,7 +730,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3082"> + <widget class="GtkImage" id="image3151"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -809,7 +809,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3083"> + <widget class="GtkImage" id="image3152"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -841,7 +841,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3084"> + <widget class="GtkImage" id="image3153"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -880,7 +880,7 @@ <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3085"> + <widget class="GtkImage" id="image3154"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -892,6 +892,27 @@ </child> </widget> </child> + + <child> + <widget class="GtkImageMenuItem" id="plugin_preferences1"> + <property name="visible">True</property> + <property name="label" translatable="yes">P_lugin Preferences</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_plugin_preferences1_activate" last_modification_time="Wed, 28 Oct 2009 17:17:31 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image3155"> + <property name="visible">True</property> + <property name="stock">gtk-preferences</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> </widget> </child> </widget> @@ -951,7 +972,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3086"> + <widget class="GtkImage" id="image3156"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -1026,7 +1047,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 06 Dec 2008 17:41:21 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3087"> + <widget class="GtkImage" id="image3157"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -1060,7 +1081,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3088"> + <widget class="GtkImage" id="image3158"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1532,7 +1553,7 @@ <signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3089"> + <widget class="GtkImage" id="image3159"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1553,7 +1574,7 @@ <signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3090"> + <widget class="GtkImage" id="image3160"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1582,7 +1603,7 @@ <signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3091"> + <widget class="GtkImage" id="image3161"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1639,7 +1660,7 @@ <signal name="activate" handler="on_menu_reload_configuration1_activate" last_modification_time="Mon, 30 Jun 2008 16:19:40 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3092"> + <widget class="GtkImage" id="image3162"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -1659,7 +1680,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3093"> + <widget class="GtkImage" id="image3163"> <property name="visible">True</property> <property name="stock">gtk-file</property> <property name="icon_size">1</property> @@ -1686,7 +1707,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3094"> + <widget class="GtkImage" id="image3164"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1738,7 +1759,7 @@ <signal name="activate" handler="on_help1_activate" last_modification_time="Sun, 24 Jul 2005 15:23:11 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3095"> + <widget class="GtkImage" id="image3165"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property>
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/callbacks.c 2009-10-28 18:06:16 UTC (rev 4386) @@ -65,6 +65,7 @@ #include "plugins.h" #include "log.h" #include "toolbar.h" +#include "pluginutils.h"
#ifdef HAVE_VTE @@ -272,9 +273,18 @@ on_edit1_activate (GtkMenuItem *menuitem, gpointer user_data) { + GtkWidget *item; GeanyDocument *doc = document_get_current(); + ui_update_menu_copy_items(doc); ui_update_insert_include_item(doc, 1); + + item = ui_lookup_widget(main_widgets.window, "plugin_preferences1"); +#ifndef HAVE_PLUGINS + gtk_widget_hide(item); +#else + gtk_widget_set_sensitive(item, active_plugin_list != NULL); +#endif }
@@ -2365,3 +2375,13 @@ keybindings_send_command(GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_AUTOINDENT); }
+ +void +on_plugin_preferences1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ +#ifdef HAVE_PLUGINS + plugin_show_configure(NULL); +#endif +} +
Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/callbacks.h 2009-10-28 18:06:16 UTC (rev 4386) @@ -660,3 +660,7 @@ void on_smart_line_indent1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_plugin_preferences1_activate (GtkMenuItem *menuitem, + gpointer user_data);
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/interface.c 2009-10-28 18:06:16 UTC (rev 4386) @@ -38,7 +38,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image3072; + GtkWidget *image3141; GtkWidget *separator12; GtkWidget *menu_open1; GtkWidget *menu_open_selected_file1; @@ -47,11 +47,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image3073; + GtkWidget *image3142; GtkWidget *menu_reload1; - GtkWidget *image3074; + GtkWidget *image3143; GtkWidget *menu_reload_as1; - GtkWidget *image3075; + GtkWidget *image3144; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -62,9 +62,9 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *close_other_documents1; - GtkWidget *image3076; + GtkWidget *image3145; GtkWidget *menu_close_all1; - GtkWidget *image3077; + GtkWidget *image3146; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -90,9 +90,9 @@ GtkWidget *menu_toggle_line_commentation1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image3078; + GtkWidget *image3147; GtkWidget *menu_decrease_indent1; - GtkWidget *image3079; + GtkWidget *image3148; GtkWidget *smart_line_indent1; GtkWidget *separator37; GtkWidget *send_selection_to_vte1; @@ -102,9 +102,9 @@ GtkWidget *commands2; GtkWidget *commands2_menu; GtkWidget *cut_current_line_s_1; - GtkWidget *image3080; + GtkWidget *image3149; GtkWidget *copy_current_line_s_1; - GtkWidget *image3081; + GtkWidget *image3150; GtkWidget *delete_current_line_s_1; GtkWidget *duplicate_line_or_selection1; GtkWidget *separator49; @@ -117,7 +117,7 @@ GtkWidget *go_to_previous_marker1; GtkWidget *separator18; GtkWidget *add_comments1; - GtkWidget *image3082; + GtkWidget *image3151; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -126,16 +126,18 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image3083; + GtkWidget *image3152; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *insert_include2; - GtkWidget *image3084; + GtkWidget *image3153; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *separator9; GtkWidget *preferences1; - GtkWidget *image3085; + GtkWidget *image3154; + GtkWidget *plugin_preferences1; + GtkWidget *image3155; GtkWidget *search1; GtkWidget *search1_menu; GtkWidget *find1; @@ -143,7 +145,7 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image3086; + GtkWidget *image3156; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -152,11 +154,11 @@ GtkWidget *previous_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image3087; + GtkWidget *image3157; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image3088; + GtkWidget *image3158; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -214,30 +216,30 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image3089; + GtkWidget *image3159; GtkWidget *project_open1; - GtkWidget *image3090; + GtkWidget *image3160; GtkWidget *recent_projects1; GtkWidget *project_close1; - GtkWidget *image3091; + GtkWidget *image3161; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_reload_configuration1; - GtkWidget *image3092; + GtkWidget *image3162; GtkWidget *configuration_files1; - GtkWidget *image3093; + GtkWidget *image3163; GtkWidget *separator47; GtkWidget *menu_choose_color1; - GtkWidget *image3094; + GtkWidget *image3164; GtkWidget *menu_count_words1; GtkWidget *load_tags1; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image3095; + GtkWidget *image3165; GtkWidget *website1; GtkWidget *keyboard_shortcuts1; GtkWidget *debug_messages1; @@ -304,9 +306,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1);
- image3072 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3072); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3072); + image3141 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3141); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3141);
separator12 = gtk_separator_menu_item_new (); gtk_widget_show (separator12); @@ -342,25 +344,25 @@ gtk_widget_show (menu_save_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1);
- image3073 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3073); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3073); + image3142 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3142); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3142);
menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1);
- image3074 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3074); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3074); + image3143 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3143); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3143);
menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1);
- image3075 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3075); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3075); + image3144 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3144); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3144);
menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -403,17 +405,17 @@ gtk_widget_show (close_other_documents1); gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1);
- image3076 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3076); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3076); + image3145 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3145); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3145);
menu_close_all1 = gtk_image_menu_item_new_with_mnemonic (_("C_lose All")); gtk_widget_show (menu_close_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1);
- image3077 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3077); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3077); + image3146 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3146); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3146);
menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -519,17 +521,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1);
- image3078 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3078); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3078); + image3147 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3147); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3147);
menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1);
- image3079 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3079); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3079); + image3148 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3148); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3148);
smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("Smart Line Indent")); gtk_widget_show (smart_line_indent1); @@ -565,17 +567,17 @@ gtk_widget_show (cut_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1);
- image3080 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3080); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3080); + image3149 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3149); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3149);
copy_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("Copy current line(s)")); gtk_widget_show (copy_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), copy_current_line_s_1);
- image3081 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3081); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3081); + image3150 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3150); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3150);
delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("Delete current line(s)")); gtk_widget_show (delete_current_line_s_1); @@ -629,9 +631,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1);
- image3082 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3082); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3082); + image3151 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3151); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3151);
add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -664,9 +666,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1);
- image3083 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3083); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3083); + image3152 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3152); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3152);
insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -678,9 +680,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2);
- image3084 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3084); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3084); + image3153 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3153); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3153);
insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -697,10 +699,18 @@ gtk_widget_show (preferences1); gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1);
- image3085 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3085); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3085); + image3154 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3154); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3154);
+ plugin_preferences1 = gtk_image_menu_item_new_with_mnemonic (_("P_lugin Preferences")); + gtk_widget_show (plugin_preferences1); + gtk_container_add (GTK_CONTAINER (edit1_menu), plugin_preferences1); + + image3155 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3155); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image3155); + search1 = gtk_menu_item_new_with_mnemonic (_("_Search")); gtk_widget_show (search1); gtk_container_add (GTK_CONTAINER (menubar1), search1); @@ -728,9 +738,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1);
- image3086 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3086); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3086); + image3156 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3156); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3156);
separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -767,9 +777,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1);
- image3087 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3087); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3087); + image3157 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3157); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3157);
menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menu_view1); @@ -782,9 +792,9 @@ gtk_widget_show (menu_change_font1); gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1);
- image3088 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3088); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3088); + image3158 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3158); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3158);
menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -1023,17 +1033,17 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1);
- image3089 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3089); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3089); + image3159 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3159); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3159);
project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open")); gtk_widget_show (project_open1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1);
- image3090 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3090); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3090); + image3160 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3160); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3160);
recent_projects1 = gtk_menu_item_new_with_mnemonic (_("_Recent Projects")); gtk_widget_show (recent_projects1); @@ -1043,9 +1053,9 @@ gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1);
- image3091 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3091); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3091); + image3161 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3161); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3161);
separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -1071,17 +1081,17 @@ gtk_widget_show (menu_reload_configuration1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1);
- image3092 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3092); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3092); + image3162 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3162); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3162);
configuration_files1 = gtk_image_menu_item_new_with_mnemonic (_("C_onfiguration Files")); gtk_widget_show (configuration_files1); gtk_container_add (GTK_CONTAINER (tools1_menu), configuration_files1);
- image3093 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3093); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3093); + image3163 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3163); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3163);
separator47 = gtk_separator_menu_item_new (); gtk_widget_show (separator47); @@ -1092,9 +1102,9 @@ gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1);
- image3094 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3094); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3094); + image3164 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3164); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3164);
menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -1115,9 +1125,9 @@ gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1);
- image3095 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3095); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3095); + image3165 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3165); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3165);
website1 = gtk_menu_item_new_with_mnemonic (_("_Website")); gtk_widget_show (website1); @@ -1417,6 +1427,9 @@ g_signal_connect ((gpointer) preferences1, "activate", G_CALLBACK (on_preferences1_activate), NULL); + g_signal_connect ((gpointer) plugin_preferences1, "activate", + G_CALLBACK (on_plugin_preferences1_activate), + NULL); g_signal_connect ((gpointer) search1, "activate", G_CALLBACK (on_search1_activate), NULL); @@ -1614,7 +1627,7 @@ GLADE_HOOKUP_OBJECT (window1, file1_menu, "file1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image3072, "image3072"); + GLADE_HOOKUP_OBJECT (window1, image3141, "image3141"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); GLADE_HOOKUP_OBJECT (window1, menu_open1, "menu_open1"); GLADE_HOOKUP_OBJECT (window1, menu_open_selected_file1, "menu_open_selected_file1"); @@ -1623,11 +1636,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image3073, "image3073"); + GLADE_HOOKUP_OBJECT (window1, image3142, "image3142"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image3074, "image3074"); + GLADE_HOOKUP_OBJECT (window1, image3143, "image3143"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image3075, "image3075"); + GLADE_HOOKUP_OBJECT (window1, image3144, "image3144"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1638,9 +1651,9 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, close_other_documents1, "close_other_documents1"); - GLADE_HOOKUP_OBJECT (window1, image3076, "image3076"); + GLADE_HOOKUP_OBJECT (window1, image3145, "image3145"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image3077, "image3077"); + GLADE_HOOKUP_OBJECT (window1, image3146, "image3146"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1666,9 +1679,9 @@ GLADE_HOOKUP_OBJECT (window1, menu_toggle_line_commentation1, "menu_toggle_line_commentation1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image3078, "image3078"); + GLADE_HOOKUP_OBJECT (window1, image3147, "image3147"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image3079, "image3079"); + GLADE_HOOKUP_OBJECT (window1, image3148, "image3148"); GLADE_HOOKUP_OBJECT (window1, smart_line_indent1, "smart_line_indent1"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1"); @@ -1678,9 +1691,9 @@ GLADE_HOOKUP_OBJECT (window1, commands2, "commands2"); GLADE_HOOKUP_OBJECT (window1, commands2_menu, "commands2_menu"); GLADE_HOOKUP_OBJECT (window1, cut_current_line_s_1, "cut_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image3080, "image3080"); + GLADE_HOOKUP_OBJECT (window1, image3149, "image3149"); GLADE_HOOKUP_OBJECT (window1, copy_current_line_s_1, "copy_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image3081, "image3081"); + GLADE_HOOKUP_OBJECT (window1, image3150, "image3150"); GLADE_HOOKUP_OBJECT (window1, delete_current_line_s_1, "delete_current_line_s_1"); GLADE_HOOKUP_OBJECT (window1, duplicate_line_or_selection1, "duplicate_line_or_selection1"); GLADE_HOOKUP_OBJECT (window1, separator49, "separator49"); @@ -1693,7 +1706,7 @@ GLADE_HOOKUP_OBJECT (window1, go_to_previous_marker1, "go_to_previous_marker1"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image3082, "image3082"); + GLADE_HOOKUP_OBJECT (window1, image3151, "image3151"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1702,16 +1715,18 @@ GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); - GLADE_HOOKUP_OBJECT (window1, image3083, "image3083"); + GLADE_HOOKUP_OBJECT (window1, image3152, "image3152"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image3084, "image3084"); + GLADE_HOOKUP_OBJECT (window1, image3153, "image3153"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1"); - GLADE_HOOKUP_OBJECT (window1, image3085, "image3085"); + GLADE_HOOKUP_OBJECT (window1, image3154, "image3154"); + GLADE_HOOKUP_OBJECT (window1, plugin_preferences1, "plugin_preferences1"); + GLADE_HOOKUP_OBJECT (window1, image3155, "image3155"); GLADE_HOOKUP_OBJECT (window1, search1, "search1"); GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu"); GLADE_HOOKUP_OBJECT (window1, find1, "find1"); @@ -1719,7 +1734,7 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image3086, "image3086"); + GLADE_HOOKUP_OBJECT (window1, image3156, "image3156"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1728,11 +1743,11 @@ GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image3087, "image3087"); + GLADE_HOOKUP_OBJECT (window1, image3157, "image3157"); GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1"); GLADE_HOOKUP_OBJECT (window1, menu_view1_menu, "menu_view1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image3088, "image3088"); + GLADE_HOOKUP_OBJECT (window1, image3158, "image3158"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); @@ -1788,30 +1803,30 @@ GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1"); GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu"); GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1"); - GLADE_HOOKUP_OBJECT (window1, image3089, "image3089"); + GLADE_HOOKUP_OBJECT (window1, image3159, "image3159"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image3090, "image3090"); + GLADE_HOOKUP_OBJECT (window1, image3160, "image3160"); GLADE_HOOKUP_OBJECT (window1, recent_projects1, "recent_projects1"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image3091, "image3091"); + GLADE_HOOKUP_OBJECT (window1, image3161, "image3161"); GLADE_HOOKUP_OBJECT (window1, separator34, "separator34"); GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1"); GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1"); GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_reload_configuration1, "menu_reload_configuration1"); - GLADE_HOOKUP_OBJECT (window1, image3092, "image3092"); + GLADE_HOOKUP_OBJECT (window1, image3162, "image3162"); GLADE_HOOKUP_OBJECT (window1, configuration_files1, "configuration_files1"); - GLADE_HOOKUP_OBJECT (window1, image3093, "image3093"); + GLADE_HOOKUP_OBJECT (window1, image3163, "image3163"); GLADE_HOOKUP_OBJECT (window1, separator47, "separator47"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image3094, "image3094"); + GLADE_HOOKUP_OBJECT (window1, image3164, "image3164"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1"); GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (window1, menu_help1_menu, "menu_help1_menu"); GLADE_HOOKUP_OBJECT (window1, help1, "help1"); - GLADE_HOOKUP_OBJECT (window1, image3095, "image3095"); + GLADE_HOOKUP_OBJECT (window1, image3165, "image3165"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1");
Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/keybindings.c 2009-10-28 18:06:16 UTC (rev 4386) @@ -377,6 +377,8 @@ keybindings_set_item(group, GEANY_KEYS_SETTINGS_PREFERENCES, cb_func_menu_preferences, GDK_p, GDK_CONTROL_MASK | GDK_MOD1_MASK, "menu_preferences", _("Preferences"), LW(preferences1)); + keybindings_set_item(group, GEANY_KEYS_SETTINGS_PLUGINPREFERENCES, cb_func_menu_preferences, + 0, 0, "menu_pluginpreferences", _("P_lugin Preferences"), LW(plugin_preferences1));
group = ADD_KB_GROUP(SEARCH, _("Search"), cb_func_search_action);
@@ -1315,9 +1317,17 @@ }
-static void cb_func_menu_preferences(G_GNUC_UNUSED guint key_id) +static void cb_func_menu_preferences(guint key_id) { - on_preferences1_activate(NULL, NULL); + switch (key_id) + { + case GEANY_KEYS_SETTINGS_PREFERENCES: + on_preferences1_activate(NULL, NULL); + break; + case GEANY_KEYS_SETTINGS_PLUGINPREFERENCES: + on_plugin_preferences1_activate(NULL, NULL); + break; + } }
Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/keybindings.h 2009-10-28 18:06:16 UTC (rev 4386) @@ -210,6 +210,7 @@ enum { GEANY_KEYS_SETTINGS_PREFERENCES, + GEANY_KEYS_SETTINGS_PLUGINPREFERENCES, GEANY_KEYS_SETTINGS_COUNT };
Modified: trunk/src/pluginprivate.h =================================================================== --- trunk/src/pluginprivate.h 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/pluginprivate.h 2009-10-28 18:06:16 UTC (rev 4386) @@ -26,6 +26,7 @@ #ifndef PLUGINPRIVATE_H #define PLUGINPRIVATE_H
+#include "plugindata.h" #include "ui_utils.h" /* GeanyAutoSeparator */ #include "keybindings.h" /* GeanyKeyGroup */
Modified: trunk/src/pluginutils.c =================================================================== --- trunk/src/pluginutils.c 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/pluginutils.c 2009-10-28 18:06:16 UTC (rev 4386) @@ -195,7 +195,8 @@ }
-/* multiple plugin configure dialog */ +/* multiple plugin configure dialog + * current_plugin can be NULL */ static void configure_plugins(Plugin *current_plugin) { GtkWidget *dialog, *vbox, *nb; @@ -228,14 +229,18 @@ cur_page = n; } } - if (cur_page >= 0) + if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(nb))) { gtk_widget_show_all(vbox); - gtk_notebook_set_current_page(GTK_NOTEBOOK(nb), cur_page); + if (cur_page >= 0) + gtk_notebook_set_current_page(GTK_NOTEBOOK(nb), cur_page);
/* run the dialog */ while (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_APPLY); } + else + utils_beep(); + gtk_widget_destroy(dialog); }
@@ -244,10 +249,18 @@ * The plugin must implement one of the plugin_configure() or plugin_configure_single() symbols. * @param plugin Must be @ref geany_plugin. * @since 0.19. */ +/* if NULL, show all plugins */ void plugin_show_configure(GeanyPlugin *plugin) { - Plugin *p = plugin->priv; + Plugin *p;
+ if (!plugin) + { + configure_plugins(NULL); + return; + } + p = plugin->priv; + if (p->configure) configure_plugins(p); else
Modified: trunk/src/pluginutils.h =================================================================== --- trunk/src/pluginutils.h 2009-10-28 16:32:22 UTC (rev 4385) +++ trunk/src/pluginutils.h 2009-10-28 18:06:16 UTC (rev 4386) @@ -28,22 +28,25 @@
#ifdef HAVE_PLUGINS
-#include "plugindata.h" /* GeanyPlugin */ #include "keybindings.h" /* GeanyKeyGroupCallback */
-void plugin_add_toolbar_item(GeanyPlugin *plugin, GtkToolItem *item); +/* avoid including plugindata.h otherwise this redefines the GEANY() macro */ +struct GeanyPlugin;
-void plugin_module_make_resident(GeanyPlugin *plugin);
-void plugin_signal_connect(GeanyPlugin *plugin, +void plugin_add_toolbar_item(struct GeanyPlugin *plugin, GtkToolItem *item); + +void plugin_module_make_resident(struct GeanyPlugin *plugin); + +void plugin_signal_connect(struct GeanyPlugin *plugin, GObject *object, gchar *signal_name, gboolean after, GCallback callback, gpointer user_data);
-struct GeanyKeyGroup *plugin_set_key_group(GeanyPlugin *plugin, +struct GeanyKeyGroup *plugin_set_key_group(struct GeanyPlugin *plugin, const gchar *section_name, gsize count, GeanyKeyGroupCallback callback);
-void plugin_show_configure(GeanyPlugin *plugin); +void plugin_show_configure(struct GeanyPlugin *plugin);
#endif /* HAVE_PLUGINS */ #endif /* PLUGINUTILS_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.