[PATCH 1/2] Rework the disk shopping cart link a little bit.
Chris Lumens
clumens at redhat.com
Thu Oct 4 16:19:57 UTC 2012
This is to make way for the boot device picking option.
---
pyanaconda/ui/gui/spokes/storage.glade | 83 ++++++++++++++++------------------
pyanaconda/ui/gui/spokes/storage.py | 17 +++----
2 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade
index 7e62593..42ca926 100644
--- a/pyanaconda/ui/gui/spokes/storage.glade
+++ b/pyanaconda/ui/gui/spokes/storage.glade
@@ -24,13 +24,11 @@
<child>
<object class="GtkButton" id="options1_cancel_button">
<property name="label" translatable="yes">Cancel & _add more disks</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="halign">center</property>
<property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
</object>
@@ -43,14 +41,12 @@
<child>
<object class="GtkButton" id="options_continue_button1">
<property name="label" translatable="yes">_Continue</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">center</property>
<property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_continue_clicked" swapped="no"/>
</object>
@@ -108,11 +104,9 @@
<child>
<object class="GtkCheckButton" id="options1_custom_check">
<property name="label" translatable="yes">Let me customize the _partitioning of the disks instead.</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -161,13 +155,11 @@
<child>
<object class="GtkButton" id="options2_cancel_button">
<property name="label" translatable="yes">Cancel & _add more disks</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="halign">center</property>
<property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
</object>
@@ -180,13 +172,11 @@
<child>
<object class="GtkButton" id="options2_modify_sw_button">
<property name="label" translatable="yes">_Modify software selection</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="halign">center</property>
<property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_modify_sw_clicked" swapped="no"/>
</object>
@@ -200,14 +190,12 @@
<child>
<object class="GtkButton" id="options2_reclaim_button">
<property name="label" translatable="yes">Reclaim _space</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">center</property>
<property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_reclaim_clicked" swapped="no"/>
</object>
@@ -251,11 +239,9 @@
<child>
<object class="GtkCheckButton" id="options2_custom_check">
<property name="label" translatable="yes">I don't need help; let me _review & customize disk partitioning to reclaim space.</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -442,13 +428,11 @@
<child>
<object class="GtkButton" id="options3_quit_button">
<property name="label" translatable="yes">_Quit installer</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="halign">center</property>
<property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_quit_clicked" swapped="no"/>
</object>
@@ -461,13 +445,11 @@
<child>
<object class="GtkButton" id="options3_modify_sw_button">
<property name="label" translatable="yes">_Modify software selection</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="halign">center</property>
<property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_modify_sw_clicked" swapped="no"/>
</object>
@@ -481,14 +463,12 @@
<child>
<object class="GtkButton" id="options3_cancel_button">
<property name="label" translatable="yes">_Cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">center</property>
<property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
</object>
@@ -776,25 +756,45 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
<property name="margin_bottom">6</property>
- <property name="spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkButton" id="continue_button">
+ <property name="label" translatable="yes">_CONTINUE</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <property name="valign">end</property>
+ <property name="hexpand">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">1</property>
+ <signal name="clicked" handler="on_continue_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
<child>
<object class="GtkButton" id="summary_button">
- <property name="label" translatable="yes">summary</property>
- <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Full disk summary and options...</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="halign">start</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
@@ -802,35 +802,32 @@
<signal name="clicked" handler="on_summary_clicked" swapped="no"/>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <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="GtkButton" id="continue_button">
- <property name="label" translatable="yes">_CONTINUE</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkLabel" id="summary_label">
<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_underline">True</property>
- <property name="xalign">1</property>
- <signal name="clicked" handler="on_continue_clicked" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">6</property>
+ <property name="label" translatable="yes">summary</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 535671e..3deeae2 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -413,8 +413,10 @@ class StorageSpoke(NormalSpoke, StorageChecker):
NormalSpoke.initialize(self)
- summary_label = self.builder.get_object("summary_button").get_children()[0]
- summary_label.set_use_markup(True)
+ label = self.builder.get_object("summary_button").get_children()[0]
+ markup = "<span foreground='blue'><u>%s</u></span>" % label.get_text()
+ label.set_use_markup(True)
+ label.set_markup(markup)
self.local_disks_box = self.builder.get_object("local_disks_box")
#specialized_disks_box = self.builder.get_object("specialized_disks_box")
@@ -482,12 +484,11 @@ class StorageSpoke(NormalSpoke, StorageChecker):
free += free_space[disk.name][0]
count += 1
- summary = (P_(("%d disk selected; %s capacity; %s free ..."),
- ("%d disks selected; %s capacity; %s free ..."),
+ summary = (P_(("%d disk selected; %s capacity; %s free"),
+ ("%d disks selected; %s capacity; %s free"),
count) % (count, str(Size(spec="%s MB" % capacity)), free))
- markup = "<span foreground='blue'><u>%s</u></span>" % summary
- summary_label = self.builder.get_object("summary_button").get_children()[0]
- summary_label.set_markup(markup)
+ summary_label = self.builder.get_object("summary_label")
+ summary_label.set_text(summary)
if count == 0:
self.window.set_info(Gtk.MessageType.WARNING, _("No disks selected; please select at least one disk to install to."))
@@ -495,7 +496,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
self.window.clear_info()
self.builder.get_object("continue_button").set_sensitive(count > 0)
- self.builder.get_object("summary_button").set_sensitive(count > 0)
+ self.builder.get_object("summary_label").set_sensitive(count > 0)
def _update_disk_list(self):
""" Update self.selected_disks based on the UI. """
--
1.7.11.2
More information about the anaconda-patches
mailing list