[gnome-color-manager] Remove the device-specific labels on the first panel page
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Remove the device-specific labels on the first panel page
- Date: Sat, 9 Oct 2010 20:34:54 +0000 (UTC)
commit 84ab078667a2db40c628d329dfce1db1f55cb38e
Author: Richard Hughes <richard hughsie com>
Date: Fri Oct 8 23:11:32 2010 +0100
Remove the device-specific labels on the first panel page
data/gcm-prefs.ui | 291 +-------------------------------------------------
src/cc-color-panel.c | 47 --------
2 files changed, 5 insertions(+), 333 deletions(-)
---
diff --git a/data/gcm-prefs.ui b/data/gcm-prefs.ui
index b62de95..ad4ece0 100644
--- a/data/gcm-prefs.ui
+++ b/data/gcm-prefs.ui
@@ -11,14 +11,7 @@
<widget name="combobox_space_gray"/>
</widgets>
</object>
- <object class="GtkSizeGroup" id="sizegroup_devices">
- <widgets>
- <widget name="hbox21"/>
- <widget name="hbox22"/>
- <widget name="hbox23"/>
- <widget name="hbox53"/>
- </widgets>
- </object>
+ <object class="GtkSizeGroup" id="sizegroup_devices"/>
<object class="GtkSizeGroup" id="sizegroup_defaults">
<widgets>
<widget name="hbox43"/>
@@ -685,265 +678,12 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox_device">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
- <property name="spacing">12</property>
<child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="vbox6">
- <property name="visible">True</property>
- <property name="spacing">9</property>
- <child>
- <object class="GtkVBox" id="vbox_device_details">
- <property name="visible">True</property>
- <child>
- <object class="GtkHBox" id="hbox_manufacturer">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox21">
- <property name="visible">True</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>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </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="hbox25">
- <property name="visible">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="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>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <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">12</property>
- <child>
- <object class="GtkHBox" id="hbox22">
- <property name="visible">True</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>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </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="hbox24">
- <property name="visible">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="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>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <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">12</property>
- <child>
- <object class="GtkHBox" id="hbox23">
- <property name="visible">True</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>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </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="hbox26">
- <property name="visible">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="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>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="padding">3</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_eisa">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkHBox" id="hbox53">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label_title_eisa">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="The EISA (standards body) identifier of the device">EISA ID:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </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="hbox54">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label_eisa">
- <property name="visible">True</property>
- <property name="label">eisa-id</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>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="padding">3</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
+ <object class="GtkLabel" id="label_problems">
+ <property name="label">Problems</property>
+ <property name="selectable">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -951,27 +691,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label_problems">
- <property name="label">Problems</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>
</object>
<packing>
<property name="expand">False</property>
diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
index 2677b6e..b76a59c 100644
--- a/src/cc-color-panel.c
+++ b/src/cc-color-panel.c
@@ -1545,10 +1545,6 @@ cc_color_panel_devices_treeview_clicked_cb (GtkTreeSelection *selection, CcColor
gchar *id = NULL;
gboolean ret;
GcmDeviceKind kind;
- const gchar *device_serial = NULL;
- const gchar *device_model = NULL;
- const gchar *device_manufacturer = NULL;
- const gchar *eisa_id = NULL;
GPtrArray *profiles = NULL;
GcmProfile *profile;
@@ -1606,49 +1602,6 @@ cc_color_panel_devices_treeview_clicked_cb (GtkTreeSelection *selection, CcColor
}
}
- /* set device labels */
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hbox_serial"));
- device_serial = gcm_device_get_serial (panel->priv->current_device);
- if (device_serial != NULL) {
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "label_serial"));
- gtk_label_set_label (GTK_LABEL (widget), device_serial);
- } else {
- gtk_widget_hide (widget);
- }
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hbox_model"));
- device_model = gcm_device_get_model (panel->priv->current_device);
- if (device_model != NULL) {
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "label_model"));
- gtk_label_set_label (GTK_LABEL (widget), device_model);
- } else {
- gtk_widget_hide (widget);
- }
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hbox_manufacturer"));
- device_manufacturer = gcm_device_get_manufacturer (panel->priv->current_device);
- if (device_manufacturer != NULL) {
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "label_manufacturer"));
- gtk_label_set_label (GTK_LABEL (widget), device_manufacturer);
- } else {
- gtk_widget_hide (widget);
- }
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "vbox_device_details"));
- gtk_widget_show (widget);
-
- /* get display specific properties */
- if (kind == GCM_DEVICE_KIND_DISPLAY)
- eisa_id = gcm_device_xrandr_get_eisa_id (GCM_DEVICE_XRANDR (panel->priv->current_device));
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "hbox_eisa"));
- if (eisa_id != NULL) {
- gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "label_eisa"));
- gtk_label_set_label (GTK_LABEL (widget), eisa_id);
- } else {
- gtk_widget_hide (widget);
- }
-
/* set adjustments */
panel->priv->setting_up_device = TRUE;
localgamma = gcm_device_get_gamma (panel->priv->current_device);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
