commit 1415b2cfecb5d86f750c779210d9fd58c68624e7
Author: Richard Hughes <richard hughsie com>
Date: Tue Dec 29 16:33:04 2009 +0000
trivial: some more HIG fixups for the button spacing
data/gcm-prefs.ui | 1882 +++++++++++++++++++++++++++--------------------------
1 files changed, 942 insertions(+), 940 deletions(-)
---
diff --git a/data/gcm-prefs.ui b/data/gcm-prefs.ui
index 9929bfa..ad549fa 100644
--- a/data/gcm-prefs.ui
+++ b/data/gcm-prefs.ui
@@ -14,35 +14,46 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkNotebook" id="notebook_prefs">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">6</property>
+ <property name="right_padding">6</property>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkNotebook" id="notebook_prefs">
<property name="visible">True</property>
- <property name="border_width">9</property>
- <property name="spacing">9</property>
+ <property name="can_focus">True</property>
<child>
- <object class="GtkHBox" id="hbox20">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="border_width">9</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkVBox" id="vbox_devices">
+ <object class="GtkHBox" id="hbox20">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkVBox" id="vbox_devices">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkTreeView" id="treeview_devices">
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="headers_visible">False</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</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>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -51,244 +62,212 @@
</child>
</object>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
<child>
- <object class="GtkVBox" id="vbox_sections">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">15</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkVBox" id="vbox7">
+ <object class="GtkVBox" id="vbox_sections">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">15</property>
<child>
- <object class="GtkHBox" id="hbox19">
+ <object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label_device">
+ <object class="GtkHBox" id="hbox19">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="Section heading for device settings">Device</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <child>
+ <object class="GtkLabel" id="label_device">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="Section heading for device settings">Device</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox6">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">9</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox_device_details">
+ <object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="orientation">vertical</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkHBox" id="hbox_manufacturer">
+ <object class="GtkVBox" id="vbox_device_details">
<property name="visible">True</property>
- <property name="spacing">6</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="hbox21">
+ <object class="GtkHBox" id="hbox_manufacturer">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label_title_manufacturer">
+ <object class="GtkHBox" id="hbox21">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The manufacturer of the device">Manufacturer:</property>
+ <child>
+ <object class="GtkLabel" id="label_title_manufacturer">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="The manufacturer of the device">Manufacturer:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox25">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_manufacturer">
+ <object class="GtkHBox" id="hbox25">
<property name="visible">True</property>
- <property name="label">manufacturer</property>
- <property name="selectable">True</property>
+ <child>
+ <object class="GtkLabel" id="label_manufacturer">
+ <property name="visible">True</property>
+ <property name="label">manufacturer</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</property>
+ <property name="padding">3</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="padding">3</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_model">
- <property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkHBox" id="hbox22">
+ <object class="GtkHBox" id="hbox_model">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label_title_model">
+ <object class="GtkHBox" id="hbox22">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The model of the device">Model:</property>
+ <child>
+ <object class="GtkLabel" id="label_title_model">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="The model of the device">Model:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox24">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_model">
+ <object class="GtkHBox" id="hbox24">
<property name="visible">True</property>
- <property name="label">model</property>
- <property name="selectable">True</property>
+ <child>
+ <object class="GtkLabel" id="label_model">
+ <property name="visible">True</property>
+ <property name="label">model</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="padding">3</property>
<property name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="padding">3</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_serial">
- <property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkHBox" id="hbox23">
+ <object class="GtkHBox" id="hbox_serial">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label_title_serial">
+ <object class="GtkHBox" id="hbox23">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The serial number of the device">Serial number:</property>
+ <child>
+ <object class="GtkLabel" id="label_title_serial">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="The serial number of the device">Serial number:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox26">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_serial">
+ <object class="GtkHBox" id="hbox26">
<property name="visible">True</property>
- <property name="label">serial</property>
- <property name="selectable">True</property>
+ <child>
+ <object class="GtkLabel" id="label_serial">
+ <property name="visible">True</property>
+ <property name="label">serial</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</property>
+ <property name="padding">3</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">3</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
</object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox8">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label_profile">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="Section heading for device profile settings">Color Profile</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -298,17 +277,20 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox5">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">9</property>
<child>
- <object class="GtkComboBox" id="combobox_profile">
+ <object class="GtkLabel" id="label_profile">
<property name="visible">True</property>
+ <property name="label" translatable="yes" comments="Section heading for device profile settings">Color Profile</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -316,6 +298,36 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">9</property>
+ <child>
+ <object class="GtkComboBox" id="combobox_profile">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
@@ -323,206 +335,205 @@
<property name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkExpander" id="expander1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkExpander" id="expander1">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">True</property>
<child>
- <object class="GtkVBox" id="vbox10">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">3</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkVBox" id="vbox10">
<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>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
<child>
- <object class="GtkHBox" id="hbox8">
+ <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="GtkLabel" id="label_gamma">
+ <object class="GtkHScale" id="hscale_gamma">
<property name="visible">True</property>
- <property name="label" translatable="yes">Gamma:</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="expand">False</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</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">
+ <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="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkHScale" id="hscale_brightness">
<property name="visible">True</property>
- <property name="label" translatable="yes">Brightness:</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="expand">False</property>
- <property name="position">0</property>
+ <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="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="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="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="padding">6</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox28">
+ <object class="GtkHBox" id="hbox7">
<property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_contrast">
+ <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.">_Reset to defaults</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Contrast:</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">0</property>
</packing>
</child>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="padding">6</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
- <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.">_Reset to defaults</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">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</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>
- </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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkButton" id="button_calibrate">
- <property name="label" translatable="yes" comments="This is a button to calibrate the device by creating an ICC profile file using a hardware device or a reference image">Create _profile for device</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Create a color profile for the selected device</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button_delete">
- <property name="label" translatable="yes" comments="This is a button to delete the saved device">_Delete device</property>
+ <object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Remove disconnected hardware from the device list</property>
- <property name="use_underline">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkButton" id="button_calibrate">
+ <property name="label" translatable="yes" comments="This is a button to calibrate the device by creating an ICC profile file using a hardware device or a reference image">Create _profile for device</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="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_delete">
+ <property name="label" translatable="yes" comments="This is a button to delete the saved device">_Delete device</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>
<packing>
<property name="expand">False</property>
@@ -532,53 +543,51 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label_devices">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="Tab title, currently connected or saved devices">Devices</property>
+ </object>
<packing>
- <property name="position">1</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label_devices">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="Tab title, currently connected or saved devices">Devices</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox27">
- <property name="visible">True</property>
- <property name="border_width">9</property>
- <property name="spacing">9</property>
<child>
- <object class="GtkHBox" id="hbox29">
+ <object class="GtkHBox" id="hbox27">
<property name="visible">True</property>
+ <property name="border_width">9</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkVBox" id="vbox_profiles">
+ <object class="GtkHBox" id="hbox29">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkVBox" id="vbox_profiles">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkTreeView" id="treeview_profiles">
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="headers_visible">False</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview_profiles">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -587,588 +596,588 @@
</child>
</object>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox11">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
<child>
- <object class="GtkVBox" id="vbox_sections1">
+ <object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">15</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkVBox" id="vbox13">
+ <object class="GtkVBox" id="vbox_sections1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">15</property>
<child>
- <object class="GtkHBox" id="hbox38">
+ <object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label_profile1">
+ <object class="GtkHBox" id="hbox38">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="Section heading for device profile settings">Color Profile</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <child>
+ <object class="GtkLabel" id="label_profile1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="Section heading for device profile settings">Color Profile</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment5">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox_profiles_details">
+ <object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">9</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox_profiles_details1">
+ <object class="GtkVBox" id="vbox_profiles_details">
<property name="visible">True</property>
<property name="orientation">vertical</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkHBox" id="hbox_type">
+ <object class="GtkVBox" id="vbox_profiles_details1">
<property name="visible">True</property>
- <property name="spacing">9</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="hbox6">
+ <object class="GtkHBox" id="hbox_type">
<property name="visible">True</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkLabel" id="label_title_type">
+ <object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The type of profile, e.g. display, scanner, etc.">Profile type:</property>
+ <child>
+ <object class="GtkLabel" id="label_title_type">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="The type of profile, e.g. display, scanner, etc.">Profile type:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkHBox" id="hbox18">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label_type">
+ <property name="visible">True</property>
+ <property name="label">input</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox18">
+ <object class="GtkHBox" id="hbox_colorspace">
<property name="visible">True</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkLabel" id="label_type">
+ <object class="GtkHBox" id="hbox39">
<property name="visible">True</property>
- <property name="label">input</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
+ <child>
+ <object class="GtkLabel" id="label_title_colorspace">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="The profile colorspace, e.g. RGB">Colorspace:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_colorspace">
- <property name="visible">True</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkHBox" id="hbox39">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_title_colorspace">
+ <object class="GtkHBox" id="hbox40">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The profile colorspace, e.g. RGB">Colorspace:</property>
+ <child>
+ <object class="GtkLabel" id="label_colorspace">
+ <property name="visible">True</property>
+ <property name="label">colorspace</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox40">
+ <object class="GtkHBox" id="hbox_datetime">
<property name="visible">True</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkLabel" id="label_colorspace">
+ <object class="GtkHBox" id="hbox36">
<property name="visible">True</property>
- <property name="label">colorspace</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
+ <child>
+ <object class="GtkLabel" id="label_title_datetime">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="When the profile was created">Created:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_datetime">
- <property name="visible">True</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkHBox" id="hbox36">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_title_datetime">
+ <object class="GtkHBox" id="hbox37">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="When the profile was created">Created:</property>
+ <child>
+ <object class="GtkLabel" id="label_datetime">
+ <property name="visible">True</property>
+ <property name="label">datetime</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox37">
+ <object class="GtkHBox" id="hbox_profile_manufacturer">
<property name="visible">True</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkLabel" id="label_datetime">
+ <object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
- <property name="label">datetime</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
+ <child>
+ <object class="GtkLabel" id="label_title_profile_manufacturer">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="The manufacturer of the profile">Device manufacturer:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_profile_manufacturer">
- <property name="visible">True</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_title_profile_manufacturer">
+ <object class="GtkHBox" id="hbox11">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The manufacturer of the profile">Device manufacturer:</property>
+ <child>
+ <object class="GtkLabel" id="label_profile_manufacturer">
+ <property name="visible">True</property>
+ <property name="label">manufacturer</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox11">
+ <object class="GtkHBox" id="hbox_profile_model">
<property name="visible">True</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkLabel" id="label_profile_manufacturer">
+ <object class="GtkHBox" id="hbox34">
<property name="visible">True</property>
- <property name="label">manufacturer</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
+ <child>
+ <object class="GtkLabel" id="label_title_profile_model">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="The manufacturer of the profile">Device model:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_profile_model">
- <property name="visible">True</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkHBox" id="hbox34">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_title_profile_model">
+ <object class="GtkHBox" id="hbox35">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The manufacturer of the profile">Device model:</property>
+ <child>
+ <object class="GtkLabel" id="label_profile_model">
+ <property name="visible">True</property>
+ <property name="label">model</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox35">
+ <object class="GtkHBox" id="hbox_copyright">
<property name="visible">True</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkLabel" id="label_profile_model">
+ <object class="GtkHBox" id="hbox10">
<property name="visible">True</property>
- <property name="label">model</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
+ <child>
+ <object class="GtkLabel" id="label_title_copyright">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="The licence of the profile, normally non-free">License:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_copyright">
- <property name="visible">True</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_title_copyright">
+ <object class="GtkHBox" id="hbox12">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The licence of the profile, normally non-free">License:</property>
+ <child>
+ <object class="GtkLabel" id="label_copyright">
+ <property name="visible">True</property>
+ <property name="label">non-free</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox12">
+ <object class="GtkHBox" id="hbox_size">
<property name="visible">True</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkLabel" id="label_copyright">
+ <object class="GtkHBox" id="hbox30">
<property name="visible">True</property>
- <property name="label">non-free</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
+ <child>
+ <object class="GtkLabel" id="label_title_size">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="The file size in bytes of the profile">File size:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_size">
- <property name="visible">True</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkHBox" id="hbox30">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_title_size">
+ <object class="GtkHBox" id="hbox31">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The file size in bytes of the profile">File size:</property>
+ <child>
+ <object class="GtkLabel" id="label_size">
+ <property name="visible">True</property>
+ <property name="label">input</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox31">
+ <object class="GtkHBox" id="hbox_filename">
<property name="visible">True</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkLabel" id="label_size">
+ <object class="GtkHBox" id="hbox32">
<property name="visible">True</property>
- <property name="label">input</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
+ <child>
+ <object class="GtkLabel" id="label_title_filename">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="The basename (the last section of the filename) of the profile">File name:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_filename">
- <property name="visible">True</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkHBox" id="hbox32">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_title_filename">
+ <object class="GtkHBox" id="hbox33">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="The basename (the last section of the filename) of the profile">File name:</property>
+ <child>
+ <object class="GtkLabel" id="label_filename">
+ <property name="visible">True</property>
+ <property name="label">filename</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox33">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label_filename">
- <property name="visible">True</property>
- <property name="label">filename</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
+ <property name="position">7</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">7</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label_cie_title">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="Section heading for CIE and TRC graphs">Profile Graphs</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <child>
+ <object class="GtkLabel" id="label_cie_title">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="Section heading for CIE and TRC graphs">Profile Graphs</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
<child>
- <object class="GtkHBox" id="hbox47">
+ <object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkAspectFrame" id="aspectframe1">
+ <object class="GtkHBox" id="hbox47">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkHBox" id="hbox_cie_widget">
+ <object class="GtkAspectFrame" id="aspectframe1">
<property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkLabel" id="label3">
+ <object class="GtkHBox" id="hbox_cie_widget">
<property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">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>
</object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAspectFrame" id="aspectframe2">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkHBox" id="hbox_trc_widget">
+ <object class="GtkAspectFrame" id="aspectframe2">
<property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkLabel" id="label6">
+ <object class="GtkHBox" id="hbox_trc_widget">
<property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">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>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -1176,47 +1185,45 @@
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox45">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkButton" id="button_profile_import">
- <property name="label" translatable="yes">_Import profile</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Import a color profile</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
- <object class="GtkButton" id="button_profile_delete">
- <property name="label" translatable="yes">_Delete profile</property>
+ <object class="GtkHBox" id="hbox45">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Permanently delete the selected profile</property>
- <property name="use_underline">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkButton" id="button_profile_import">
+ <property name="label" translatable="yes">_Import profile</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="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_profile_delete">
+ <property name="label" translatable="yes">_Delete profile</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="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -1225,299 +1232,268 @@
<property name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label_profiles">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="Tab title, currently installed profiles">Profiles</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="border_width">9</property>
- <property name="orientation">vertical</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkHBox" id="hbox_display">
+ <child type="tab">
+ <object class="GtkLabel" id="label_profiles">
<property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Display</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="label" translatable="yes" comments="Tab title, currently installed profiles">Profiles</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment6">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="border_width">9</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">9</property>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkHBox" id="hbox_display">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">3</property>
<child>
- <object class="GtkCheckButton" id="checkbutton_display">
- <property name="label" translatable="yes">_Apply display correction</property>
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Applies global correction to all windows</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="label" translatable="yes">Display</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_profile">
- <property name="label" translatable="yes">_Set profile for color managed applications</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Inform color-aware applications that a videocard gamma profile has been set</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox41">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Working space</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment8">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox12">
+ <object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">3</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkHBox" id="hbox42">
+ <object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
- <property name="spacing">9</property>
- <property name="homogeneous">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
<child>
- <object class="GtkHBox" id="hbox43">
+ <object class="GtkCheckButton" id="checkbutton_display">
+ <property name="label" translatable="yes">_Apply display correction</property>
<property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label_space_rgb">
- <property name="visible">True</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>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="combobox_space_rgb">
+ <object class="GtkCheckButton" id="checkbutton_profile">
+ <property name="label" translatable="yes">_Set profile for color managed applications</property>
<property name="visible">True</property>
- <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox41">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Working space</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkHBox" id="hbox44">
+ <object class="GtkVBox" id="vbox12">
<property name="visible">True</property>
- <property name="spacing">9</property>
- <property name="homogeneous">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
<child>
- <object class="GtkHBox" id="hbox46">
+ <object class="GtkHBox" id="hbox42">
<property name="visible">True</property>
+ <property name="spacing">9</property>
+ <property name="homogeneous">True</property>
<child>
- <object class="GtkLabel" id="label_space_cmyk">
+ <object class="GtkHBox" id="hbox43">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="Technical color word for softproof rendering intent">CMYK:</property>
+ <child>
+ <object class="GtkLabel" id="label_space_rgb">
+ <property name="visible">True</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">False</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkComboBox" id="combobox_space_rgb">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="combobox_space_cmyk">
+ <object class="GtkHBox" id="hbox44">
<property name="visible">True</property>
- <property name="sensitive">False</property>
+ <property name="spacing">9</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox46">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label_space_cmyk">
+ <property name="visible">True</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="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combobox_space_cmyk">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox13">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label2">
+ <object class="GtkHBox" id="hbox13">
<property name="visible">True</property>
- <property name="label" translatable="yes">Rendering intent</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Rendering intent</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">0</property>
+ <property name="position">4</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment7">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
<child>
- <object class="GtkVBox" id="vbox9">
+ <object class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">3</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkHBox" id="hbox14">
+ <object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
- <property name="spacing">9</property>
- <property name="homogeneous">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
<child>
- <object class="GtkHBox" id="hbox15">
+ <object class="GtkHBox" id="hbox14">
<property name="visible">True</property>
+ <property name="spacing">9</property>
+ <property name="homogeneous">True</property>
<child>
- <object class="GtkLabel" id="label_rendering_display">
+ <object class="GtkHBox" id="hbox15">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="What mode to use for display rendering intent">Display:</property>
+ <child>
+ <object class="GtkLabel" id="label_rendering_display">
+ <property name="visible">True</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">False</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="combobox_rendering_display">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox16">
- <property name="visible">True</property>
- <property name="spacing">9</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkHBox" id="hbox17">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_rendering_softproof">
+ <object class="GtkComboBox" id="combobox_rendering_display">
<property name="visible">True</property>
- <property name="label" translatable="yes" comments="Technical color word for softproof rendering intent">Softproof:</property>
+ <property name="sensitive">False</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -1526,43 +1502,69 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="combobox_rendering_softproof">
+ <object class="GtkHBox" id="hbox16">
<property name="visible">True</property>
- <property name="sensitive">False</property>
+ <property name="spacing">9</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox17">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label_rendering_softproof">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="Technical color word for softproof rendering intent">Softproof:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combobox_rendering_softproof">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label_defaults">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="Tab title, system wide defaults to use">Defaults</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
</object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label_defaults">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="Tab title, system wide defaults to use">Defaults</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
</child>
</object>
<packing>