Revision: 2709 http://geany.svn.sourceforge.net/geany/?rev=2709&view=rev Author: eht16 Date: 2008-06-19 07:34:53 -0700 (Thu, 19 Jun 2008)
Log Message: ----------- Add "Replace spaces by tabs".
Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/editor.c trunk/src/editor.h trunk/src/interface.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-06-19 14:31:09 UTC (rev 2708) +++ trunk/ChangeLog 2008-06-19 14:34:53 UTC (rev 2709) @@ -2,6 +2,9 @@
* src/dialogs.c, src/dialogs.c: Add dialogs_show_input_numeric(). + * geany.glade, src/callbacks.c, src/callbacks.h, src/editor.c, + src/editor.h, src/interface.c: + Add "Replace spaces by tabs".
2008-06-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-06-19 14:31:09 UTC (rev 2708) +++ trunk/geany.glade 2008-06-19 14:34:53 UTC (rev 2709) @@ -58,7 +58,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image2367"> + <widget class="GtkImage" id="image2409"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -148,7 +148,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="image2368"> + <widget class="GtkImage" id="image2410"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -169,7 +169,7 @@ <signal name="activate" handler="on_toolbutton23_clicked" last_modification_time="Mon, 24 Jul 2006 19:26:04 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image2369"> + <widget class="GtkImage" id="image2411"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -189,7 +189,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image2370"> + <widget class="GtkImage" id="image2412"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -278,7 +278,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="image2371"> + <widget class="GtkImage" id="image2413"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -477,7 +477,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="image2372"> + <widget class="GtkImage" id="image2414"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -498,7 +498,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="image2373"> + <widget class="GtkImage" id="image2415"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -554,7 +554,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image2374"> + <widget class="GtkImage" id="image2416"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -639,7 +639,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image2375"> + <widget class="GtkImage" id="image2417"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -671,7 +671,7 @@ <property name="use_underline">True</property>
<child internal-child="image"> - <widget class="GtkImage" id="image2376"> + <widget class="GtkImage" id="image2418"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -768,7 +768,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="image2377"> + <widget class="GtkImage" id="image2419"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -834,7 +834,7 @@ <signal name="activate" handler="on_go_to_line1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/>
<child internal-child="image"> - <widget class="GtkImage" id="image2378"> + <widget class="GtkImage" id="image2420"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -869,7 +869,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="image2379"> + <widget class="GtkImage" id="image2421"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1216,6 +1216,16 @@ </child>
<child> + <widget class="GtkMenuItem" id="menu_replace_spaces"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Replaces all spaces in the document by tab characters.</property> + <property name="label" translatable="yes">Replace Spaces b_y Tabs</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_replace_spaces_activate" last_modification_time="Wed, 18 Jun 2008 18:56:33 GMT"/> + </widget> + </child> + + <child> <widget class="GtkSeparatorMenuItem" id="separator22"> <property name="visible">True</property> </widget> @@ -1288,7 +1298,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="image2380"> + <widget class="GtkImage" id="image2422"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1309,7 +1319,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="image2381"> + <widget class="GtkImage" id="image2423"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1330,7 +1340,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="image2382"> + <widget class="GtkImage" id="image2424"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1389,7 +1399,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="image2383"> + <widget class="GtkImage" id="image2425"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1443,7 +1453,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="image2384"> + <widget class="GtkImage" id="image2426"> <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 2008-06-19 14:31:09 UTC (rev 2708) +++ trunk/src/callbacks.c 2008-06-19 14:34:53 UTC (rev 2709) @@ -2148,3 +2148,13 @@
doc->line_breaking = !doc->line_breaking; } + +void +on_replace_spaces_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + GeanyDocument *doc = document_get_current(); + + editor_replace_spaces(doc); +} +
Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2008-06-19 14:31:09 UTC (rev 2708) +++ trunk/src/callbacks.h 2008-06-19 14:34:53 UTC (rev 2709) @@ -602,3 +602,7 @@ on_line_breaking1_activate (GtkMenuItem *menuitem, gpointer user_data);
+ +void +on_replace_spaces_activate (GtkMenuItem *menuitem, + gpointer user_data);
Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-06-19 14:31:09 UTC (rev 2708) +++ trunk/src/editor.c 2008-06-19 14:34:53 UTC (rev 2709) @@ -44,6 +44,7 @@ #include "sciwrappers.h" #include "ui_utils.h" #include "utils.h" +#include "dialogs.h" #include "symbols.h"
@@ -3136,14 +3137,62 @@ sci_target_start(doc->sci, search_pos); sci_target_end(doc->sci, search_pos + 1); sci_target_replace(doc->sci, tab_str, FALSE); - ttf.chrg.cpMin = search_pos + current_tab_true_length - 1; /* next search starts after replacement */ - ttf.chrg.cpMax += current_tab_true_length - 1; /* update end of range now text has changed */ + /* next search starts after replacement */ + ttf.chrg.cpMin = search_pos + current_tab_true_length - 1; + /* update end of range now text has changed */ + ttf.chrg.cpMax += current_tab_true_length - 1; g_free(tab_str); } sci_end_undo_action(doc->sci); }
+/* Replaces all occurrences all spaces of the length of a given tab_width. */ +void editor_replace_spaces(GeanyDocument *doc) +{ + gint search_pos; + static gdouble tab_len_f = -1.0; /* keep the last used value */ + gint tab_len; + struct TextToFind ttf; + + if (doc == NULL) + return; + + if (tab_len_f < 0.0) + tab_len_f = sci_get_tab_width(doc->sci); + + if (! dialogs_show_input_numeric( + _("Enter Tab Width"), + _("Enter the amount of spaces which should be replaced by a tab character."), + &tab_len_f, 1, 100, 1)) + { + return; + } + tab_len = (gint) tab_len_f; + + sci_start_undo_action(doc->sci); + ttf.chrg.cpMin = 0; + ttf.chrg.cpMax = sci_get_length(doc->sci); + ttf.lpstrText = g_strnfill(tab_len, ' '); + + while (TRUE) + { + search_pos = sci_find_text(doc->sci, SCFIND_MATCHCASE, &ttf); + if (search_pos == -1) + break; + + sci_target_start(doc->sci, search_pos); + sci_target_end(doc->sci, search_pos + tab_len); + sci_target_replace(doc->sci, "\t", FALSE); + ttf.chrg.cpMin = search_pos; + /* update end of range now text has changed */ + ttf.chrg.cpMax -= tab_len - 1; + } + sci_end_undo_action(doc->sci); + g_free(ttf.lpstrText); +} + + void editor_strip_line_trailing_spaces(GeanyDocument *doc, gint line) { gint line_start = sci_get_position_from_line(doc->sci, line);
Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2008-06-19 14:31:09 UTC (rev 2708) +++ trunk/src/editor.h 2008-06-19 14:34:53 UTC (rev 2709) @@ -189,6 +189,8 @@
void editor_replace_tabs(GeanyDocument *doc);
+void editor_replace_spaces(GeanyDocument *doc); + void editor_strip_line_trailing_spaces(GeanyDocument *doc, gint line);
void editor_strip_trailing_spaces(GeanyDocument *doc);
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-06-19 14:31:09 UTC (rev 2708) +++ trunk/src/interface.c 2008-06-19 14:34:53 UTC (rev 2709) @@ -37,7 +37,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image2367; + GtkWidget *image2409; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -48,11 +48,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image2368; + GtkWidget *image2410; GtkWidget *menu_reload1; - GtkWidget *image2369; + GtkWidget *image2411; GtkWidget *menu_reload_as1; - GtkWidget *image2370; + GtkWidget *image2412; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -63,7 +63,7 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image2371; + GtkWidget *image2413; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -88,16 +88,16 @@ GtkWidget *menu_duplicate_line1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image2372; + GtkWidget *image2414; GtkWidget *menu_decrease_indent1; - GtkWidget *image2373; + GtkWidget *image2415; GtkWidget *separator37; GtkWidget *send_selection_to2; GtkWidget *send_selection_to2_menu; GtkWidget *invisible13; GtkWidget *separator18; GtkWidget *add_comments1; - GtkWidget *image2374; + GtkWidget *image2416; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -106,11 +106,11 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image2375; + GtkWidget *image2417; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *insert_include2; - GtkWidget *image2376; + GtkWidget *image2418; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *separator9; @@ -122,7 +122,7 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image2377; + GtkWidget *image2419; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -130,11 +130,11 @@ GtkWidget *next_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image2378; + GtkWidget *image2420; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image2379; + GtkWidget *image2421; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -176,6 +176,7 @@ GtkWidget *separator8; GtkWidget *strip_trailing_spaces1; GtkWidget *menu_replace_tabs; + GtkWidget *menu_replace_spaces; GtkWidget *separator22; GtkWidget *menu_fold_all1; GtkWidget *menu_unfold_all1; @@ -185,24 +186,24 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image2380; + GtkWidget *image2422; GtkWidget *project_open1; - GtkWidget *image2381; + GtkWidget *image2423; GtkWidget *project_close1; - GtkWidget *image2382; + GtkWidget *image2424; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_choose_color1; - GtkWidget *image2383; + GtkWidget *image2425; GtkWidget *menu_count_words1; GtkWidget *load_tags1; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image2384; + GtkWidget *image2426; GtkWidget *keyboard_shortcuts1; GtkWidget *website1; GtkWidget *separator16; @@ -305,9 +306,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1);
- image2367 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2367); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2367); + image2409 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2409); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2409);
menu_new_with_template1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); @@ -350,25 +351,25 @@ gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL);
- image2368 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2368); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2368); + image2410 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2410); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2410);
menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1);
- image2369 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2369); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2369); + image2411 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2411); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2411);
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);
- image2370 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2370); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2370); + image2412 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2412); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2412);
menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -413,9 +414,9 @@ gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL);
- image2371 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2371); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2371); + image2413 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2413); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2413);
menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -519,17 +520,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1);
- image2372 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2372); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2372); + image2414 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2414); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2414);
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);
- image2373 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2373); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2373); + image2415 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2415); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2415);
separator37 = gtk_separator_menu_item_new (); gtk_widget_show (separator37); @@ -555,9 +556,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1);
- image2374 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2374); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2374); + image2416 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2416); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2416);
add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -596,9 +597,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1);
- image2375 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2375); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2375); + image2417 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2417); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2417);
insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -610,9 +611,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2);
- image2376 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2376); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2376); + image2418 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2418); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2418);
insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -656,9 +657,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1);
- image2377 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2377); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2377); + image2419 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2419); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2419);
separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -691,9 +692,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1);
- image2378 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2378); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2378); + image2420 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2420); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2420);
menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menu_view1); @@ -707,9 +708,9 @@ gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL);
- image2379 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2379); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2379); + image2421 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2421); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2421);
menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -889,6 +890,11 @@ gtk_container_add (GTK_CONTAINER (menu_document1_menu), menu_replace_tabs); gtk_tooltips_set_tip (tooltips, menu_replace_tabs, _("Replaces all tabs in document by spaces."), NULL);
+ menu_replace_spaces = gtk_menu_item_new_with_mnemonic (_("Replace Spaces b_y Tabs")); + gtk_widget_show (menu_replace_spaces); + gtk_container_add (GTK_CONTAINER (menu_document1_menu), menu_replace_spaces); + gtk_tooltips_set_tip (tooltips, menu_replace_spaces, _("Replaces all spaces in the document by tab characters."), NULL); + separator22 = gtk_separator_menu_item_new (); gtk_widget_show (separator22); gtk_container_add (GTK_CONTAINER (menu_document1_menu), separator22); @@ -929,25 +935,25 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1);
- image2380 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2380); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2380); + image2422 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2422); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2422);
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);
- image2381 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2381); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2381); + image2423 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2423); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2423);
project_close1 = gtk_image_menu_item_new_with_mnemonic (_("_Close")); gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1);
- image2382 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2382); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2382); + image2424 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2424); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2424);
separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -974,9 +980,9 @@ gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL);
- image2383 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2383); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2383); + image2425 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2425); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2425);
menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -999,9 +1005,9 @@ gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1);
- image2384 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2384); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2384); + image2426 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2426); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2426);
keyboard_shortcuts1 = gtk_menu_item_new_with_mnemonic (_("_Keyboard Shortcuts")); gtk_widget_show (keyboard_shortcuts1); @@ -1536,6 +1542,9 @@ g_signal_connect ((gpointer) menu_replace_tabs, "activate", G_CALLBACK (on_replace_tabs_activate), NULL); + g_signal_connect ((gpointer) menu_replace_spaces, "activate", + G_CALLBACK (on_replace_spaces_activate), + NULL); g_signal_connect ((gpointer) menu_fold_all1, "activate", G_CALLBACK (on_menu_fold_all1_activate), NULL); @@ -1687,7 +1696,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, image2367, "image2367"); + GLADE_HOOKUP_OBJECT (window1, image2409, "image2409"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); @@ -1698,11 +1707,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, image2368, "image2368"); + GLADE_HOOKUP_OBJECT (window1, image2410, "image2410"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image2369, "image2369"); + GLADE_HOOKUP_OBJECT (window1, image2411, "image2411"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image2370, "image2370"); + GLADE_HOOKUP_OBJECT (window1, image2412, "image2412"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1713,7 +1722,7 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image2371, "image2371"); + GLADE_HOOKUP_OBJECT (window1, image2413, "image2413"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1738,16 +1747,16 @@ GLADE_HOOKUP_OBJECT (window1, menu_duplicate_line1, "menu_duplicate_line1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image2372, "image2372"); + GLADE_HOOKUP_OBJECT (window1, image2414, "image2414"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image2373, "image2373"); + GLADE_HOOKUP_OBJECT (window1, image2415, "image2415"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); 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, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image2374, "image2374"); + GLADE_HOOKUP_OBJECT (window1, image2416, "image2416"); 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"); @@ -1756,11 +1765,11 @@ 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, image2375, "image2375"); + GLADE_HOOKUP_OBJECT (window1, image2417, "image2417"); 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, image2376, "image2376"); + GLADE_HOOKUP_OBJECT (window1, image2418, "image2418"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); @@ -1772,7 +1781,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, image2377, "image2377"); + GLADE_HOOKUP_OBJECT (window1, image2419, "image2419"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1780,11 +1789,11 @@ GLADE_HOOKUP_OBJECT (window1, next_message1, "next_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image2378, "image2378"); + GLADE_HOOKUP_OBJECT (window1, image2420, "image2420"); 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, image2379, "image2379"); + GLADE_HOOKUP_OBJECT (window1, image2421, "image2421"); 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"); @@ -1824,6 +1833,7 @@ GLADE_HOOKUP_OBJECT (window1, separator8, "separator8"); GLADE_HOOKUP_OBJECT (window1, strip_trailing_spaces1, "strip_trailing_spaces1"); GLADE_HOOKUP_OBJECT (window1, menu_replace_tabs, "menu_replace_tabs"); + GLADE_HOOKUP_OBJECT (window1, menu_replace_spaces, "menu_replace_spaces"); GLADE_HOOKUP_OBJECT (window1, separator22, "separator22"); GLADE_HOOKUP_OBJECT (window1, menu_fold_all1, "menu_fold_all1"); GLADE_HOOKUP_OBJECT (window1, menu_unfold_all1, "menu_unfold_all1"); @@ -1833,24 +1843,24 @@ 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, image2380, "image2380"); + GLADE_HOOKUP_OBJECT (window1, image2422, "image2422"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image2381, "image2381"); + GLADE_HOOKUP_OBJECT (window1, image2423, "image2423"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image2382, "image2382"); + GLADE_HOOKUP_OBJECT (window1, image2424, "image2424"); 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_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image2383, "image2383"); + GLADE_HOOKUP_OBJECT (window1, image2425, "image2425"); 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, image2384, "image2384"); + GLADE_HOOKUP_OBJECT (window1, image2426, "image2426"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, separator16, "separator16");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.