[recipes] Run gtk-builder-tool simplify over all ui files

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [recipes] Run gtk-builder-tool simplify over all ui files
Date: Thu, 15 Dec 2016 02:24:08 +0000 (UTC)
commit 61972199cea479a2d757db0259286bac4cbcb736
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Dec 14 15:31:49 2016 -0500

    Run gtk-builder-tool simplify over all ui files

 src/gr-category-tile.ui       |    1 -
 src/gr-cuisine-page.ui        |    2 -
 src/gr-cuisines-page.ui       |   85 +++++++++++++++++++--------------------
 src/gr-details-page.ui        |   30 +++++++------
 src/gr-diet-row.ui            |    1 -
 src/gr-edit-page.ui           |    1 -
 src/gr-ingredient-row.ui      |    1 -
 src/gr-list-page.ui           |   88 ++++++++++++++++++++--------------------
 src/gr-meal-row.ui            |    1 -
 src/recipe-conflict-dialog.ui |    1 -
 10 files changed, 102 insertions(+), 109 deletions(-)
---
diff --git a/src/gr-category-tile.ui b/src/gr-category-tile.ui
index 293ca1b..8c9ef8f 100644
--- a/src/gr-category-tile.ui
+++ b/src/gr-category-tile.ui
@@ -10,7 +10,6 @@
     <child>
       <object class="GtkBox" id="box">
         <property name="visible">1</property>
-        <property name="orientation">horizontal</property>
         <property name="spacing">12</property>
         <property name="margin-top">9</property>
         <property name="margin-bottom">9</property>
diff --git a/src/gr-cuisine-page.ui b/src/gr-cuisine-page.ui
index e7749ce..5c3a8e8 100644
--- a/src/gr-cuisine-page.ui
+++ b/src/gr-cuisine-page.ui
@@ -14,7 +14,6 @@
               <object class="GtkScrolledWindow">
                 <property name="visible">1</property>
                 <property name="hscrollbar-policy">never</property>
-                <property name="vscrollbar-policy">automatic</property>
                 <child>
                   <object class="GtkListBox" id="sidebar">
                     <property name="visible">1</property>
@@ -29,7 +28,6 @@
                 <property name="visible">1</property>
                 <property name="expand">1</property>
                 <property name="hscrollbar-policy">never</property>
-                <property name="vscrollbar-policy">automatic</property>
                 <child>
                   <object class="GtkBox" id="category_box">
                     <property name="visible">1</property>
diff --git a/src/gr-cuisines-page.ui b/src/gr-cuisines-page.ui
index a92707f..8f882ff 100644
--- a/src/gr-cuisines-page.ui
+++ b/src/gr-cuisines-page.ui
@@ -14,7 +14,6 @@
         <property name="visible">1</property>
         <property name="expand">1</property>
         <property name="hscrollbar-policy">never</property>
-        <property name="vscrollbar-policy">automatic</property>
         <child>
           <object class="GtkBox">
             <property name="visible">1</property>
@@ -96,54 +95,54 @@
                 </child>
               </object>
             </child>
+            <child>
+              <object class="GtkBox" id="seasonal_expander_box">
+                <property name="visible">1</property>
+                <property name="margin-start">24</property>
+                <property name="margin-end">24</property>
+                <property name="margin-bottom">12</property>
                 <child>
-                  <object class="GtkBox" id="seasonal_expander_box">
+                  <object class="GtkSeparator" id="seasonal_expander_lsep">
                     <property name="visible">1</property>
-                    <property name="margin-start">24</property>
-                    <property name="margin-end">24</property>
-                    <property name="margin-bottom">12</property>
-                    <child>
-                      <object class="GtkSeparator" id="seasonal_expander_lsep">
-                        <property name="visible">1</property>
-                        <property name="expand">1</property>
-                        <property name="valign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="seasonal_expander_button">
-                        <property name="visible">1</property>
-                        <property name="can-focus">1</property>
-                        <property name="margin-start">9</property>
-                        <property name="margin-end">9</property>
-                        <property name="valign">center</property>
-                        <property name="relief">none</property>
-                        <signal name="clicked" handler="expander_button_clicked" swapped="yes"/>
-                        <style>
-                          <class name="image-cutton"/>
-                          <class name="circular"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage" id="seasonal_expander_image">
-                            <property name="visible">1</property>
-                            <property name="icon-name">pan-down-symbolic</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="expand">1</property>
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton" id="seasonal_expander_button">
+                    <property name="visible">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="margin-start">9</property>
+                    <property name="margin-end">9</property>
+                    <property name="valign">center</property>
+                    <property name="relief">none</property>
+                    <signal name="clicked" handler="expander_button_clicked" swapped="yes"/>
+                    <style>
+                      <class name="image-cutton"/>
+                      <class name="circular"/>
+                    </style>
                     <child>
-                      <object class="GtkSeparator" id="seasonal_expander_rsep">
+                      <object class="GtkImage" id="seasonal_expander_image">
                         <property name="visible">1</property>
-                        <property name="expand">1</property>
-                        <property name="valign">center</property>
+                        <property name="icon-name">pan-down-symbolic</property>
+                        <property name="icon-size">1</property>
                       </object>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSeparator" id="seasonal_expander_rsep">
+                    <property name="visible">1</property>
+                    <property name="expand">1</property>
+                    <property name="valign">center</property>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
             </child>
           </object>
diff --git a/src/gr-details-page.ui b/src/gr-details-page.ui
index d522021..03aa0aa 100644
--- a/src/gr-details-page.ui
+++ b/src/gr-details-page.ui
@@ -18,7 +18,9 @@
             <property name="visible">1</property>
             <property name="spacing">10</property>
             <property name="hexpand">1</property>
-            <style> <class name="location-bar"/> </style>
+            <style>
+              <class name="location-bar"/>
+            </style>
             <child>
               <object class="GrToggleButton" id="ingredients_check">
                 <property name="visible">1</property>
@@ -100,7 +102,6 @@ followed</property>
         <child>
           <object class="GtkBox">
             <property name="visible">1</property>
-            <property name="orientation">horizontal</property>
             <property name="homogeneous">1</property>
             <property name="expand">1</property>
             <property name="halign">center</property>
@@ -115,7 +116,6 @@ followed</property>
                 <property name="visible">1</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">20</property>
-                <property name="halign">fill</property>
                 <property name="valign">start</property>
                 <child>
                   <object class="GtkImage" id="recipe_image">
@@ -130,7 +130,6 @@ followed</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkBox" id="warning_box">
-                        <property name="orientation">horizontal</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkImage" id="garlic_warning">
@@ -153,15 +152,14 @@ followed</property>
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="fill">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkListBox" id="ingredients_list">
                         <property name="visible">1</property>
                         <property name="selection-mode">none</property>
-                        <style> <class name="frame"/> </style>
+                        <style>
+                          <class name="frame"/>
+                        </style>
                       </object>
                     </child>
                   </object>
@@ -174,7 +172,6 @@ followed</property>
             <child>
               <object class="GtkGrid">
                 <property name="visible">1</property>
-                <property name="halign">fill</property>
                 <property name="valign">start</property>
                 <child>
                   <object class="GtkLabel">
@@ -185,7 +182,9 @@ followed</property>
                     <property name="margin-start">20</property>
                     <property name="margin-end">20</property>
                     <property name="margin-bottom">15</property>
-                    <style> <class name="dim-label"/> </style>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -217,7 +216,9 @@ followed</property>
                     <property name="margin-start">20</property>
                     <property name="margin-end">20</property>
                     <property name="margin-bottom">15</property>
-                    <style> <class name="dim-label"/> </style>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -245,7 +246,9 @@ followed</property>
                     <property name="margin-start">20</property>
                     <property name="margin-end">20</property>
                     <property name="margin-bottom">30</property>
-                    <style> <class name="dim-label"/> </style>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -341,7 +344,6 @@ followed</property>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">0</property>
             <property name="use-underline">1</property>
             <property name="label" translatable="yes">_Share</property>
           </object>
@@ -407,7 +409,7 @@ followed</property>
                 <property name="label" translatable="yes">Start</property>
                 <property name="halign">end</property>
                 <property name="valign">end</property>
-                <property name="sensitive">False</property>
+                <property name="sensitive">0</property>
                 <signal name="clicked" handler="start_or_stop_timer" swapped="yes"/>
               </object>
             </child>
diff --git a/src/gr-diet-row.ui b/src/gr-diet-row.ui
index 8654d67..ba92b3a 100644
--- a/src/gr-diet-row.ui
+++ b/src/gr-diet-row.ui
@@ -6,7 +6,6 @@
     <child>
       <object class="GtkBox" id="box">
         <property name="visible">1</property>
-        <property name="orientation">horizontal</property>
         <property name="spacing">12</property>
         <property name="margin">6</property>
         <child>
diff --git a/src/gr-edit-page.ui b/src/gr-edit-page.ui
index 8f837cc..8ad7ffd 100644
--- a/src/gr-edit-page.ui
+++ b/src/gr-edit-page.ui
@@ -435,7 +435,6 @@
                 <child>
                   <object class="GtkComboBoxText" id="spiciness_combo">
                     <property name="visible">1</property>
-                    <property name="has-entry">0</property>
                     <items>
                       <item translatable="yes" id="mild">Mild</item>
                       <item translatable="yes" id="spicy">Somewhat spicy</item>
diff --git a/src/gr-ingredient-row.ui b/src/gr-ingredient-row.ui
index 3e81d68..df04a93 100644
--- a/src/gr-ingredient-row.ui
+++ b/src/gr-ingredient-row.ui
@@ -6,7 +6,6 @@
     <child>
       <object class="GtkBox" id="box">
         <property name="visible">1</property>
-        <property name="orientation">horizontal</property>
         <property name="spacing">12</property>
         <property name="margin">6</property>
         <child>
diff --git a/src/gr-list-page.ui b/src/gr-list-page.ui
index ed985e4..4158562 100644
--- a/src/gr-list-page.ui
+++ b/src/gr-list-page.ui
@@ -66,51 +66,51 @@
                 <property name="margin-end">80</property>
                 <child>
                   <object class="GtkGrid" id="chef_grid">
+                    <property name="visible">1</property>
+                    <property name="margin-top">20</property>
+                    <property name="column-spacing">20</property>
+                    <property name="row-spacing">20</property>
+                    <child>
+                      <object class="GtkImage" id="chef_image">
+                        <property name="visible">1</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
+                        <style>
+                          <class name="image-button"/>
+                          <class name="circular"/>
+                          <class name="chef"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">0</property>
+                        <property name="height">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="chef_fullname">
+                        <property name="visible">1</property>
+                        <property name="xalign">0</property>
+                        <attributes>
+                          <attribute name="scale" value="1.44"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="chef_description">
                         <property name="visible">1</property>
-                        <property name="margin-top">20</property>
-                        <property name="column-spacing">20</property>
-                        <property name="row-spacing">20</property>
-                        <child>
-                          <object class="GtkImage" id="chef_image">
-                            <property name="visible">1</property>
-                            <property name="halign">center</property>
-                            <property name="valign">center</property>
-                            <style>
-                              <class name="image-button"/>
-                              <class name="circular"/>
-                              <class name="chef"/>
-                            </style>
-                          </object>
-                          <packing>
-                            <property name="left-attach">0</property>
-                            <property name="top-attach">0</property>
-                            <property name="height">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="chef_fullname">
-                            <property name="visible">1</property>
-                            <property name="xalign">0</property>
-                            <attributes>
-                              <attribute name="scale" value="1.44"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="left-attach">1</property>
-                            <property name="top-attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="chef_description">
-                            <property name="visible">1</property>
-                            <property name="xalign">0</property>
-                            <property name="wrap">1</property>
-                          </object>
-                          <packing>
-                            <property name="left-attach">1</property>
-                            <property name="top-attach">1</property>
-                          </packing>
-                        </child>
+                        <property name="xalign">0</property>
+                        <property name="wrap">1</property>
+                      </object>
+                      <packing>
+                        <property name="left-attach">1</property>
+                        <property name="top-attach">1</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
                 <child>
diff --git a/src/gr-meal-row.ui b/src/gr-meal-row.ui
index d7a9f4f..36208dd 100644
--- a/src/gr-meal-row.ui
+++ b/src/gr-meal-row.ui
@@ -6,7 +6,6 @@
     <child>
       <object class="GtkBox" id="box">
         <property name="visible">1</property>
-        <property name="orientation">horizontal</property>
         <property name="spacing">12</property>
         <property name="margin">6</property>
         <child>
diff --git a/src/recipe-conflict-dialog.ui b/src/recipe-conflict-dialog.ui
index 8574997..02d94e4 100644
--- a/src/recipe-conflict-dialog.ui
+++ b/src/recipe-conflict-dialog.ui
@@ -30,7 +30,6 @@
         <child>
           <object class="GtkBox">
             <property name="visible">1</property>
-            <property name="orientation">horizontal</property>
             <property name="spacing">10</property>
             <child>
               <object class="GtkLabel" id="label">
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]