SF.net SVN: geany:[4349] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Wed Oct 21 11:49:48 UTC 2009


Revision: 4349
          http://geany.svn.sourceforge.net/geany/?rev=4349&view=rev
Author:   ntrel
Date:     2009-10-21 11:49:48 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
Don't expand hard tab width alignment.

Modified Paths:
--------------
    trunk/geany.glade
    trunk/src/interface.c

Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade	2009-10-21 11:31:58 UTC (rev 4348)
+++ trunk/geany.glade	2009-10-21 11:49:48 UTC (rev 4349)
@@ -9518,6 +9518,29 @@
 	      </child>
 
 	      <child>
+		<widget class="GtkCheckButton" id="check_detect_indent">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Detect from file</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">5</property>
+		  <property name="bottom_attach">6</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
+	      </child>
+
+	      <child>
 		<widget class="GtkAlignment" id="alignment44">
 		  <property name="visible">True</property>
 		  <property name="xalign">0.5</property>
@@ -9588,31 +9611,9 @@
 		  <property name="top_attach">4</property>
 		  <property name="bottom_attach">5</property>
 		  <property name="x_options">fill</property>
+		  <property name="y_options">fill</property>
 		</packing>
 	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="check_detect_indent">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Detect from file</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">5</property>
-		  <property name="bottom_attach">6</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>

Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c	2009-10-21 11:31:58 UTC (rev 4348)
+++ trunk/src/interface.c	2009-10-21 11:49:48 UTC (rev 4349)
@@ -4994,12 +4994,12 @@
   GSList *radio_indent_spaces_group = NULL;
   GtkWidget *radio_indent_tabs;
   GtkWidget *radio_indent_both;
+  GtkWidget *check_detect_indent;
   GtkWidget *alignment44;
   GtkWidget *hbox14;
   GtkWidget *label231;
   GtkObject *spin_tab_width_adj;
   GtkWidget *spin_tab_width;
-  GtkWidget *check_detect_indent;
   GtkWidget *label227;
   GtkWidget *dialog_action_area4;
   GtkWidget *cancelbutton1;
@@ -5095,11 +5095,18 @@
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_both), radio_indent_spaces_group);
   radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_both));
 
+  check_detect_indent = gtk_check_button_new_with_mnemonic (_("Detect from file"));
+  gtk_widget_show (check_detect_indent);
+  gtk_table_attach (GTK_TABLE (table17), check_detect_indent, 1, 2, 5, 6,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_tooltips_set_tip (tooltips, check_detect_indent, _("Whether to detect the indentation type from file contents when a file is opened"), NULL);
+
   alignment44 = gtk_alignment_new (0.5, 0.5, 1, 1);
   gtk_widget_show (alignment44);
   gtk_table_attach (GTK_TABLE (table17), alignment44, 1, 2, 4, 5,
                     (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+                    (GtkAttachOptions) (GTK_FILL), 0, 0);
   gtk_alignment_set_padding (GTK_ALIGNMENT (alignment44), 0, 0, 24, 0);
 
   hbox14 = gtk_hbox_new (FALSE, 12);
@@ -5119,13 +5126,6 @@
   gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_tab_width), GTK_UPDATE_IF_VALID);
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_tab_width), TRUE);
 
-  check_detect_indent = gtk_check_button_new_with_mnemonic (_("Detect from file"));
-  gtk_widget_show (check_detect_indent);
-  gtk_table_attach (GTK_TABLE (table17), check_detect_indent, 1, 2, 5, 6,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_tooltips_set_tip (tooltips, check_detect_indent, _("Whether to detect the indentation type from file contents when a file is opened"), NULL);
-
   label227 = gtk_label_new (_("Indentation"));
   gtk_widget_show (label227);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (project_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (project_notebook), 0), label227);
@@ -5157,11 +5157,11 @@
   GLADE_HOOKUP_OBJECT (project_dialog, radio_indent_spaces, "radio_indent_spaces");
   GLADE_HOOKUP_OBJECT (project_dialog, radio_indent_tabs, "radio_indent_tabs");
   GLADE_HOOKUP_OBJECT (project_dialog, radio_indent_both, "radio_indent_both");
+  GLADE_HOOKUP_OBJECT (project_dialog, check_detect_indent, "check_detect_indent");
   GLADE_HOOKUP_OBJECT (project_dialog, alignment44, "alignment44");
   GLADE_HOOKUP_OBJECT (project_dialog, hbox14, "hbox14");
   GLADE_HOOKUP_OBJECT (project_dialog, label231, "label231");
   GLADE_HOOKUP_OBJECT (project_dialog, spin_tab_width, "spin_tab_width");
-  GLADE_HOOKUP_OBJECT (project_dialog, check_detect_indent, "check_detect_indent");
   GLADE_HOOKUP_OBJECT (project_dialog, label227, "label227");
   GLADE_HOOKUP_OBJECT_NO_REF (project_dialog, dialog_action_area4, "dialog_action_area4");
   GLADE_HOOKUP_OBJECT (project_dialog, cancelbutton1, "cancelbutton1");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the Commits mailing list