[gnome-disk-utility/udisks2-port] Clean up drive properties a bit
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility/udisks2-port] Clean up drive properties a bit
- Date: Sun, 14 Aug 2011 17:08:55 +0000 (UTC)
commit 69b7eaeda8c66279d44a23f169b5d6f247827851
Author: David Zeuthen <davidz redhat com>
Date: Sun Aug 14 13:07:18 2011 -0400
Clean up drive properties a bit
In particular
- Don't show the WWN
- Show "Firmware Version" (if available) in the Model line
- Use "Serial", not "Serial Number"
- Use "Status", not "Self-assessment"
- Show "Temperature" (if available) in the "Status" line
Signed-off-by: David Zeuthen <davidz redhat com>
data/ui/palimpsest.ui | 125 +++-----------------------------------------
src/palimpsest/gduwindow.c | 53 ++++++++++---------
2 files changed, 35 insertions(+), 143 deletions(-)
---
diff --git a/data/ui/palimpsest.ui b/data/ui/palimpsest.ui
index 8a90cfc..19c1e42 100644
--- a/data/ui/palimpsest.ui
+++ b/data/ui/palimpsest.ui
@@ -1137,7 +1137,7 @@
<object class="GtkTable" id="devtab-drive-table">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">9</property>
+ <property name="n_rows">6</property>
<property name="n_columns">2</property>
<property name="column_spacing">10</property>
<child>
@@ -1195,48 +1195,11 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="devtab-firmware-version-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Firmware Version</property>
- <attributes>
- <attribute name="foreground" value="#555555555555"/>
- </attributes>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="y_padding">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="devtab-firmware-version-value-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="selectable">True</property>
- <property name="ellipsize">end</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="y_padding">4</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="devtab-serial-number-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Serial Number</property>
+ <property name="label" translatable="yes">Serial</property>
<attributes>
<attribute name="foreground" value="#555555555555"/>
</attributes>
@@ -1269,43 +1232,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="devtab-wwn-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">World Wide Name</property>
- <attributes>
- <attribute name="foreground" value="#555555555555"/>
- </attributes>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="y_padding">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="devtab-wwn-value-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="selectable">True</property>
- <property name="ellipsize">end</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="y_padding">4</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="devtab-media-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1397,14 +1323,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Self-Assessment</property>
+ <property name="label" translatable="yes">Status</property>
<attributes>
<attribute name="foreground" value="#555555555555"/>
</attributes>
</object>
<packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="y_padding">4</property>
@@ -1422,45 +1348,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="y_padding">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="devtab-drive-temperature-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Temperature</property>
- <attributes>
- <attribute name="foreground" value="#555555555555"/>
- </attributes>
- </object>
- <packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="y_padding">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="devtab-drive-temperature-value-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="selectable">True</property>
- <property name="ellipsize">end</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="y_padding">4</property>
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index 71e7c98..d9569bc 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -1356,6 +1356,7 @@ update_device_page_for_drive (GduWindow *window,
GString *str;
const gchar *drive_vendor;
const gchar *drive_model;
+ const gchar *drive_revision;
gchar *name;
gchar *description;
gchar *media_description;
@@ -1377,6 +1378,7 @@ update_device_page_for_drive (GduWindow *window,
drive_vendor = udisks_drive_get_vendor (drive);
drive_model = udisks_drive_get_model (drive);
+ drive_revision = udisks_drive_get_revision (drive);
str = g_string_new (NULL);
for (l = block_devices; l != NULL; l = l->next)
@@ -1400,32 +1402,28 @@ update_device_page_for_drive (GduWindow *window,
gtk_image_set_from_gicon (GTK_IMAGE (window->devtab_drive_image), drive_icon, GTK_ICON_SIZE_DIALOG);
gtk_widget_show (window->devtab_drive_image);
+ str = g_string_new (NULL);
if (strlen (drive_vendor) == 0)
- s = g_strdup (drive_model);
+ g_string_append (str, drive_model);
else if (strlen (drive_model) == 0)
- s = g_strdup (drive_vendor);
+ g_string_append (str, drive_vendor);
else
- s = g_strconcat (drive_vendor, " ", drive_model, NULL);
+ g_string_append_printf (str, "%s %s", drive_vendor, drive_model);
+ if (strlen (drive_revision) > 0)
+ g_string_append_printf (str, " (%s)", drive_revision);
set_markup (window,
"devtab-model-label",
- "devtab-model-value-label", s, SET_MARKUP_FLAGS_HYPHEN_IF_EMPTY);
- g_free (s);
+ "devtab-model-value-label", str->str, SET_MARKUP_FLAGS_HYPHEN_IF_EMPTY);
+ g_string_free (str, TRUE);
set_markup (window,
"devtab-serial-number-label",
"devtab-serial-number-value-label",
udisks_drive_get_serial (drive), SET_MARKUP_FLAGS_NONE);
- set_markup (window,
- "devtab-firmware-version-label",
- "devtab-firmware-version-value-label",
- udisks_drive_get_revision (drive), SET_MARKUP_FLAGS_NONE);
- set_markup (window,
- "devtab-wwn-label",
- "devtab-wwn-value-label",
- udisks_drive_get_wwn (drive), SET_MARKUP_FLAGS_NONE);
if (ata != NULL && !udisks_drive_get_media_removable (drive))
{
gchar *s2 = NULL;
+ gchar *s3 = NULL;
if (!udisks_drive_ata_get_smart_supported (ata))
{
s = g_strdup (_("S.M.A.R.T. not supported"));
@@ -1452,13 +1450,16 @@ update_device_page_for_drive (GduWindow *window,
if (failing)
{
s = g_strdup_printf ("<b><span foreground=\"#ff0000\">%s</span></b>",
- _("FAILING NOW"));
+ _("ABOUT TO FAIL"));
}
else
{
- s = g_strdup (_("Passed"));
+ s = g_strdup (_("No problems detected"));
}
- /* TODO: also show if a self-test is in progress */
+ /* TODO: Also show
+ * - if one or more prefail attrs are exceeding threshold
+ * - if a self-test is in progress
+ */
temp = udisks_drive_ata_get_smart_temperature (ata);
if (temp > 1.0)
@@ -1475,19 +1476,21 @@ update_device_page_for_drive (GduWindow *window,
}
}
}
+ if (s2 != NULL)
+ {
+ s3 = g_strdup_printf ("%s (%s)", s, s2);
+ }
+ else
+ {
+ s3 = g_strdup (s);
+ }
set_markup (window,
"devtab-drive-smart-label",
"devtab-drive-smart-value-label",
- s, SET_MARKUP_FLAGS_NONE);
+ s3, SET_MARKUP_FLAGS_NONE);
+ g_free (s3);
+ g_free (s2);
g_free (s);
- if (s2 != NULL)
- {
- set_markup (window,
- "devtab-drive-temperature-label",
- "devtab-drive-temperature-value-label",
- s2, SET_MARKUP_FLAGS_NONE);
- g_free (s2);
- }
}
size = udisks_drive_get_size (drive);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
