[rhel7-branch][PATCH] Set sensitivity of the "Encrypt" checkbox together with its label (#1181468)
David Shea
dshea at redhat.com
Tue Jun 23 17:42:32 UTC 2015
On 06/23/2015 10:03 AM, Vratislav Podzimek wrote:
> Otherwise they can get out of sync as reported in the bug.
>
> Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
> ---
> pyanaconda/ui/gui/spokes/custom.py | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
> index 64df7da..ed7cc8a 100644
> --- a/pyanaconda/ui/gui/spokes/custom.py
> +++ b/pyanaconda/ui/gui/spokes/custom.py
> @@ -1399,13 +1399,13 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
> use_dev.exists and not use_dev.formatImmutable)
>
> self._encryptCheckbox.set_active(isinstance(device, LUKSDevice))
> - self._encryptCheckbox.set_sensitive(self._reformatCheckbox.get_active())
> + fancy_set_sensitive(self._encryptCheckbox, self._reformatCheckbox.get_active())
> ancestors = use_dev.ancestors
> ancestors.remove(use_dev)
> if any(a.format.type == "luks" for a in ancestors):
> # The encryption checkbutton should not be sensitive if there is
> # existing encryption below the leaf layer.
> - self._encryptCheckbox.set_sensitive(False)
> + fancy_set_sensitive(self._encryptCheckbox, False)
> self._encryptCheckbox.set_active(True)
> self._encryptCheckbox.set_tooltip_text(_("The container is encrypted."))
> else:
> @@ -2289,7 +2289,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
> def on_reformat_toggled(self, widget):
> active = widget.get_active()
>
> - self._encryptCheckbox.set_sensitive(active)
> + fancy_set_sensitive(self._encryptCheckbox, active)
> if self._current_selector:
> device = self._current_selector.device.raw_device
>
> @@ -2298,14 +2298,14 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
> if any(a.format.type == "luks" and a.format.exists for a in ancestors):
> # The encryption checkbutton should not be sensitive if there is
> # existing encryption below the leaf layer.
> - self._encryptCheckbox.set_sensitive(False)
> + fancy_set_sensitive(self._encryptCheckbox, False)
>
> # you can't encrypt a btrfs subvolume -- only the volume/container
> device_type = self._get_current_device_type()
> if device_type == DEVICE_TYPE_BTRFS:
> self._encryptCheckbox.set_active(False)
>
> - self._encryptCheckbox.set_sensitive(device_type != DEVICE_TYPE_BTRFS)
> + fancy_set_sensitive(self._encryptCheckbox, device_type != DEVICE_TYPE_BTRFS)
> fancy_set_sensitive(self._fsCombo, active)
>
> def on_fs_type_changed(self, combo):
Looks good.
More information about the anaconda-patches
mailing list