Changeset 4156

Timestamp:

Dec 13, 2007, 7:54:24 PM (14 years ago)

Author:

charles

Message:

wereHamster's patch to remove some clutter from the prefs dialog

Location:

trunk/gtk

Files:

• hig.c (modified) (1 diff)
• hig.h (modified) (1 diff)
• tr_prefs.c (modified) (2 diffs)

trunk/gtk/hig.c

@@ -75 +75 @@
                     1, 4, *row, *row+1,
                     GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+  ++*row;
+}
+
+void
+hig_workarea_add_double_control (GtkWidget * table,
+                               int       * row,
+                               GtkWidget * wl,
+                               GtkWidget * wr)
+{
+  gtk_table_attach (GTK_TABLE(table), wl,
+                    1, 2, *row, *row+1,
+                    GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+  gtk_table_attach (GTK_TABLE(table), wr,
+                    3, 4, *row, *row+1,
+                    GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
   ++*row;
 }

trunk/gtk/hig.h

@@ -41 +41 @@
                                int         * row,
                                GtkWidget   * w);
+
+void
+hig_workarea_add_double_control (GtkWidget * table,
+                               int       * row,
+                               GtkWidget * wl,
+                               GtkWidget * wr);
 
 GtkWidget*

trunk/gtk/tr_prefs.c

@@ -198 +198 @@
     const char * s;
     GtkWidget * t;
-    GtkWidget * w;
+    GtkWidget * w, * w2;
     GtkWidget * l;
     GtkWidget * d;
@@ -213 +213 @@
 
     hig_workarea_add_section_title (t, &row, _("Speed Limits"));
-    hig_workarea_add_section_spacer (t, row, 4);
-
-        s = _("_Limit Upload Speed");
+    hig_workarea_add_section_spacer (t, row, 2);
+
+        s = _("_Limit Upload Speed (KiB/s)");
         w = new_check_button( s, PREF_KEY_UL_LIMIT_ENABLED, core );
-        hig_workarea_add_wide_control( t, &row, w );
-
-        w = new_spin_button( PREF_KEY_UL_LIMIT, core, 0, INT_MAX );
-        s = _("Maximum _Upload Speed (KiB/s)");
-        l = hig_workarea_add_row( t, &row, s, w, NULL );
-        
-        s = _("Li_mit Download Speed");
+        w2 = new_spin_button( PREF_KEY_UL_LIMIT, core, 0, INT_MAX );
+        hig_workarea_add_double_control( t, &row, w, w2 );
+
+        s = _("Li_mit Download Speed (KiB/s)");
         w = new_check_button( s, PREF_KEY_DL_LIMIT_ENABLED, core );
-        hig_workarea_add_wide_control( t, &row, w );
-
-        w = new_spin_button( PREF_KEY_DL_LIMIT, core, 0, INT_MAX );
-        s = _("Maximum _Download Speed (KiB/s)");
-        l = hig_workarea_add_row( t, &row, s, w, NULL );
+        w2 = new_spin_button( PREF_KEY_DL_LIMIT, core, 0, INT_MAX );
+        hig_workarea_add_double_control( t, &row, w, w2 );
 
     hig_workarea_add_section_divider( t, &row );
     hig_workarea_add_section_title (t, &row, _("Downloads"));
-    hig_workarea_add_section_spacer (t, row, 4);
-
-        s = _("Al_ways prompt for download directory");
+    hig_workarea_add_section_spacer (t, row, 3);
+
+        s = _("P_rompt for download directory");
         w = new_check_button( s, PREF_KEY_DIR_ASK, core );
-        hig_workarea_add_wide_control( t, &row, w );
-
-        w = new_path_chooser_button( PREF_KEY_DIR_DEFAULT, core );
-        s = _("Download Di_rectory");
-        l = hig_workarea_add_row( t, &row, s, w, NULL );
+        w2 = new_path_chooser_button( PREF_KEY_DIR_DEFAULT, core );
+        hig_workarea_add_double_control( t, &row, w, w2 );
 
         w = new_action_combo( PREF_KEY_ADDSTD, core );