[gnome-color-manager] Remove the 'Working Spaces' tab from gcm-prefs
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Remove the 'Working Spaces' tab from gcm-prefs
- Date: Tue, 17 May 2011 19:14:34 +0000 (UTC)
commit 5ff998c863a37929294113bb47a3e1b9b702c376
Author: Richard Hughes <richard hughsie com>
Date: Tue May 10 14:50:08 2011 -0400
Remove the 'Working Spaces' tab from gcm-prefs
data/gcm-prefs.ui | 665 ++++++++++++++++++-----------------------------------
src/gcm-prefs.c | 179 +--------------
2 files changed, 221 insertions(+), 623 deletions(-)
---
diff --git a/data/gcm-prefs.ui b/data/gcm-prefs.ui
index b420dbd..892bd15 100644
--- a/data/gcm-prefs.ui
+++ b/data/gcm-prefs.ui
@@ -56,6 +56,12 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkVBox" id="vbox5">
@@ -161,509 +167,284 @@
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">15</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkNotebook" id="notebook_prefs">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkVBox" id="vbox_devices">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">15</property>
- <property name="spacing">12</property>
+ <property name="label" translatable="yes">For a color managed workflow, each connected device should have one or more color profiles associated with it.</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="vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow_devices">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkTreeView" id="treeview_devices">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">For a color managed workflow, each connected device should have one or more color profiles associated with it.</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection"/>
</child>
</object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="toolbar_devices">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_device_add">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Add a virtual device</property>
+ <property name="tooltip_text">Add a virtual device</property>
+ <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">list-add-symbolic</property>
+ </object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkToolButton" id="toolbutton_device_remove">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow_devices">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="treeview_devices">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection"/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="toolbar_devices">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">1</property>
- <child>
- <object class="GtkToolButton" id="toolbutton_device_add">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text">Add a virtual device</property>
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">Add</property>
- <property name="use_underline">True</property>
- <property name="icon_name">list-add-symbolic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="toolbutton_device_remove">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text">Remove a device</property>
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">Remove</property>
- <property name="use_underline">True</property>
- <property name="icon_name">list-remove-symbolic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparatorToolItem" id="toolbutton2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="toolbutton_device_default">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text">Set this device for all users on this computer</property>
- <property name="use_action_appearance">False</property>
- <property name="is_important">True</property>
- <property name="label" translatable="yes">Set for all users</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="toolbutton_device_calibrate">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Calibrate the device</property>
- <property name="use_action_appearance">False</property>
- <property name="is_important">True</property>
- <property name="label" translatable="yes">Calibrate</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Remove a device</property>
+ <property name="tooltip_text">Remove a device</property>
+ <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Remove</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">list-remove-symbolic</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkSeparatorToolItem" id="toolbutton2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow_assign">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="treeview_assign">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection1"/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="toolbar_profiles">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">1</property>
- <child>
- <object class="GtkToolButton" id="toolbutton_profile_add">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text">Add a profile for the device</property>
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">Add</property>
- <property name="use_underline">True</property>
- <property name="icon_name">list-add-symbolic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="toolbutton_profile_remove">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text">Remove a profile from the device</property>
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">Remove</property>
- <property name="use_underline">True</property>
- <property name="icon_name">list-remove-symbolic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparatorToolItem" id="toolbutton1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="toolbutton_profile_view">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Show details about this profile</property>
- <property name="use_action_appearance">False</property>
- <property name="is_important">True</property>
- <property name="label" translatable="yes">View details</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="toolbutton_profile_default">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text">Makes the profile default for the device</property>
- <property name="use_action_appearance">False</property>
- <property name="is_important">True</property>
- <property name="label" translatable="yes">Set as default</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_device_default">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Set this device for all users on this computer</property>
+ <property name="tooltip_text">Set this device for all users on this computer</property>
+ <property name="use_action_appearance">False</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Set for all users</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_device_calibrate">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Calibrate the device</property>
+ <property name="tooltip_text" translatable="yes">Calibrate the device</property>
+ <property name="use_action_appearance">False</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Calibrate</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
- <child type="tab">
- <object class="GtkLabel" id="label_devices">
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow_assign">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="Tab title, currently connected or saved devices">Devices</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview_assign">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ </object>
+ </child>
</object>
<packing>
- <property name="tab_fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox_working_spaces">
+ <object class="GtkToolbar" id="toolbar_profiles">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">15</property>
- <property name="spacing">12</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">1</property>
<child>
- <object class="GtkHBox" id="hbox58">
+ <object class="GtkToolButton" id="toolbutton_profile_add">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">A working space is a default colorspace that is not associated with a specific device.</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>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Add a profile for the device</property>
+ <property name="tooltip_text">Add a profile for the device</property>
+ <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">list-add-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox12">
+ <object class="GtkToolButton" id="toolbutton_profile_remove">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkHBox" id="hbox42">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox43">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_space_rgb">
- <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">RGB:</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="GtkComboBox" id="combobox_space_rgb">
- <property name="visible">True</property>
- <property name="can_focus">False</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="hbox44">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox46">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_space_cmyk">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="Technical color word for softproof rendering intent">CMYK:</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="GtkComboBox" id="combobox_space_cmyk">
- <property name="visible">True</property>
- <property name="can_focus">False</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>
- <child>
- <object class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_space_gray">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="Technical color word for softproof rendering intent">Gray:</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="GtkComboBox" id="combobox_space_gray">
- <property name="visible">True</property>
- <property name="can_focus">False</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">2</property>
- </packing>
- </child>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Remove a profile from the device</property>
+ <property name="tooltip_text">Remove a profile from the device</property>
+ <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Remove</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">list-remove-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_viewer">
+ <object class="GtkSeparatorToolItem" id="toolbutton1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"><a href="moo">Compare profiles...</a></property>
- <property name="use_markup">True</property>
+ <property name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_profile_view">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Show details about this profile</property>
+ <property name="tooltip_text" translatable="yes">Show details about this profile</property>
+ <property name="use_action_appearance">False</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">View details</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_profile_default">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Makes the profile default for the device</property>
+ <property name="tooltip_text">Makes the profile default for the device</property>
+ <property name="use_action_appearance">False</property>
+ <property name="is_important">True</property>
+ <property name="label" translatable="yes">Set as default</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label_working_spaces">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="Tab title, icc color spaces to use for different defaults">Working Spaces</property>
- </object>
- <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
- <property name="tab_fill">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -724,6 +505,12 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkVBox" id="vbox1">
@@ -985,19 +772,7 @@
</action-widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup_buttons"/>
- <object class="GtkSizeGroup" id="sizegroup_combos">
- <widgets>
- <widget name="combobox_space_cmyk"/>
- <widget name="combobox_space_rgb"/>
- <widget name="combobox_space_gray"/>
- </widgets>
- </object>
- <object class="GtkSizeGroup" id="sizegroup_defaults">
- <widgets>
- <widget name="hbox43"/>
- <widget name="hbox46"/>
- <widget name="hbox6"/>
- </widgets>
- </object>
+ <object class="GtkSizeGroup" id="sizegroup_combos"/>
+ <object class="GtkSizeGroup" id="sizegroup_defaults"/>
<object class="GtkSizeGroup" id="sizegroup_devices"/>
</interface>
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index 55d466c..b6488f4 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -1936,113 +1936,6 @@ gcm_prefs_device_removed_cb (CdClient *client,
}
/**
- * gcm_prefs_setup_space_combobox:
- **/
-static void
-gcm_prefs_setup_space_combobox (GcmPrefsPriv *prefs,
- GtkWidget *widget,
- CdColorspace colorspace,
- const gchar *profile_filename)
-{
- CdColorspace colorspace_tmp;
- CdProfile *profile;
- const gchar *filename;
- gboolean has_colorspace_description;
- gboolean has_profile = FALSE;
- gboolean has_vcgt;
- gchar *text = NULL;
- GError *error = NULL;
- GPtrArray *profile_array = NULL;
- GtkTreeIter iter;
- GtkTreeModel *model;
- guint i;
-
- /* get profiles */
- profile_array = cd_client_get_profiles_sync (prefs->client,
- prefs->cancellable,
- &error);
- if (profile_array == NULL) {
- g_warning ("failed to get profiles: %s",
- error->message);
- g_error_free (error);
- goto out;
- }
-
- /* update each list */
- for (i=0; i<profile_array->len; i++) {
- profile = g_ptr_array_index (profile_array, i);
-
- /* only for correct kind */
- has_vcgt = cd_profile_get_has_vcgt (profile);
- has_colorspace_description = gcm_profile_has_colorspace_description (profile);
- colorspace_tmp = cd_profile_get_colorspace (profile);
- if (!has_vcgt &&
- colorspace == colorspace_tmp &&
- (colorspace != CD_COLORSPACE_RGB ||
- has_colorspace_description)) {
- gcm_prefs_combobox_add_profile (widget, profile, GCM_PREFS_ENTRY_TYPE_PROFILE, &iter);
-
- /* set active option */
- filename = cd_profile_get_filename (profile);
- if (g_strcmp0 (filename, profile_filename) == 0)
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (widget), &iter);
- has_profile = TRUE;
- }
- }
- if (!has_profile) {
- /* TRANSLATORS: this is when there are no profiles that
- * can be used; the search term is either "RGB" or "CMYK" */
- text = g_strdup_printf (_("No %s color spaces available"),
- cd_colorspace_to_localised_string (colorspace));
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
- gtk_list_store_append (GTK_LIST_STORE(model), &iter);
- gtk_list_store_set (GTK_LIST_STORE(model), &iter,
- GCM_PREFS_COMBO_COLUMN_TEXT, text,
- -1);
- gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
- gtk_widget_set_sensitive (widget, FALSE);
- }
-out:
- if (profile_array != NULL)
- g_ptr_array_unref (profile_array);
- g_free (text);
-}
-
-/**
- * gcm_prefs_space_combo_changed_cb:
- **/
-static void
-gcm_prefs_space_combo_changed_cb (GtkWidget *widget, GcmPrefsPriv *prefs)
-{
- gboolean ret;
- GtkTreeIter iter;
- const gchar *filename;
- GtkTreeModel *model;
- CdProfile *profile = NULL;
- const gchar *key = g_object_get_data (G_OBJECT(widget), "GCM:GSettingsKey");
-
- /* no selection */
- ret = gtk_combo_box_get_active_iter (GTK_COMBO_BOX(widget), &iter);
- if (!ret)
- return;
-
- /* get profile */
- model = gtk_combo_box_get_model (GTK_COMBO_BOX(widget));
- gtk_tree_model_get (model, &iter,
- GCM_PREFS_COMBO_COLUMN_PROFILE, &profile,
- -1);
- if (profile == NULL)
- goto out;
-
- filename = cd_profile_get_filename (profile);
- g_debug ("changed working space %s", filename);
- g_settings_set_string (prefs->settings, key, filename);
-out:
- if (profile != NULL)
- g_object_unref (profile);
-}
-
-/**
* gcm_prefs_is_color_profiles_extra_installed_ready_cb:
**/
static void
@@ -2130,57 +2023,10 @@ out:
static gboolean
gcm_prefs_startup_idle_cb (GcmPrefsPriv *prefs)
{
- gchar *colorspace_cmyk;
- gchar *colorspace_gray;
- gchar *colorspace_rgb;
- GtkWidget *widget;
-
/* search the disk for profiles */
g_signal_connect (prefs->client, "changed",
G_CALLBACK(gcm_prefs_profile_store_changed_cb), prefs);
- /* setup RGB combobox */
- widget = GTK_WIDGET (gtk_builder_get_object (prefs->builder,
- "combobox_space_rgb"));
- colorspace_rgb = g_settings_get_string (prefs->settings,
- GCM_SETTINGS_COLORSPACE_RGB);
- gcm_prefs_set_combo_simple_text (widget);
- gcm_prefs_setup_space_combobox (prefs, widget,
- CD_COLORSPACE_RGB,
- colorspace_rgb);
- g_object_set_data (G_OBJECT(widget), "GCM:GSettingsKey",
- (gpointer) GCM_SETTINGS_COLORSPACE_RGB);
- g_signal_connect (G_OBJECT (widget), "changed",
- G_CALLBACK (gcm_prefs_space_combo_changed_cb), prefs);
-
- /* setup CMYK combobox */
- widget = GTK_WIDGET (gtk_builder_get_object (prefs->builder,
- "combobox_space_cmyk"));
- colorspace_cmyk = g_settings_get_string (prefs->settings,
- GCM_SETTINGS_COLORSPACE_CMYK);
- gcm_prefs_set_combo_simple_text (widget);
- gcm_prefs_setup_space_combobox (prefs, widget,
- CD_COLORSPACE_CMYK,
- colorspace_cmyk);
- g_object_set_data (G_OBJECT(widget), "GCM:GSettingsKey",
- (gpointer) GCM_SETTINGS_COLORSPACE_CMYK);
- g_signal_connect (G_OBJECT (widget), "changed",
- G_CALLBACK (gcm_prefs_space_combo_changed_cb), prefs);
-
- /* setup gray combobox */
- widget = GTK_WIDGET (gtk_builder_get_object (prefs->builder,
- "combobox_space_gray"));
- colorspace_gray = g_settings_get_string (prefs->settings,
- GCM_SETTINGS_COLORSPACE_GRAY);
- gcm_prefs_set_combo_simple_text (widget);
- gcm_prefs_setup_space_combobox (prefs, widget,
- CD_COLORSPACE_GRAY,
- colorspace_gray);
- g_object_set_data (G_OBJECT(widget), "GCM:GSettingsKey",
- (gpointer) GCM_SETTINGS_COLORSPACE_GRAY);
- g_signal_connect (G_OBJECT (widget), "changed",
- G_CALLBACK (gcm_prefs_space_combo_changed_cb), prefs);
-
/* set calibrate button sensitivity */
gcm_prefs_sensor_coldplug (prefs);
gcm_prefs_set_calibrate_button_sensitivity (prefs);
@@ -2191,9 +2037,6 @@ gcm_prefs_startup_idle_cb (GcmPrefsPriv *prefs)
/* do we show the shared-color-profiles-extra installer? */
g_debug ("getting installed");
gcm_prefs_is_color_profiles_extra_installed (prefs);
-
- g_free (colorspace_rgb);
- g_free (colorspace_cmyk);
return FALSE;
}
@@ -2369,18 +2212,6 @@ gcm_prefs_button_virtual_entry_changed_cb (GtkEntry *entry,
}
/**
- * gcm_prefs_activate_link_cb:
- **/
-static gboolean
-gcm_prefs_activate_link_cb (GtkLabel *label,
- const gchar *uri,
- GcmPrefsPriv *prefs)
-{
- gcm_prefs_open_viewer (prefs, NULL);
- return TRUE;
-}
-
-/**
* gcm_window_set_parent_xid:
**/
static void
@@ -2531,14 +2362,6 @@ gcm_viewer_startup_cb (GApplication *application, GcmPrefsPriv *prefs)
g_signal_connect (widget, "clicked",
G_CALLBACK (gcm_prefs_default_cb), prefs);
widget = GTK_WIDGET (gtk_builder_get_object (prefs->builder,
- "label_viewer"));
- g_signal_connect (widget, "activate-link",
- G_CALLBACK (gcm_prefs_activate_link_cb), prefs);
- /* TRANSLATORS: link to gcm-viewer */
- text = g_strdup_printf ("<a href=\"moo\">%s</a>",
- _("Compare profiles..."));
- gtk_label_set_markup (GTK_LABEL (widget), text);
- widget = GTK_WIDGET (gtk_builder_get_object (prefs->builder,
"toolbutton_device_remove"));
g_signal_connect (widget, "clicked",
G_CALLBACK (gcm_prefs_delete_cb), prefs);
@@ -2699,7 +2522,7 @@ gcm_viewer_startup_cb (GApplication *application, GcmPrefsPriv *prefs)
/* add infobar to defaults pane */
widget = GTK_WIDGET (gtk_builder_get_object (prefs->builder,
- "vbox_working_spaces"));
+ "dialog-vbox1"));
gtk_box_pack_start (GTK_BOX(widget),
prefs->info_bar_profiles,
TRUE, FALSE, 0);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
