gnome-terminal r2670 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:43:45 2008
New Revision: 2670
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2670&view=rev

Log:
Move colour scheme names to the glade/ui file.


Modified:
   trunk/src/profile-editor.c
   trunk/src/profile-preferences.glade
   trunk/src/profile-preferences.ui

Modified: trunk/src/profile-editor.c
==============================================================================
--- trunk/src/profile-editor.c	(original)
+++ trunk/src/profile-editor.c	Thu May 29 19:43:45 2008
@@ -80,7 +80,6 @@
                                                     GParamSpec *pspec,
                                                     GtkWidget *editor);
 
-
 static GtkWidget*
 profile_editor_get_widget (GtkWidget  *editor,
                            const char *widget_name)
@@ -782,26 +781,6 @@
     }
 }
 
-static void
-init_palette_scheme_menu (GtkWidget *combo_box)
-{
-  /* Need to keep the same order as they're declared in terminal-profile.c */
-  const char *palette_schemes[] = {
-    N_("Tango"),
-    N_("Linux console"),
-    N_("XTerm"),
-    N_("Rxvt")
-  };
-  int i;
-
-  i = G_N_ELEMENTS (palette_schemes);
-  while (i > 0)
-    {
-      gtk_combo_box_prepend_text (GTK_COMBO_BOX (combo_box), 
-                                  _(palette_schemes[--i]));
-    }
-}
-
 static char*
 format_percent_value (GtkScale *scale,
                       double    val,
@@ -1018,9 +997,6 @@
   w = (GtkWidget *) gtk_builder_get_object  (builder, "color-scheme-combobox");
   init_color_scheme_menu (w);
 
-  w = (GtkWidget *) gtk_builder_get_object  (builder, "palette-combobox");
-  init_palette_scheme_menu (w);
-
   w = (GtkWidget *) gtk_builder_get_object  (builder, "darken-background-scale");
   init_background_darkness_scale (w);
 

Modified: trunk/src/profile-preferences.glade
==============================================================================
--- trunk/src/profile-preferences.glade	(original)
+++ trunk/src/profile-preferences.glade	Thu May 29 19:43:45 2008
@@ -1583,7 +1583,11 @@
 			  <child>
 			    <widget class="GtkComboBox" id="palette-combobox">
 			      <property name="visible">True</property>
-			      <property name="items" translatable="yes">Custom</property>
+			      <property name="items" translatable="yes">Tango
+Linux console
+XTerm
+Rxvt
+Custom</property>
 			      <property name="add_tearoffs">False</property>
 			      <property name="focus_on_click">True</property>
 			    </widget>

Modified: trunk/src/profile-preferences.ui
==============================================================================
--- trunk/src/profile-preferences.ui	(original)
+++ trunk/src/profile-preferences.ui	Thu May 29 19:43:45 2008
@@ -76,6 +76,18 @@
     </columns>
     <data>
       <row>
+        <col id="0">Tango</col>
+      </row>
+      <row>
+        <col id="0">Linux console</col>
+      </row>
+      <row>
+        <col id="0">XTerm</col>
+      </row>
+      <row>
+        <col id="0">Rxvt</col>
+      </row>
+      <row>
         <col id="0">Custom</col>
       </row>
     </data>