SF.net SVN: geany:[2844] branches/custom-tab-width - Commits

31 Jul 2008

Revision: 2844
          http://geany.svn.sourceforge.net/geany/?rev=2844&view=rev
Author:   ntrel
Date:     2008-07-31 14:47:03 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
Add 'Tabs and Spaces' Document menu indent option.
Modified Paths:
--------------
    branches/custom-tab-width/ChangeLog
    branches/custom-tab-width/geany.glade
    branches/custom-tab-width/src/editor.h
    branches/custom-tab-width/src/interface.c
Modified: branches/custom-tab-width/ChangeLog
===================================================================

--- branches/custom-tab-width/ChangeLog	2008-07-30 18:22:51 UTC (rev 2843)
+++ branches/custom-tab-width/ChangeLog	2008-07-31 14:47:03 UTC (rev 2844)
@@ -1,3 +1,9 @@
+2008-07-31  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/interface.c, src/editor.h, geany.glade:
+   Add 'Tabs and Spaces' Document menu indent option.
+
+
 2008-07-30  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
* src/keyfile.c, src/editor.h:
Modified: branches/custom-tab-width/geany.glade
===================================================================
--- branches/custom-tab-width/geany.glade	2008-07-30 18:22:51 UTC (rev 2843)
+++ branches/custom-tab-width/geany.glade	2008-07-31 14:47:03 UTC (rev 2844)
@@ -58,7 +58,7 @@
    	      <property name="use_underline">True</property>
<child internal-child="image">
-			<widget class="GtkImage" id="image2548">
+			<widget class="GtkImage" id="image2576">
    		  <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="image2549">
+			<widget class="GtkImage" id="image2577">
    		  <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="image2550">
+			<widget class="GtkImage" id="image2578">
    		  <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="image2551">
+			<widget class="GtkImage" id="image2579">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-revert-to-saved</property>
    		  <property name="icon_size">1</property>
@@ -277,7 +277,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="image2552">
+			<widget class="GtkImage" id="image2580">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-close</property>
    		  <property name="icon_size">1</property>
@@ -299,7 +299,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="image2553">
+			<widget class="GtkImage" id="image2581">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-close</property>
    		  <property name="icon_size">1</property>
@@ -498,7 +498,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="image2554">
+				<widget class="GtkImage" id="image2582">
    			  <property name="visible">True</property>
    			  <property name="stock">gtk-indent</property>
    			  <property name="icon_size">1</property>
@@ -519,7 +519,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="image2555">
+				<widget class="GtkImage" id="image2583">
    			  <property name="visible">True</property>
    			  <property name="stock">gtk-unindent</property>
    			  <property name="icon_size">1</property>
@@ -575,7 +575,7 @@
    	      <property name="use_underline">True</property>
<child internal-child="image">
-			<widget class="GtkImage" id="image2556">
+			<widget class="GtkImage" id="image2584">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-add</property>
    		  <property name="icon_size">1</property>
@@ -660,7 +660,7 @@
    	      <property name="use_underline">True</property>
<child internal-child="image">
-			<widget class="GtkImage" id="image2557">
+			<widget class="GtkImage" id="image2585">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-add</property>
    		  <property name="icon_size">1</property>
@@ -692,7 +692,7 @@
    	      <property name="use_underline">True</property>
<child internal-child="image">
-			<widget class="GtkImage" id="image2558">
+			<widget class="GtkImage" id="image2586">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-add</property>
    		  <property name="icon_size">1</property>
@@ -790,7 +790,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="image2559">
+			<widget class="GtkImage" id="image2587">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-find-and-replace</property>
    		  <property name="icon_size">1</property>
@@ -865,7 +865,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="image2560">
+			<widget class="GtkImage" id="image2588">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-jump-to</property>
    		  <property name="icon_size">1</property>
@@ -900,7 +900,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="image2561">
+			<widget class="GtkImage" id="image2589">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-select-font</property>
    		  <property name="icon_size">1</property>
@@ -1098,6 +1098,17 @@
    		      <signal name="activate" handler="on_spaces1_activate" last_modification_time="Thu, 04 Oct 2007 16:07:51 GMT"/>
    		    </widget>
    		  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="tabs_and_spaces1">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">T_abs and Spaces</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">False</property>
+			      <property name="group">tabs1</property>
+			      <signal name="activate" handler="on_tabs_and_spaces1_activate" last_modification_time="Thu, 31 Jul 2008 14:23:06 GMT"/>
+			    </widget>
+			  </child>
    		</widget>
    	      </child>
    	    </widget>
@@ -1329,7 +1340,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="image2562">
+			<widget class="GtkImage" id="image2590">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-new</property>
    		  <property name="icon_size">1</property>
@@ -1350,7 +1361,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="image2563">
+			<widget class="GtkImage" id="image2591">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-open</property>
    		  <property name="icon_size">1</property>
@@ -1371,7 +1382,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="image2564">
+			<widget class="GtkImage" id="image2592">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-close</property>
    		  <property name="icon_size">1</property>
@@ -1430,7 +1441,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="image2565">
+			<widget class="GtkImage" id="image2593">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-select-color</property>
    		  <property name="icon_size">1</property>
@@ -1472,7 +1483,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="image2566">
+			<widget class="GtkImage" id="image2594">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-refresh</property>
    		  <property name="icon_size">1</property>
@@ -1506,7 +1517,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="image2567">
+			<widget class="GtkImage" id="image2595">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-help</property>
    		  <property name="icon_size">1</property>
@@ -5538,7 +5549,7 @@
    			      <property name="visible">True</property>
    			      <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property>
    			      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">T_abs &amp; Spaces</property>
+				      <property name="label" translatable="yes">T_abs and Spaces</property>
    			      <property name="use_underline">True</property>
    			      <property name="relief">GTK_RELIEF_NORMAL</property>
    			      <property name="focus_on_click">True</property>
Modified: branches/custom-tab-width/src/editor.h
===================================================================
--- branches/custom-tab-width/src/editor.h	2008-07-30 18:22:51 UTC (rev 2843)
+++ branches/custom-tab-width/src/editor.h	2008-07-31 14:47:03 UTC (rev 2844)
@@ -125,7 +125,7 @@
    gboolean		 auto_indent;	/**< @c TRUE if auto-indentation is enabled. */
    /** Percentage to scroll view by on paint, if positive. */
    gfloat			 scroll_percent;
-	gboolean		 use_tabs;		/**< @c TRUE if tabs are used for indentation. */
+	GeanyIndentType	 indent_type;	/* Use editor_get_indent_prefs() instead. */
    gboolean		 line_breaking;	/**< Whether to split long lines as you type. */
 }
 GeanyEditor;
@@ -235,8 +235,10 @@
void editor_insert_color(GeanyDocument *doc, const gchar *colour);
-void editor_set_use_tabs(GeanyEditor *editor, gboolean use_tabs);
+const GeanyIndentPrefs *editor_get_indent_prefs(GeanyEditor *editor);
+void editor_set_indent_type(GeanyEditor *editor, GeanyIndentType type);
+
 void editor_set_line_wrapping(GeanyEditor *editor, gboolean wrap);
gboolean editor_goto_pos(GeanyEditor *editor, gint pos, gboolean mark);
Modified: branches/custom-tab-width/src/interface.c
===================================================================
--- branches/custom-tab-width/src/interface.c	2008-07-30 18:22:51 UTC (rev 2843)
+++ branches/custom-tab-width/src/interface.c	2008-07-31 14:47:03 UTC (rev 2844)
@@ -37,7 +37,7 @@
   GtkWidget *file1_menu;
   GtkWidget *menu_new1;
   GtkWidget *menu_new_with_template1;
-  GtkWidget *image2548;
+  GtkWidget *image2576;
   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 *image2549;
+  GtkWidget *image2577;
   GtkWidget *menu_reload1;
-  GtkWidget *image2550;
+  GtkWidget *image2578;
   GtkWidget *menu_reload_as1;
-  GtkWidget *image2551;
+  GtkWidget *image2579;
   GtkWidget *menu_reload_as1_menu;
   GtkWidget *invisible7;
   GtkWidget *separator21;
@@ -63,9 +63,9 @@
   GtkWidget *separator14;
   GtkWidget *menu_close1;
   GtkWidget *close_other_documents1;
-  GtkWidget *image2552;
+  GtkWidget *image2580;
   GtkWidget *menu_close_all1;
-  GtkWidget *image2553;
+  GtkWidget *image2581;
   GtkWidget *menu_separatormenuitem1;
   GtkWidget *menu_quit1;
   GtkWidget *edit1;
@@ -90,16 +90,16 @@
   GtkWidget *menu_duplicate_line1;
   GtkWidget *separator29;
   GtkWidget *menu_increase_indent1;
-  GtkWidget *image2554;
+  GtkWidget *image2582;
   GtkWidget *menu_decrease_indent1;
-  GtkWidget *image2555;
+  GtkWidget *image2583;
   GtkWidget *separator37;
   GtkWidget *send_selection_to2;
   GtkWidget *send_selection_to2_menu;
   GtkWidget *invisible13;
   GtkWidget *separator18;
   GtkWidget *add_comments1;
-  GtkWidget *image2556;
+  GtkWidget *image2584;
   GtkWidget *add_comments1_menu;
   GtkWidget *menu_add_changelog_entry1;
   GtkWidget *insert_file_header1;
@@ -108,11 +108,11 @@
   GtkWidget *insert_gpl_notice2;
   GtkWidget *insert_bsd_license_notice2;
   GtkWidget *insert_date1;
-  GtkWidget *image2557;
+  GtkWidget *image2585;
   GtkWidget *insert_date1_menu;
   GtkWidget *invisible8;
   GtkWidget *insert_include2;
-  GtkWidget *image2558;
+  GtkWidget *image2586;
   GtkWidget *insert_include2_menu;
   GtkWidget *invisible4;
   GtkWidget *separator9;
@@ -124,7 +124,7 @@
   GtkWidget *find_previous1;
   GtkWidget *find_in_files1;
   GtkWidget *replace1;
-  GtkWidget *image2559;
+  GtkWidget *image2587;
   GtkWidget *separator33;
   GtkWidget *find_nextsel1;
   GtkWidget *find_prevsel1;
@@ -133,11 +133,11 @@
   GtkWidget *previous_message1;
   GtkWidget *separator32;
   GtkWidget *go_to_line1;
-  GtkWidget *image2560;
+  GtkWidget *image2588;
   GtkWidget *menu_view1;
   GtkWidget *menu_view1_menu;
   GtkWidget *menu_change_font1;
-  GtkWidget *image2561;
+  GtkWidget *image2589;
   GtkWidget *menu_separator4;
   GtkWidget *menu_toggle_all_additional_widgets1;
   GtkWidget *menu_fullscreen1;
@@ -160,6 +160,7 @@
   GSList *tabs1_group = NULL;
   GtkWidget *tabs1;
   GtkWidget *spaces1;
+  GtkWidget *tabs_and_spaces1;
   GtkWidget *separator45;
   GtkWidget *set_file_readonly1;
   GtkWidget *menu_write_unicode_bom1;
@@ -189,26 +190,26 @@
   GtkWidget *menu_project1;
   GtkWidget *menu_project1_menu;
   GtkWidget *project_new1;
-  GtkWidget *image2562;
+  GtkWidget *image2590;
   GtkWidget *project_open1;
-  GtkWidget *image2563;
+  GtkWidget *image2591;
   GtkWidget *project_close1;
-  GtkWidget *image2564;
+  GtkWidget *image2592;
   GtkWidget *separator34;
   GtkWidget *project_properties1;
   GtkWidget *menu_build1;
   GtkWidget *tools1;
   GtkWidget *tools1_menu;
   GtkWidget *menu_choose_color1;
-  GtkWidget *image2565;
+  GtkWidget *image2593;
   GtkWidget *menu_count_words1;
   GtkWidget *load_tags1;
   GtkWidget *menu_reload_configuration1;
-  GtkWidget *image2566;
+  GtkWidget *image2594;
   GtkWidget *menu_help1;
   GtkWidget *menu_help1_menu;
   GtkWidget *help1;
-  GtkWidget *image2567;
+  GtkWidget *image2595;
   GtkWidget *keyboard_shortcuts1;
   GtkWidget *website1;
   GtkWidget *separator16;
@@ -311,9 +312,9 @@
   gtk_widget_show (menu_new_with_template1);
   gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1);
-  image2548 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2548);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2548);
+  image2576 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2576);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2576);
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);
@@ -356,25 +357,25 @@
   gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1);
   gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL);
-  image2549 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2549);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2549);
+  image2577 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2577);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2577);
menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload"));
   gtk_widget_show (menu_reload1);
   gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1);
-  image2550 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2550);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2550);
+  image2578 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2578);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2578);
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);
-  image2551 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2551);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2551);
+  image2579 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2579);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2579);
menu_reload_as1_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu);
@@ -418,18 +419,18 @@
   gtk_widget_show (close_other_documents1);
   gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1);
-  image2552 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2552);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image2552);
+  image2580 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2580);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image2580);
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);
   gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL);
-  image2553 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2553);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2553);
+  image2581 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2581);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2581);
menu_separatormenuitem1 = gtk_separator_menu_item_new ();
   gtk_widget_show (menu_separatormenuitem1);
@@ -533,17 +534,17 @@
   gtk_widget_show (menu_increase_indent1);
   gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1);
-  image2554 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2554);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2554);
+  image2582 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2582);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2582);
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);
-  image2555 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2555);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2555);
+  image2583 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2583);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2583);
separator37 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator37);
@@ -569,9 +570,9 @@
   gtk_widget_show (add_comments1);
   gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1);
-  image2556 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2556);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2556);
+  image2584 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2584);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2584);
add_comments1_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu);
@@ -610,9 +611,9 @@
   gtk_widget_show (insert_date1);
   gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1);
-  image2557 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2557);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2557);
+  image2585 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2585);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2585);
insert_date1_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu);
@@ -624,9 +625,9 @@
   gtk_widget_show (insert_include2);
   gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2);
-  image2558 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2558);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2558);
+  image2586 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2586);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2586);
insert_include2_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu);
@@ -670,9 +671,9 @@
   gtk_widget_show (replace1);
   gtk_container_add (GTK_CONTAINER (search1_menu), replace1);
-  image2559 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2559);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2559);
+  image2587 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2587);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2587);
separator33 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator33);
@@ -709,9 +710,9 @@
   gtk_widget_show (go_to_line1);
   gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1);
-  image2560 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2560);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2560);
+  image2588 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2588);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2588);
menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View"));
   gtk_widget_show (menu_view1);
@@ -725,9 +726,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);
-  image2561 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2561);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2561);
+  image2589 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2589);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2589);
menu_separator4 = gtk_separator_menu_item_new ();
   gtk_widget_show (menu_separator4);
@@ -829,6 +830,11 @@
   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));
+  gtk_widget_show (tabs_and_spaces1);
+  gtk_container_add (GTK_CONTAINER (indent_type1_menu), tabs_and_spaces1);
+
   separator45 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator45);
   gtk_container_add (GTK_CONTAINER (menu_document1_menu), separator45);
@@ -952,25 +958,25 @@
   gtk_widget_show (project_new1);
   gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1);
-  image2562 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2562);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2562);
+  image2590 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2590);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2590);
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);
-  image2563 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2563);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2563);
+  image2591 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2591);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2591);
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);
-  image2564 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2564);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2564);
+  image2592 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2592);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2592);
separator34 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator34);
@@ -997,9 +1003,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);
-  image2565 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2565);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2565);
+  image2593 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2593);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2593);
menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count"));
   gtk_widget_show (menu_count_words1);
@@ -1016,9 +1022,9 @@
   gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1);
   gtk_tooltips_set_tip (tooltips, menu_reload_configuration1, _("Reload configuration data like snippets, templates and filetype extensions."), NULL);
-  image2566 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2566);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image2566);
+  image2594 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2594);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image2594);
menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help"));
   gtk_widget_show (menu_help1);
@@ -1031,9 +1037,9 @@
   gtk_widget_show (help1);
   gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1);
-  image2567 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2567);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2567);
+  image2595 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2595);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2595);
keyboard_shortcuts1 = gtk_menu_item_new_with_mnemonic (_("_Keyboard Shortcuts"));
   gtk_widget_show (keyboard_shortcuts1);
@@ -1556,6 +1562,9 @@
   g_signal_connect ((gpointer) spaces1, "activate",
                     G_CALLBACK (on_spaces1_activate),
                     NULL);
+  g_signal_connect ((gpointer) tabs_and_spaces1, "activate",
+                    G_CALLBACK (on_tabs_and_spaces1_activate),
+                    NULL);
   g_signal_connect ((gpointer) set_file_readonly1, "toggled",
                     G_CALLBACK (on_set_file_readonly1_toggled),
                     NULL);
@@ -1734,7 +1743,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, image2548, "image2548");
+  GLADE_HOOKUP_OBJECT (window1, image2576, "image2576");
   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");
@@ -1745,11 +1754,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, image2549, "image2549");
+  GLADE_HOOKUP_OBJECT (window1, image2577, "image2577");
   GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1");
-  GLADE_HOOKUP_OBJECT (window1, image2550, "image2550");
+  GLADE_HOOKUP_OBJECT (window1, image2578, "image2578");
   GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1");
-  GLADE_HOOKUP_OBJECT (window1, image2551, "image2551");
+  GLADE_HOOKUP_OBJECT (window1, image2579, "image2579");
   GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu");
   GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7");
   GLADE_HOOKUP_OBJECT (window1, separator21, "separator21");
@@ -1760,9 +1769,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, image2552, "image2552");
+  GLADE_HOOKUP_OBJECT (window1, image2580, "image2580");
   GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1");
-  GLADE_HOOKUP_OBJECT (window1, image2553, "image2553");
+  GLADE_HOOKUP_OBJECT (window1, image2581, "image2581");
   GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1");
   GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1");
   GLADE_HOOKUP_OBJECT (window1, edit1, "edit1");
@@ -1787,16 +1796,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, image2554, "image2554");
+  GLADE_HOOKUP_OBJECT (window1, image2582, "image2582");
   GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1");
-  GLADE_HOOKUP_OBJECT (window1, image2555, "image2555");
+  GLADE_HOOKUP_OBJECT (window1, image2583, "image2583");
   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, image2556, "image2556");
+  GLADE_HOOKUP_OBJECT (window1, image2584, "image2584");
   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");
@@ -1805,11 +1814,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, image2557, "image2557");
+  GLADE_HOOKUP_OBJECT (window1, image2585, "image2585");
   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, image2558, "image2558");
+  GLADE_HOOKUP_OBJECT (window1, image2586, "image2586");
   GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu");
   GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4");
   GLADE_HOOKUP_OBJECT (window1, separator9, "separator9");
@@ -1821,7 +1830,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, image2559, "image2559");
+  GLADE_HOOKUP_OBJECT (window1, image2587, "image2587");
   GLADE_HOOKUP_OBJECT (window1, separator33, "separator33");
   GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1");
   GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1");
@@ -1830,11 +1839,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, image2560, "image2560");
+  GLADE_HOOKUP_OBJECT (window1, image2588, "image2588");
   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, image2561, "image2561");
+  GLADE_HOOKUP_OBJECT (window1, image2589, "image2589");
   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");
@@ -1856,6 +1865,7 @@
   GLADE_HOOKUP_OBJECT (window1, indent_type1_menu, "indent_type1_menu");
   GLADE_HOOKUP_OBJECT (window1, tabs1, "tabs1");
   GLADE_HOOKUP_OBJECT (window1, spaces1, "spaces1");
+  GLADE_HOOKUP_OBJECT (window1, tabs_and_spaces1, "tabs_and_spaces1");
   GLADE_HOOKUP_OBJECT (window1, separator45, "separator45");
   GLADE_HOOKUP_OBJECT (window1, set_file_readonly1, "set_file_readonly1");
   GLADE_HOOKUP_OBJECT (window1, menu_write_unicode_bom1, "menu_write_unicode_bom1");
@@ -1884,26 +1894,26 @@
   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, image2562, "image2562");
+  GLADE_HOOKUP_OBJECT (window1, image2590, "image2590");
   GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1");
-  GLADE_HOOKUP_OBJECT (window1, image2563, "image2563");
+  GLADE_HOOKUP_OBJECT (window1, image2591, "image2591");
   GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1");
-  GLADE_HOOKUP_OBJECT (window1, image2564, "image2564");
+  GLADE_HOOKUP_OBJECT (window1, image2592, "image2592");
   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, image2565, "image2565");
+  GLADE_HOOKUP_OBJECT (window1, image2593, "image2593");
   GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1");
   GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1");
   GLADE_HOOKUP_OBJECT (window1, menu_reload_configuration1, "menu_reload_configuration1");
-  GLADE_HOOKUP_OBJECT (window1, image2566, "image2566");
+  GLADE_HOOKUP_OBJECT (window1, image2594, "image2594");
   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, image2567, "image2567");
+  GLADE_HOOKUP_OBJECT (window1, image2595, "image2595");
   GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1");
   GLADE_HOOKUP_OBJECT (window1, website1, "website1");
   GLADE_HOOKUP_OBJECT (window1, separator16, "separator16");
@@ -3659,7 +3669,7 @@
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_tabs), radio_indent_spaces_group);
   radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_tabs));
-  radio_indent_both = gtk_radio_button_new_with_mnemonic (NULL, _("T_abs & Spaces"));
+  radio_indent_both = gtk_radio_button_new_with_mnemonic (NULL, _("T_abs and Spaces"));
   gtk_widget_show (radio_indent_both);
   gtk_table_attach (GTK_TABLE (table13), radio_indent_both, 1, 2, 3, 4,
                     (GtkAttachOptions) (GTK_FILL),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    