SF.net SVN: geany:[4390] trunk - Commits

29 Oct 2009

Revision: 4390
          http://geany.svn.sourceforge.net/geany/?rev=4390&view=rev
Author:   ntrel
Date:     2009-10-29 12:34:53 +0000 (Thu, 29 Oct 2009)
Log Message:
-----------
Use GtkVBoxes for Encoding prefs combo boxes to reduce width of prefs
dialog.
Modified Paths:
--------------
    trunk/ChangeLog
    trunk/geany.glade
    trunk/src/interface.c
Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2009-10-29 11:59:55 UTC (rev 4389)
+++ trunk/ChangeLog	2009-10-29 12:34:53 UTC (rev 4390)
@@ -10,6 +10,9 @@
    strings.
    Add mnemonics for 3 Edit->Format menu items.
    Add keybindings_get_label().
+ * src/interface.c, geany.glade:
+   Use GtkVBoxes for Encoding prefs combo boxes to reduce width of prefs
+   dialog.
2009-10-28  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade	2009-10-29 11:59:55 UTC (rev 4389)
+++ trunk/geany.glade	2009-10-29 12:34:53 UTC (rev 4390)
@@ -7287,117 +7287,68 @@
    	      <property name="right_padding">0</property>
<child>
-			<widget class="GtkTable" id="table5">
+			<widget class="GtkVBox" id="vbox43">
    		  <property name="visible">True</property>
-			  <property name="n_rows">3</property>
-			  <property name="n_columns">2</property>
    		  <property name="homogeneous">False</property>
-			  <property name="row_spacing">3</property>
-			  <property name="column_spacing">24</property>
+			  <property name="spacing">6</property>
<child>
-			    <widget class="GtkEventBox" id="eventbox1">
+			    <widget class="GtkVBox" id="vbox44">
    		      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Sets the default encoding for newly created files</property>
-			      <property name="visible_window">True</property>
-			      <property name="above_child">False</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
<child>
-				<widget class="GtkComboBox" id="combo_new_encoding">
+				<widget class="GtkLabel" id="label153">
    			  <property name="visible">True</property>
-				  <property name="add_tearoffs">False</property>
-				  <property name="focus_on_click">True</property>
+				  <property name="label" translatable="yes">Default encoding (new files):</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
    			</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
    		      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-			  <child>
-			    <widget class="GtkLabel" id="label153">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Default encoding (new files):</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label_open_encoding">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Default encoding (existing non-Unicode files):</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEventBox" id="eventbox3">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Sets the default encoding for opening existing non-Unicode files</property>
-			      <property name="visible_window">True</property>
-			      <property name="above_child">False</property>
-
    		      <child>
-				<widget class="GtkComboBox" id="combo_open_encoding">
+				<widget class="GtkEventBox" id="eventbox1">
    			  <property name="visible">True</property>
-				  <property name="add_tearoffs">False</property>
-				  <property name="focus_on_click">True</property>
+				  <property name="tooltip" translatable="yes">Sets the default encoding for newly created files</property>
+				  <property name="visible_window">True</property>
+				  <property name="above_child">False</property>
+
+				  <child>
+				    <widget class="GtkComboBox" id="combo_new_encoding">
+				      <property name="visible">True</property>
+				      <property name="add_tearoffs">False</property>
+				      <property name="focus_on_click">True</property>
+				    </widget>
+				  </child>
    			</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
    		      </child>
    		    </widget>
    		    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
    		    </packing>
    		  </child>
@@ -7415,13 +7366,71 @@
    		      <property name="draw_indicator">True</property>
    		    </widget>
    		    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options"></property>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
    		    </packing>
    		  </child>
+
+			  <child>
+			    <widget class="GtkVBox" id="vbox45">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label_open_encoding">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Default encoding (existing non-Unicode files):</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkEventBox" id="eventbox3">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Sets the default encoding for opening existing non-Unicode files</property>
+				  <property name="visible_window">True</property>
+				  <property name="above_child">False</property>
+
+				  <child>
+				    <widget class="GtkComboBox" id="combo_open_encoding">
+				      <property name="visible">True</property>
+				      <property name="add_tearoffs">False</property>
+				      <property name="focus_on_click">True</property>
+				    </widget>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
    		</widget>
    	      </child>
    	    </widget>
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c	2009-10-29 11:59:55 UTC (rev 4389)
+++ trunk/src/interface.c	2009-10-29 12:34:53 UTC (rev 4390)
@@ -2584,14 +2584,16 @@
   GtkWidget *label109;
   GtkWidget *frame37;
   GtkWidget *alignment40;
-  GtkWidget *table5;
+  GtkWidget *vbox43;
+  GtkWidget *vbox44;
+  GtkWidget *label153;
   GtkWidget *eventbox1;
   GtkWidget *combo_new_encoding;
-  GtkWidget *label153;
+  GtkWidget *check_open_encoding;
+  GtkWidget *vbox45;
   GtkWidget *label_open_encoding;
   GtkWidget *eventbox3;
   GtkWidget *combo_open_encoding;
-  GtkWidget *check_open_encoding;
   GtkWidget *label219;
   GtkWidget *frame2;
   GtkWidget *alignment3;
@@ -4044,55 +4046,51 @@
   gtk_container_add (GTK_CONTAINER (frame37), alignment40);
   gtk_alignment_set_padding (GTK_ALIGNMENT (alignment40), 0, 0, 12, 0);
-  table5 = gtk_table_new (3, 2, FALSE);
-  gtk_widget_show (table5);
-  gtk_container_add (GTK_CONTAINER (alignment40), table5);
-  gtk_table_set_row_spacings (GTK_TABLE (table5), 3);
-  gtk_table_set_col_spacings (GTK_TABLE (table5), 24);
+  vbox43 = gtk_vbox_new (FALSE, 6);
+  gtk_widget_show (vbox43);
+  gtk_container_add (GTK_CONTAINER (alignment40), vbox43);
+  vbox44 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (vbox44);
+  gtk_box_pack_start (GTK_BOX (vbox43), vbox44, TRUE, TRUE, 0);
+
+  label153 = gtk_label_new (_("Default encoding (new files):"));
+  gtk_widget_show (label153);
+  gtk_box_pack_start (GTK_BOX (vbox44), label153, FALSE, FALSE, 0);
+  gtk_misc_set_alignment (GTK_MISC (label153), 0, 0.5);
+
   eventbox1 = gtk_event_box_new ();
   gtk_widget_show (eventbox1);
-  gtk_table_attach (GTK_TABLE (table5), eventbox1, 1, 2, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (GTK_FILL), 0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox44), eventbox1, TRUE, TRUE, 0);
   gtk_tooltips_set_tip (tooltips, eventbox1, _("Sets the default encoding for newly created files"), NULL);
combo_new_encoding = gtk_combo_box_new_text ();
   gtk_widget_show (combo_new_encoding);
   gtk_container_add (GTK_CONTAINER (eventbox1), combo_new_encoding);
-  label153 = gtk_label_new (_("Default encoding (new files):"));
-  gtk_widget_show (label153);
-  gtk_table_attach (GTK_TABLE (table5), label153, 0, 1, 0, 1,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label153), 0, 0.5);
+  check_open_encoding = gtk_check_button_new_with_mnemonic (_("Use fixed encoding when opening non-Unicode files"));
+  gtk_widget_show (check_open_encoding);
+  gtk_box_pack_start (GTK_BOX (vbox43), check_open_encoding, FALSE, FALSE, 0);
+  gtk_tooltips_set_tip (tooltips, check_open_encoding, _("This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)"), NULL);
+  vbox45 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (vbox45);
+  gtk_box_pack_start (GTK_BOX (vbox43), vbox45, TRUE, TRUE, 0);
+
   label_open_encoding = gtk_label_new (_("Default encoding (existing non-Unicode files):"));
   gtk_widget_show (label_open_encoding);
-  gtk_table_attach (GTK_TABLE (table5), label_open_encoding, 0, 1, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox45), label_open_encoding, FALSE, FALSE, 0);
   gtk_misc_set_alignment (GTK_MISC (label_open_encoding), 0, 0.5);
eventbox3 = gtk_event_box_new ();
   gtk_widget_show (eventbox3);
-  gtk_table_attach (GTK_TABLE (table5), eventbox3, 1, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (GTK_FILL), 0, 0);
+  gtk_box_pack_start (GTK_BOX (vbox45), eventbox3, TRUE, TRUE, 0);
   gtk_tooltips_set_tip (tooltips, eventbox3, _("Sets the default encoding for opening existing non-Unicode files"), NULL);
combo_open_encoding = gtk_combo_box_new_text ();
   gtk_widget_show (combo_open_encoding);
   gtk_container_add (GTK_CONTAINER (eventbox3), combo_open_encoding);
-  check_open_encoding = gtk_check_button_new_with_mnemonic (_("Use fixed encoding when opening non-Unicode files"));
-  gtk_widget_show (check_open_encoding);
-  gtk_table_attach (GTK_TABLE (table5), check_open_encoding, 0, 2, 1, 2,
-                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_tooltips_set_tip (tooltips, check_open_encoding, _("This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)"), NULL);
-
   label219 = gtk_label_new (_("<b>Encodings</b>"));
   gtk_widget_show (label219);
   gtk_frame_set_label_widget (GTK_FRAME (frame37), label219);
@@ -4924,14 +4922,16 @@
   GLADE_HOOKUP_OBJECT (prefs_dialog, label109, "label109");
   GLADE_HOOKUP_OBJECT (prefs_dialog, frame37, "frame37");
   GLADE_HOOKUP_OBJECT (prefs_dialog, alignment40, "alignment40");
-  GLADE_HOOKUP_OBJECT (prefs_dialog, table5, "table5");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, vbox43, "vbox43");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, vbox44, "vbox44");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, label153, "label153");
   GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox1, "eventbox1");
   GLADE_HOOKUP_OBJECT (prefs_dialog, combo_new_encoding, "combo_new_encoding");
-  GLADE_HOOKUP_OBJECT (prefs_dialog, label153, "label153");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, check_open_encoding, "check_open_encoding");
+  GLADE_HOOKUP_OBJECT (prefs_dialog, vbox45, "vbox45");
   GLADE_HOOKUP_OBJECT (prefs_dialog, label_open_encoding, "label_open_encoding");
   GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox3, "eventbox3");
   GLADE_HOOKUP_OBJECT (prefs_dialog, combo_open_encoding, "combo_open_encoding");
-  GLADE_HOOKUP_OBJECT (prefs_dialog, check_open_encoding, "check_open_encoding");
   GLADE_HOOKUP_OBJECT (prefs_dialog, label219, "label219");
   GLADE_HOOKUP_OBJECT (prefs_dialog, frame2, "frame2");
   GLADE_HOOKUP_OBJECT (prefs_dialog, alignment3, "alignment3");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    