Revision: 4384 http://geany.svn.sourceforge.net/geany/?rev=4384&view=rev Author: ntrel Date: 2009-10-28 11:33:11 +0000 (Wed, 28 Oct 2009)
Log Message: ----------- Add 'Reflow, Transpose, Smart line indent' Edit->Format menu items.
Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c trunk/src/keybindings.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/ChangeLog 2009-10-28 11:33:11 UTC (rev 4384) @@ -2,6 +2,9 @@
* src/ui_utils.c: Desensitize Edit->Commands menu item when no docs are open. + * src/interface.c, src/keybindings.c, src/callbacks.c, + src/callbacks.h, geany.glade: + Add 'Reflow, Transpose, Smart line indent' Edit->Format menu items.
2009-10-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/geany.glade 2009-10-28 11:33:11 UTC (rev 4384) @@ -67,7 +67,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3021"> + <widget class="GtkImage" id="image3072"> <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="image3022"> + <widget class="GtkImage" id="image3073"> <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="image3023"> + <widget class="GtkImage" id="image3074"> <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="image3024"> + <widget class="GtkImage" id="image3075"> <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="image3025"> + <widget class="GtkImage" id="image3076"> <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="image3026"> + <widget class="GtkImage" id="image3077"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -426,6 +426,15 @@ <widget class="GtkMenu" id="menu_format1_menu">
<child> + <widget class="GtkMenuItem" id="reflow_lines/block1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Reflow Lines/Block</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_reflow_lines/block1_activate" last_modification_time="Wed, 28 Oct 2009 11:13:48 GMT"/> + </widget> + </child> + + <child> <widget class="GtkMenuItem" id="menu_toggle_case2"> <property name="visible">True</property> <property name="label" translatable="yes">T_oggle Case of Selection</property> @@ -435,6 +444,15 @@ </child>
<child> + <widget class="GtkMenuItem" id="transpose_current_line1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Transpose Current Line</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_transpose_current_line1_activate" last_modification_time="Wed, 28 Oct 2009 11:13:48 GMT"/> + </widget> + </child> + + <child> <widget class="GtkSeparatorMenuItem" id="separator28"> <property name="visible">True</property> </widget> @@ -481,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="image3027"> + <widget class="GtkImage" id="image3078"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -502,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="image3028"> + <widget class="GtkImage" id="image3079"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -516,6 +534,15 @@ </child>
<child> + <widget class="GtkMenuItem" id="smart_line_indent1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Smart Line Indent</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_smart_line_indent1_activate" last_modification_time="Wed, 28 Oct 2009 11:13:48 GMT"/> + </widget> + </child> + + <child> <widget class="GtkSeparatorMenuItem" id="separator37"> <property name="visible">True</property> </widget> @@ -561,7 +588,7 @@ <property name="use_underline">True</property>
<child> - <widget class="GtkMenu" id="commands1_menu"> + <widget class="GtkMenu" id="commands2_menu">
<child> <widget class="GtkImageMenuItem" id="cut_current_line(s)1"> @@ -571,7 +598,7 @@ <signal name="activate" handler="on_cut_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3013"> + <widget class="GtkImage" id="image3080"> <property name="visible">True</property> <property name="stock">gtk-cut</property> <property name="icon_size">1</property> @@ -592,7 +619,7 @@ <signal name="activate" handler="on_copy_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3014"> + <widget class="GtkImage" id="image3081"> <property name="visible">True</property> <property name="stock">gtk-copy</property> <property name="icon_size">1</property> @@ -703,7 +730,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3029"> + <widget class="GtkImage" id="image3082"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -782,7 +809,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3030"> + <widget class="GtkImage" id="image3083"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -814,7 +841,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3031"> + <widget class="GtkImage" id="image3084"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -853,7 +880,7 @@ <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image3032"> + <widget class="GtkImage" id="image3085"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -924,7 +951,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="image3033"> + <widget class="GtkImage" id="image3086"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -999,7 +1026,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="image3034"> + <widget class="GtkImage" id="image3087"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -1033,7 +1060,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="image3035"> + <widget class="GtkImage" id="image3088"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1505,7 +1532,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="image3036"> + <widget class="GtkImage" id="image3089"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1526,7 +1553,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="image3037"> + <widget class="GtkImage" id="image3090"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1555,7 +1582,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="image3038"> + <widget class="GtkImage" id="image3091"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1612,7 +1639,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="image3039"> + <widget class="GtkImage" id="image3092"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -1632,7 +1659,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image3040"> + <widget class="GtkImage" id="image3093"> <property name="visible">True</property> <property name="stock">gtk-file</property> <property name="icon_size">1</property> @@ -1659,7 +1686,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="image3041"> + <widget class="GtkImage" id="image3094"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1711,7 +1738,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="image3042"> + <widget class="GtkImage" id="image3095"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property>
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/src/callbacks.c 2009-10-28 11:33:11 UTC (rev 4384) @@ -2341,3 +2341,27 @@ keybindings_send_command(GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_PREVIOUSMARKER); }
+ +void +on_reflow_lines_block1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH); +} + + +void +on_transpose_current_line1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_TRANSPOSELINE); +} + + +void +on_smart_line_indent1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + keybindings_send_command(GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_AUTOINDENT); +} +
Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/src/callbacks.h 2009-10-28 11:33:11 UTC (rev 4384) @@ -648,3 +648,15 @@ void on_go_to_previous_marker1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_reflow_lines_block1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_transpose_current_line1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_smart_line_indent1_activate (GtkMenuItem *menuitem, + gpointer user_data);
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/src/interface.c 2009-10-28 11:33:11 UTC (rev 4384) @@ -38,7 +38,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image3021; + GtkWidget *image3072; 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 *image3022; + GtkWidget *image3073; GtkWidget *menu_reload1; - GtkWidget *image3023; + GtkWidget *image3074; GtkWidget *menu_reload_as1; - GtkWidget *image3024; + GtkWidget *image3075; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -62,9 +62,9 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *close_other_documents1; - GtkWidget *image3025; + GtkWidget *image3076; GtkWidget *menu_close_all1; - GtkWidget *image3026; + GtkWidget *image3077; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -81,27 +81,30 @@ GtkWidget *separator25; GtkWidget *menu_format1; GtkWidget *menu_format1_menu; + GtkWidget *reflow_lines_block1; GtkWidget *menu_toggle_case2; + GtkWidget *transpose_current_line1; GtkWidget *separator28; GtkWidget *menu_comment_line1; GtkWidget *menu_uncomment_line1; GtkWidget *menu_toggle_line_commentation1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image3027; + GtkWidget *image3078; GtkWidget *menu_decrease_indent1; - GtkWidget *image3028; + GtkWidget *image3079; + GtkWidget *smart_line_indent1; GtkWidget *separator37; GtkWidget *send_selection_to_vte1; GtkWidget *send_selection_to2; GtkWidget *send_selection_to2_menu; GtkWidget *invisible13; GtkWidget *commands2; - GtkWidget *commands1_menu; + GtkWidget *commands2_menu; GtkWidget *cut_current_line_s_1; - GtkWidget *image3013; + GtkWidget *image3080; GtkWidget *copy_current_line_s_1; - GtkWidget *image3014; + GtkWidget *image3081; GtkWidget *delete_current_line_s_1; GtkWidget *duplicate_line_or_selection1; GtkWidget *separator49; @@ -114,7 +117,7 @@ GtkWidget *go_to_previous_marker1; GtkWidget *separator18; GtkWidget *add_comments1; - GtkWidget *image3029; + GtkWidget *image3082; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -123,16 +126,16 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image3030; + GtkWidget *image3083; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *insert_include2; - GtkWidget *image3031; + GtkWidget *image3084; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *separator9; GtkWidget *preferences1; - GtkWidget *image3032; + GtkWidget *image3085; GtkWidget *search1; GtkWidget *search1_menu; GtkWidget *find1; @@ -140,7 +143,7 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image3033; + GtkWidget *image3086; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -149,11 +152,11 @@ GtkWidget *previous_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image3034; + GtkWidget *image3087; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image3035; + GtkWidget *image3088; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -211,30 +214,30 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image3036; + GtkWidget *image3089; GtkWidget *project_open1; - GtkWidget *image3037; + GtkWidget *image3090; GtkWidget *recent_projects1; GtkWidget *project_close1; - GtkWidget *image3038; + GtkWidget *image3091; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_reload_configuration1; - GtkWidget *image3039; + GtkWidget *image3092; GtkWidget *configuration_files1; - GtkWidget *image3040; + GtkWidget *image3093; GtkWidget *separator47; GtkWidget *menu_choose_color1; - GtkWidget *image3041; + GtkWidget *image3094; GtkWidget *menu_count_words1; GtkWidget *load_tags1; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image3042; + GtkWidget *image3095; GtkWidget *website1; GtkWidget *keyboard_shortcuts1; GtkWidget *debug_messages1; @@ -301,9 +304,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1);
- image3021 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3021); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3021); + image3072 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3072); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3072);
separator12 = gtk_separator_menu_item_new (); gtk_widget_show (separator12); @@ -339,25 +342,25 @@ gtk_widget_show (menu_save_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1);
- image3022 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3022); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3022); + image3073 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3073); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3073);
menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1);
- image3023 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3023); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3023); + image3074 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3074); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3074);
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);
- image3024 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3024); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3024); + image3075 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3075); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3075);
menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -400,17 +403,17 @@ gtk_widget_show (close_other_documents1); gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1);
- image3025 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3025); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3025); + image3076 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3076); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3076);
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);
- image3026 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3026); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3026); + image3077 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3077); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3077);
menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -478,10 +481,18 @@ menu_format1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_format1), menu_format1_menu);
+ reflow_lines_block1 = gtk_menu_item_new_with_mnemonic (_("Reflow Lines/Block")); + gtk_widget_show (reflow_lines_block1); + gtk_container_add (GTK_CONTAINER (menu_format1_menu), reflow_lines_block1); + menu_toggle_case2 = gtk_menu_item_new_with_mnemonic (_("T_oggle Case of Selection")); gtk_widget_show (menu_toggle_case2); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_toggle_case2);
+ transpose_current_line1 = gtk_menu_item_new_with_mnemonic (_("Transpose Current Line")); + gtk_widget_show (transpose_current_line1); + gtk_container_add (GTK_CONTAINER (menu_format1_menu), transpose_current_line1); + separator28 = gtk_separator_menu_item_new (); gtk_widget_show (separator28); gtk_container_add (GTK_CONTAINER (menu_format1_menu), separator28); @@ -508,18 +519,22 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1);
- image3027 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3027); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3027); + image3078 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3078); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3078);
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);
- image3028 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3028); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3028); + image3079 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3079); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3079);
+ smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("Smart Line Indent")); + gtk_widget_show (smart_line_indent1); + gtk_container_add (GTK_CONTAINER (menu_format1_menu), smart_line_indent1); + separator37 = gtk_separator_menu_item_new (); gtk_widget_show (separator37); gtk_container_add (GTK_CONTAINER (menu_format1_menu), separator37); @@ -543,67 +558,67 @@ gtk_widget_show (commands2); gtk_container_add (GTK_CONTAINER (edit1_menu), commands2);
- commands1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (commands2), commands1_menu); + commands2_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (commands2), commands2_menu);
cut_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("Cut current line(s)")); gtk_widget_show (cut_current_line_s_1); - gtk_container_add (GTK_CONTAINER (commands1_menu), cut_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1);
- image3013 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3013); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3013); + image3080 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3080); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3080);
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 (commands1_menu), copy_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), copy_current_line_s_1);
- image3014 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3014); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3014); + image3081 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3081); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3081);
delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("Delete current line(s)")); gtk_widget_show (delete_current_line_s_1); - gtk_container_add (GTK_CONTAINER (commands1_menu), delete_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), delete_current_line_s_1);
duplicate_line_or_selection1 = gtk_menu_item_new_with_mnemonic (_("Duplicate line or selection")); gtk_widget_show (duplicate_line_or_selection1); - gtk_container_add (GTK_CONTAINER (commands1_menu), duplicate_line_or_selection1); + gtk_container_add (GTK_CONTAINER (commands2_menu), duplicate_line_or_selection1);
separator49 = gtk_separator_menu_item_new (); gtk_widget_show (separator49); - gtk_container_add (GTK_CONTAINER (commands1_menu), separator49); + gtk_container_add (GTK_CONTAINER (commands2_menu), separator49); gtk_widget_set_sensitive (separator49, FALSE);
select_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("Select current line(s)")); gtk_widget_show (select_current_line_s_1); - gtk_container_add (GTK_CONTAINER (commands1_menu), select_current_line_s_1); + gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_line_s_1);
select_current_paragraph1 = gtk_menu_item_new_with_mnemonic (_("Select current paragraph")); gtk_widget_show (select_current_paragraph1); - gtk_container_add (GTK_CONTAINER (commands1_menu), select_current_paragraph1); + gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_paragraph1);
separator50 = gtk_separator_menu_item_new (); gtk_widget_show (separator50); - gtk_container_add (GTK_CONTAINER (commands1_menu), separator50); + gtk_container_add (GTK_CONTAINER (commands2_menu), separator50); gtk_widget_set_sensitive (separator50, FALSE);
insert_alternative_white_space1 = gtk_menu_item_new_with_mnemonic (_("Insert alternative white space")); gtk_widget_show (insert_alternative_white_space1); - gtk_container_add (GTK_CONTAINER (commands1_menu), insert_alternative_white_space1); + gtk_container_add (GTK_CONTAINER (commands2_menu), insert_alternative_white_space1);
separator51 = gtk_separator_menu_item_new (); gtk_widget_show (separator51); - gtk_container_add (GTK_CONTAINER (commands1_menu), separator51); + gtk_container_add (GTK_CONTAINER (commands2_menu), separator51); gtk_widget_set_sensitive (separator51, FALSE);
go_to_next_marker1 = gtk_menu_item_new_with_mnemonic (_("Go to next marker")); gtk_widget_show (go_to_next_marker1); - gtk_container_add (GTK_CONTAINER (commands1_menu), go_to_next_marker1); + gtk_container_add (GTK_CONTAINER (commands2_menu), go_to_next_marker1);
go_to_previous_marker1 = gtk_menu_item_new_with_mnemonic (_("Go to previous marker")); gtk_widget_show (go_to_previous_marker1); - gtk_container_add (GTK_CONTAINER (commands1_menu), go_to_previous_marker1); + gtk_container_add (GTK_CONTAINER (commands2_menu), go_to_previous_marker1);
separator18 = gtk_separator_menu_item_new (); gtk_widget_show (separator18); @@ -614,9 +629,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1);
- image3029 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3029); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3029); + image3082 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3082); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3082);
add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -649,9 +664,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1);
- image3030 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3030); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3030); + image3083 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3083); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3083);
insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -663,9 +678,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2);
- image3031 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3031); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3031); + image3084 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3084); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3084);
insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -682,9 +697,9 @@ gtk_widget_show (preferences1); gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1);
- image3032 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3032); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3032); + image3085 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3085); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3085);
search1 = gtk_menu_item_new_with_mnemonic (_("_Search")); gtk_widget_show (search1); @@ -713,9 +728,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1);
- image3033 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3033); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3033); + image3086 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3086); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3086);
separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -752,9 +767,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1);
- image3034 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3034); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3034); + image3087 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3087); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3087);
menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menu_view1); @@ -767,9 +782,9 @@ gtk_widget_show (menu_change_font1); gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1);
- image3035 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3035); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3035); + image3088 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3088); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3088);
menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -1008,17 +1023,17 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1);
- image3036 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3036); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3036); + image3089 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3089); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3089);
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);
- image3037 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3037); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3037); + image3090 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3090); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3090);
recent_projects1 = gtk_menu_item_new_with_mnemonic (_("_Recent Projects")); gtk_widget_show (recent_projects1); @@ -1028,9 +1043,9 @@ gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1);
- image3038 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3038); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3038); + image3091 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3091); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3091);
separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -1056,17 +1071,17 @@ gtk_widget_show (menu_reload_configuration1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1);
- image3039 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3039); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3039); + image3092 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3092); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3092);
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);
- image3040 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3040); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3040); + image3093 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3093); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3093);
separator47 = gtk_separator_menu_item_new (); gtk_widget_show (separator47); @@ -1077,9 +1092,9 @@ gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1);
- image3041 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3041); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3041); + image3094 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3094); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3094);
menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -1100,9 +1115,9 @@ gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1);
- image3042 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image3042); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3042); + image3095 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image3095); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3095);
website1 = gtk_menu_item_new_with_mnemonic (_("_Website")); gtk_widget_show (website1); @@ -1324,9 +1339,15 @@ g_signal_connect ((gpointer) menu_select_all1, "activate", G_CALLBACK (on_menu_select_all1_activate), NULL); + g_signal_connect ((gpointer) reflow_lines_block1, "activate", + G_CALLBACK (on_reflow_lines_block1_activate), + NULL); g_signal_connect ((gpointer) menu_toggle_case2, "activate", G_CALLBACK (on_toggle_case1_activate), NULL); + g_signal_connect ((gpointer) transpose_current_line1, "activate", + G_CALLBACK (on_transpose_current_line1_activate), + NULL); g_signal_connect ((gpointer) menu_comment_line1, "activate", G_CALLBACK (on_menu_comment_line1_activate), NULL); @@ -1342,6 +1363,9 @@ g_signal_connect ((gpointer) menu_decrease_indent1, "activate", G_CALLBACK (on_menu_decrease_indent1_activate), NULL); + g_signal_connect ((gpointer) smart_line_indent1, "activate", + G_CALLBACK (on_smart_line_indent1_activate), + NULL); g_signal_connect ((gpointer) send_selection_to_vte1, "activate", G_CALLBACK (on_send_selection_to_vte1_activate), NULL); @@ -1590,7 +1614,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, image3021, "image3021"); + GLADE_HOOKUP_OBJECT (window1, image3072, "image3072"); 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"); @@ -1599,11 +1623,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, image3022, "image3022"); + GLADE_HOOKUP_OBJECT (window1, image3073, "image3073"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image3023, "image3023"); + GLADE_HOOKUP_OBJECT (window1, image3074, "image3074"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image3024, "image3024"); + GLADE_HOOKUP_OBJECT (window1, image3075, "image3075"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1614,9 +1638,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, image3025, "image3025"); + GLADE_HOOKUP_OBJECT (window1, image3076, "image3076"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image3026, "image3026"); + GLADE_HOOKUP_OBJECT (window1, image3077, "image3077"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1633,27 +1657,30 @@ GLADE_HOOKUP_OBJECT (window1, separator25, "separator25"); GLADE_HOOKUP_OBJECT (window1, menu_format1, "menu_format1"); GLADE_HOOKUP_OBJECT (window1, menu_format1_menu, "menu_format1_menu"); + GLADE_HOOKUP_OBJECT (window1, reflow_lines_block1, "reflow_lines_block1"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_case2, "menu_toggle_case2"); + GLADE_HOOKUP_OBJECT (window1, transpose_current_line1, "transpose_current_line1"); GLADE_HOOKUP_OBJECT (window1, separator28, "separator28"); GLADE_HOOKUP_OBJECT (window1, menu_comment_line1, "menu_comment_line1"); GLADE_HOOKUP_OBJECT (window1, menu_uncomment_line1, "menu_uncomment_line1"); 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, image3027, "image3027"); + GLADE_HOOKUP_OBJECT (window1, image3078, "image3078"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image3028, "image3028"); + GLADE_HOOKUP_OBJECT (window1, image3079, "image3079"); + GLADE_HOOKUP_OBJECT (window1, smart_line_indent1, "smart_line_indent1"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2, "send_selection_to2"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2_menu, "send_selection_to2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible13, "invisible13"); GLADE_HOOKUP_OBJECT (window1, commands2, "commands2"); - GLADE_HOOKUP_OBJECT (window1, commands1_menu, "commands1_menu"); + 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, image3013, "image3013"); + GLADE_HOOKUP_OBJECT (window1, image3080, "image3080"); GLADE_HOOKUP_OBJECT (window1, copy_current_line_s_1, "copy_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image3014, "image3014"); + GLADE_HOOKUP_OBJECT (window1, image3081, "image3081"); 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"); @@ -1666,7 +1693,7 @@ GLADE_HOOKUP_OBJECT (window1, go_to_previous_marker1, "go_to_previous_marker1"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image3029, "image3029"); + GLADE_HOOKUP_OBJECT (window1, image3082, "image3082"); 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"); @@ -1675,16 +1702,16 @@ 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, image3030, "image3030"); + GLADE_HOOKUP_OBJECT (window1, image3083, "image3083"); 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, image3031, "image3031"); + GLADE_HOOKUP_OBJECT (window1, image3084, "image3084"); 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, image3032, "image3032"); + GLADE_HOOKUP_OBJECT (window1, image3085, "image3085"); GLADE_HOOKUP_OBJECT (window1, search1, "search1"); GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu"); GLADE_HOOKUP_OBJECT (window1, find1, "find1"); @@ -1692,7 +1719,7 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image3033, "image3033"); + GLADE_HOOKUP_OBJECT (window1, image3086, "image3086"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1701,11 +1728,11 @@ GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image3034, "image3034"); + GLADE_HOOKUP_OBJECT (window1, image3087, "image3087"); 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, image3035, "image3035"); + GLADE_HOOKUP_OBJECT (window1, image3088, "image3088"); 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"); @@ -1761,30 +1788,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, image3036, "image3036"); + GLADE_HOOKUP_OBJECT (window1, image3089, "image3089"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image3037, "image3037"); + GLADE_HOOKUP_OBJECT (window1, image3090, "image3090"); GLADE_HOOKUP_OBJECT (window1, recent_projects1, "recent_projects1"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image3038, "image3038"); + GLADE_HOOKUP_OBJECT (window1, image3091, "image3091"); 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, image3039, "image3039"); + GLADE_HOOKUP_OBJECT (window1, image3092, "image3092"); GLADE_HOOKUP_OBJECT (window1, configuration_files1, "configuration_files1"); - GLADE_HOOKUP_OBJECT (window1, image3040, "image3040"); + GLADE_HOOKUP_OBJECT (window1, image3093, "image3093"); GLADE_HOOKUP_OBJECT (window1, separator47, "separator47"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image3041, "image3041"); + GLADE_HOOKUP_OBJECT (window1, image3094, "image3094"); 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, image3042, "image3042"); + GLADE_HOOKUP_OBJECT (window1, image3095, "image3095"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1");
Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2009-10-28 11:06:31 UTC (rev 4383) +++ trunk/src/keybindings.c 2009-10-28 11:33:11 UTC (rev 4384) @@ -264,8 +264,10 @@ keybindings_set_item(group, GEANY_KEYS_EDITOR_DELETELINETOEND, NULL, GDK_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_deletelinetoend", _("Delete to line end"), NULL); + /* transpose may fit better in format group */ keybindings_set_item(group, GEANY_KEYS_EDITOR_TRANSPOSELINE, NULL, - GDK_t, GDK_CONTROL_MASK, "edit_transposeline", _("Transpose current line"), NULL); + GDK_t, GDK_CONTROL_MASK, "edit_transposeline", _("Transpose Current Line"), + LW(transpose_current_line1)); keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLTOLINE, NULL, GDK_l, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_scrolltoline", _("Scroll to current line"), NULL); keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLLINEUP, NULL, @@ -348,7 +350,7 @@ keybindings_set_item(group, GEANY_KEYS_FORMAT_DECREASEINDENTBYSPACE, NULL, 0, 0, "edit_decreaseindentbyspace", _("Decrease indent by one space"), NULL); keybindings_set_item(group, GEANY_KEYS_FORMAT_AUTOINDENT, NULL, - 0, 0, "edit_autoindent", _("Smart line indent"), NULL); + 0, 0, "edit_autoindent", _("Smart Line Indent"), LW(smart_line_indent1)); keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD1, NULL, GDK_1, GDK_CONTROL_MASK, "edit_sendtocmd1", _("Send to Custom Command 1"), NULL); keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD2, NULL, @@ -358,7 +360,8 @@ keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOVTE, NULL, 0, 0, "edit_sendtovte", _("Send Selection to Terminal"), LW(send_selection_to_vte1)); keybindings_set_item(group, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH, NULL, - GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("Reflow lines/block"), NULL); + GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("Reflow Lines/Block"), + LW(reflow_lines_block1));
group = ADD_KB_GROUP(INSERT, _("Insert"), cb_func_insert_action);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.