SF.net SVN: geany:[2786] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Thu Jul 17 16:42:13 UTC 2008
Revision: 2786
http://geany.svn.sourceforge.net/geany/?rev=2786&view=rev
Author: ntrel
Date: 2008-07-17 16:42:03 +0000 (Thu, 17 Jul 2008)
Log Message:
-----------
Add Find Document Usage popup menu command & keybinding.
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/ui_utils.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-07-17 16:28:16 UTC (rev 2785)
+++ trunk/ChangeLog 2008-07-17 16:42:03 UTC (rev 2786)
@@ -1,3 +1,12 @@
+2008-07-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/ui_utils.c, src/ui_utils.h, src/main.c:
+ Move widget array lookups from main.c to ui_utils.c.
+ * 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.
+
+
2008-07-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* data/filetypes.fortran:
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade 2008-07-17 16:28:16 UTC (rev 2785)
+++ trunk/geany.glade 2008-07-17 16:42:03 UTC (rev 2786)
@@ -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="image2385">
+ <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="image2386">
+ <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="image2387">
+ <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="image2388">
+ <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="image2389">
+ <widget class="GtkImage" id="image2572">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -3047,7 +3047,7 @@
<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="image2390">
+ <widget class="GtkImage" id="image2573">
<property name="visible">True</property>
<property name="stock">gtk-find</property>
<property name="icon_size">1</property>
@@ -3061,6 +3061,27 @@
</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 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="GtkMenuItem" id="goto_tag_definition1">
<property name="visible">True</property>
<property name="label" translatable="yes">Go to _Tag Definition</property>
@@ -3102,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="image2391">
+ <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/callbacks.c
===================================================================
--- trunk/src/callbacks.c 2008-07-17 16:28:16 UTC (rev 2785)
+++ trunk/src/callbacks.c 2008-07-17 16:42:03 UTC (rev 2786)
@@ -1004,9 +1004,7 @@
}
-void
-on_find_usage1_activate (GtkMenuItem *menuitem,
- gpointer user_data)
+static void find_usage(gboolean in_session)
{
gint flags;
gchar *search_text;
@@ -1027,12 +1025,28 @@
flags = SCFIND_MATCHCASE | SCFIND_WHOLEWORD;
}
- search_find_usage(search_text, flags, TRUE);
+ search_find_usage(search_text, flags, in_session);
g_free(search_text);
}
void
+on_find_document_usage1_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ find_usage(FALSE);
+}
+
+
+void
+on_find_usage1_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ find_usage(TRUE);
+}
+
+
+void
on_goto_tag_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
Modified: trunk/src/callbacks.h
===================================================================
--- trunk/src/callbacks.h 2008-07-17 16:28:16 UTC (rev 2785)
+++ trunk/src/callbacks.h 2008-07-17 16:42:03 UTC (rev 2786)
@@ -622,3 +622,7 @@
void
on_menu_reload_configuration1_activate (GtkMenuItem *menuitem,
gpointer user_data);
+
+void
+on_find_document_usage1_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c 2008-07-17 16:28:16 UTC (rev 2785)
+++ trunk/src/interface.c 2008-07-17 16:42:03 UTC (rev 2786)
@@ -2102,16 +2102,16 @@
GtkWidget *menu_duplicate_line2;
GtkWidget *separator31;
GtkWidget *menu_increase_indent2;
- GtkWidget *image2385;
+ GtkWidget *image2568;
GtkWidget *menu_decrease_indent2;
- GtkWidget *image2386;
+ GtkWidget *image2569;
GtkWidget *separator38;
GtkWidget *send_selection_to1;
GtkWidget *send_selection_to1_menu;
GtkWidget *invisible12;
GtkWidget *separator17;
GtkWidget *comments;
- GtkWidget *image2387;
+ GtkWidget *image2570;
GtkWidget *comments_menu;
GtkWidget *add_changelog_entry2;
GtkWidget *insert_file_header2;
@@ -2120,22 +2120,24 @@
GtkWidget *insert_gpl_notice1;
GtkWidget *insert_bsd_license_notice1;
GtkWidget *insert_date2;
- GtkWidget *image2388;
+ GtkWidget *image2571;
GtkWidget *insert_date2_menu;
GtkWidget *invisible10;
GtkWidget *insert_include1;
- GtkWidget *image2389;
+ GtkWidget *image2572;
GtkWidget *insert_include1_menu;
GtkWidget *invisible3;
GtkWidget *separator7;
GtkWidget *find_usage1;
- GtkWidget *image2390;
+ GtkWidget *image2573;
+ GtkWidget *find_document_usage1;
+ GtkWidget *image2574;
GtkWidget *goto_tag_definition1;
GtkWidget *goto_tag_declaration1;
GtkWidget *context_action1;
GtkWidget *separator15;
GtkWidget *go_to_line;
- GtkWidget *image2391;
+ GtkWidget *image2575;
GtkAccelGroup *accel_group;
GtkTooltips *tooltips;
@@ -2238,17 +2240,17 @@
gtk_widget_show (menu_increase_indent2);
gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_increase_indent2);
- image2385 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2385);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image2385);
+ 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);
- image2386 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2386);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image2386);
+ 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);
@@ -2274,9 +2276,9 @@
gtk_widget_show (comments);
gtk_container_add (GTK_CONTAINER (edit_menu1), comments);
- image2387 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2387);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image2387);
+ 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);
@@ -2315,9 +2317,9 @@
gtk_widget_show (insert_date2);
gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2);
- image2388 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2388);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image2388);
+ 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);
@@ -2329,9 +2331,9 @@
gtk_widget_show (insert_include1);
gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1);
- image2389 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2389);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image2389);
+ 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);
@@ -2348,10 +2350,18 @@
gtk_widget_show (find_usage1);
gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1);
- image2390 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2390);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image2390);
+ 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 (edit_menu1), find_document_usage1);
+
+ 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);
+
goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to _Tag Definition"));
gtk_widget_show (goto_tag_definition1);
gtk_container_add (GTK_CONTAINER (edit_menu1), goto_tag_definition1);
@@ -2374,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);
- image2391 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2391);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image2391);
+ 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),
@@ -2444,6 +2454,9 @@
g_signal_connect ((gpointer) find_usage1, "activate",
G_CALLBACK (on_find_usage1_activate),
NULL);
+ g_signal_connect ((gpointer) find_document_usage1, "activate",
+ G_CALLBACK (on_find_document_usage1_activate),
+ NULL);
g_signal_connect ((gpointer) goto_tag_definition1, "activate",
G_CALLBACK (on_goto_tag_activate),
NULL);
@@ -2481,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, image2385, "image2385");
+ GLADE_HOOKUP_OBJECT (edit_menu1, image2568, "image2568");
GLADE_HOOKUP_OBJECT (edit_menu1, menu_decrease_indent2, "menu_decrease_indent2");
- GLADE_HOOKUP_OBJECT (edit_menu1, image2386, "image2386");
+ 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, image2387, "image2387");
+ 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");
@@ -2499,22 +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, image2388, "image2388");
+ 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, image2389, "image2389");
+ 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, find_usage1, "find_usage1");
- GLADE_HOOKUP_OBJECT (edit_menu1, image2390, "image2390");
+ GLADE_HOOKUP_OBJECT (edit_menu1, image2573, "image2573");
+ GLADE_HOOKUP_OBJECT (edit_menu1, find_document_usage1, "find_document_usage1");
+ 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, 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, image2391, "image2391");
+ 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/keybindings.c
===================================================================
--- trunk/src/keybindings.c 2008-07-17 16:28:16 UTC (rev 2785)
+++ trunk/src/keybindings.c 2008-07-17 16:42:03 UTC (rev 2786)
@@ -326,6 +326,8 @@
0, 0, "menu_previousmessage", _("Previous Message"), LW(previous_message1));
keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDUSAGE, cb_func_search_action,
0, 0, "popup_findusage", _("Find Usage"), NULL);
+ keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, cb_func_search_action,
+ 0, 0, "popup_finddocumentusage", _("Find Document Usage"), NULL);
group = ADD_KB_GROUP(GOTO, _("Go to"));
@@ -579,6 +581,7 @@
group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_SEARCH);
GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SEARCH_FINDUSAGE, find_usage1);
+ GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, find_document_usage1);
group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_GOTO);
GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_LINE, go_to_line);
@@ -1078,6 +1081,10 @@
if (check_current_word())
on_find_usage1_activate(NULL, NULL);
break;
+ case GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE:
+ if (check_current_word())
+ on_find_document_usage1_activate(NULL, NULL);
+ break;
}
}
Modified: trunk/src/keybindings.h
===================================================================
--- trunk/src/keybindings.h 2008-07-17 16:28:16 UTC (rev 2785)
+++ trunk/src/keybindings.h 2008-07-17 16:42:03 UTC (rev 2786)
@@ -210,6 +210,7 @@
GEANY_KEYS_SEARCH_NEXTMESSAGE,
GEANY_KEYS_SEARCH_FINDUSAGE,
GEANY_KEYS_SEARCH_PREVIOUSMESSAGE,
+ GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE,
GEANY_KEYS_SEARCH_COUNT
};
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c 2008-07-17 16:28:16 UTC (rev 2785)
+++ trunk/src/ui_utils.c 2008-07-17 16:42:03 UTC (rev 2786)
@@ -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 *popup_goto_items[3];
+ GtkWidget *popup_goto_items[4];
GtkWidget *popup_copy_items[3];
GtkWidget *menu_copy_items[3];
GtkWidget *redo_items[3];
@@ -340,6 +340,7 @@
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);
}
@@ -1474,6 +1475,7 @@
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