[PATCH 5/8] Fix some minor inconsistencies in filter.glade

David Shea dshea at redhat.com
Thu Jun 4 19:57:41 UTC 2015


Set no_show_all=True, can_focus=False, and show_border=False for each of
the search type notebooks. Set headers_clickable=False on the
otherTreeView.

Replace the stock gtk-find button on the other tab with a regularly
labelled button. Add a translation context to the refresh button.

Set a spacing of 5 in one of the boxes to 6.

Fix the mnemonic_widget for the multipath filter label. Add a
mnemonic_widget to the zFCP filter label.

Remove an extra er from otherIDRenderer.

(cherry picked from commit 953d9090420b0a4fb5bc1f1154eeb7b22514dea5)

Related: rhbz#1168950
---
 pyanaconda/ui/gui/spokes/filter.glade | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/filter.glade b/pyanaconda/ui/gui/spokes/filter.glade
index b6144fc..c422962 100644
--- a/pyanaconda/ui/gui/spokes/filter.glade
+++ b/pyanaconda/ui/gui/spokes/filter.glade
@@ -171,7 +171,8 @@
                                 <child>
                                   <object class="GtkNotebook" id="searchTypeNotebook">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="hexpand">True</property>
                                     <property name="show_tabs">False</property>
                                     <property name="show_border">False</property>
@@ -286,7 +287,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="hexpand">True</property>
-                                        <property name="spacing">5</property>
+                                        <property name="spacing">6</property>
                                         <child>
                                           <object class="GtkLabel" id="label18">
                                             <property name="visible">True</property>
@@ -583,7 +584,7 @@
                                 <child>
                                   <object class="GtkNotebook" id="multipathTypeNotebook">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="no_show_all">True</property>
                                     <property name="hexpand">True</property>
                                     <property name="show_tabs">False</property>
@@ -890,7 +891,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Other">Filter _By:</property>
                                     <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">multipathTypeCombo</property>
+                                    <property name="mnemonic_widget">otherTypeCombo</property>
                                     <property name="xalign">0</property>
                                   </object>
                                   <packing>
@@ -922,10 +923,8 @@
                                     <property name="hexpand">True</property>
                                     <property name="vexpand">True</property>
                                     <property name="model">otherModel</property>
-                                    <property name="headers_clickable">False</property>
                                     <property name="rules_hint">True</property>
                                     <property name="enable_search">False</property>
-                                    <property name="search_column">0</property>
                                     <property name="enable_tree_lines">True</property>
                                     <child internal-child="selection">
                                       <object class="GtkTreeSelection" id="treeview-selection3"/>
@@ -949,7 +948,7 @@
                                         <property name="title" translatable="yes">Identifier</property>
                                         <property name="clickable">True</property>
                                         <child>
-                                          <object class="GtkCellRendererText" id="otherIDRendererer"/>
+                                          <object class="GtkCellRendererText" id="otherIDRenderer"/>
                                           <attributes>
                                             <attribute name="sensitive">2</attribute>
                                             <attribute name="visible">0</attribute>
@@ -1010,11 +1009,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="otherFindButton">
-                                    <property name="label">gtk-find</property>
+                                    <property name="label" context="GUI|Installation Destination|Filter|Other">_Find</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="use_underline">True</property>
                                     <signal name="clicked" handler="on_find_clicked" swapped="no"/>
                                   </object>
                                   <packing>
@@ -1211,6 +1210,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|zSeries">Filter B_y:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">zTypeCombo</property>
                                     <property name="xalign">0</property>
                                   </object>
                                   <packing>
@@ -1371,6 +1371,7 @@
                                     <property name="no_show_all">True</property>
                                     <property name="hexpand">True</property>
                                     <property name="show_tabs">False</property>
+                                    <property name="show_border">False</property>
                                     <child>
                                       <object class="GtkLabel" id="label19">
                                         <property name="visible">True</property>
@@ -1632,7 +1633,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="refresh">
-                        <property name="label" translatable="yes">Refresh _List</property>
+                        <property name="label" translatable="yes" context="GUI|Installation Destination|Filter">Refresh _List</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-- 
2.1.0



More information about the anaconda-patches mailing list