[gnome-software] Put GtkBox children in correct order in GtkBuilder files



commit c48f14f7f248f6f4e1a2da91076e16be814eb617
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Oct 1 12:12:46 2018 +1300

    Put GtkBox children in correct order in GtkBuilder files
    
    In a follow up patch the position packing attributes will be removed, this
    patch is to isolate any potential regressions that might occur.

 src/gnome-software.ui    |  4 ++--
 src/gs-app-row.ui        | 30 +++++++++++++++---------------
 src/gs-details-page.ui   | 48 ++++++++++++++++++++++++------------------------
 src/gs-editor.ui         |  4 ++--
 src/gs-history-dialog.ui |  2 +-
 src/gs-repos-dialog.ui   |  3 ---
 src/gs-review-dialog.ui  |  6 +++---
 7 files changed, 47 insertions(+), 50 deletions(-)
---
diff --git a/src/gnome-software.ui b/src/gnome-software.ui
index 82a129e6..4225fa4f 100644
--- a/src/gnome-software.ui
+++ b/src/gnome-software.ui
@@ -281,7 +281,7 @@
               </object>
               <packing>
                 <property name="pack-type">end</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
@@ -337,7 +337,7 @@
               </object>
               <packing>
                 <property name="pack-type">end</property>
-                <property name="position">2</property>
+                <property name="position">3</property>
               </packing>
             </child>
           </object>
diff --git a/src/gs-app-row.ui b/src/gs-app-row.ui
index 0550717f..64041cc2 100644
--- a/src/gs-app-row.ui
+++ b/src/gs-app-row.ui
@@ -136,21 +136,6 @@
                 <property name="spacing">4</property>
                 <property name="margin_left">24</property>
                 <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkLabel" id="label_warning">
-                    <property name="visible">False</property>
-                    <property name="label">warning-text</property>
-                    <property name="halign">start</property>
-                    <property name="ellipsize">middle</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                      <attribute name="foreground" value="#cccc00000000"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkBox" id="box_desc">
                     <property name="visible">True</property>
@@ -207,6 +192,21 @@
                    </child>
                   </object>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="label_warning">
+                    <property name="visible">False</property>
+                    <property name="label">warning-text</property>
+                    <property name="halign">start</property>
+                    <property name="ellipsize">middle</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                      <attribute name="foreground" value="#cccc00000000"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="position">1</property>
diff --git a/src/gs-details-page.ui b/src/gs-details-page.ui
index 7c124c12..98fef806 100644
--- a/src/gs-details-page.ui
+++ b/src/gs-details-page.ui
@@ -236,21 +236,6 @@
                                 <property name="spacing">3</property>
                                 <property name="orientation">vertical</property>
                                 <property name="hexpand">True</property>
-                                <child>
-                                  <object class="GtkProgressBar" id="progressbar_top">
-                                    <property name="visible">True</property>
-                                    <property name="fraction">0.5</property>
-                                    <property name="valign">center</property>
-                                    <property name="vexpand">True</property>
-                                    <property name="width_request">624</property>
-                                    <style>
-                                      <class name="upgrade-progressbar"/>
-                                    </style>
-                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
                                 <child>
                                   <object class="GtkBox" id="box_progress2">
                                     <property name="visible">True</property>
@@ -273,6 +258,21 @@
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkProgressBar" id="progressbar_top">
+                                    <property name="visible">True</property>
+                                    <property name="fraction">0.5</property>
+                                    <property name="valign">center</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="width_request">624</property>
+                                    <style>
+                                      <class name="upgrade-progressbar"/>
+                                    </style>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="position">4</property>
@@ -425,7 +425,7 @@
                             <property name="body" translatable="yes">This application includes a software 
repository which provides updates, as well as access to other software.</property>
                           </object>
                           <packing>
-                            <property name="position">6</property>
+                            <property name="position">5</property>
                           </packing>
                         </child>
                         <child>
@@ -436,7 +436,7 @@
                             <property name="body" translatable="yes">This application does not include a 
software repository. It will not be updated with new versions.</property>
                           </object>
                           <packing>
-                            <property name="position">7</property>
+                            <property name="position">6</property>
                           </packing>
                         </child>
                         <child>
@@ -447,7 +447,7 @@
                             <property name="title" translatable="yes">This software is already provided by 
your distribution and should not be replaced.</property>
                           </object>
                           <packing>
-                            <property name="position">8</property>
+                            <property name="position">7</property>
                           </packing>
                         </child>
                         <child>
@@ -459,7 +459,7 @@
                             <property name="warning" translatable="yes">Only use software repositories that 
you trust.</property>
                           </object>
                           <packing>
-                            <property name="position">9</property>
+                            <property name="position">8</property>
                           </packing>
                         </child>
                         <child>
@@ -493,7 +493,7 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="position">10</property>
+                            <property name="position">9</property>
                           </packing>
                         </child>
                         <child>
@@ -509,7 +509,7 @@
                             </style>
                           </object>
                           <packing>
-                            <property name="position">11</property>
+                            <property name="position">10</property>
                           </packing>
                         </child>
                         <child>
@@ -1024,7 +1024,7 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="position">12</property>
+                            <property name="position">11</property>
                           </packing>
                         </child>
                         <child>
@@ -1083,7 +1083,7 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="position">13</property>
+                            <property name="position">12</property>
                           </packing>
                         </child>
                         <child>
@@ -1146,7 +1146,7 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="position">14</property>
+                            <property name="position">13</property>
                           </packing>
                         </child>
                       </object>
diff --git a/src/gs-editor.ui b/src/gs-editor.ui
index 606978ac..616a3ae7 100644
--- a/src/gs-editor.ui
+++ b/src/gs-editor.ui
@@ -489,7 +489,7 @@
           </object>
           <packing>
             <property name="pack_type">end</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -507,7 +507,7 @@
           </object>
           <packing>
             <property name="pack_type">end</property>
-            <property name="position">5</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </object>
diff --git a/src/gs-history-dialog.ui b/src/gs-history-dialog.ui
index d81e13ee..22e3d302 100644
--- a/src/gs-history-dialog.ui
+++ b/src/gs-history-dialog.ui
@@ -42,7 +42,7 @@
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
diff --git a/src/gs-repos-dialog.ui b/src/gs-repos-dialog.ui
index 6483d6d7..d049f28a 100644
--- a/src/gs-repos-dialog.ui
+++ b/src/gs-repos-dialog.ui
@@ -173,9 +173,6 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/src/gs-review-dialog.ui b/src/gs-review-dialog.ui
index 8b1ead20..3900e929 100644
--- a/src/gs-review-dialog.ui
+++ b/src/gs-review-dialog.ui
@@ -91,7 +91,7 @@
                     <property name="halign">center</property>
                   </object>
                   <packing>
-                    <property name="position">2</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
@@ -105,7 +105,7 @@
                     </style>
                   </object>
                   <packing>
-                    <property name="position">3</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
@@ -151,7 +151,7 @@
                     <property name="can_focus">True</property>
                   </object>
                   <packing>
-                    <property name="position">3</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>


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