[gnome-color-manager] Show the device vendor in the UI, rather than the description
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Show the device vendor in the UI, rather than the description
- Date: Thu, 5 Nov 2009 17:02:37 +0000 (UTC)
commit 8b30fd5e98e814e344523edc928e8acc4660c991
Author: Richard Hughes <richard hughsie com>
Date: Thu Nov 5 16:59:32 2009 +0000
Show the device vendor in the UI, rather than the description
data/gcm-prefs.ui | 124 ++++++++++++++++++++++++++++------------------------
src/gcm-prefs.c | 28 ++++++------
2 files changed, 81 insertions(+), 71 deletions(-)
---
diff --git a/data/gcm-prefs.ui b/data/gcm-prefs.ui
index 47df5c0..cb6f470 100644
--- a/data/gcm-prefs.ui
+++ b/data/gcm-prefs.ui
@@ -42,7 +42,7 @@
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="spacing">9</property>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
@@ -75,93 +75,104 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table_details">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">3</property>
- <property name="row_spacing">3</property>
<child>
- <object class="GtkHBox" id="hbox5">
+ <object class="GtkTable" id="table_details">
<property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">3</property>
+ <property name="row_spacing">3</property>
<child>
- <object class="GtkLabel" id="label_title_description">
+ <object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
- <property name="label" translatable="yes">Description:</property>
+ <child>
+ <object class="GtkLabel" id="label_title_vendor">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Vendor:</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>
- </child>
- <child>
- <object class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_title_copyright">
+ <object class="GtkHBox" id="hbox10">
<property name="visible">True</property>
- <property name="label" translatable="yes">License:</property>
+ <child>
+ <object class="GtkLabel" id="label_title_copyright">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">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>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox11">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_description">
+ <object class="GtkHBox" id="hbox11">
<property name="visible">True</property>
- <property name="label">Long description about what the profile says</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
+ <child>
+ <object class="GtkLabel" id="label_vendor">
+ <property name="visible">True</property>
+ <property name="label">The hardware vendor</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">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="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox12">
- <property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label_copyright">
+ <object class="GtkHBox" id="hbox12">
<property name="visible">True</property>
- <property name="label">Usually non-free</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
+ <child>
+ <object class="GtkLabel" id="label_copyright">
+ <property name="visible">True</property>
+ <property name="label">Usually non-free</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">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="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
</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>
+ <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">2</property>
</packing>
</child>
@@ -287,7 +298,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index 1e74b86..180056c 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -366,16 +366,16 @@ gcm_prefs_devices_treeview_clicked_cb (GtkTreeSelection *selection, gboolean dat
/* not a xrandr device */
if (type != GCM_DEVICE_TYPE_DISPLAY) {
widget = GTK_WIDGET (gtk_builder_get_object (builder, "expander1"));
- gtk_widget_hide (widget);
+ gtk_widget_set_sensitive (widget, FALSE);
widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_reset"));
- gtk_widget_hide (widget);
+ gtk_widget_set_sensitive (widget, FALSE);
} else {
/* show more UI */
widget = GTK_WIDGET (gtk_builder_get_object (builder, "expander1"));
- gtk_widget_show (widget);
+ gtk_widget_set_sensitive (widget, TRUE);
widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_reset"));
- gtk_widget_show (widget);
+ gtk_widget_set_sensitive (widget, TRUE);
}
g_object_get (current_device,
@@ -526,7 +526,7 @@ gcm_prefs_profile_combo_changed_cb (GtkWidget *widget, gpointer data)
{
guint active;
gchar *copyright = NULL;
- gchar *description = NULL;
+ gchar *vendor = NULL;
gchar *profile_old = NULL;
const gchar *filename = NULL;
gboolean ret;
@@ -572,7 +572,7 @@ gcm_prefs_profile_combo_changed_cb (GtkWidget *widget, gpointer data)
/* get the new details from the profile */
g_object_get (profile,
"copyright", ©right,
- "description", &description,
+ "vendor", &vendor,
NULL);
}
@@ -591,21 +591,21 @@ gcm_prefs_profile_combo_changed_cb (GtkWidget *widget, gpointer data)
}
/* set new descriptions */
- if (description == NULL) {
- widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_title_description"));
+ if (vendor == NULL) {
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_title_vendor"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_description"));
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_vendor"));
gtk_widget_hide (widget);
} else {
- widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_title_description"));
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_title_vendor"));
gtk_widget_show (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_description"));
- gtk_label_set_label (GTK_LABEL(widget), description);
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_vendor"));
+ gtk_label_set_label (GTK_LABEL(widget), vendor);
gtk_widget_show (widget);
}
/* set new descriptions */
- if (copyright == NULL && description == NULL) {
+ if (copyright == NULL && vendor == NULL) {
widget = GTK_WIDGET (gtk_builder_get_object (builder, "table_details"));
gtk_widget_hide (widget);
} else {
@@ -638,7 +638,7 @@ out:
if (profile != NULL)
g_object_unref (profile);
g_free (copyright);
- g_free (description);
+ g_free (vendor);
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
