[gnome-color-manager/gnome-3-8] Make wrapping sensible when showing details about profiles
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager/gnome-3-8] Make wrapping sensible when showing details about profiles
- Date: Mon, 15 Apr 2013 09:15:29 +0000 (UTC)
commit 6a7239c9f8e49a3ddf8dd51f21a720b3a653383f
Author: Richard Hughes <richard hughsie com>
Date: Tue Mar 26 14:36:44 2013 +0000
Make wrapping sensible when showing details about profiles
No string changes.
data/gcm-viewer.ui | 1016 +++++++++++++++-------------------------------------
src/gcm-viewer.c | 111 +++---
2 files changed, 351 insertions(+), 776 deletions(-)
---
diff --git a/data/gcm-viewer.ui b/data/gcm-viewer.ui
index 061e125..9c358ff 100644
--- a/data/gcm-viewer.ui
+++ b/data/gcm-viewer.ui
@@ -83,7 +83,6 @@
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Add a profile for the
device</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="icon_name">list-add-symbolic</property>
</object>
@@ -99,7 +98,6 @@
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Remove a profile from the
device</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="icon_name">list-remove-symbolic</property>
</object>
@@ -127,777 +125,389 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkVBox" id="vbox_profiles_details1">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">9</property>
+ <property name="row_spacing">12</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkHBox" id="hbox_type">
+ <object class="GtkLabel" id="label_title_type">
<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_title_type">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="The type of profile,
e.g. display, scanner, etc.">Profile type</property>
- <property name="mnemonic_widget">label_type</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox18">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_type">
- <property name="visible">True</property>
- <property name="can_focus">False</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="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="The type of profile, e.g.
display, scanner, etc.">Profile type</property>
+ <property name="mnemonic_widget">label_type</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_colorspace">
+ <object class="GtkLabel" id="label_title_colorspace">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox39">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_title_colorspace">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="The profile colorspace,
e.g. RGB">Colorspace</property>
- <property name="mnemonic_widget">label_colorspace</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox40">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_colorspace">
- <property name="visible">True</property>
- <property name="can_focus">False</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="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="The profile colorspace, e.g.
RGB">Colorspace</property>
+ <property name="mnemonic_widget">label_colorspace</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_datetime">
+ <object class="GtkLabel" id="label_title_datetime">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox36">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_title_datetime">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="When the profile was
created">Created</property>
- <property name="mnemonic_widget">label_datetime</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox37">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_datetime">
- <property name="visible">True</property>
- <property name="can_focus">False</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="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="When the profile was
created">Created</property>
+ <property name="mnemonic_widget">label_datetime</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_version">
+ <object class="GtkLabel" id="label_title_version">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_title_version">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="label" translatable="yes" comments="The version of the
profile">Version</property>
- <property name="mnemonic_widget">label_version</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_version">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="wrap_mode">char</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="valign">start</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="The version of the
profile">Version</property>
+ <property name="mnemonic_widget">label_version</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_profile_manufacturer">
+ <object class="GtkLabel" id="label_title_profile_manufacturer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_title_profile_manufacturer">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="label" translatable="yes" comments="The manufacturer of the
profile">Device manufacturer</property>
- <property name="mnemonic_widget">label_profile_manufacturer</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_profile_manufacturer">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="wrap_mode">char</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="valign">start</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="The manufacturer of the
profile">Device manufacturer</property>
+ <property name="mnemonic_widget">label_profile_manufacturer</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_profile_model">
+ <object class="GtkLabel" id="label_title_profile_model">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox34">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_title_profile_model">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="label" translatable="yes" comments="The manufacturer of the
profile">Device model</property>
- <property name="mnemonic_widget">label_profile_model</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox35">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_profile_model">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="wrap_mode">char</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="valign">start</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="The manufacturer of the
profile">Device model</property>
+ <property name="mnemonic_widget">label_profile_model</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
- <property name="position">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_vcgt">
+ <object class="GtkLabel" id="label_title_vcgt">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox48">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_title_vcgt">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="If the profile contains
a display correction table">Display correction</property>
- <property name="mnemonic_widget">label_vcgt</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox49">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_vcgt">
- <property name="visible">True</property>
- <property name="can_focus">False</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="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="If the profile contains a
display correction table">Display correction</property>
+ <property name="mnemonic_widget">label_vcgt</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_title_temp">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="The basename (the last section
of the filename) of the profile">White point</property>
+ <property name="mnemonic_widget">label_temp</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_title_copyright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="The licence of the profile,
normally non-free">License</property>
+ <property name="mnemonic_widget">label_copyright</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_title_size">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="The file size in bytes of the
profile">File size</property>
+ <property name="mnemonic_widget">label_size</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_title_filename">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="The basename (the last section
of the filename) of the profile">Filename</property>
+ <property name="mnemonic_widget">label_filename</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_title_warnings">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="warnings for the
profile">Warnings</property>
+ <property name="mnemonic_widget">label_warnings</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">11</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_colorspace">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</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="fill">False</property>
- <property name="padding">3</property>
- <property name="position">6</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_temp">
+ <object class="GtkLabel" id="label_datetime">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_title_temp">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="The basename (the last
section of the filename) of the profile">White point</property>
- <property name="mnemonic_widget">label_temp</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_temp">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="wrap_mode">word-char</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</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="fill">False</property>
- <property name="padding">3</property>
- <property name="position">7</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_copyright">
+ <object class="GtkLabel" id="label_version">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_title_copyright">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="label" translatable="yes" comments="The licence of the
profile, normally non-free">License</property>
- <property name="mnemonic_widget">label_copyright</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox30">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_copyright">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="wrap_mode">char</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</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="fill">False</property>
- <property name="padding">3</property>
- <property name="position">8</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_size">
+ <object class="GtkLabel" id="label_profile_manufacturer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox31">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_title_size">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="The file size in bytes
of the profile">File size</property>
- <property name="mnemonic_widget">label_size</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox32">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_size">
- <property name="visible">True</property>
- <property name="can_focus">False</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="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</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="fill">False</property>
- <property name="padding">3</property>
- <property name="position">9</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_filename">
+ <object class="GtkLabel" id="label_profile_model">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox33">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_title_filename">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="label" translatable="yes" comments="The basename (the last
section of the filename) of the profile">Filename</property>
- <property name="mnemonic_widget">label_filename</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox47">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_filename">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="wrap_mode">char</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</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="fill">False</property>
- <property name="padding">3</property>
- <property name="position">10</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_warnings">
+ <object class="GtkLabel" id="label_vcgt">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox332">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_title_warnings">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="label" translatable="yes" comments="warnings for the
profile">Warnings</property>
- <property name="mnemonic_widget">label_warnings</property>
- </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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox472">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label_warnings">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <property name="wrap_mode">char</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</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="fill">False</property>
- <property name="padding">3</property>
- <property name="position">11</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_temp">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_copyright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_size">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_filename">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">10</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_warnings">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">11</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -1263,7 +873,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="button_image_prev-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes">Previous Image</property>
@@ -1312,7 +921,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="button_image_next-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">Next
Image</property>
@@ -1383,7 +991,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="button_image_prev1-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes">Previous Image</property>
@@ -1432,7 +1039,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="button_image_next1-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">Next
Image</property>
@@ -1643,30 +1249,4 @@
<action-widget response="0">button_close</action-widget>
</action-widgets>
</object>
- <object class="GtkSizeGroup" id="sizegroup_profiles">
- <widgets>
- <widget name="hbox33"/>
- <widget name="hbox332"/>
- <widget name="hbox31"/>
- <widget name="hbox12"/>
- <widget name="hbox48"/>
- <widget name="hbox34"/>
- <widget name="hbox10"/>
- <widget name="hbox36"/>
- <widget name="hbox39"/>
- <widget name="hbox6"/>
- <widget name="hbox1"/>
- <widget name="hbox6"/>
- <widget name="hbox39"/>
- <widget name="hbox36"/>
- <widget name="hbox10"/>
- <widget name="hbox34"/>
- <widget name="hbox48"/>
- <widget name="hbox1"/>
- <widget name="hbox12"/>
- <widget name="hbox31"/>
- <widget name="hbox33"/>
- <widget name="hbox9"/>
- </widgets>
- </object>
</interface>
diff --git a/src/gcm-viewer.c b/src/gcm-viewer.c
index 47a0115..007a086 100644
--- a/src/gcm-viewer.c
+++ b/src/gcm-viewer.c
@@ -1115,25 +1115,24 @@ gcm_viewer_set_profile (GcmViewerPrivate *viewer, CdProfile *profile)
}
/* set kind */
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "hbox_type"));
profile_kind = cd_profile_get_kind (profile);
- if (profile_kind == CD_PROFILE_KIND_UNKNOWN) {
- gtk_widget_hide (widget);
- } else {
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_title_type"));
+ gtk_widget_set_visible (widget, profile_kind != CD_PROFILE_KIND_UNKNOWN);
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_type"));
+ gtk_widget_set_visible (widget, profile_kind != CD_PROFILE_KIND_UNKNOWN);
+ if (profile_kind != CD_PROFILE_KIND_UNKNOWN) {
gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_type"));
profile_kind_text = gcm_viewer_profile_kind_to_string (profile_kind);
gtk_label_set_label (GTK_LABEL (widget), profile_kind_text);
}
/* set colorspace */
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "hbox_colorspace"));
profile_colorspace = cd_profile_get_colorspace (profile);
- if (profile_colorspace == CD_COLORSPACE_UNKNOWN) {
- gtk_widget_hide (widget);
- } else {
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_colorspace"));
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_title_colorspace"));
+ gtk_widget_set_visible (widget, profile_colorspace != CD_COLORSPACE_UNKNOWN);
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_colorspace"));
+ gtk_widget_set_visible (widget, profile_colorspace != CD_COLORSPACE_UNKNOWN);
+ if (profile_colorspace != CD_COLORSPACE_UNKNOWN) {
profile_colorspace_text = gcm_viewer_profile_colorspace_to_string (profile_colorspace);
gtk_label_set_label (GTK_LABEL (widget), profile_colorspace_text);
}
@@ -1162,14 +1161,13 @@ gcm_viewer_set_profile (GcmViewerPrivate *viewer, CdProfile *profile)
g_free (temp);
/* set warnings */
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "hbox_warnings"));
warnings = cd_profile_get_warnings (profile);
size = g_strv_length (warnings);
- if (size == 0) {
- gtk_widget_set_visible (widget, FALSE);
- } else {
- gtk_widget_set_visible (widget, TRUE);
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_warnings"));
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_title_warnings"));
+ gtk_widget_set_visible (widget, size != 0);
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_warnings"));
+ gtk_widget_set_visible (widget, size != 0);
+ if (size > 0) {
str = g_string_new ("");
/* TRANSLATORS: profiles that have warnings are useable,
* but may not be any good */
@@ -1194,80 +1192,77 @@ gcm_viewer_set_profile (GcmViewerPrivate *viewer, CdProfile *profile)
/* set whitepoint */
temperature = gcm_profile_get_temperature (gcm_profile);
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_title_temp"));
+ gtk_widget_set_visible (widget, temperature > 0);
widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_temp"));
- if (fabs (temperature - 5000) < 10) {
- temp = g_strdup_printf ("%i°K (D50)", temperature);
- } else if (fabs (temperature - 6500) < 10) {
- temp = g_strdup_printf ("%i°K (D65)", temperature);
- } else {
- temp = g_strdup_printf ("%i°K", temperature);
+ gtk_widget_set_visible (widget, temperature > 0);
+ if (temperature > 0) {
+ if (fabs (temperature - 5000) < 10) {
+ temp = g_strdup_printf ("%i°K (D50)", temperature);
+ } else if (fabs (temperature - 6500) < 10) {
+ temp = g_strdup_printf ("%i°K (D65)", temperature);
+ } else {
+ temp = g_strdup_printf ("%i°K", temperature);
+ }
+ gtk_label_set_label (GTK_LABEL (widget), temp);
+ g_free (temp);
}
- gtk_label_set_label (GTK_LABEL (widget), temp);
- g_free (temp);
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "hbox_temp"));
- gtk_widget_set_visible (widget, (temperature > 0));
/* set size */
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "hbox_size"));
filesize = gcm_profile_get_size (gcm_profile);
- if (filesize == 0) {
- gtk_widget_hide (widget);
- } else {
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_size"));
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_title_size"));
+ gtk_widget_set_visible (widget, filesize > 0);
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_size"));
+ gtk_widget_set_visible (widget, filesize > 0);
+ if (filesize > 0) {
size_text = g_format_size (filesize);
gtk_label_set_label (GTK_LABEL (widget), size_text);
}
/* set new copyright */
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "hbox_copyright"));
profile_copyright = gcm_profile_get_copyright (gcm_profile);
- if (profile_copyright == NULL) {
- gtk_widget_hide (widget);
- } else {
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_copyright"));
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_title_copyright"));
+ gtk_widget_set_visible (widget, profile_copyright != NULL);
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_copyright"));
+ gtk_widget_set_visible (widget, profile_copyright != NULL);
+ if (profile_copyright != NULL) {
temp = gcm_utils_linkify (profile_copyright);
gtk_label_set_label (GTK_LABEL (widget), temp);
g_free (temp);
}
/* set new manufacturer */
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "hbox_profile_manufacturer"));
profile_manufacturer = gcm_profile_get_manufacturer (gcm_profile);
- if (profile_manufacturer == NULL) {
- gtk_widget_hide (widget);
- } else {
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_profile_manufacturer"));
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_title_profile_manufacturer"));
+ gtk_widget_set_visible (widget, profile_manufacturer != NULL);
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_profile_manufacturer"));
+ gtk_widget_set_visible (widget, profile_manufacturer != NULL);
+ if (profile_manufacturer != NULL) {
temp = gcm_utils_linkify (profile_manufacturer);
gtk_label_set_label (GTK_LABEL (widget), temp);
g_free (temp);
}
/* set new model */
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "hbox_profile_model"));
profile_model = gcm_profile_get_model (gcm_profile);
- if (profile_model == NULL) {
- gtk_widget_hide (widget);
- } else {
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_profile_model"));
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_title_profile_model"));
+ gtk_widget_set_visible (widget, profile_model != NULL);
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_profile_model"));
+ gtk_widget_set_visible (widget, profile_model != NULL);
+ if (profile_model != NULL) {
temp = g_markup_escape_text (profile_model, -1);
gtk_label_set_label (GTK_LABEL(widget), temp);
g_free (temp);
}
/* set new datetime */
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "hbox_datetime"));
profile_datetime = gcm_profile_get_datetime (gcm_profile);
- if (profile_datetime == NULL) {
- gtk_widget_hide (widget);
- } else {
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_datetime"));
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_title_datetime"));
+ gtk_widget_set_visible (widget, profile_datetime != NULL);
+ widget = GTK_WIDGET (gtk_builder_get_object (viewer->builder, "label_datetime"));
+ gtk_widget_set_visible (widget, profile_datetime != NULL);
+ if (profile_datetime != NULL)
gtk_label_set_label (GTK_LABEL(widget), profile_datetime);
- }
/* setup named color tab */
ret = FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
