From: "Brian C. Lane" bcl@redhat.com
Shrink doesn't give the user any control on the amount to shrink by. Remove the shrink button.
The checkbox to use or not use the update repo isn't connected to anything. At this point it is best to just remove it.
Brian C. Lane (2): Remove Shrink button from reclaim dialog (#875944) remove the don't use upgrades checkbox from source (#889366)
pyanaconda/ui/gui/spokes/lib/resize.glade | 12 ----------- pyanaconda/ui/gui/spokes/lib/resize.py | 22 +++++++++---------- pyanaconda/ui/gui/spokes/source.glade | 35 ------------------------------- 3 files changed, 11 insertions(+), 58 deletions(-)
From: "Brian C. Lane" bcl@redhat.com
--- pyanaconda/ui/gui/spokes/lib/resize.glade | 12 ------------ pyanaconda/ui/gui/spokes/lib/resize.py | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/resize.glade b/pyanaconda/ui/gui/spokes/lib/resize.glade index f2cd461..cb9291c 100644 --- a/pyanaconda/ui/gui/spokes/lib/resize.glade +++ b/pyanaconda/ui/gui/spokes/lib/resize.glade @@ -222,18 +222,6 @@ </packing> </child> <child> - <object class="GtkToolButton" id="shrinkButton"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Shrink</property> - <signal name="clicked" handler="on_shrink_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> <object class="GtkToolButton" id="deleteButton"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/pyanaconda/ui/gui/spokes/lib/resize.py b/pyanaconda/ui/gui/spokes/lib/resize.py index b500c97..d80ae8d 100644 --- a/pyanaconda/ui/gui/spokes/lib/resize.py +++ b/pyanaconda/ui/gui/spokes/lib/resize.py @@ -82,7 +82,7 @@ class ResizeDialog(GUIObject): self._resizeButton = self.builder.get_object("resizeButton")
self._preserveButton = self.builder.get_object("preserveButton") - self._shrinkButton = self.builder.get_object("shrinkButton") +# self._shrinkButton = self.builder.get_object("shrinkButton") self._deleteButton = self.builder.get_object("deleteButton")
def _description(self, part): @@ -177,12 +177,12 @@ class ResizeDialog(GUIObject): "for this installation. Removing a filesystem will permanently delete all " "of the data it contains.")
- if canShrinkSomething: - description += "\n\n" - description += _("There is also free space available in pre-existing filesystems. " - "While it's risky and we recommend you back up your data first, you " - "can recover that free disk space and make it available for this " - "installation below.") +# if canShrinkSomething: +# description += "\n\n" +# description += _("There is also free space available in pre-existing filesystems. " +# "While it's risky and we recommend you back up your data first, you " +# "can recover that free disk space and make it available for this " +# "installation below.")
self._reclaimDescLabel.set_text(description)
@@ -201,7 +201,7 @@ class ResizeDialog(GUIObject): # If this is a disk header, it's not editable, so make all the # buttons insensitive. self._preserveButton.set_sensitive(row[EDITABLE_COL]) - self._shrinkButton.set_sensitive(row[EDITABLE_COL]) +# self._shrinkButton.set_sensitive(row[EDITABLE_COL]) self._deleteButton.set_sensitive(row[EDITABLE_COL])
if not row[EDITABLE_COL]: @@ -210,14 +210,14 @@ class ResizeDialog(GUIObject): # If the selected filesystem does not support shrinking, make that # button insensitive. device = self.storage.devicetree.getDeviceByID(row[DEVICE_ID_COL]) - self._shrinkButton.set_sensitive(device.resizable) +# self._shrinkButton.set_sensitive(device.resizable)
# Then, disable the button for whatever action is currently selected. # It doesn't make a lot of sense to allow clicking that. if row[ACTION_COL] == _(PRESERVE): self._preserveButton.set_sensitive(False) - elif row[ACTION_COL] == _(SHRINK): - self._shrinkButton.set_sensitive(False) +# elif row[ACTION_COL] == _(SHRINK): +# self._shrinkButton.set_sensitive(False) elif row[ACTION_COL] == _(DELETE): self._deleteButton.set_sensitive(False)
From: "Brian C. Lane" bcl@redhat.com
--- pyanaconda/ui/gui/spokes/source.glade | 35 ----------------------------------- 1 file changed, 35 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade index 07fc23d..4eec557 100644 --- a/pyanaconda/ui/gui/spokes/source.glade +++ b/pyanaconda/ui/gui/spokes/source.glade @@ -1217,41 +1217,6 @@ TeXlive 2012 repository</col> <property name="position">6</property> </packing> </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="margin_top">12</property> - <property name="label" translatable="yes">Updates</property> - <attributes> - <attribute name="font-desc" value="Cantarell 10"/> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">7</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="noUpdatesCheckbox"> - <property name="label" translatable="yes">D_on't install the latest available software updates. Install the default versions provided by the install source above.</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="margin_left">12</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">8</property> - </packing> - </child> </object> </child> </object>
On Fri, 2012-12-21 at 09:28 -0800, Brian C. Lane wrote:
From: "Brian C. Lane" bcl@redhat.com
Shrink doesn't give the user any control on the amount to shrink by. Remove the shrink button.
The checkbox to use or not use the update repo isn't connected to anything. At this point it is best to just remove it.
Ack to both, there's nothing better we could do now.
anaconda-patches@lists.fedorahosted.org
-
Brian C. Lane -
Vratislav Podzimek