[PATCH 1/8] Rearrange filter.glade the way glade wants it now

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


This alphabetizes the properties, removes some properties that are equal
to the default value, adds some empty placeholders, and adds the
internal selection child for a tree view.

This is the same idea as 2746b8a329971175f06528e9d623b5246955dc0a except
that the content is completely different, because of course it is.

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

diff --git a/pyanaconda/ui/gui/spokes/filter.glade b/pyanaconda/ui/gui/spokes/filter.glade
index 09c1d3f..7d0ba19 100644
--- a/pyanaconda/ui/gui/spokes/filter.glade
+++ b/pyanaconda/ui/gui/spokes/filter.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <requires lib="AnacondaWidgets" version="1.0"/>
@@ -129,8 +129,8 @@
                                   <object class="GtkLabel" id="label6">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Search Results:</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -142,10 +142,10 @@
                                   <object class="GtkLabel" id="label1">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Search">Search _By:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">searchTypeCombo</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -306,9 +306,9 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="invisible_char">●</property>
+                                            <property name="width_chars">30</property>
                                             <property name="secondary_icon_name">edit-clear-symbolic</property>
                                             <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/>
-                                            <property name="width_chars">30</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -510,6 +510,9 @@
                                     <property name="top_attach">0</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -550,10 +553,10 @@
                                   <object class="GtkLabel" id="label2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|Multipath">Filter _By:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">multipathTypeCombo</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -695,9 +698,9 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="invisible_char">●</property>
+                                            <property name="width_chars">30</property>
                                             <property name="secondary_icon_name">edit-clear-symbolic</property>
                                             <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/>
-                                            <property name="width_chars">30</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -838,6 +841,9 @@
                                     <property name="top_attach">0</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -882,10 +888,10 @@
                                   <object class="GtkLabel" id="label3">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</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="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -1000,7 +1006,6 @@
                                     <property name="left_attach">0</property>
                                     <property name="top_attach">1</property>
                                     <property name="width">5</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1016,7 +1021,6 @@
                                     <property name="left_attach">3</property>
                                     <property name="top_attach">0</property>
                                     <property name="width">2</property>
-                                    <property name="height">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1137,9 +1141,9 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="invisible_char">●</property>
+                                            <property name="width_chars">30</property>
                                             <property name="secondary_icon_name">edit-clear-symbolic</property>
                                             <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/>
-                                            <property name="width_chars">30</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -1205,9 +1209,9 @@
                                   <object class="GtkLabel" id="label10">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes" context="GUI|Installation Destination|Filter|zSeries">Filter B_y:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
@@ -1238,6 +1242,9 @@
                                     <property name="rules_hint">True</property>
                                     <property name="enable_search">False</property>
                                     <property name="enable_tree_lines">True</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection4"/>
+                                    </child>
                                     <child>
                                       <object class="GtkTreeViewColumn" id="zSelectedCol">
                                         <child>
@@ -1397,11 +1404,10 @@
                                           <object class="GtkEntry" id="zCCWEntry">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="invisible_char">???</property>
+                                            <property name="invisible_char">?</property>
+                                            <property name="width_chars">30</property>
                                             <property name="secondary_icon_name">edit-clear-symbolic</property>
                                             <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/>
-                                            <property name="width_chars">30</property>
-                                            <property name="invisible_char_set">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -1446,11 +1452,10 @@
                                           <object class="GtkEntry" id="zWWPNEntry">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="invisible_char">???</property>
+                                            <property name="invisible_char">?</property>
+                                            <property name="width_chars">30</property>
                                             <property name="secondary_icon_name">edit-clear-symbolic</property>
                                             <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/>
-                                            <property name="width_chars">30</property>
-                                            <property name="invisible_char_set">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -1489,11 +1494,10 @@
                                           <object class="GtkEntry" id="zLUNEntry">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="invisible_char">???</property>
+                                            <property name="invisible_char">?</property>
+                                            <property name="width_chars">30</property>
                                             <property name="secondary_icon_name">edit-clear-symbolic</property>
                                             <signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/>
-                                            <property name="width_chars">30</property>
-                                            <property name="invisible_char_set">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -1510,15 +1514,12 @@
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkComboBoxText" id="zTypeCombo">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="entry_text_column">0</property>
-                                    <property name="id_column">1</property>
                                     <items>
                                       <item translatable="yes">None</item>
                                       <item translatable="yes">CCW</item>
@@ -1530,10 +1531,11 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                     <property name="height">1</property>
-                                   </packing>
-                                 </child>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
                               </object>
                             </child>
                           </object>
-- 
2.1.0



More information about the anaconda-patches mailing list