[gnome-color-manager] Remove the rendering intent page from the preferences, the designers hate it

[Richard Hughes <rhughes src gnome org>]

commit 51074f7fb510547fda6ecc596e2d78dc40013817
Author: Richard Hughes <richard hughsie com>
Date:   Thu Apr 28 12:46:41 2011 +0100

    Remove the rendering intent page from the preferences, the designers hate it

 data/gcm-prefs.ui |  157 -----------------------------------------------------
 src/gcm-prefs.c   |   68 -----------------------
 2 files changed, 0 insertions(+), 225 deletions(-)
---
diff --git a/data/gcm-prefs.ui b/data/gcm-prefs.ui
index d1f5f20..b420dbd 100644
--- a/data/gcm-prefs.ui
+++ b/data/gcm-prefs.ui
@@ -659,159 +659,6 @@
                 <property name="tab_fill">False</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkVBox" id="vbox3_intents">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">15</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkHBox" id="hbox59">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">9</property>
-                    <child>
-                      <object class="GtkLabel" id="label15">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">The rendering intent defines how color should be transformed from one colorspace to another.</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="vbox9">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox14">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox15">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkLabel" id="label_rendering_display">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="What mode to use for display rendering intent">Display:</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="combobox_rendering_display">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="entry_text_column">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox16">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox17">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkLabel" id="label_rendering_softproof">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="The rendering intent for the print preview">Print Preview:</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxText" id="combobox_rendering_softproof">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="entry_text_column">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label_intents">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" comments="Tab title, the way colors should be converted from one colorspace to another">Rendering Intents</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -1140,8 +987,6 @@
   <object class="GtkSizeGroup" id="sizegroup_buttons"/>
   <object class="GtkSizeGroup" id="sizegroup_combos">
     <widgets>
-      <widget name="combobox_rendering_softproof"/>
-      <widget name="combobox_rendering_display"/>
       <widget name="combobox_space_cmyk"/>
       <widget name="combobox_space_rgb"/>
       <widget name="combobox_space_gray"/>
@@ -1152,8 +997,6 @@
       <widget name="hbox43"/>
       <widget name="hbox46"/>
       <widget name="hbox6"/>
-      <widget name="hbox15"/>
-      <widget name="hbox17"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="sizegroup_devices"/>
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index 6d05852..55d466c 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -2043,51 +2043,6 @@ out:
 }
 
 /**
- * gcm_prefs_renderer_combo_changed_cb:
- **/
-static void
-gcm_prefs_renderer_combo_changed_cb (GtkWidget *widget, GcmPrefsPriv *prefs)
-{
-	gint active;
-	const gchar *key = g_object_get_data (G_OBJECT(widget), "GCM:GSettingsKey");
-
-	/* no selection */
-	active = gtk_combo_box_get_active (GTK_COMBO_BOX(widget));
-	if (active == -1)
-		return;
-
-	/* save to GSettings */
-	g_debug ("changed rendering intent to %s", cd_rendering_intent_to_string (active+1));
-	g_settings_set_enum (prefs->settings, key, active+1);
-}
-
-/**
- * gcm_prefs_setup_rendering_combobox:
- **/
-static void
-gcm_prefs_setup_rendering_combobox (GtkWidget *widget, CdRenderingIntent intent)
-{
-	guint i;
-	gboolean ret = FALSE;
-	gchar *label;
-
-	for (i=1; i<CD_RENDERING_INTENT_LAST; i++) {
-		label = g_strdup_printf ("%s - %s",
-					 cd_rendering_intent_to_localized_text (i),
-					 cd_rendering_intent_to_localized_description (i));
-		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), label);
-		g_free (label);
-		if (i == intent) {
-			ret = TRUE;
-			gtk_combo_box_set_active (GTK_COMBO_BOX (widget), i-1);
-		}
-	}
-	/* nothing matches, just set the first option */
-	if (!ret)
-		gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-}
-
-/**
  * gcm_prefs_is_color_profiles_extra_installed_ready_cb:
  **/
 static void
@@ -2178,8 +2133,6 @@ gcm_prefs_startup_idle_cb (GcmPrefsPriv *prefs)
 	gchar *colorspace_cmyk;
 	gchar *colorspace_gray;
 	gchar *colorspace_rgb;
-	gint intent_display = -1;
-	gint intent_softproof = -1;
 	GtkWidget *widget;
 
 	/* search the disk for profiles */
@@ -2228,27 +2181,6 @@ gcm_prefs_startup_idle_cb (GcmPrefsPriv *prefs)
 	g_signal_connect (G_OBJECT (widget), "changed",
 			  G_CALLBACK (gcm_prefs_space_combo_changed_cb), prefs);
 
-	/* setup rendering lists */
-	widget = GTK_WIDGET (gtk_builder_get_object (prefs->builder,
-						     "combobox_rendering_display"));
-	intent_display = g_settings_get_enum (prefs->settings,
-					      GCM_SETTINGS_RENDERING_INTENT_DISPLAY);
-	gcm_prefs_setup_rendering_combobox (widget, intent_display);
-	g_object_set_data (G_OBJECT(widget), "GCM:GSettingsKey",
-			   (gpointer) GCM_SETTINGS_RENDERING_INTENT_DISPLAY);
-	g_signal_connect (G_OBJECT (widget), "changed",
-			  G_CALLBACK (gcm_prefs_renderer_combo_changed_cb), prefs);
-
-	widget = GTK_WIDGET (gtk_builder_get_object (prefs->builder,
-						     "combobox_rendering_softproof"));
-	intent_softproof = g_settings_get_enum (prefs->settings,
-						GCM_SETTINGS_RENDERING_INTENT_SOFTPROOF);
-	gcm_prefs_setup_rendering_combobox (widget, intent_softproof);
-	g_object_set_data (G_OBJECT(widget), "GCM:GSettingsKey",
-			   (gpointer) GCM_SETTINGS_RENDERING_INTENT_SOFTPROOF);
-	g_signal_connect (G_OBJECT (widget), "changed",
-			  G_CALLBACK (gcm_prefs_renderer_combo_changed_cb), prefs);
-
 	/* set calibrate button sensitivity */
 	gcm_prefs_sensor_coldplug (prefs);
 	gcm_prefs_set_calibrate_button_sensitivity (prefs);