[gnome-disk-utility] The UUID of the selected volume is shown

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 838acfeeaa64ec9cfb3f22d2fe511abdbb943859
Author: Kai Lüke <kailueke riseup net>
Date:   Mon Mar 27 21:19:57 2017 +0200

    The UUID of the selected volume is shown
    
    UUIDs are listed as possible identifier in the mount options
    dialog but not shown elsewhere. By displaying the property as
    label for selected volumes near to the device path it should
    be more discoverable and easy to copy from. Closing #752121.

 src/disks/gduwindow.c |   10 ++++++++
 src/disks/ui/disks.ui |   61 +++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 59 insertions(+), 12 deletions(-)
---
diff --git a/src/disks/gduwindow.c b/src/disks/gduwindow.c
index ffe83e4..0508829 100644
--- a/src/disks/gduwindow.c
+++ b/src/disks/gduwindow.c
@@ -2563,6 +2563,16 @@ update_device_page_for_block (GduWindow          *window,
     }
 
   /* ------------------------------ */
+  /* 'UUID' field */
+
+  s = udisks_block_dup_id_uuid (block);
+  set_markup (window,
+              "devtab-uuid-label",
+              "devtab-uuid-value-label",
+              s, SET_MARKUP_FLAGS_NONE);
+  g_free (s);
+
+  /* ------------------------------ */
   /* 'Contents' field */
 
   usage = udisks_block_get_id_usage (block);
diff --git a/src/disks/ui/disks.ui b/src/disks/ui/disks.ui
index adf3771..49b938e 100644
--- a/src/disks/ui/disks.ui
+++ b/src/disks/ui/disks.ui
@@ -819,7 +819,7 @@
                               <object class="GtkTable" id="devtab-table">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="n_rows">5</property>
+                                <property name="n_rows">6</property>
                                 <property name="n_columns">2</property>
                                 <property name="column_spacing">10</property>
                                 <child>
@@ -866,8 +866,8 @@
                                     </style>
                                   </object>
                                   <packing>
-                                    <property name="top_attach">3</property>
-                                    <property name="bottom_attach">4</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options"/>
                                     <property name="y_padding">4</property>
@@ -885,8 +885,8 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="top_attach">3</property>
-                                    <property name="bottom_attach">4</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options"/>
                                     <property name="y_padding">4</property>
@@ -930,11 +930,11 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="devtab-partition-label">
+                                  <object class="GtkLabel" id="devtab-uuid-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="xalign">1</property>
-                                    <property name="label" translatable="yes">Partition Type</property>
+                                    <property name="label" translatable="yes">UUID</property>
                                     <style>
                                       <class name="dim-label"/>
                                     </style>
@@ -948,7 +948,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="devtab-partition-value-label">
+                                  <object class="GtkLabel" id="devtab-uuid-value-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="hexpand">True</property>
@@ -967,6 +967,43 @@
                                   </packing>
                                 </child>
                                 <child>
+                                  <object class="GtkLabel" id="devtab-partition-label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Partition Type</property>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"/>
+                                    <property name="y_padding">4</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="devtab-partition-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">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"/>
+                                    <property name="y_padding">4</property>
+                                  </packing>
+                                </child>
+                                <child>
                                   <object class="GtkLabel" id="devtab-job-label">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -978,8 +1015,8 @@
                                     </style>
                                   </object>
                                   <packing>
-                                    <property name="top_attach">4</property>
-                                    <property name="bottom_attach">5</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_padding">4</property>
                                   </packing>
@@ -1059,8 +1096,8 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="top_attach">4</property>
-                                    <property name="bottom_attach">5</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>