[master/rhel7] Add more details to iso device selector (#971290)

[Brian C. Lane]

From: "Brian C. Lane"

Add the device path, format and label or uuid to the dropdown. uuid is
only shown if there is no label.

-- See and example here: http://bcl.fedorapeople.org/images/isofile.png
---
 pyanaconda/ui/gui/spokes/source.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 8dd8ba2..e8fb3c5 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -625,7 +625,14 @@ class SourceSpoke(NormalSpoke):
         active = 0
         idx = 0
         for dev in potentialHdisoSources(self.storage.devicetree):
-            store.append([dev, "%s (%s MB)" % (self._sanitize_model(dev.disk.model), int(dev.size))])
+            # path model size format type uuid of format
+            dev_info = { "model" : self._sanitize_model(dev.disk.model),
+                         "path"  : dev.path,
+                         "size"  : dev.size,
+                         "format": dev.format.name or "",
+                         "label" : dev.format.label or dev.format.uuid or ""
+                       }
+            store.append([dev, "%(model)s %(path)s (%(size)s MB) %(format)s %(label)s" % dev_info])
             if self.data.method.method == "harddrive" and dev.name == self.data.method.partition:
                 active = idx
             added = True

[Vratislav Podzimek]

On Wed, 2013-09-04 at 16:36 -0700, Brian C. Lane wrote:
> From: "Brian C. Lane"
>
> Add the device path, format and label or uuid to the dropdown. uuid is
> only shown if there is no label.
> -- See and example here: http://bcl.fedorapeople.org/images/isofile.png
>
> pyanaconda/ui/gui/spokes/source.py | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
> index 8dd8ba2..e8fb3c5 100644
> --- a/pyanaconda/ui/gui/spokes/source.py
> +++ b/pyanaconda/ui/gui/spokes/source.py
> @@ -625,7 +625,14 @@ class SourceSpoke(NormalSpoke):
>          active = 0
>          idx = 0
>          for dev in potentialHdisoSources(self.storage.devicetree):
>        store.append([dev, "%s (%s MB)" % (self._sanitize_model(dev.disk.model), int(dev.size))])
>        # path model size format type uuid of format
>        dev_info = { "model" : self._sanitize_model(dev.disk.model),
>                     "path"  : dev.path,
>                     "size"  : dev.size,
>                     "format": dev.format.name or "",
>                     "label" : dev.format.label or dev.format.uuid or ""
>                   }
>        store.append([dev, "%(model)s %(path)s (%(size)s MB) %(format)s %(label)s" % dev_info])
>        if self.data.method.method == "harddrive" and dev.name == self.data.method.partition:
>            active = idx
>        added = True

This looks good to me. My only concern is that on small screens the text
might be too wide. Maybe we could set ellipsize-end for the renderer?
That would cause no harm on wide screens or with short texts and would
prevent issues in other cases. Nevertheless, ACK for any version.

[Brian C. Lane]

On Thu, Sep 05, 2013 at 08:46:55AM +0200, Vratislav Podzimek wrote:
> This looks good to me. My only concern is that on small screens the text
> might be too wide. Maybe we could set ellipsize-end for the renderer?
> That would cause no harm on wide screens or with short texts and would
> prevent issues in other cases. Nevertheless, ACK for any version.

I was testing in a KVM and even with uuid it has lots of room left at
the end so it should be ok.

[Chris Lumens]

> diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
> index 8dd8ba2..e8fb3c5 100644
> --- a/pyanaconda/ui/gui/spokes/source.py
> +++ b/pyanaconda/ui/gui/spokes/source.py
> @@ -625,7 +625,14 @@ class SourceSpoke(NormalSpoke):
>          active = 0
>          idx = 0
>          for dev in potentialHdisoSources(self.storage.devicetree):
>        store.append([dev, "%s (%s MB)" % (self._sanitize_model(dev.disk.model), int(dev.size))])
>        # path model size format type uuid of format
>        dev_info = { "model" : self._sanitize_model(dev.disk.model),
>                     "path"  : dev.path,
>                     "size"  : dev.size,
>                     "format": dev.format.name or "",
>                     "label" : dev.format.label or dev.format.uuid or ""
>                   }
>        store.append([dev, "%(model)s %(path)s (%(size)s MB) %(format)s %(label)s" % dev_info])
>        if self.data.method.method == "harddrive" and dev.name == self.data.method.partition:
>            active = idx
>        added = True

I'd prefer some separators like dashes or whatever between the fields.
It kind of looks like a run-on sentence now.

- Chris