GNOME.org
 

[gnome-disk-utility] Use the one_liner value from UDisksObjectInfo in RAID dialog

commit 1e4551b5f6b8920c1db8f75799355bd52c3f35bc
Author: David Zeuthen <zeuthen gmail com>
Date:   Tue Nov 27 12:34:29 2012 -0500

    Use the one_liner value from UDisksObjectInfo in RAID dialog
    
    ... instead of rolling our own.
    
    Signed-off-by: David Zeuthen <zeuthen gmail com>

 data/ui/benchmark-dialog.ui      |    2 +-
 data/ui/md-raid-disks-dialog.ui  |   65 +++++++++-----------------------------
 src/disks/gdumdraiddisksdialog.c |   22 +------------
 3 files changed, 17 insertions(+), 72 deletions(-)
---
diff --git a/data/ui/benchmark-dialog.ui b/data/ui/benchmark-dialog.ui
index e191fef..29a3c10 100644
--- a/data/ui/benchmark-dialog.ui
+++ b/data/ui/benchmark-dialog.ui
@@ -230,7 +230,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Disk Drive or Device</property>
+                    <property name="label" translatable="yes">Disk or Device</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
diff --git a/data/ui/md-raid-disks-dialog.ui b/data/ui/md-raid-disks-dialog.ui
index 976da7e..992d508 100644
--- a/data/ui/md-raid-disks-dialog.ui
+++ b/data/ui/md-raid-disks-dialog.ui
@@ -20,11 +20,9 @@
             <child>
               <object class="GtkButton" id="close-button">
                 <property name="label">gtk-close</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -83,11 +81,9 @@
                     <property name="icon_size">1</property>
                     <child>
                       <object class="GtkToolButton" id="add-toolbutton">
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Add Diskâ</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Add Diskâ</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">list-add-symbolic</property>
@@ -99,11 +95,9 @@
                     </child>
                     <child>
                       <object class="GtkToolButton" id="remove-toolbutton">
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Remove Diskâ</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Remove Diskâ</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">list-remove-symbolic</property>
@@ -115,10 +109,8 @@
                     </child>
                     <child>
                       <object class="GtkSeparatorToolItem" id="toolbutton1">
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -127,11 +119,9 @@
                     </child>
                     <child>
                       <object class="GtkToolButton" id="goto-disk-toolbutton">
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Go To Disk</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Go To Disk</property>
                         <property name="use_underline">True</property>
                         <property name="icon_name">go-jump-symbolic</property>
@@ -168,11 +158,13 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">Serial Number</property>
-                    <style><class name="dim-label"/></style>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="top_attach">1</property>
                     <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
@@ -183,11 +175,13 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">Assessment</property>
-                    <style><class name="dim-label"/></style>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="top_attach">2</property>
                     <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
@@ -203,7 +197,7 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
+                    <property name="top_attach">1</property>
                     <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
@@ -219,7 +213,7 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
+                    <property name="top_attach">2</property>
                     <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
@@ -229,8 +223,10 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Model or Name</property>
-                    <style><class name="dim-label"/></style>
+                    <property name="label" translatable="yes">Disk or Device</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -240,37 +236,6 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="model-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="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Device</property>
-                    <style><class name="dim-label"/></style>
-                  </object>
-                  <packing>
-                    <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="GtkLabel" id="device-label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -281,7 +246,7 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
+                    <property name="top_attach">0</property>
                     <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
diff --git a/src/disks/gdumdraiddisksdialog.c b/src/disks/gdumdraiddisksdialog.c
index b0f121e..a9edeb5 100644
--- a/src/disks/gdumdraiddisksdialog.c
+++ b/src/disks/gdumdraiddisksdialog.c
@@ -45,7 +45,6 @@ typedef struct
   GtkWidget *remove_toolbutton;
   GtkWidget *goto_disk_toolbutton;
 
-  GtkWidget *model_label;
   GtkWidget *device_label;
   GtkWidget *serial_label;
   GtkWidget *assessment_label;
@@ -67,7 +66,6 @@ static const struct {
   {G_STRUCT_OFFSET (DialogData, remove_toolbutton), "remove-toolbutton"},
   {G_STRUCT_OFFSET (DialogData, goto_disk_toolbutton), "goto-disk-toolbutton"},
 
-  {G_STRUCT_OFFSET (DialogData, model_label), "model-label"},
   {G_STRUCT_OFFSET (DialogData, device_label), "device-label"},
   {G_STRUCT_OFFSET (DialogData, serial_label), "serial-label"},
   {G_STRUCT_OFFSET (DialogData, assessment_label), "assessment-label"},
@@ -220,11 +218,9 @@ update_dialog_labels (DialogData *data)
   UDisksObject *object = NULL;
   UDisksBlock *block = NULL;
   UDisksDrive *drive = NULL;
-  gchar *model_markup = NULL;
   gchar *device_markup = NULL;
   gchar *serial_markup = NULL;
   gchar *assessment_markup = NULL;
-  const gchar *drive_revision = NULL;
   UDisksObjectInfo *info = NULL;
   UDisksObject *drive_object = NULL;
   UDisksDriveAta *ata = NULL;
@@ -260,7 +256,6 @@ update_dialog_labels (DialogData *data)
   drive = udisks_client_get_drive_for_block (data->client, block);
   if (drive != NULL)
     {
-      drive_revision = udisks_drive_get_revision (drive);
       drive_object = (UDisksObject *) g_dbus_interface_get_object (G_DBUS_INTERFACE (drive));
       ata = udisks_object_peek_drive_ata (drive_object);
       serial_markup = udisks_drive_dup_serial (drive);
@@ -272,28 +267,13 @@ update_dialog_labels (DialogData *data)
         }
     }
 
-  if (drive_revision != NULL && strlen (drive_revision) > 0)
-    {
-      /* Translators: Shown for "Model" field.
-       *              The first %s is the name of the object (e.g. "INTEL SSDSA2MH080G1GC").
-       *              The second %s is the fw revision (e.g "45ABX21").
-       */
-      model_markup = g_strdup_printf (C_("mdraid-disks", "%s (%s)"),
-                                      udisks_object_info_get_name (info),
-                                      drive_revision);
-    }
-  else
-    {
-      model_markup = g_strdup (udisks_object_info_get_name (info));
-    }
+  device_markup = g_strdup (udisks_object_info_get_one_liner (info));
 
  out:
-  gtk_label_set_markup (GTK_LABEL (data->model_label),      model_markup != NULL ?      model_markup : "â");
   gtk_label_set_markup (GTK_LABEL (data->device_label),     device_markup != NULL ?     device_markup : "â");
   gtk_label_set_markup (GTK_LABEL (data->serial_label),     serial_markup != NULL ?     serial_markup : "â");
   gtk_label_set_markup (GTK_LABEL (data->assessment_label), assessment_markup != NULL ? assessment_markup : "â");
 
-  g_free (model_markup);
   g_free (device_markup);
   g_free (serial_markup);
   g_free (assessment_markup);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]