Skip to content

G
geany
Kaydet (Commit) 9469f020 authored tarafından Nick Treleaven's avatar Nick Treleaven
Dosyalara gözat
Seçenekler

Move editor popup menu current word items to submenu. 

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2787 ea778897-0a13-0410-b9d1-a72fbfd435f5
üst 3d24008b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 72 deletions
ChangeLog
Dosyayı görüntüle @ 9469f020
......@@ -5,6 +5,8 @@
* src/interface.c, src/keybindings.c, src/keybindings.h,
src/callbacks.c, src/callbacks.h, geany.glade:
Add Find Document Usage popup menu command & keybinding.
* src/interface.c, src/ui_utils.c, geany.glade:
Move editor popup menu current word items to submenu.
2008-07-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
......
geany.glade
Dosyayı görüntüle @ 9469f020
......@@ -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="image2568">
<widget class="GtkImage" id="image2589">
<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="image2569">
<widget class="GtkImage" id="image2590">
<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="image2570">
<widget class="GtkImage" id="image2591">
<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="image2571">
<widget class="GtkImage" id="image2592">
<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="image2572">
<widget class="GtkImage" id="image2593">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
......@@ -3040,71 +3040,96 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="find_usage1">
<widget class="GtkMenuItem" id="current_word1">
<property name="visible">True</property>
<property name="label" translatable="yes">Find _Usage</property>
<property name="label" translatable="yes">Current _Word</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 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="GtkMenu" id="current_word1_menu">
<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="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 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 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>
<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="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_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 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="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"/>
<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>
</widget>
</child>
......@@ -3123,7 +3148,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="image2575">
<widget class="GtkImage" id="image2596">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
......
src/interface.c
Dosyayı görüntüle @ 9469f020
This diff is collapsed.
src/ui_utils.c
Dosyayı görüntüle @ 9469f020
......@@ -61,7 +61,7 @@ static struct
/* pointers to widgets only sensitive when there is at least one document */
GPtrArray *document_buttons;
GtkWidget *menu_insert_include_items[2];
GtkWidget *popup_goto_items[4];
GtkWidget *current_word_item;
GtkWidget *popup_copy_items[3];
GtkWidget *menu_copy_items[3];
GtkWidget *redo_items[3];
......@@ -337,10 +337,7 @@ void ui_update_popup_copy_items(GeanyDocument *doc)
void ui_update_popup_goto_items(gboolean 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);
gtk_widget_set_sensitive(widgets.current_word_item, enable);
}
......@@ -1472,10 +1469,7 @@ void ui_init(void)
ui_widgets.statusbar = lookup_widget(main_widgets.window, "statusbar");
ui_widgets.print_page_setup = lookup_widget(main_widgets.window, "page_setup1");
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.current_word_item = lookup_widget(main_widgets.editor_menu, "current_word1");
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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment