SF.net SVN: geany:[2817] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Fri Jul 25 11:23:53 UTC 2008
Revision: 2817
http://geany.svn.sourceforge.net/geany/?rev=2817&view=rev
Author: ntrel
Date: 2008-07-25 11:23:52 +0000 (Fri, 25 Jul 2008)
Log Message:
-----------
Revert editor popup menu Current Word submenu changes. See
http://lists.uvena.de/geany-devel/2008-July/000101.html.
Modified Paths:
--------------
trunk/ChangeLog
trunk/geany.glade
trunk/src/interface.c
trunk/src/ui_utils.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-07-25 09:51:08 UTC (rev 2816)
+++ trunk/ChangeLog 2008-07-25 11:23:52 UTC (rev 2817)
@@ -1,3 +1,10 @@
+2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/interface.c, src/ui_utils.c, geany.glade:
+ Revert editor popup menu Current Word submenu changes. See
+ http://lists.uvena.de/geany-devel/2008-July/000101.html.
+
+
2008-07-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* data/filetypes.sh, src/highlighting.c:
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade 2008-07-25 09:51:08 UTC (rev 2816)
+++ trunk/geany.glade 2008-07-25 11:23:52 UTC (rev 2817)
@@ -2814,7 +2814,7 @@
<signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2589">
+ <widget class="GtkImage" id="image2568">
<property name="visible">True</property>
<property name="stock">gtk-indent</property>
<property name="icon_size">1</property>
@@ -2835,7 +2835,7 @@
<signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2590">
+ <widget class="GtkImage" id="image2569">
<property name="visible">True</property>
<property name="stock">gtk-unindent</property>
<property name="icon_size">1</property>
@@ -2891,7 +2891,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image2591">
+ <widget class="GtkImage" id="image2570">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -2976,7 +2976,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image2592">
+ <widget class="GtkImage" id="image2571">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -3008,7 +3008,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image2593">
+ <widget class="GtkImage" id="image2572">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -3040,96 +3040,71 @@
</child>
<child>
- <widget class="GtkMenuItem" id="current_word1">
+ <widget class="GtkImageMenuItem" id="find_usage1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Current _Word</property>
+ <property name="label" translatable="yes">Find _Usage</property>
<property name="use_underline">True</property>
+ <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/>
- <child>
- <widget class="GtkMenu" id="current_word1_menu">
+ <child internal-child="image">
+ <widget class="GtkImage" id="image2573">
+ <property name="visible">True</property>
+ <property name="stock">gtk-find</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>
- <child>
- <widget class="GtkImageMenuItem" id="find_usage1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Find _Usage</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/>
+ <child>
+ <widget class="GtkImageMenuItem" id="find_document_usage1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Find _Document Usage</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_find_document_usage1_activate" last_modification_time="Thu, 17 Jul 2008 13:42:25 GMT"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image2594">
- <property name="visible">True</property>
- <property name="stock">gtk-find</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>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image2574">
+ <property name="visible">True</property>
+ <property name="stock">gtk-find</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>
- <child>
- <widget class="GtkImageMenuItem" id="find_document_usage1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Find _Document Usage</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_find_document_usage1_activate" last_modification_time="Thu, 17 Jul 2008 13:42:25 GMT"/>
+ <child>
+ <widget class="GtkMenuItem" id="goto_tag_definition1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Go to _Tag Definition</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_goto_tag_activate" last_modification_time="Sun, 29 May 2005 22:08:28 GMT"/>
+ </widget>
+ </child>
- <child internal-child="image">
- <widget class="GtkImage" id="image2595">
- <property name="visible">True</property>
- <property name="stock">gtk-find</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>
+ <child>
+ <widget class="GtkMenuItem" id="goto_tag_declaration1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Go to T_ag Declaration</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_goto_tag_activate" last_modification_time="Sun, 29 May 2005 22:08:28 GMT"/>
+ </widget>
+ </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator47">
- <property name="visible">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="goto_tag_definition1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Go to _Tag Definition</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_goto_tag_activate" last_modification_time="Sun, 29 May 2005 22:08:28 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="goto_tag_declaration1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Go to T_ag Declaration</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_goto_tag_activate" last_modification_time="Sun, 29 May 2005 22:08:28 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator48">
- <property name="visible">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="context_action1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Conte_xt Action</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_context_action1_activate" last_modification_time="Fri, 13 Apr 2007 18:37:55 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
+ <child>
+ <widget class="GtkMenuItem" id="context_action1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Conte_xt Action</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_context_action1_activate" last_modification_time="Fri, 13 Apr 2007 18:37:55 GMT"/>
</widget>
</child>
@@ -3148,7 +3123,7 @@
<signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 16 Jul 2005 11:20:32 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2596">
+ <widget class="GtkImage" id="image2575">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c 2008-07-25 09:51:08 UTC (rev 2816)
+++ trunk/src/interface.c 2008-07-25 11:23:52 UTC (rev 2817)
@@ -2102,16 +2102,16 @@
GtkWidget *menu_duplicate_line2;
GtkWidget *separator31;
GtkWidget *menu_increase_indent2;
- GtkWidget *image2589;
+ GtkWidget *image2568;
GtkWidget *menu_decrease_indent2;
- GtkWidget *image2590;
+ GtkWidget *image2569;
GtkWidget *separator38;
GtkWidget *send_selection_to1;
GtkWidget *send_selection_to1_menu;
GtkWidget *invisible12;
GtkWidget *separator17;
GtkWidget *comments;
- GtkWidget *image2591;
+ GtkWidget *image2570;
GtkWidget *comments_menu;
GtkWidget *add_changelog_entry2;
GtkWidget *insert_file_header2;
@@ -2120,28 +2120,24 @@
GtkWidget *insert_gpl_notice1;
GtkWidget *insert_bsd_license_notice1;
GtkWidget *insert_date2;
- GtkWidget *image2592;
+ GtkWidget *image2571;
GtkWidget *insert_date2_menu;
GtkWidget *invisible10;
GtkWidget *insert_include1;
- GtkWidget *image2593;
+ GtkWidget *image2572;
GtkWidget *insert_include1_menu;
GtkWidget *invisible3;
GtkWidget *separator7;
- GtkWidget *current_word1;
- GtkWidget *current_word1_menu;
GtkWidget *find_usage1;
- GtkWidget *image2594;
+ GtkWidget *image2573;
GtkWidget *find_document_usage1;
- GtkWidget *image2595;
- GtkWidget *separator47;
+ GtkWidget *image2574;
GtkWidget *goto_tag_definition1;
GtkWidget *goto_tag_declaration1;
- GtkWidget *separator48;
GtkWidget *context_action1;
GtkWidget *separator15;
GtkWidget *go_to_line;
- GtkWidget *image2596;
+ GtkWidget *image2575;
GtkAccelGroup *accel_group;
GtkTooltips *tooltips;
@@ -2244,17 +2240,17 @@
gtk_widget_show (menu_increase_indent2);
gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_increase_indent2);
- image2589 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2589);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image2589);
+ image2568 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2568);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image2568);
menu_decrease_indent2 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent"));
gtk_widget_show (menu_decrease_indent2);
gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_decrease_indent2);
- image2590 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2590);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image2590);
+ image2569 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2569);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image2569);
separator38 = gtk_separator_menu_item_new ();
gtk_widget_show (separator38);
@@ -2280,9 +2276,9 @@
gtk_widget_show (comments);
gtk_container_add (GTK_CONTAINER (edit_menu1), comments);
- image2591 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2591);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image2591);
+ image2570 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2570);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image2570);
comments_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu);
@@ -2321,9 +2317,9 @@
gtk_widget_show (insert_date2);
gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2);
- image2592 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2592);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image2592);
+ image2571 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2571);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image2571);
insert_date2_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date2), insert_date2_menu);
@@ -2335,9 +2331,9 @@
gtk_widget_show (insert_include1);
gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1);
- image2593 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2593);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image2593);
+ image2572 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2572);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image2572);
insert_include1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu);
@@ -2350,50 +2346,33 @@
gtk_container_add (GTK_CONTAINER (edit_menu1), separator7);
gtk_widget_set_sensitive (separator7, FALSE);
- current_word1 = gtk_menu_item_new_with_mnemonic (_("Current _Word"));
- gtk_widget_show (current_word1);
- gtk_container_add (GTK_CONTAINER (edit_menu1), current_word1);
-
- current_word1_menu = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (current_word1), current_word1_menu);
-
find_usage1 = gtk_image_menu_item_new_with_mnemonic (_("Find _Usage"));
gtk_widget_show (find_usage1);
- gtk_container_add (GTK_CONTAINER (current_word1_menu), find_usage1);
+ gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1);
- image2594 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2594);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image2594);
+ image2573 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2573);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image2573);
find_document_usage1 = gtk_image_menu_item_new_with_mnemonic (_("Find _Document Usage"));
gtk_widget_show (find_document_usage1);
- gtk_container_add (GTK_CONTAINER (current_word1_menu), find_document_usage1);
+ gtk_container_add (GTK_CONTAINER (edit_menu1), find_document_usage1);
- image2595 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2595);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_document_usage1), image2595);
+ image2574 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2574);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_document_usage1), image2574);
- separator47 = gtk_separator_menu_item_new ();
- gtk_widget_show (separator47);
- gtk_container_add (GTK_CONTAINER (current_word1_menu), separator47);
- gtk_widget_set_sensitive (separator47, FALSE);
-
goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to _Tag Definition"));
gtk_widget_show (goto_tag_definition1);
- gtk_container_add (GTK_CONTAINER (current_word1_menu), goto_tag_definition1);
+ gtk_container_add (GTK_CONTAINER (edit_menu1), goto_tag_definition1);
goto_tag_declaration1 = gtk_menu_item_new_with_mnemonic (_("Go to T_ag Declaration"));
gtk_widget_show (goto_tag_declaration1);
- gtk_container_add (GTK_CONTAINER (current_word1_menu), goto_tag_declaration1);
+ gtk_container_add (GTK_CONTAINER (edit_menu1), goto_tag_declaration1);
- separator48 = gtk_separator_menu_item_new ();
- gtk_widget_show (separator48);
- gtk_container_add (GTK_CONTAINER (current_word1_menu), separator48);
- gtk_widget_set_sensitive (separator48, FALSE);
-
context_action1 = gtk_menu_item_new_with_mnemonic (_("Conte_xt Action"));
gtk_widget_show (context_action1);
- gtk_container_add (GTK_CONTAINER (current_word1_menu), context_action1);
+ gtk_container_add (GTK_CONTAINER (edit_menu1), context_action1);
separator15 = gtk_separator_menu_item_new ();
gtk_widget_show (separator15);
@@ -2405,9 +2384,9 @@
gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line);
gtk_tooltips_set_tip (tooltips, go_to_line, _("Go to the entered line"), NULL);
- image2596 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2596);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image2596);
+ image2575 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2575);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image2575);
g_signal_connect ((gpointer) undo1, "activate",
G_CALLBACK (on_undo1_activate),
@@ -2515,16 +2494,16 @@
GLADE_HOOKUP_OBJECT (edit_menu1, menu_duplicate_line2, "menu_duplicate_line2");
GLADE_HOOKUP_OBJECT (edit_menu1, separator31, "separator31");
GLADE_HOOKUP_OBJECT (edit_menu1, menu_increase_indent2, "menu_increase_indent2");
- GLADE_HOOKUP_OBJECT (edit_menu1, image2589, "image2589");
+ GLADE_HOOKUP_OBJECT (edit_menu1, image2568, "image2568");
GLADE_HOOKUP_OBJECT (edit_menu1, menu_decrease_indent2, "menu_decrease_indent2");
- GLADE_HOOKUP_OBJECT (edit_menu1, image2590, "image2590");
+ GLADE_HOOKUP_OBJECT (edit_menu1, image2569, "image2569");
GLADE_HOOKUP_OBJECT (edit_menu1, separator38, "separator38");
GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1, "send_selection_to1");
GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1_menu, "send_selection_to1_menu");
GLADE_HOOKUP_OBJECT (edit_menu1, invisible12, "invisible12");
GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17");
GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments");
- GLADE_HOOKUP_OBJECT (edit_menu1, image2591, "image2591");
+ GLADE_HOOKUP_OBJECT (edit_menu1, image2570, "image2570");
GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu");
GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2");
GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2");
@@ -2533,28 +2512,24 @@
GLADE_HOOKUP_OBJECT (edit_menu1, insert_gpl_notice1, "insert_gpl_notice1");
GLADE_HOOKUP_OBJECT (edit_menu1, insert_bsd_license_notice1, "insert_bsd_license_notice1");
GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2, "insert_date2");
- GLADE_HOOKUP_OBJECT (edit_menu1, image2592, "image2592");
+ GLADE_HOOKUP_OBJECT (edit_menu1, image2571, "image2571");
GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2_menu, "insert_date2_menu");
GLADE_HOOKUP_OBJECT (edit_menu1, invisible10, "invisible10");
GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1");
- GLADE_HOOKUP_OBJECT (edit_menu1, image2593, "image2593");
+ GLADE_HOOKUP_OBJECT (edit_menu1, image2572, "image2572");
GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu");
GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3");
GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7");
- GLADE_HOOKUP_OBJECT (edit_menu1, current_word1, "current_word1");
- GLADE_HOOKUP_OBJECT (edit_menu1, current_word1_menu, "current_word1_menu");
GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1");
- GLADE_HOOKUP_OBJECT (edit_menu1, image2594, "image2594");
+ GLADE_HOOKUP_OBJECT (edit_menu1, image2573, "image2573");
GLADE_HOOKUP_OBJECT (edit_menu1, find_document_usage1, "find_document_usage1");
- GLADE_HOOKUP_OBJECT (edit_menu1, image2595, "image2595");
- GLADE_HOOKUP_OBJECT (edit_menu1, separator47, "separator47");
+ GLADE_HOOKUP_OBJECT (edit_menu1, image2574, "image2574");
GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1");
GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_declaration1, "goto_tag_declaration1");
- GLADE_HOOKUP_OBJECT (edit_menu1, separator48, "separator48");
GLADE_HOOKUP_OBJECT (edit_menu1, context_action1, "context_action1");
GLADE_HOOKUP_OBJECT (edit_menu1, separator15, "separator15");
GLADE_HOOKUP_OBJECT (edit_menu1, go_to_line, "go_to_line");
- GLADE_HOOKUP_OBJECT (edit_menu1, image2596, "image2596");
+ GLADE_HOOKUP_OBJECT (edit_menu1, image2575, "image2575");
GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, tooltips, "tooltips");
gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group);
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c 2008-07-25 09:51:08 UTC (rev 2816)
+++ trunk/src/ui_utils.c 2008-07-25 11:23:52 UTC (rev 2817)
@@ -61,7 +61,7 @@
/* pointers to widgets only sensitive when there is at least one document */
GPtrArray *document_buttons;
GtkWidget *menu_insert_include_items[2];
- GtkWidget *current_word_item;
+ GtkWidget *popup_goto_items[4];
GtkWidget *popup_copy_items[3];
GtkWidget *menu_copy_items[3];
GtkWidget *redo_items[3];
@@ -338,7 +338,10 @@
void ui_update_popup_goto_items(gboolean enable)
{
- gtk_widget_set_sensitive(widgets.current_word_item, enable);
+ gtk_widget_set_sensitive(widgets.popup_goto_items[0], enable);
+ gtk_widget_set_sensitive(widgets.popup_goto_items[1], enable);
+ gtk_widget_set_sensitive(widgets.popup_goto_items[2], enable);
+ gtk_widget_set_sensitive(widgets.popup_goto_items[3], enable);
}
@@ -1477,7 +1480,10 @@
ui_widgets.statusbar = lookup_widget(main_widgets.window, "statusbar");
ui_widgets.print_page_setup = lookup_widget(main_widgets.window, "page_setup1");
- widgets.current_word_item = lookup_widget(main_widgets.editor_menu, "current_word1");
+ widgets.popup_goto_items[0] = lookup_widget(main_widgets.editor_menu, "goto_tag_definition1");
+ widgets.popup_goto_items[1] = lookup_widget(main_widgets.editor_menu, "goto_tag_declaration1");
+ widgets.popup_goto_items[2] = lookup_widget(main_widgets.editor_menu, "find_usage1");
+ widgets.popup_goto_items[3] = lookup_widget(main_widgets.editor_menu, "find_document_usage1");
widgets.popup_copy_items[0] = lookup_widget(main_widgets.editor_menu, "cut1");
widgets.popup_copy_items[1] = lookup_widget(main_widgets.editor_menu, "copy1");
widgets.popup_copy_items[2] = lookup_widget(main_widgets.editor_menu, "delete1");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list