It doesn't make sense for these two dialogs to display different columns. This
adds the pretty name (like "sda") to the latter dialog and also puts its
columns
in the same order as the former.
---
.../ui/gui/spokes/lib/custom_storage_helpers.glade | 34 +++++++++++-----------
.../ui/gui/spokes/lib/custom_storage_helpers.py | 4 +--
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
index cb9e925..c73e528 100644
--- a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
+++ b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
@@ -96,13 +96,13 @@
</object>
<object class="GtkListStore" id="disk_store">
<columns>
- <!-- column-name disk_col -->
+ <!-- column-name description_col -->
<column type="gchararray"/>
<!-- column-name capacity_col -->
<column type="gchararray"/>
<!-- column-name free_col -->
<column type="gchararray"/>
- <!-- column-name serial_col -->
+ <!-- column-name name_col -->
<column type="gchararray"/>
<!-- column-name id_col -->
<column type="gint"/>
@@ -217,12 +217,12 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="disk_column">
+ <object class="GtkTreeViewColumn"
id="description_column">
<property name="spacing">6</property>
- <property name="title"
translatable="yes">Disk</property>
+ <property name="title"
translatable="yes">Description</property>
<property name="clickable">True</property>
<child>
- <object class="GtkCellRendererText"
id="disk_renderer"/>
+ <object class="GtkCellRendererText"
id="description_renderer"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -230,40 +230,40 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="capacity_column">
+ <object class="GtkTreeViewColumn"
id="name_column">
<property name="spacing">6</property>
- <property name="title"
translatable="yes">Capacity</property>
+ <property name="title"
translatable="yes">Name</property>
<property name="clickable">True</property>
<child>
- <object class="GtkCellRendererText"
id="capacity_renderer"/>
+ <object class="GtkCellRendererText"
id="name_renderer"/>
<attributes>
- <attribute name="text">1</attribute>
+ <attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="free_column">
+ <object class="GtkTreeViewColumn"
id="capacity_column">
<property name="spacing">6</property>
- <property name="title"
translatable="yes">Free</property>
+ <property name="title"
translatable="yes">Capacity</property>
<property name="clickable">True</property>
<child>
- <object class="GtkCellRendererText"
id="free_renderer"/>
+ <object class="GtkCellRendererText"
id="capacity_renderer"/>
<attributes>
- <attribute name="text">2</attribute>
+ <attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="id_column">
+ <object class="GtkTreeViewColumn"
id="free_column">
<property name="spacing">6</property>
- <property name="title"
translatable="yes">ID</property>
+ <property name="title"
translatable="yes">Free</property>
<property name="clickable">True</property>
<child>
- <object class="GtkCellRendererText"
id="id_renderer"/>
+ <object class="GtkCellRendererText"
id="free_renderer"/>
<attributes>
- <attribute name="text">3</attribute>
+ <attribute name="text">2</attribute>
</attributes>
</child>
</object>
diff --git a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
index 1e6df8c..42d0e63 100644
--- a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
+++ b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
@@ -419,10 +419,10 @@ class DisksDialog(GUIObject):
self._store = self.builder.get_object("disk_store")
# populate the store
for disk in self._disks:
- self._store.append([disk.description,
+ self._store.append(["%s (%s)" % (disk.description, disk.serial),
str(disk.size),
str(free[disk.name][0]),
- disk.serial,
+ disk.name,
disk.id])
treeview = self.builder.get_object("disk_view")
--
1.9.3
Show replies by date
They're never going to be able to size themselves automatically to show
everything for everyone, but these new values ought to make them wide enough for
most people by default.
---
pyanaconda/ui/gui/spokes/lib/cart.glade | 2 +-
pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/cart.glade
b/pyanaconda/ui/gui/spokes/lib/cart.glade
index 819633c..1aa2ca4 100644
--- a/pyanaconda/ui/gui/spokes/lib/cart.glade
+++ b/pyanaconda/ui/gui/spokes/lib/cart.glade
@@ -19,7 +19,7 @@
</columns>
</object>
<object class="GtkDialog" id="selected_disks_dialog">
- <property name="width_request">500</property>
+ <property name="width_request">600</property>
<property name="height_request">400</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
diff --git a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
index c73e528..a534ab4 100644
--- a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
+++ b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
@@ -109,7 +109,7 @@
</columns>
</object>
<object class="GtkDialog" id="disks_dialog">
- <property name="width_request">400</property>
+ <property name="width_request">550</property>
<property name="height_request">200</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
--
1.9.3
These both look good to me.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic