Revision: 5211 http://geany.svn.sourceforge.net/geany/?rev=5211&view=rev Author: ntrel Date: 2010-09-09 11:58:55 +0000 (Thu, 09 Sep 2010)
Log Message: ----------- Add Find Usage and Go to Tag items to Search menu for easier discovery.
Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c trunk/src/keybindings.c trunk/src/ui_utils.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-09-09 11:19:27 UTC (rev 5210) +++ trunk/ChangeLog 2010-09-09 11:58:55 UTC (rev 5211) @@ -2,6 +2,11 @@
* src/build.c: Use up/down icons for Previous/Next Error. + * src/interface.c, src/keybindings.c, src/callbacks.c, + src/callbacks.h, src/ui_utils.c, doc/geany.txt, doc/geany.html, + geany.glade: + Add Find Usage and Go to Tag items to Search menu for easier + discovery.
2010-09-09 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2010-09-09 11:19:27 UTC (rev 5210) +++ trunk/doc/geany.html 2010-09-09 11:58:55 UTC (rev 5211) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2010-08-11" /> +<meta name="date" content="2010-08-24" /> <style type="text/css">
/* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2010-08-11</td></tr> +<td>2010-08-24</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.20</td></tr> </tbody> @@ -1488,15 +1488,13 @@ and the editor window's popup menu:</p> <ul class="simple"> <li>Find</li> -<li>Find usage *</li> +<li>Find usage</li> <li>Find in files</li> <li>Replace</li> -<li>Go to tag definition *</li> -<li>Go to tag declaration *</li> +<li>Go to tag definition</li> +<li>Go to tag declaration</li> <li>Go to line</li> </ul> -<p>* These items are available from the editor window's popup menu, or by -using a keyboard shortcut (see <a class="reference" href="#search-keybindings">Search keybindings</a>).</p> <div class="section"> <h3><a class="toc-backref" href="#id57" id="toolbar-entries" name="toolbar-entries">Toolbar entries</a></h3> <p>There are also two toolbar entries:</p> @@ -1650,7 +1648,7 @@ <div class="section"> <h3><a class="toc-backref" href="#id69" id="go-to-tag-declaration" name="go-to-tag-declaration">Go to tag declaration</a></h3> <p>Like Go to tag definition, but for a forward declaration such as a -function prototype or <tt class="docutils literal"><span class="pre">extern</span></tt> declaration instead of a function +C function prototype or <tt class="docutils literal"><span class="pre">extern</span></tt> declaration instead of a function body.</p> </div> <div class="section"> @@ -6130,7 +6128,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2010-08-24 12:06 UTC. +Generated on: 2010-09-09 11:53 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2010-09-09 11:19:27 UTC (rev 5210) +++ trunk/doc/geany.txt 2010-09-09 11:58:55 UTC (rev 5211) @@ -1102,16 +1102,13 @@ and the editor window's popup menu:
* Find -* Find usage * +* Find usage * Find in files * Replace -* Go to tag definition * -* Go to tag declaration * +* Go to tag definition +* Go to tag declaration * Go to line
-* These items are available from the editor window's popup menu, or by -using a keyboard shortcut (see `Search keybindings`_). - Toolbar entries ^^^^^^^^^^^^^^^ There are also two toolbar entries: @@ -1300,7 +1297,7 @@ ^^^^^^^^^^^^^^^^^^^^^
Like Go to tag definition, but for a forward declaration such as a -function prototype or ``extern`` declaration instead of a function +C function prototype or ``extern`` declaration instead of a function body.
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2010-09-09 11:19:27 UTC (rev 5210) +++ trunk/geany.glade 2010-09-09 11:58:55 UTC (rev 5211) @@ -67,7 +67,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3245"> + <widget class="GtkImage" id="image3444"> <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="image3246"> + <widget class="GtkImage" id="image3445"> <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="image3247"> + <widget class="GtkImage" id="image3446"> <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="image3248"> + <widget class="GtkImage" id="image3447"> <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="image3249"> + <widget class="GtkImage" id="image3448"> <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="image3250"> + <widget class="GtkImage" id="image3449"> <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="image3251"> + <widget class="GtkImage" id="image3450"> <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="image3252"> + <widget class="GtkImage" id="image3451"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -589,7 +589,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="image3253"> + <widget class="GtkImage" id="image3452"> <property name="visible">True</property> <property name="stock">gtk-cut</property> <property name="icon_size">1</property> @@ -610,7 +610,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="image3254"> + <widget class="GtkImage" id="image3453"> <property name="visible">True</property> <property name="stock">gtk-copy</property> <property name="icon_size">1</property> @@ -736,7 +736,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3255"> + <widget class="GtkImage" id="image3454"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -815,7 +815,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3256"> + <widget class="GtkImage" id="image3455"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -847,7 +847,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3257"> + <widget class="GtkImage" id="image3456"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -886,7 +886,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="image3258"> + <widget class="GtkImage" id="image3457"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -907,7 +907,7 @@ <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="image3259"> + <widget class="GtkImage" id="image3458"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -968,15 +968,6 @@ </child>
<child> - <widget class="GtkMenuItem" id="find_in_files1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Find in F_iles</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_find_in_files1_activate" last_modification_time="Thu, 06 Jul 2006 11:31:09 GMT"/> - </widget> - </child> - - <child> <widget class="GtkImageMenuItem" id="replace1"> <property name="visible">True</property> <property name="label" translatable="yes">_Replace</property> @@ -984,7 +975,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="image3260"> + <widget class="GtkImage" id="image3459"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -1028,6 +1019,51 @@ </child>
<child> + <widget class="GtkImageMenuItem" id="find_in_files1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Find in F_iles</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_find_in_files1_activate" last_modification_time="Thu, 06 Jul 2006 11:31:09 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image3460"> + <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="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"/> + </widget> + </child> + + <child> + <widget class="GtkMenuItem" 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"/> + </widget> + </child> + + <child> + <widget class="GtkSeparatorMenuItem" id="separator55"> + <property name="visible">True</property> + </widget> + </child> + + <child> <widget class="GtkImageMenuItem" id="next_message1"> <property name="visible">True</property> <property name="label" translatable="yes">Next _Message</property> @@ -1035,7 +1071,7 @@ <signal name="activate" handler="on_next_message1_activate" last_modification_time="Tue, 05 Dec 2006 11:15:02 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3261"> + <widget class="GtkImage" id="image3461"> <property name="visible">True</property> <property name="stock">gtk-go-down</property> <property name="icon_size">1</property> @@ -1056,7 +1092,7 @@ <signal name="activate" handler="on_previous_message1_activate" last_modification_time="Wed, 25 Jun 2008 12:10:04 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3262"> + <widget class="GtkImage" id="image3462"> <property name="visible">True</property> <property name="stock">gtk-go-up</property> <property name="icon_size">1</property> @@ -1083,7 +1119,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="image3263"> + <widget class="GtkImage" id="image3463"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -1095,6 +1131,24 @@ </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_definition1" last_modification_time="Thu, 09 Sep 2010 11:30:29 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_declaration1" last_modification_time="Thu, 09 Sep 2010 11:30:29 GMT"/> + </widget> + </child> </widget> </child> </widget> @@ -1117,7 +1171,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="image3264"> + <widget class="GtkImage" id="image3464"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1338,7 +1392,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">_Tabs</property> <property name="use_underline">True</property> - <property name="active">True</property> + <property name="active">False</property> <signal name="activate" handler="on_tabs1_activate" last_modification_time="Thu, 04 Oct 2007 16:07:51 GMT"/> </widget> </child> @@ -1348,7 +1402,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">_Spaces</property> <property name="use_underline">True</property> - <property name="active">True</property> + <property name="active">False</property> <property name="group">tabs1</property> <signal name="activate" handler="on_spaces1_activate" last_modification_time="Thu, 04 Oct 2007 16:07:51 GMT"/> </widget> @@ -1455,7 +1509,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Convert and Set to _CR/LF (Win)</property> <property name="use_underline">True</property> - <property name="active">True</property> + <property name="active">False</property> <signal name="activate" handler="on_crlf_activate" last_modification_time="Thu, 28 Apr 2005 16:27:24 GMT"/> </widget> </child> @@ -1465,7 +1519,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Convert and Set to _LF (Unix)</property> <property name="use_underline">True</property> - <property name="active">True</property> + <property name="active">False</property> <property name="group">crlf</property> <signal name="activate" handler="on_lf_activate" last_modification_time="Thu, 28 Apr 2005 16:27:24 GMT"/> </widget> @@ -1589,7 +1643,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="image3265"> + <widget class="GtkImage" id="image3465"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1610,7 +1664,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="image3266"> + <widget class="GtkImage" id="image3466"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1639,7 +1693,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="image3267"> + <widget class="GtkImage" id="image3467"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1696,7 +1750,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="image3268"> + <widget class="GtkImage" id="image3468"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -1716,7 +1770,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3269"> + <widget class="GtkImage" id="image3469"> <property name="visible">True</property> <property name="stock">gtk-file</property> <property name="icon_size">1</property> @@ -1743,7 +1797,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="image3270"> + <widget class="GtkImage" id="image3470"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1795,7 +1849,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="image3271"> + <widget class="GtkImage" id="image3471"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> @@ -2492,7 +2546,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3043"> + <widget class="GtkImage" id="image3411"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2571,7 +2625,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3044"> + <widget class="GtkImage" id="image3412"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2603,7 +2657,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3045"> + <widget class="GtkImage" id="image3413"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2642,7 +2696,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="image3046"> + <widget class="GtkImage" id="image3414"> <property name="visible">True</property> <property name="stock">gtk-find</property> <property name="icon_size">1</property> @@ -2663,7 +2717,7 @@ <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="image3047"> + <widget class="GtkImage" id="image3415"> <property name="visible">True</property> <property name="stock">gtk-find</property> <property name="icon_size">1</property> @@ -2681,7 +2735,7 @@ <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"/> + <signal name="activate" handler="on_goto_tag_definition1" last_modification_time="Thu, 09 Sep 2010 11:30:52 GMT"/> </widget> </child>
@@ -2690,7 +2744,7 @@ <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"/> + <signal name="activate" handler="on_goto_tag_declaration1" last_modification_time="Thu, 09 Sep 2010 11:30:52 GMT"/> </widget> </child>
@@ -2717,7 +2771,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="image3048"> + <widget class="GtkImage" id="image3416"> <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 2010-09-09 11:19:27 UTC (rev 5210) +++ trunk/src/callbacks.c 2010-09-09 11:58:55 UTC (rev 5211) @@ -485,7 +485,7 @@ charset = doc->encoding;
base_name = g_path_get_basename(doc->file_name); - if (!doc->changed || + if (!doc->changed || dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, _("Any unsaved changes will be lost."), _("Are you sure you want to reload '%s'?"), base_name)) @@ -1016,6 +1016,8 @@ } else { + editor_find_current_word(doc->editor, -1, + editor_info.current_word, GEANY_MAX_WORD_LENGTH, NULL); search_text = g_strdup(editor_info.current_word); flags = SCFIND_MATCHCASE | SCFIND_WHOLEWORD; } @@ -1041,12 +1043,8 @@ }
-void -on_goto_tag_activate (GtkMenuItem *menuitem, - gpointer user_data) +static void goto_tag(gboolean definition) { - gboolean definition = (menuitem == - GTK_MENU_ITEM(ui_lookup_widget(main_widgets.editor_menu, "goto_tag_definition1"))); GeanyDocument *doc = document_get_current();
g_return_if_fail(doc != NULL); @@ -1064,6 +1062,22 @@
void +on_goto_tag_definition1 (GtkMenuItem *menuitem, + gpointer user_data) +{ + goto_tag(TRUE); +} + + +void +on_goto_tag_declaration1 (GtkMenuItem *menuitem, + gpointer user_data) +{ + goto_tag(FALSE); +} + + +void on_count_words1_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -2332,3 +2346,4 @@ #endif }
+
Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2010-09-09 11:19:27 UTC (rev 5210) +++ trunk/src/callbacks.h 2010-09-09 11:58:55 UTC (rev 5211) @@ -175,10 +175,6 @@ gpointer user_data);
void -on_goto_tag_activate (GtkMenuItem *menuitem, - gpointer user_data); - -void on_construct_completion1_activate (GtkMenuItem *menuitem, gpointer user_data);
@@ -640,3 +636,11 @@ void on_plugin_preferences1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_goto_tag_definition1 (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_goto_tag_declaration1 (GtkMenuItem *menuitem, + gpointer user_data);
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2010-09-09 11:19:27 UTC (rev 5210) +++ trunk/src/interface.c 2010-09-09 11:58:55 UTC (rev 5211) @@ -38,7 +38,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image3245; + GtkWidget *image3444; 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 *image3246; + GtkWidget *image3445; GtkWidget *menu_reload1; - GtkWidget *image3247; + GtkWidget *image3446; GtkWidget *menu_reload_as1; - GtkWidget *image3248; + GtkWidget *image3447; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -62,9 +62,9 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *close_other_documents1; - GtkWidget *image3249; + GtkWidget *image3448; GtkWidget *menu_close_all1; - GtkWidget *image3250; + GtkWidget *image3449; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -90,9 +90,9 @@ GtkWidget *menu_toggle_line_commentation1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image3251; + GtkWidget *image3450; GtkWidget *menu_decrease_indent1; - GtkWidget *image3252; + GtkWidget *image3451; GtkWidget *smart_line_indent1; GtkWidget *separator37; GtkWidget *send_selection_to2; @@ -101,9 +101,9 @@ GtkWidget *commands2; GtkWidget *commands2_menu; GtkWidget *cut_current_line_s_1; - GtkWidget *image3253; + GtkWidget *image3452; GtkWidget *copy_current_line_s_1; - GtkWidget *image3254; + GtkWidget *image3453; GtkWidget *delete_current_line_s_1; GtkWidget *duplicate_line_or_selection1; GtkWidget *separator49; @@ -118,7 +118,7 @@ GtkWidget *send_selection_to_vte1; GtkWidget *separator18; GtkWidget *add_comments1; - GtkWidget *image3255; + GtkWidget *image3454; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -127,42 +127,48 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image3256; + GtkWidget *image3455; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *insert_include2; - GtkWidget *image3257; + GtkWidget *image3456; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *separator9; GtkWidget *preferences1; - GtkWidget *image3258; + GtkWidget *image3457; GtkWidget *plugin_preferences1; - GtkWidget *image3259; + GtkWidget *image3458; GtkWidget *search1; GtkWidget *search1_menu; GtkWidget *find1; GtkWidget *find_next1; GtkWidget *find_previous1; GtkWidget *separator54; - GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image3260; + GtkWidget *image3459; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; GtkWidget *separator35; + GtkWidget *find_in_files1; + GtkWidget *image3460; + GtkWidget *find_usage1; + GtkWidget *find_document_usage1; + GtkWidget *separator55; GtkWidget *next_message1; - GtkWidget *image3261; + GtkWidget *image3461; GtkWidget *previous_message1; - GtkWidget *image3262; + GtkWidget *image3462; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image3263; + GtkWidget *image3463; + GtkWidget *goto_tag_definition1; + GtkWidget *goto_tag_declaration1; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image3264; + GtkWidget *image3464; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -220,30 +226,30 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image3265; + GtkWidget *image3465; GtkWidget *project_open1; - GtkWidget *image3266; + GtkWidget *image3466; GtkWidget *recent_projects1; GtkWidget *project_close1; - GtkWidget *image3267; + GtkWidget *image3467; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_reload_configuration1; - GtkWidget *image3268; + GtkWidget *image3468; GtkWidget *configuration_files1; - GtkWidget *image3269; + GtkWidget *image3469; GtkWidget *separator47; GtkWidget *menu_choose_color1; - GtkWidget *image3270; + GtkWidget *image3470; GtkWidget *menu_count_words1; GtkWidget *load_tags1; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image3271; + GtkWidget *image3471; GtkWidget *website1; GtkWidget *keyboard_shortcuts1; GtkWidget *debug_messages1; @@ -310,9 +316,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1);
- image3245 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3245); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3245); + image3444 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3444); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3444);
separator12 = gtk_separator_menu_item_new (); gtk_widget_show (separator12); @@ -348,25 +354,25 @@ gtk_widget_show (menu_save_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1);
- image3246 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3246); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3246); + image3445 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3445); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3445);
menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1);
- image3247 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3247); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3247); + image3446 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3446); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3446);
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);
- image3248 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3248); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3248); + image3447 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3447); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3447);
menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -409,17 +415,17 @@ gtk_widget_show (close_other_documents1); gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1);
- image3249 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3249); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3249); + image3448 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3448); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3448);
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);
- image3250 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3250); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3250); + image3449 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3449); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3449);
menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -525,17 +531,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1);
- image3251 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3251); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3251); + image3450 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3450); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3450);
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);
- image3252 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3252); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3252); + image3451 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3451); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3451);
smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("_Smart Line Indent")); gtk_widget_show (smart_line_indent1); @@ -567,17 +573,17 @@ gtk_widget_show (cut_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1);
- image3253 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3253); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3253); + image3452 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3452); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3452);
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);
- image3254 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3254); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3254); + image3453 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3453); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3453);
delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("_Delete Current Line(s)")); gtk_widget_show (delete_current_line_s_1); @@ -640,9 +646,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1);
- image3255 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3255); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3255); + image3454 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3454); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3454);
add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -675,9 +681,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1);
- image3256 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3256); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3256); + image3455 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3455); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3455);
insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -689,9 +695,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2);
- image3257 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3257); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3257); + image3456 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3456); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3456);
insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -708,17 +714,17 @@ gtk_widget_show (preferences1); gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1);
- image3258 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3258); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3258); + image3457 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3457); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3457);
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);
- image3259 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3259); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image3259); + image3458 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3458); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image3458);
search1 = gtk_menu_item_new_with_mnemonic (_("_Search")); gtk_widget_show (search1); @@ -744,17 +750,13 @@ gtk_container_add (GTK_CONTAINER (search1_menu), separator54); gtk_widget_set_sensitive (separator54, FALSE);
- find_in_files1 = gtk_menu_item_new_with_mnemonic (_("Find in F_iles")); - gtk_widget_show (find_in_files1); - gtk_container_add (GTK_CONTAINER (search1_menu), find_in_files1); - replace1 = gtk_image_menu_item_new_with_mnemonic (_("_Replace")); gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1);
- image3260 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3260); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3260); + image3459 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3459); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3459);
separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -774,21 +776,42 @@ gtk_container_add (GTK_CONTAINER (search1_menu), separator35); gtk_widget_set_sensitive (separator35, FALSE);
+ find_in_files1 = gtk_image_menu_item_new_with_mnemonic (_("Find in F_iles")); + gtk_widget_show (find_in_files1); + gtk_container_add (GTK_CONTAINER (search1_menu), find_in_files1); + + image3460 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3460); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_in_files1), image3460); + + find_usage1 = gtk_menu_item_new_with_mnemonic (_("Find _Usage")); + gtk_widget_show (find_usage1); + gtk_container_add (GTK_CONTAINER (search1_menu), find_usage1); + + find_document_usage1 = gtk_menu_item_new_with_mnemonic (_("Find _Document Usage")); + gtk_widget_show (find_document_usage1); + gtk_container_add (GTK_CONTAINER (search1_menu), find_document_usage1); + + separator55 = gtk_separator_menu_item_new (); + gtk_widget_show (separator55); + gtk_container_add (GTK_CONTAINER (search1_menu), separator55); + gtk_widget_set_sensitive (separator55, FALSE); + next_message1 = gtk_image_menu_item_new_with_mnemonic (_("Next _Message")); gtk_widget_show (next_message1); gtk_container_add (GTK_CONTAINER (search1_menu), next_message1);
- image3261 = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3261); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (next_message1), image3261); + image3461 = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3461); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (next_message1), image3461);
previous_message1 = gtk_image_menu_item_new_with_mnemonic (_("Pr_evious Message")); gtk_widget_show (previous_message1); gtk_container_add (GTK_CONTAINER (search1_menu), previous_message1);
- image3262 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3262); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (previous_message1), image3262); + image3462 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3462); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (previous_message1), image3462);
separator32 = gtk_separator_menu_item_new (); gtk_widget_show (separator32); @@ -799,10 +822,18 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1);
- image3263 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3263); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3263); + image3463 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3463); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3463);
+ goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to _Tag Definition")); + gtk_widget_show (goto_tag_definition1); + gtk_container_add (GTK_CONTAINER (search1_menu), 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 (search1_menu), goto_tag_declaration1); + menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menu_view1); gtk_container_add (GTK_CONTAINER (menubar1), menu_view1); @@ -814,9 +845,9 @@ gtk_widget_show (menu_change_font1); gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1);
- image3264 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3264); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3264); + image3464 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3464); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3464);
menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -924,13 +955,11 @@ tabs1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (tabs1)); gtk_widget_show (tabs1); gtk_container_add (GTK_CONTAINER (indent_type1_menu), tabs1); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (tabs1), TRUE);
spaces1 = gtk_radio_menu_item_new_with_mnemonic (tabs1_group, _("_Spaces")); tabs1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (spaces1)); gtk_widget_show (spaces1); gtk_container_add (GTK_CONTAINER (indent_type1_menu), spaces1); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (spaces1), TRUE);
tabs_and_spaces1 = gtk_radio_menu_item_new_with_mnemonic (tabs1_group, _("T_abs and Spaces")); tabs1_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (tabs_and_spaces1)); @@ -987,13 +1016,11 @@ crlf_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (crlf)); gtk_widget_show (crlf); gtk_container_add (GTK_CONTAINER (menu_line_endings1_menu), crlf); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (crlf), TRUE);
lf = gtk_radio_menu_item_new_with_mnemonic (crlf_group, _("Convert and Set to _LF (Unix)")); crlf_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (lf)); gtk_widget_show (lf); gtk_container_add (GTK_CONTAINER (menu_line_endings1_menu), lf); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lf), TRUE);
cr = gtk_radio_menu_item_new_with_mnemonic (crlf_group, _("Convert and Set to CR (_Mac)")); crlf_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (cr)); @@ -1055,17 +1082,17 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1);
- image3265 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3265); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3265); + image3465 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3465); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3465);
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);
- image3266 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3266); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3266); + image3466 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3466); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3466);
recent_projects1 = gtk_menu_item_new_with_mnemonic (_("_Recent Projects")); gtk_widget_show (recent_projects1); @@ -1075,9 +1102,9 @@ gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1);
- image3267 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3267); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3267); + image3467 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3467); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3467);
separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -1103,17 +1130,17 @@ gtk_widget_show (menu_reload_configuration1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1);
- image3268 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3268); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3268); + image3468 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3468); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3468);
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);
- image3269 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3269); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3269); + image3469 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3469); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3469);
separator47 = gtk_separator_menu_item_new (); gtk_widget_show (separator47); @@ -1124,9 +1151,9 @@ gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1);
- image3270 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3270); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3270); + image3470 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3470); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3470);
menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -1147,9 +1174,9 @@ gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1);
- image3271 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3271); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3271); + image3471 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3471); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3471);
website1 = gtk_menu_item_new_with_mnemonic (_("_Website")); gtk_widget_show (website1); @@ -1464,9 +1491,6 @@ g_signal_connect ((gpointer) find_previous1, "activate", G_CALLBACK (on_find_previous1_activate), NULL); - g_signal_connect ((gpointer) find_in_files1, "activate", - G_CALLBACK (on_find_in_files1_activate), - NULL); g_signal_connect ((gpointer) replace1, "activate", G_CALLBACK (on_replace1_activate), NULL); @@ -1476,6 +1500,15 @@ g_signal_connect ((gpointer) find_prevsel1, "activate", G_CALLBACK (on_find_prevsel1_activate), NULL); + g_signal_connect ((gpointer) find_in_files1, "activate", + G_CALLBACK (on_find_in_files1_activate), + NULL); + 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) next_message1, "activate", G_CALLBACK (on_next_message1_activate), NULL); @@ -1485,6 +1518,12 @@ g_signal_connect ((gpointer) go_to_line1, "activate", G_CALLBACK (on_go_to_line_activate), NULL); + g_signal_connect ((gpointer) goto_tag_definition1, "activate", + G_CALLBACK (on_goto_tag_definition1), + NULL); + g_signal_connect ((gpointer) goto_tag_declaration1, "activate", + G_CALLBACK (on_goto_tag_declaration1), + NULL); g_signal_connect ((gpointer) menu_change_font1, "activate", G_CALLBACK (on_change_font1_activate), NULL); @@ -1649,7 +1688,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, image3245, "image3245"); + GLADE_HOOKUP_OBJECT (window1, image3444, "image3444"); 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"); @@ -1658,11 +1697,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, image3246, "image3246"); + GLADE_HOOKUP_OBJECT (window1, image3445, "image3445"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image3247, "image3247"); + GLADE_HOOKUP_OBJECT (window1, image3446, "image3446"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image3248, "image3248"); + GLADE_HOOKUP_OBJECT (window1, image3447, "image3447"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1673,9 +1712,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, image3249, "image3249"); + GLADE_HOOKUP_OBJECT (window1, image3448, "image3448"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image3250, "image3250"); + GLADE_HOOKUP_OBJECT (window1, image3449, "image3449"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1701,9 +1740,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, image3251, "image3251"); + GLADE_HOOKUP_OBJECT (window1, image3450, "image3450"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image3252, "image3252"); + GLADE_HOOKUP_OBJECT (window1, image3451, "image3451"); GLADE_HOOKUP_OBJECT (window1, smart_line_indent1, "smart_line_indent1"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2, "send_selection_to2"); @@ -1712,9 +1751,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, image3253, "image3253"); + GLADE_HOOKUP_OBJECT (window1, image3452, "image3452"); GLADE_HOOKUP_OBJECT (window1, copy_current_line_s_1, "copy_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image3254, "image3254"); + GLADE_HOOKUP_OBJECT (window1, image3453, "image3453"); 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"); @@ -1729,7 +1768,7 @@ GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image3255, "image3255"); + GLADE_HOOKUP_OBJECT (window1, image3454, "image3454"); 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"); @@ -1738,42 +1777,48 @@ 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, image3256, "image3256"); + GLADE_HOOKUP_OBJECT (window1, image3455, "image3455"); 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, image3257, "image3257"); + GLADE_HOOKUP_OBJECT (window1, image3456, "image3456"); 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, image3258, "image3258"); + GLADE_HOOKUP_OBJECT (window1, image3457, "image3457"); GLADE_HOOKUP_OBJECT (window1, plugin_preferences1, "plugin_preferences1"); - GLADE_HOOKUP_OBJECT (window1, image3259, "image3259"); + GLADE_HOOKUP_OBJECT (window1, image3458, "image3458"); GLADE_HOOKUP_OBJECT (window1, search1, "search1"); GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu"); GLADE_HOOKUP_OBJECT (window1, find1, "find1"); GLADE_HOOKUP_OBJECT (window1, find_next1, "find_next1"); GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, separator54, "separator54"); - GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image3260, "image3260"); + GLADE_HOOKUP_OBJECT (window1, image3459, "image3459"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); GLADE_HOOKUP_OBJECT (window1, separator35, "separator35"); + GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); + GLADE_HOOKUP_OBJECT (window1, image3460, "image3460"); + GLADE_HOOKUP_OBJECT (window1, find_usage1, "find_usage1"); + GLADE_HOOKUP_OBJECT (window1, find_document_usage1, "find_document_usage1"); + GLADE_HOOKUP_OBJECT (window1, separator55, "separator55"); GLADE_HOOKUP_OBJECT (window1, next_message1, "next_message1"); - GLADE_HOOKUP_OBJECT (window1, image3261, "image3261"); + GLADE_HOOKUP_OBJECT (window1, image3461, "image3461"); GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1"); - GLADE_HOOKUP_OBJECT (window1, image3262, "image3262"); + GLADE_HOOKUP_OBJECT (window1, image3462, "image3462"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image3263, "image3263"); + GLADE_HOOKUP_OBJECT (window1, image3463, "image3463"); + GLADE_HOOKUP_OBJECT (window1, goto_tag_definition1, "goto_tag_definition1"); + GLADE_HOOKUP_OBJECT (window1, goto_tag_declaration1, "goto_tag_declaration1"); 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, image3264, "image3264"); + GLADE_HOOKUP_OBJECT (window1, image3464, "image3464"); 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"); @@ -1829,30 +1874,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, image3265, "image3265"); + GLADE_HOOKUP_OBJECT (window1, image3465, "image3465"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image3266, "image3266"); + GLADE_HOOKUP_OBJECT (window1, image3466, "image3466"); GLADE_HOOKUP_OBJECT (window1, recent_projects1, "recent_projects1"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image3267, "image3267"); + GLADE_HOOKUP_OBJECT (window1, image3467, "image3467"); 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, image3268, "image3268"); + GLADE_HOOKUP_OBJECT (window1, image3468, "image3468"); GLADE_HOOKUP_OBJECT (window1, configuration_files1, "configuration_files1"); - GLADE_HOOKUP_OBJECT (window1, image3269, "image3269"); + GLADE_HOOKUP_OBJECT (window1, image3469, "image3469"); GLADE_HOOKUP_OBJECT (window1, separator47, "separator47"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image3270, "image3270"); + GLADE_HOOKUP_OBJECT (window1, image3470, "image3470"); 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, image3271, "image3271"); + GLADE_HOOKUP_OBJECT (window1, image3471, "image3471"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1"); @@ -1962,7 +2007,7 @@ GtkWidget *commands1; GtkWidget *separator17; GtkWidget *comments; - GtkWidget *image3043; + GtkWidget *image3411; GtkWidget *comments_menu; GtkWidget *add_changelog_entry2; GtkWidget *insert_file_header2; @@ -1971,24 +2016,24 @@ GtkWidget *insert_gpl_notice1; GtkWidget *insert_bsd_license_notice1; GtkWidget *insert_date2; - GtkWidget *image3044; + GtkWidget *image3412; GtkWidget *insert_date2_menu; GtkWidget *invisible10; GtkWidget *insert_include1; - GtkWidget *image3045; + GtkWidget *image3413; GtkWidget *insert_include1_menu; GtkWidget *invisible3; GtkWidget *separator7; GtkWidget *find_usage1; - GtkWidget *image3046; + GtkWidget *image3414; GtkWidget *find_document_usage1; - GtkWidget *image3047; + GtkWidget *image3415; GtkWidget *goto_tag_definition1; GtkWidget *goto_tag_declaration1; GtkWidget *context_action1; GtkWidget *separator15; GtkWidget *go_to_line; - GtkWidget *image3048; + GtkWidget *image3416; GtkAccelGroup *accel_group;
accel_group = gtk_accel_group_new (); @@ -2064,9 +2109,9 @@ gtk_widget_show (comments); gtk_container_add (GTK_CONTAINER (edit_menu1), comments);
- image3043 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3043); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image3043); + image3411 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3411); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image3411);
comments_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu); @@ -2099,9 +2144,9 @@ gtk_widget_show (insert_date2); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2);
- image3044 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3044); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image3044); + image3412 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3412); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image3412);
insert_date2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date2), insert_date2_menu); @@ -2113,9 +2158,9 @@ gtk_widget_show (insert_include1); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1);
- image3045 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3045); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image3045); + image3413 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3413); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image3413);
insert_include1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); @@ -2132,17 +2177,17 @@ gtk_widget_show (find_usage1); gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1);
- image3046 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3046); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image3046); + image3414 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3414); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image3414);
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);
- image3047 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3047); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_document_usage1), image3047); + image3415 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3415); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_document_usage1), image3415);
goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to _Tag Definition")); gtk_widget_show (goto_tag_definition1); @@ -2165,9 +2210,9 @@ gtk_widget_show (go_to_line); gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line);
- image3048 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3048); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image3048); + image3416 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3416); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image3416);
g_signal_connect ((gpointer) undo1, "activate", G_CALLBACK (on_undo1_activate), @@ -2218,10 +2263,10 @@ G_CALLBACK (on_find_document_usage1_activate), NULL); g_signal_connect ((gpointer) goto_tag_definition1, "activate", - G_CALLBACK (on_goto_tag_activate), + G_CALLBACK (on_goto_tag_definition1), NULL); g_signal_connect ((gpointer) goto_tag_declaration1, "activate", - G_CALLBACK (on_goto_tag_activate), + G_CALLBACK (on_goto_tag_declaration1), NULL); g_signal_connect ((gpointer) context_action1, "activate", G_CALLBACK (on_context_action1_activate), @@ -2248,7 +2293,7 @@ GLADE_HOOKUP_OBJECT (edit_menu1, commands1, "commands1"); GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17"); GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments"); - GLADE_HOOKUP_OBJECT (edit_menu1, image3043, "image3043"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3411, "image3411"); 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"); @@ -2257,24 +2302,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, image3044, "image3044"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3412, "image3412"); 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, image3045, "image3045"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3413, "image3413"); 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, image3046, "image3046"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3414, "image3414"); GLADE_HOOKUP_OBJECT (edit_menu1, find_document_usage1, "find_document_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image3047, "image3047"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3415, "image3415"); 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, image3048, "image3048"); + GLADE_HOOKUP_OBJECT (edit_menu1, image3416, "image3416");
gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group);
Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2010-09-09 11:19:27 UTC (rev 5210) +++ trunk/src/keybindings.c 2010-09-09 11:58:55 UTC (rev 5211) @@ -405,9 +405,9 @@ keybindings_set_item(group, GEANY_KEYS_SEARCH_PREVIOUSMESSAGE, NULL, 0, 0, "menu_previousmessage", _("Previous Message"), LW(previous_message1)); keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDUSAGE, NULL, - 0, 0, "popup_findusage", _("Find Usage"), NULL); + 0, 0, "popup_findusage", _("Find Usage"), LW(find_usage1)); keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, NULL, - 0, 0, "popup_finddocumentusage", _("Find Document Usage"), NULL); + 0, 0, "popup_finddocumentusage", _("Find Document Usage"), LW(find_document_usage1)); keybindings_set_item(group, GEANY_KEYS_SEARCH_MARKALL, NULL, GDK_m, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "find_markall", _("Mark All"), NULL);
@@ -432,9 +432,9 @@ GDK_comma, GDK_CONTROL_MASK, "edit_gotopreviousmarker", _("_Go to Previous Marker"), LW(go_to_previous_marker1)); keybindings_set_item(group, GEANY_KEYS_GOTO_TAGDEFINITION, NULL, - 0, 0, "popup_gototagdefinition", _("Go to Tag Definition"), NULL); + 0, 0, "popup_gototagdefinition", _("Go to Tag Definition"), LW(goto_tag_definition1)); keybindings_set_item(group, GEANY_KEYS_GOTO_TAGDECLARATION, NULL, - 0, 0, "popup_gototagdeclaration", _("Go to Tag Declaration"), NULL); + 0, 0, "popup_gototagdeclaration", _("Go to Tag Declaration"), LW(goto_tag_declaration1)); keybindings_set_item(group, GEANY_KEYS_GOTO_LINESTART, NULL, GDK_Home, 0, "edit_gotolinestart", _("Go to Start of Line"), NULL); keybindings_set_item(group, GEANY_KEYS_GOTO_LINEEND, NULL,
Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2010-09-09 11:19:27 UTC (rev 5210) +++ trunk/src/ui_utils.c 2010-09-09 11:58:55 UTC (rev 5211) @@ -732,7 +732,11 @@ add_doc_widget("replace1"); add_doc_widget("find_nextsel1"); add_doc_widget("find_prevsel1"); + add_doc_widget("find_usage1"); + add_doc_widget("find_document_usage1"); add_doc_widget("go_to_line1"); + add_doc_widget("goto_tag_definition1"); + add_doc_widget("goto_tag_declaration1"); add_doc_toolitem("Close"); add_doc_toolitem("CloseAll"); add_doc_toolitem("Search");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.