[gnome-software] trivial: Add a parent GtkBox on the overview page



commit a1a996de3bd6ce5dda06be644180d04b4f6e5af1
Author: Richard Hughes <richard hughsie com>
Date:   Mon Aug 29 11:02:06 2016 +0100

    trivial: Add a parent GtkBox on the overview page
    
    Looks like a huge diff, but it's really just one more trivial widget and lots
    of indenting changes.

 src/gs-shell-overview.ui |  339 ++++++++++++++++++++++++----------------------
 1 files changed, 174 insertions(+), 165 deletions(-)
---
diff --git a/src/gs-shell-overview.ui b/src/gs-shell-overview.ui
index 9b1090d..18d2f1c 100644
--- a/src/gs-shell-overview.ui
+++ b/src/gs-shell-overview.ui
@@ -11,86 +11,69 @@
       <object class="GtkStack" id="stack_overview">
         <property name="visible">True</property>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow_overview">
+          <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="vscrollbar_policy">automatic</property>
-            <property name="shadow_type">none</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkViewport" id="viewport_overview">
+              <object class="GtkScrolledWindow" id="scrolledwindow_overview">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkBox" id="box_overview">
+                  <object class="GtkViewport" id="viewport_overview">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="hexpand">False</property>
-                    <property name="border_width">12</property>
-                    <property name="orientation">vertical</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                     <child>
-                      <object class="GtkAlignment" id="bin_featured">
-                        <property name="visible">True</property>
-                        <property name="halign">fill</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <object class="GtkLabel" id="category_heading">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Categories</property>
-                        <property name="margin-top">24</property>
-                        <property name="margin-bottom">6</property>
-                        <accessibility>
-                          <relation target="flowbox_categories" type="label-for"/>
-                        </accessibility>
-                        <style>
-                          <class name="index-title-alignment-software"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkFlowBox" id="flowbox_categories">
+                      <object class="GtkBox" id="box_overview">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin-bottom">14</property>
-                        <property name="row_spacing">14</property>
-                        <property name="column_spacing">14</property>
-                        <property name="homogeneous">True</property>
-                        <property name="max_children_per_line">3</property>
-                        <property name="selection_mode">none</property>
-                        <accessibility>
-                          <relation target="category_heading" type="labelled-by"/>
-                        </accessibility>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRevealer" id="categories_more">
-                        <property name="visible">True</property>
-                        <property name="transition-type">slide-up</property>
+                        <property name="halign">center</property>
+                        <property name="hexpand">False</property>
+                        <property name="border_width">12</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkAlignment" id="bin_featured">
+                            <property name="visible">True</property>
+                            <property name="halign">fill</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+
                         <child>
-                          <object class="GtkFlowBox" id="flowbox_categories2">
+                          <object class="GtkLabel" id="category_heading">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin-bottom">24</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Categories</property>
+                            <property name="margin-top">24</property>
+                            <property name="margin-bottom">6</property>
+                            <accessibility>
+                              <relation target="flowbox_categories" type="label-for"/>
+                            </accessibility>
+                            <style>
+                              <class name="index-title-alignment-software"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFlowBox" id="flowbox_categories">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin-bottom">14</property>
                             <property name="row_spacing">14</property>
                             <property name="column_spacing">14</property>
                             <property name="homogeneous">True</property>
@@ -100,122 +83,148 @@
                               <relation target="category_heading" type="labelled-by"/>
                             </accessibility>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRevealer" id="categories_expander">
-                        <property name="visible">True</property>
-                        <property name="transition-type">slide-up</property>
-                        <property name="reveal-child">True</property>
                         <child>
-                          <object class="GtkBox" id="categories_expander_box">
+                          <object class="GtkRevealer" id="categories_more">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="vexpand">False</property>
-                            <property name="orientation">horizontal</property>
-                            <property name="margin_start">24</property>
-                            <property name="margin_end">24</property>
-                            <property name="margin-bottom">12</property>
+                            <property name="transition-type">slide-up</property>
                             <child>
-                              <object class="GtkSeparator" id="categories_expander_lsep">
+                              <object class="GtkFlowBox" id="flowbox_categories2">
                                 <property name="visible">True</property>
-                                <property name="orientation">horizontal</property>
-                                <property name="expand">True</property>
-                                <property name="valign">center</property>
+                                <property name="can_focus">False</property>
+                                <property name="margin-bottom">24</property>
+                                <property name="row_spacing">14</property>
+                                <property name="column_spacing">14</property>
+                                <property name="homogeneous">True</property>
+                                <property name="max_children_per_line">3</property>
+                                <property name="selection_mode">none</property>
+                                <accessibility>
+                                  <relation target="category_heading" type="labelled-by"/>
+                                </accessibility>
                               </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRevealer" id="categories_expander">
+                            <property name="visible">True</property>
+                            <property name="transition-type">slide-up</property>
+                            <property name="reveal-child">True</property>
                             <child>
-                              <object class="GtkButton" id="categories_expander_button">
+                              <object class="GtkBox" id="categories_expander_box">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="margin-start">9</property>
-                                <property name="margin-end">9</property>
-                                <property name="valign">center</property>
-                                <style>
-                                  <class name="round-button"/>
-                                </style>
+                                <property name="can_focus">False</property>
+                                <property name="vexpand">False</property>
+                                <property name="orientation">horizontal</property>
+                                <property name="margin_start">24</property>
+                                <property name="margin_end">24</property>
+                                <property name="margin-bottom">12</property>
                                 <child>
-                                  <object class="GtkImage" id="categories_expander_image">
+                                  <object class="GtkSeparator" id="categories_expander_lsep">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon_name">view-more-symbolic</property>
-                                    <property name="icon_size">1</property>
+                                    <property name="orientation">horizontal</property>
+                                    <property name="expand">True</property>
+                                    <property name="valign">center</property>
                                   </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="categories_expander_button">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="margin-start">9</property>
+                                    <property name="margin-end">9</property>
+                                    <property name="valign">center</property>
+                                    <style>
+                                      <class name="round-button"/>
+                                    </style>
+                                    <child>
+                                      <object class="GtkImage" id="categories_expander_image">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="icon_name">view-more-symbolic</property>
+                                        <property name="icon_size">1</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSeparator" id="categories_expander_rsep">
+                                    <property name="visible">True</property>
+                                    <property name="orientation">horizontal</property>
+                                    <property name="expand">True</property>
+                                    <property name="valign">center</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSeparator" id="categories_expander_rsep">
-                                <property name="visible">True</property>
-                                <property name="orientation">horizontal</property>
-                                <property name="expand">True</property>
-                                <property name="valign">center</property>
-                              </object>
-                              <packing>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
 
-                    <child>
-                      <object class="GtkLabel" id="popular_heading">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes" comments="Translators: This is a heading 
for software which has been featured (&apos;picked&apos;) by the distribution.">Editor's Picks</property>
-                        <property name="margin-top">0</property>
-                        <property name="margin-bottom">6</property>
-                        <accessibility>
-                          <relation target="box_popular" type="label-for"/>
-                        </accessibility>
-                        <style>
-                          <class name="index-title-alignment-software"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GsHidingBox" id="box_popular">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">14</property>
-                        <property name="valign">start</property>
-                        <accessibility>
-                          <relation target="popular_heading" type="labelled-by"/>
-                        </accessibility>
+                        <child>
+                          <object class="GtkLabel" id="popular_heading">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes" comments="Translators: This is a 
heading for software which has been featured (&apos;picked&apos;) by the distribution.">Editor's 
Picks</property>
+                            <property name="margin-top">0</property>
+                            <property name="margin-bottom">6</property>
+                            <accessibility>
+                              <relation target="box_popular" type="label-for"/>
+                            </accessibility>
+                            <style>
+                              <class name="index-title-alignment-software"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">5</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GsHidingBox" id="box_popular">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">14</property>
+                            <property name="valign">start</property>
+                            <accessibility>
+                              <relation target="popular_heading" type="labelled-by"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">6</property>
+                          </packing>
+                        </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">6</property>
-                      </packing>
                     </child>
                   </object>
                 </child>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]