[gnome-color-manager] Never show the 'Fine tuning' section in the control center, it invalidates the profiles
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Never show the 'Fine tuning' section in the control center, it invalidates the profiles
- Date: Tue, 30 Nov 2010 19:42:50 +0000 (UTC)
commit 5d1266f92b1e6181bfe5551cb777fab05e6b780e
Author: Richard Hughes <richard hughsie com>
Date: Tue Nov 30 19:41:38 2010 +0000
Never show the 'Fine tuning' section in the control center, it invalidates the profiles
data/gcm-prefs.ui | 160 --------------------------
data/org.gnome.color-manager.gschema.migrate | 1 -
data/org.gnome.color-manager.gschema.xml | 5 -
src/cc-color-panel.c | 133 ---------------------
4 files changed, 0 insertions(+), 299 deletions(-)
---
diff --git a/data/gcm-prefs.ui b/data/gcm-prefs.ui
index fd700cf..14f6f16 100644
--- a/data/gcm-prefs.ui
+++ b/data/gcm-prefs.ui
@@ -724,166 +724,6 @@
<property name="position">3</property>
</packing>
</child>
- <child>
- <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>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <child>
- <object class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">3</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkHScale" id="hscale_gamma">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="restrict_to_fill_level">False</property>
- <property name="fill_level">1</property>
- <property name="value_pos">right</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox8">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label_gamma">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Gamma:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkHScale" id="hscale_brightness">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="restrict_to_fill_level">False</property>
- <property name="fill_level">1</property>
- <property name="value_pos">right</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHScale" id="hscale_contrast">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="restrict_to_fill_level">False</property>
- <property name="fill_level">1</property>
- <property name="value_pos">right</property>
- </object>
- <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>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label_brightness">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Brightness:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox28">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label_contrast">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Contrast:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="padding">6</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_reset">
- <property name="label" translatable="yes" comments="This resets the device to it's defaults, and removes any user tweaked settings.">Rese_t</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="Settings that users don't normally have to touch">Fine tuning</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
</object>
</child>
<child type="tab">
diff --git a/data/org.gnome.color-manager.gschema.migrate b/data/org.gnome.color-manager.gschema.migrate
index ff7ee9d..afd901e 100644
--- a/data/org.gnome.color-manager.gschema.migrate
+++ b/data/org.gnome.color-manager.gschema.migrate
@@ -8,7 +8,6 @@ colorspace-rgb = /apps/gnome-color-manager/colorspace_rgb
colorspace-cmyk = /apps/gnome-color-manager/colorspace_cmyk
use-profiles-from-volumes = /apps/gnome-color-manager/use_profiles_from_volumes
calibration-length = /apps/gnome-color-manager/calibration_length
-show-fine-tuning = /apps/gnome-color-manager/show_fine_tuning
recalibrate-printer-threshold = /apps/gnome-color-manager/recalibrate_printer_threshold
recalibrate-display-threshold = /apps/gnome-color-manager/recalibrate_display_threshold
diff --git a/data/org.gnome.color-manager.gschema.xml b/data/org.gnome.color-manager.gschema.xml
index 8812cd6..8fd291b 100644
--- a/data/org.gnome.color-manager.gschema.xml
+++ b/data/org.gnome.color-manager.gschema.xml
@@ -45,11 +45,6 @@
<summary>Set the _ICC_PROFILE hint for applications</summary>
<description>If set to TRUE then the __ICC_PROFILE hint will be set, which applications use to convert true color to screen color.</description>
</key>
- <key name="show-fine-tuning" type="b">
- <default>false</default>
- <summary>Show the fine tuning controls for display devices</summary>
- <description>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.</description>
- </key>
<key name="rendering-intent-display" enum="org.gnome.color-manager.RenderingType">
<default>'perceptual'</default>
<summary>The rendering intent to use for the display, e.g. 'perceptual'</summary>
diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
index 22fcf2d..5f54336 100644
--- a/src/cc-color-panel.c
+++ b/src/cc-color-panel.c
@@ -1274,25 +1274,10 @@ cc_color_panel_delete_cb (GtkWidget *widget, CcColorPanel *panel)
static gboolean
cc_color_panel_save_and_apply_current_device_cb (CcColorPanel *panel)
{
- gfloat localgamma;
- gfloat brightness;
- gfloat contrast;
GtkWidget *widget;
gboolean ret;
GError *error = NULL;
- /* get values */
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_gamma"));
- localgamma = gtk_range_get_value (GTK_RANGE (widget));
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_brightness"));
- brightness = gtk_range_get_value (GTK_RANGE (widget));
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_contrast"));
- contrast = gtk_range_get_value (GTK_RANGE (widget));
-
- gcm_device_set_gamma (panel->priv->current_device, localgamma);
- gcm_device_set_brightness (panel->priv->current_device, brightness * 100.0f);
- gcm_device_set_contrast (panel->priv->current_device, contrast * 100.0f);
-
/* save new profile */
ret = gcm_device_save (panel->priv->current_device, &error);
if (!ret) {
@@ -1314,28 +1299,6 @@ out:
}
/**
- * cc_color_panel_reset_cb:
- **/
-static void
-cc_color_panel_reset_cb (GtkWidget *widget, CcColorPanel *panel)
-{
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_gamma"));
- gtk_range_set_value (GTK_RANGE (widget), 1.0f);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_brightness"));
- gtk_range_set_value (GTK_RANGE (widget), 0.0f);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_contrast"));
- gtk_range_set_value (GTK_RANGE (widget), 1.0f);
-
- /* if we've already queued a save and apply, ignore this */
- if (panel->priv->save_and_apply_id != 0) {
- g_debug ("ignoring extra save and apply, as one is already pending");
- return;
- }
- panel->priv->save_and_apply_id =
- g_timeout_add (50, (GSourceFunc) cc_color_panel_save_and_apply_current_device_cb, panel);
-}
-
-/**
* cc_color_panel_add_devices_columns:
**/
static void
@@ -1502,9 +1465,6 @@ cc_color_panel_devices_treeview_clicked_cb (GtkTreeSelection *selection, CcColor
GtkTreeModel *model;
GtkTreePath *path;
GtkWidget *widget;
- gfloat localgamma;
- gfloat brightness;
- gfloat contrast;
gboolean connected;
gchar *id = NULL;
gboolean ret;
@@ -1532,21 +1492,6 @@ cc_color_panel_devices_treeview_clicked_cb (GtkTreeSelection *selection, CcColor
if (panel->priv->current_device == NULL)
goto out;
- /* not a xrandr device */
- kind = gcm_device_get_kind (panel->priv->current_device);
- if (kind != GCM_DEVICE_KIND_DISPLAY) {
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "expander_fine_tuning"));
- gtk_widget_set_sensitive (widget, FALSE);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "button_reset"));
- gtk_widget_set_sensitive (widget, FALSE);
- } else {
- /* show more UI */
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "expander_fine_tuning"));
- gtk_widget_set_sensitive (widget, TRUE);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "button_reset"));
- gtk_widget_set_sensitive (widget, TRUE);
- }
-
/* show broken devices */
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hbox_problems"));
gtk_widget_hide (widget);
@@ -1567,19 +1512,6 @@ cc_color_panel_devices_treeview_clicked_cb (GtkTreeSelection *selection, CcColor
}
}
- /* set adjustments */
- panel->priv->setting_up_device = TRUE;
- localgamma = gcm_device_get_gamma (panel->priv->current_device);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_gamma"));
- gtk_range_set_value (GTK_RANGE (widget), localgamma);
- brightness = gcm_device_get_brightness (panel->priv->current_device);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_brightness"));
- gtk_range_set_value (GTK_RANGE (widget), brightness);
- contrast = gcm_device_get_contrast (panel->priv->current_device);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_contrast"));
- gtk_range_set_value (GTK_RANGE (widget), contrast);
- panel->priv->setting_up_device = FALSE;
-
/* set new device */
gcm_list_store_profiles_set_from_device (panel->priv->list_store_profiles,
panel->priv->current_device);
@@ -1594,8 +1526,6 @@ cc_color_panel_devices_treeview_clicked_cb (GtkTreeSelection *selection, CcColor
/* make sure selectable */
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "combobox_profile"));
gtk_widget_set_sensitive (widget, TRUE);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "button_reset"));
- gtk_widget_set_sensitive (widget, TRUE);
/* can we delete this device? */
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "button_delete"));
@@ -1870,29 +1800,6 @@ out:
}
/**
- * cc_color_panel_slider_changed_cb:
- **/
-static void
-cc_color_panel_slider_changed_cb (GtkRange *range, CcColorPanel *panel)
-{
- /* we're just setting up the device, not moving the slider */
- if (panel->priv->setting_up_device) {
- g_debug ("setting up device, so ignore");
- return;
- }
-
- /* if we've already queued a save and apply, ignore this */
- if (panel->priv->save_and_apply_id != 0) {
- g_debug ("ignoring extra save and apply, as one is already pending");
- return;
- }
-
- /* schedule a save and apply */
- panel->priv->save_and_apply_id =
- g_timeout_add (50, (GSourceFunc) cc_color_panel_save_and_apply_current_device_cb, panel);
-}
-
-/**
* cc_color_panel_sensor_client_changed_cb:
**/
static void
@@ -2711,9 +2618,6 @@ cc_color_panel_init (CcColorPanel *panel)
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "button_viewer"));
g_signal_connect (widget, "clicked",
G_CALLBACK (cc_color_panel_viewer_cb), panel);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "button_reset"));
- g_signal_connect (widget, "clicked",
- G_CALLBACK (cc_color_panel_reset_cb), panel);
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "button_delete"));
g_signal_connect (widget, "clicked",
G_CALLBACK (cc_color_panel_delete_cb), panel);
@@ -2724,8 +2628,6 @@ cc_color_panel_init (CcColorPanel *panel)
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "button_calibrate"));
g_signal_connect (widget, "clicked",
G_CALLBACK (cc_color_panel_calibrate_cb), panel);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "expander_fine_tuning"));
- gtk_widget_set_sensitive (widget, FALSE);
/* set up virtual dialog */
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "dialog_virtual"));
@@ -2772,23 +2674,6 @@ cc_color_panel_init (CcColorPanel *panel)
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (cc_color_panel_profile_combo_changed_cb), panel);
- /* set ranges */
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_gamma"));
- gtk_range_set_range (GTK_RANGE (widget), 0.1f, 5.0f);
- gtk_scale_add_mark (GTK_SCALE (widget), 1.0f, GTK_POS_TOP, "");
- gtk_scale_add_mark (GTK_SCALE (widget), 1.8f, GTK_POS_TOP, "");
- gtk_scale_add_mark (GTK_SCALE (widget), 2.2f, GTK_POS_TOP, "");
-
- /* set ranges */
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_brightness"));
- gtk_range_set_range (GTK_RANGE (widget), 0.0f, 0.9f);
-// gtk_scale_add_mark (GTK_SCALE (widget), 0.0f, GTK_POS_TOP, "");
-
- /* set ranges */
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_contrast"));
- gtk_range_set_range (GTK_RANGE (widget), 0.1f, 1.0f);
-// gtk_scale_add_mark (GTK_SCALE (widget), 1.0f, GTK_POS_TOP, "");
-
/* use a device client array */
panel->priv->gcm_client = gcm_client_new ();
gcm_client_set_use_threads (panel->priv->gcm_client, TRUE);
@@ -2825,24 +2710,6 @@ cc_color_panel_init (CcColorPanel *panel)
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "vbox_working_spaces"));
gtk_box_pack_start (GTK_BOX(widget), panel->priv->info_bar_profiles, TRUE, FALSE, 0);
- /* connect up sliders */
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_contrast"));
- g_signal_connect (widget, "value-changed",
- G_CALLBACK (cc_color_panel_slider_changed_cb), panel);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_brightness"));
- g_signal_connect (widget, "value-changed",
- G_CALLBACK (cc_color_panel_slider_changed_cb), panel);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hscale_gamma"));
- g_signal_connect (widget, "value-changed",
- G_CALLBACK (cc_color_panel_slider_changed_cb), panel);
-
- /* do we show the fine tuning box */
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "expander_fine_tuning"));
- g_settings_bind (panel->priv->settings,
- GCM_SETTINGS_SHOW_FINE_TUNING,
- widget, "visible",
- G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY);
-
/* get main window */
panel->priv->main_window = gtk_widget_get_toplevel (panel->priv->info_bar_profiles);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
