Skip to content

Commit

Permalink
Improve language selection at low resolutions.
Browse files Browse the repository at this point in the history 
Move the two language strings (native and English) into a single column
so that the strings in each row can be positioned independent of other
rows. Allow the English string to be ellipsized so that the really long
ones (e.g., Norwegian Bokmal) don't cut off the right side of the
TreeView and mess up the layout.

Allow the locale selection pane to scroll horizontally in order to
handle long locale names (one of the Chinese locales does not fit at
800x600), and change the column sizing from Grow Only to Automatic to
allow the column to shrink back when switching to other locales. This
way the scrollbar is only shown when needed.
  • Loading branch information
@dashea
dashea committed Nov 3, 2015
1 parent a6e392a commit 18267cf
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 32 deletions.
19 changes: 6 additions & 13 deletions pyanaconda/ui/gui/spokes/langsupport.glade
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.19.0 -->
<interface>
<requires lib="gtk+" version="3.2"/>
<requires lib="AnacondaWidgets" version="1.0"/>
Expand Down Expand Up @@ -75,8 +75,8 @@
<property name="can_focus">False</property>
<property name="margin_left">36</property>
<property name="margin_right">36</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Select additional language support to be installed:</property>
<property name="xalign">0</property>
<attributes>
<attribute name="font-desc" value="Cantarell 14"/>
<attribute name="weight" value="normal"/>
Expand Down Expand Up @@ -134,8 +134,8 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="nativeName">
<property name="title" translatable="yes">nativeName</property>
<object class="GtkTreeViewColumn" id="nameColumn">
<property name="title" translatable="yes">name</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="sort_column_id">0</property>
Expand All @@ -148,17 +148,10 @@
<attribute name="markup">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="englishName">
<property name="title" translatable="yes">englishName</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="sort_column_id">1</property>
<child>
<object class="GtkCellRendererText" id="englishNameRenderer">
<property name="xalign">0.89999997615814209</property>
<property name="ellipsize">end</property>
<property name="font">Cantarell Italic 14</property>
<property name="foreground">gray</property>
</object>
Expand Down Expand Up @@ -206,7 +199,6 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="localeView">
Expand Down Expand Up @@ -238,6 +230,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="localeNativeName">
<property name="sizing">autosize</property>
<property name="title" translatable="yes">nativeName</property>
<property name="expand">True</property>
<property name="clickable">True</property>
Expand Down
10 changes: 5 additions & 5 deletions pyanaconda/ui/gui/spokes/langsupport.py
View file
Expand Up @@ -86,11 +86,11 @@ def initialize(self):
override_cell_property(localeNativeColumn, localeNativeNameRenderer,
"weight", self._mark_selected_locale_bold)

for col, rend in [("nativeName", "nativeNameRenderer"),
("englishName", "englishNameRenderer")]:
column = self.builder.get_object(col)
renderer = self.builder.get_object(rend)
override_cell_property(column, renderer, "weight", self._mark_selected_language_bold)
languageNameColumn = self.builder.get_object("nameColumn")
nativeNameRenderer = self.builder.get_object("nativeNameRenderer")
englishNameRenderer = self.builder.get_object("englishNameRenderer")
override_cell_property(languageNameColumn, nativeNameRenderer, "weight", self._mark_selected_language_bold)
override_cell_property(languageNameColumn, englishNameRenderer, "weight", self._mark_selected_language_bold)

# If a language has selected locales, highlight every column so that
# the row appears highlighted
Expand Down
21 changes: 7 additions & 14 deletions pyanaconda/ui/gui/spokes/welcome.glade
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.19.0 -->
<interface>
<requires lib="gtk+" version="3.2"/>
<requires lib="AnacondaWidgets" version="1.0"/>
Expand Down Expand Up @@ -199,9 +199,9 @@
<property name="can_focus">False</property>
<property name="margin_left">36</property>
<property name="margin_right">36</property>
<property name="xalign">0</property>
<property name="ypad">6</property>
<property name="label">WELCOME TO %(name)s %(version)s.</property>
<property name="xalign">0</property>
<attributes>
<attribute name="font-desc" value="Cantarell Bold 16"/>
</attributes>
Expand All @@ -220,9 +220,9 @@
<property name="valign">start</property>
<property name="margin_left">36</property>
<property name="margin_right">36</property>
<property name="xalign">0</property>
<property name="ypad">6</property>
<property name="label" translatable="yes">What language would you like to use during the installation process?</property>
<property name="xalign">0</property>
<attributes>
<attribute name="font-desc" value="Cantarell 12"/>
</attributes>
Expand Down Expand Up @@ -269,8 +269,8 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="nativeName">
<property name="title" translatable="yes">nativeName</property>
<object class="GtkTreeViewColumn" id="nameColumn">
<property name="title" translatable="yes">name</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="sort_column_id">0</property>
Expand All @@ -283,17 +283,10 @@
<attribute name="markup">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="englishName">
<property name="title" translatable="yes">englishName</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="sort_column_id">1</property>
<child>
<object class="GtkCellRendererText" id="englishNameRenderer">
<property name="xalign">0.89999997615814209</property>
<property name="ellipsize">end</property>
<property name="font">Cantarell Italic 14</property>
<property name="foreground">gray</property>
</object>
Expand Down Expand Up @@ -349,7 +342,6 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="localeView">
Expand All @@ -369,6 +361,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="nativeName1">
<property name="sizing">autosize</property>
<property name="title" translatable="yes">nativeName</property>
<property name="expand">True</property>
<property name="clickable">True</property>
Expand Down

0 comments on commit 18267cf

Please sign in to comment.