[master/rhel7] Add a tooltip to the container combobox (#975801)

[Brian C. Lane]

From: "Brian C. Lane"

Make it more clear what the combo does. Also added : to the description
to make it consistent with the others.

Resolves: rhbz#975801
---
 pyanaconda/ui/gui/spokes/custom.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 6072649..22d0863 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -97,6 +97,7 @@ NOTEBOOK_INCOMPLETE_PAGE = 4

new_install_name = N_("New %s %s Installation")
 new_container_text = N_("Create a new %(container_type)s ...")
+container_tooltip = N_("Create or select %(container_type)s")
 container_dialog_title = N_("CONFIGURE %(container_type)s")
 container_dialog_text = N_("Please create a name for this %(container_type)s "
                            "and select at least one disk below.")
@@ -2597,7 +2598,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                     container_size_policy = container.size_policy

container_type_text = container_type_names[device_type]
-            container_label.set_text(container_type_text.title())
+            container_label.set_text(container_type_text.title() + ":")
             container_combo.remove_all()
             if device_type == DEVICE_TYPE_BTRFS:
                 containers = self.__storage.btrfsVolumes
@@ -2624,6 +2625,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                 container_combo.set_active(len(container_combo.get_model()) - 1)

container_combo.append_text(_(new_container_text) % {"container_type": container_type_text.lower()})
+            container_combo.set_tooltip_text(_(container_tooltip) % {"container_type": container_type_text.lower()})
             if default_container is None:
                 container_combo.set_active(len(container_combo.get_model()) - 1)

[David Shea]

On 10/07/2013 01:23 PM, Brian C. Lane wrote:
> From: "Brian C. Lane"
>
> Make it more clear what the combo does. Also added : to the description
> to make it consistent with the others.
> Resolves: rhbz#975801
>
> pyanaconda/ui/gui/spokes/custom.py | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
> index 6072649..22d0863 100644
> --- a/pyanaconda/ui/gui/spokes/custom.py
> +++ b/pyanaconda/ui/gui/spokes/custom.py
> @@ -97,6 +97,7 @@ NOTEBOOK_INCOMPLETE_PAGE = 4
>
> new_install_name = N_("New %s %s Installation")
>   new_container_text = N_("Create a new %(container_type)s ...")
> +container_tooltip = N_("Create or select %(container_type)s")
>   container_dialog_title = N_("CONFIGURE %(container_type)s")
>   container_dialog_text = N_("Please create a name for this %(container_type)s "
>                              "and select at least one disk below.")
> @@ -2597,7 +2598,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
>                       container_size_policy = container.size_policy
>           container_type_text = container_type_names[device_type]
>        container_label.set_text(container_type_text.title())
>        container_label.set_text(container_type_text.title() + ":")
>         container_combo.remove_all()
>         if device_type == DEVICE_TYPE_BTRFS:
>             containers = self.__storage.btrfsVolumes

container_type_text needs to be translated. Related to that, I don't 
think we should just append a colon to a translated (or translatable, at 
least) string; the form with a colon on the end should be a separate 
string. Glancing through our translations, I see that several of the 
Chinese translations use U+FF1A for a fullwidth colon.
> @@ -2624,6 +2625,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
>                   container_combo.set_active(len(container_combo.get_model()) - 1)
>           container_combo.append_text(_(new_container_text) % {"container_type": container_type_text.lower()})
>        container_combo.set_tooltip_text(_(container_tooltip) % {"container_type": container_type_text.lower()})
>         if default_container is None:
>             container_combo.set_active(len(container_combo.get_model()) - 1)

container_type_text needs to be translated here too. And a few more 
places. Maybe that should be a separate bug?

[Brian C. Lane]

On Mon, Oct 07, 2013 at 02:40:19PM -0400, David Shea wrote:
> > @@ -2624,6 +2625,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
> >                  container_combo.set_active(len(container_combo.get_model()) - 1)
> >              container_combo.append_text(_(new_container_text) % {"container_type": container_type_text.lower()})
> >        container_combo.set_tooltip_text(_(container_tooltip) % {"container_type": container_type_text.lower()})
> >        if default_container is None:
> >            container_combo.set_active(len(container_combo.get_model()) - 1)
>
> container_type_text needs to be translated here too. And a few more
> places. Maybe that should be a separate bug?

Yeah, I think deferring those kinds of changes to a cleanup bug/patch
would be a good idea. I'll drop the colon bit from this if the patch
gets pushed.