[gnome-color-manager] Do not show the 'Fine tuning' expander by default, and have configuration in GConf

[Richard Hughes <rhughes src gnome org>]

commit d3fa659a24d9ca437a489a46855097d7d36d4e31
Author: Richard Hughes <richard hughsie com>
Date:   Fri Jan 29 09:04:18 2010 +0000

    Do not show the 'Fine tuning' expander by default, and have configuration in GConf

 data/gcm-prefs.ui                   |    3 ++-
 data/gnome-color-manager.schemas.in |   25 +++++++++++++++++++++----
 src/gcm-prefs.c                     |   11 ++++++++---
 src/gcm-utils.h                     |    1 +
 4 files changed, 32 insertions(+), 8 deletions(-)
---
diff --git a/data/gcm-prefs.ui b/data/gcm-prefs.ui
index 6ef9e77..37bb446 100644
--- a/data/gcm-prefs.ui
+++ b/data/gcm-prefs.ui
@@ -371,9 +371,10 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkExpander" id="expander1">
+                          <object class="GtkExpander" id="expander_fine_tuning">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="expanded">True</property>
                             <child>
                               <object class="GtkAlignment" id="alignment4">
                                 <property name="visible">True</property>
diff --git a/data/gnome-color-manager.schemas.in b/data/gnome-color-manager.schemas.in
index 3351555..3e9ad06 100644
--- a/data/gnome-color-manager.schemas.in
+++ b/data/gnome-color-manager.schemas.in
@@ -12,7 +12,7 @@
         <long>
           Gamma is adjusted to affect the color of the attached monitor.
           Traditionally Linux has used a gamma value of 1.0, but this makes
-          monitors look washed out compared Windows XP or OSX.
+          monitors look washed out compared Windows XP or OS X.
           Apple traditionally used a value of 1.8 for a long time, but now use
           the same value as Microsoft.
           Microsoft has always used a value of 2.2.</long>
@@ -43,7 +43,8 @@
           If set to TRUE then external disks are searched for device ICC profiles
           at startup, for instance looking in the OSX library folder or
           Windows XP system folders.
-          This may increase startup time if disks need to be spun-up to be searched.
+          This may increase start-up time if disks need to be spun-up to be
+          searched.
         </long>
       </locale>
     </schema>
@@ -64,6 +65,22 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/gnome-color-manager/show_fine_tuning</key>
+      <applyto>/apps/gnome-color-manager/show_fine_tuning</applyto>
+      <owner>gnome-color-manager</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Show the fine tuning controls for display devices.</short>
+        <long>
+          If set to TRUE then the fine tuning controls are visible. This allows
+          the user to change the display profile outside of what the ICC profile
+          suggests and is only recommended for advanced users.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/gnome-color-manager/rendering_intent_display</key>
       <applyto>/apps/gnome-color-manager/rendering_intent_display</applyto>
       <owner>gnome-color-manager</owner>
@@ -95,7 +112,7 @@
       <default>/usr/share/color/icc/Argyll/sRGB.icm</default>
       <locale name="C">
         <short>The default RGB profile.</short>
-        <long>The RGB profile filename to be used by applications by default.</long>
+        <long>The RGB profile file name to be used by applications by default.</long>
       </locale>
     </schema>
 
@@ -107,7 +124,7 @@
       <default>/usr/share/color/icc/Fogra27L.icc</default>
       <locale name="C">
         <short>The default CMYK profile.</short>
-        <long>The CMYK profile filename to be used by applications by default.</long>
+        <long>The CMYK profile file name to be used by applications by default.</long>
       </locale>
     </schema>
 
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index 84a1b04..7474c18 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -1498,13 +1498,13 @@ gcm_prefs_devices_treeview_clicked_cb (GtkTreeSelection *selection, gpointer use
 
 	/* not a xrandr device */
 	if (type != GCM_DEVICE_TYPE_ENUM_DISPLAY) {
-		widget = GTK_WIDGET (gtk_builder_get_object (builder, "expander1"));
+		widget = GTK_WIDGET (gtk_builder_get_object (builder, "expander_fine_tuning"));
 		gtk_widget_set_sensitive (widget, FALSE);
 		widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_reset"));
 		gtk_widget_set_sensitive (widget, FALSE);
 	} else {
 		/* show more UI */
-		widget = GTK_WIDGET (gtk_builder_get_object (builder, "expander1"));
+		widget = GTK_WIDGET (gtk_builder_get_object (builder, "expander_fine_tuning"));
 		gtk_widget_set_sensitive (widget, TRUE);
 		widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_reset"));
 		gtk_widget_set_sensitive (widget, TRUE);
@@ -2523,6 +2523,11 @@ gcm_prefs_startup_phase1_idle_cb (gpointer user_data)
 	gchar *intent_display;
 	gchar *intent_softproof;
 
+	/* do we show the fine tuning box */
+	ret = gconf_client_get_bool (gconf_client, GCM_SETTINGS_SHOW_FINE_TUNING, NULL);
+	widget = GTK_WIDGET (gtk_builder_get_object (builder, "expander_fine_tuning"));
+	gtk_widget_set_visible (widget, ret);
+
 	/* setup RGB combobox */
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "combobox_space_rgb"));
 	colorspace_rgb = gconf_client_get_string (gconf_client, GCM_SETTINGS_COLORSPACE_RGB, NULL);
@@ -2831,7 +2836,7 @@ main (int argc, char **argv)
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_profile_import"));
 	g_signal_connect (widget, "clicked",
 			  G_CALLBACK (gcm_prefs_profile_import_cb), NULL);
-	widget = GTK_WIDGET (gtk_builder_get_object (builder, "expander1"));
+	widget = GTK_WIDGET (gtk_builder_get_object (builder, "expander_fine_tuning"));
 	gtk_widget_set_sensitive (widget, FALSE);
 
 	/* hidden until a profile is selected */
diff --git a/src/gcm-utils.h b/src/gcm-utils.h
index fcb281b..ad828a1 100644
--- a/src/gcm-utils.h
+++ b/src/gcm-utils.h
@@ -42,6 +42,7 @@
 #define GCM_SETTINGS_COLORSPACE_CMYK		"/apps/gnome-color-manager/colorspace_cmyk"
 #define GCM_SETTINGS_USE_PROFILES_FROM_VOLUMES	"/apps/gnome-color-manager/use_profiles_from_volumes"
 #define GCM_SETTINGS_CALIBRATION_LENGTH		"/apps/gnome-color-manager/calibration_length"
+#define GCM_SETTINGS_SHOW_FINE_TUNING		"/apps/gnome-color-manager/show_fine_tuning"
 
 gboolean	 gcm_utils_set_gamma_for_device		(GcmDevice		*device,
 							 GError			**error);