--- pyanaconda/ui/gui/spokes/custom.py | 2 +- pyanaconda/ui/gui/spokes/lib/cart.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 597c90e..d9bebfb 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -2001,7 +2001,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
with enlightbox(self.window, dialog.window): dialog.refresh(self._clearpartDevices, self._currentFreeInfo, - showRemove=False) + showRemove=False, setBoot=False) dialog.run()
def on_help_clicked(self, button): diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py index 996c577..c1b2aa3 100644 --- a/pyanaconda/ui/gui/spokes/lib/cart.py +++ b/pyanaconda/ui/gui/spokes/lib/cart.py @@ -48,11 +48,11 @@ def size_str(mb): return str(Size(spec=spec)).upper()
class SelectedDisksDialog(GUIObject): - builderObjects = ["selected_disks_dialog", "disk_store"] + builderObjects = ["selected_disks_dialog", "disk_store", "disk_tree_view"] mainWidgetName = "selected_disks_dialog" uiFile = "spokes/lib/cart.glade"
- def initialize(self, disks, free, showRemove=True): + def initialize(self, disks, free, showRemove=True, setBoot=True): self._previousID = None
for disk in disks: @@ -68,6 +68,9 @@ class SelectedDisksDialog(GUIObject): if not showRemove: self.builder.get_object("remove_button").hide()
+ if not setBoot: + self._set_button.hide() + if not disks: return
@@ -93,10 +96,10 @@ class SelectedDisksDialog(GUIObject): row[IS_BOOT_COL] = True break
- def refresh(self, disks, free, showRemove=True): + def refresh(self, disks, free, showRemove=True, setBoot=True): super(SelectedDisksDialog, self).refresh()
- self._view = self.builder.get_object("disk_view") + self._view = self.builder.get_object("disk_tree_view") self._store = self.builder.get_object("disk_store") self._selection = self.builder.get_object("disk_selection") self._summary_label = self.builder.get_object("summary_label") @@ -105,7 +108,7 @@ class SelectedDisksDialog(GUIObject):
# clear out the store and repopulate it from the devicetree self._store.clear() - self.initialize(disks, free, showRemove=showRemove) + self.initialize(disks, free, showRemove=showRemove, setBoot=setBoot)
def run(self): rc = self.window.run()