[gnome-software: 72/110] Replace margin and border_width by margin-{top, bottom, start.end}

From: Philip Withnall <pwithnall src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-software: 72/110] Replace margin and border_width by margin-{top, bottom, start.end}
Date: Tue, 5 Oct 2021 20:32:41 +0000 (UTC)

commit 38b0f4341ce45a198089a3dda8df1e821d9702ca
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Aug 25 20:18:17 2021 -0300

    Replace margin and border_width by margin-{top,bottom,start.end}
    
    GTK4 does not have neither the 'margin' property (which was a proxy property
    that set all margin-* properties), nor the 'border-width' property anymore.
    Replace it all by margin-*.

 src/gs-age-rating-context-dialog.ui       |  5 ++++-
 src/gs-app-details-page.ui                | 14 ++++++++------
 src/gs-app-version-history-dialog.ui      |  1 -
 src/gs-basic-auth-dialog.ui               | 11 ++++++++---
 src/gs-context-dialog-row.ui              |  5 ++++-
 src/gs-details-page.ui                    |  5 ++++-
 src/gs-feature-tile.ui                    |  5 ++++-
 src/gs-featured-carousel.ui               | 10 ++++++++--
 src/gs-hardware-support-context-dialog.ui |  5 ++++-
 src/gs-license-tile.ui                    |  5 ++++-
 src/gs-metered-data-dialog.ui             |  5 ++++-
 src/gs-overview-page.ui                   | 12 ++++++++----
 src/gs-repo-row.ui                        |  5 ++++-
 src/gs-review-histogram.ui                |  5 ++++-
 src/gs-safety-context-dialog.ui           | 20 ++++++++++++++++----
 src/gs-screenshot-carousel.ui             | 10 ++++++++--
 src/gs-storage-context-dialog.ui          |  5 ++++-
 src/gs-updates-page.ui                    |  1 -
 src/gs-upgrade-banner.ui                  | 15 ++++++++++++---
 19 files changed, 108 insertions(+), 36 deletions(-)
---
diff --git a/src/gs-age-rating-context-dialog.ui b/src/gs-age-rating-context-dialog.ui
index c1f52b291..71584cdcb 100644
--- a/src/gs-age-rating-context-dialog.ui
+++ b/src/gs-age-rating-context-dialog.ui
@@ -18,7 +18,10 @@
 
                 <child>
                   <object class="GtkBox">
-                    <property name="margin">20</property>
+                    <property name="margin-top">20</property>
+                    <property name="margin-bottom">20</property>
+                    <property name="margin-start">20</property>
+                    <property name="margin-end">20</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">12</property>
                     <property name="visible">True</property>
diff --git a/src/gs-app-details-page.ui b/src/gs-app-details-page.ui
index ebbcaff9a..499235397 100644
--- a/src/gs-app-details-page.ui
+++ b/src/gs-app-details-page.ui
@@ -37,11 +37,10 @@
     <child>
       <object class="GtkBox" id="box7">
         <property name="visible">True</property>
-        <property name="margin_start">6</property>
-        <property name="margin_end">6</property>
-        <property name="margin_top">6</property>
-        <property name="margin_bottom">9</property>
-        <property name="border_width">5</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">18</property>
         <property name="orientation">vertical</property>
         <property name="spacing">9</property>
         <child>
@@ -136,7 +135,10 @@
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="margin">6</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
+                <property name="margin-start">6</property>
+                <property name="margin-end">6</property>
                 <property name="label">New in kmod 14-1
 * Moo
 * bar</property>
diff --git a/src/gs-app-version-history-dialog.ui b/src/gs-app-version-history-dialog.ui
index c25c45cef..11932f23e 100644
--- a/src/gs-app-version-history-dialog.ui
+++ b/src/gs-app-version-history-dialog.ui
@@ -16,7 +16,6 @@
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
-        <property name="border_width">0</property>
         <child>
           <object class="GtkScrolledWindow">
             <property name="visible">True</property>
diff --git a/src/gs-basic-auth-dialog.ui b/src/gs-basic-auth-dialog.ui
index 52c7577f0..4f1d56d32 100644
--- a/src/gs-basic-auth-dialog.ui
+++ b/src/gs-basic-auth-dialog.ui
@@ -2,7 +2,10 @@
 <interface>
   <template class="GsBasicAuthDialog" parent="GtkDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
+    <property name="margin-top">5</property>
+    <property name="margin-bottom">5</property>
+    <property name="margin-start">5</property>
+    <property name="margin-end">5</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
@@ -67,8 +70,10 @@
             <property name="hexpand">True</property>
             <property name="row_spacing">8</property>
             <property name="column_spacing">6</property>
-            <property name="border_width">20</property>
-            <property name="margin_end">20</property>
+            <property name="margin-top">20</property>
+            <property name="margin-bottom">20</property>
+            <property name="margin-start">20</property>
+            <property name="margin-end">40</property>
             <child>
               <object class="GtkLabel" id="description_label">
                 <property name="visible">True</property>
diff --git a/src/gs-context-dialog-row.ui b/src/gs-context-dialog-row.ui
index 36a5556b7..b2f252a58 100644
--- a/src/gs-context-dialog-row.ui
+++ b/src/gs-context-dialog-row.ui
@@ -8,7 +8,10 @@
 
     <child>
       <object class="GtkBox">
-        <property name="margin">18</property>
+        <property name="margin-top">18</property>
+        <property name="margin-bottom">18</property>
+        <property name="margin-start">18</property>
+        <property name="margin-end">18</property>
         <property name="orientation">horizontal</property>
         <property name="spacing">18</property>
         <property name="visible">True</property>
diff --git a/src/gs-details-page.ui b/src/gs-details-page.ui
index f9b2a300d..3e7af5534 100644
--- a/src/gs-details-page.ui
+++ b/src/gs-details-page.ui
@@ -718,7 +718,10 @@
                                                     <property name="visible">True</property>
                                                     <property name="orientation">vertical</property>
                                                     <property name="spacing">8</property>
-                                                    <property name="margin">14</property>
+                                                    <property name="margin-top">14</property>
+                                                    <property name="margin-bottom">14</property>
+                                                    <property name="margin-start">14</property>
+                                                    <property name="margin-end">14</property>
                                                     <property name="valign">center</property>
                                                     <property name="hexpand">True</property>
                                                     <style>
diff --git a/src/gs-feature-tile.ui b/src/gs-feature-tile.ui
index 0ae4a1534..2fc8dedfc 100644
--- a/src/gs-feature-tile.ui
+++ b/src/gs-feature-tile.ui
@@ -37,7 +37,10 @@
                 <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="orientation">vertical</property>
-                <property name="margin">50</property>
+                <property name="margin-top">50</property>
+                <property name="margin-bottom">50</property>
+                <property name="margin-start">50</property>
+                <property name="margin-end">50</property>
                 <child>
                   <object class="GtkImage" id="image">
                     <property name="visible">True</property>
diff --git a/src/gs-featured-carousel.ui b/src/gs-featured-carousel.ui
index 7c301038f..1f6ed4587 100644
--- a/src/gs-featured-carousel.ui
+++ b/src/gs-featured-carousel.ui
@@ -35,7 +35,10 @@
             <property name="valign">center</property>
             <property name="width-request">56</property>
             <property name="height-request">56</property>
-            <property name="margin">9</property>
+            <property name="margin-top">9</property>
+            <property name="margin-bottom">9</property>
+            <property name="margin-start">9</property>
+            <property name="margin-end">9</property>
             <signal name="clicked" handler="previous_button_clicked_cb"/>
             <accessibility>
               <property name="label" translatable="yes">Previous</property>
@@ -63,7 +66,10 @@
             <property name="valign">center</property>
             <property name="width-request">56</property>
             <property name="height-request">56</property>
-            <property name="margin">9</property>
+            <property name="margin-top">9</property>
+            <property name="margin-bottom">9</property>
+            <property name="margin-start">9</property>
+            <property name="margin-end">9</property>
             <signal name="clicked" handler="next_button_clicked_cb"/>
             <accessibility>
               <property name="label" translatable="yes">Next</property>
diff --git a/src/gs-hardware-support-context-dialog.ui b/src/gs-hardware-support-context-dialog.ui
index 41128f71b..125581716 100644
--- a/src/gs-hardware-support-context-dialog.ui
+++ b/src/gs-hardware-support-context-dialog.ui
@@ -18,7 +18,10 @@
 
                 <child>
                   <object class="GtkBox">
-                    <property name="margin">20</property>
+                    <property name="margin-top">20</property>
+                    <property name="margin-bottom">20</property>
+                    <property name="margin-start">20</property>
+                    <property name="margin-end">20</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">12</property>
                     <property name="visible">True</property>
diff --git a/src/gs-license-tile.ui b/src/gs-license-tile.ui
index 7f7595b54..7e4843c83 100644
--- a/src/gs-license-tile.ui
+++ b/src/gs-license-tile.ui
@@ -21,7 +21,10 @@
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">8</property>
-                <property name="margin">14</property>
+                <property name="margin-top">14</property>
+                <property name="margin-bottom">14</property>
+                <property name="margin-start">14</property>
+                <property name="margin-end">14</property>
 
                 <child>
                   <object class="GtkBox">
diff --git a/src/gs-metered-data-dialog.ui b/src/gs-metered-data-dialog.ui
index 085cb78cf..dfbbd5b08 100644
--- a/src/gs-metered-data-dialog.ui
+++ b/src/gs-metered-data-dialog.ui
@@ -28,7 +28,10 @@
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
-            <property name="margin">12</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">12</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
             <child>
               <object class="GtkLabel">
                 <property name="visible">True</property>
diff --git a/src/gs-overview-page.ui b/src/gs-overview-page.ui
index 29ccb05f0..dafe1f458 100644
--- a/src/gs-overview-page.ui
+++ b/src/gs-overview-page.ui
@@ -33,7 +33,10 @@
                       <object class="GtkBox">
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
-                        <property name="border_width">12</property>
+                        <property name="margin-top">12</property>
+                        <property name="margin-bottom">12</property>
+                        <property name="margin-start">12</property>
+                        <property name="margin-end">12</property>
                         <child>
                           <object class="GtkLabel" id="label_third_party_title">
                             <property name="visible">True</property>
@@ -81,10 +84,11 @@
                                 <property name="visible">True</property>
                                 <property name="halign">center</property>
                                 <property name="hexpand">False</property>
-                                <property name="border_width">12</property>
                                 <property name="orientation">vertical</property>
-                                <property name="margin-top">12</property>
-                                <property name="margin-bottom">24</property>
+                                <property name="margin-top">24</property>
+                                <property name="margin-bottom">36</property>
+                                <property name="margin-start">12</property>
+                                <property name="margin-end">12</property>
                                 <property name="valign">start</property>
                                 <property name="spacing">6</property>
 
diff --git a/src/gs-repo-row.ui b/src/gs-repo-row.ui
index 509f75a81..5f65d6732 100644
--- a/src/gs-repo-row.ui
+++ b/src/gs-repo-row.ui
@@ -6,7 +6,10 @@
     <child>
       <object class="GtkGrid">
         <property name="visible">True</property>
-        <property name="margin">12</property>
+        <property name="margin-top">12</property>
+        <property name="margin-bottom">12</property>
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
         <property name="row-spacing">6</property>
         <property name="column-spacing">12</property>
         <child>
diff --git a/src/gs-review-histogram.ui b/src/gs-review-histogram.ui
index 2a9d7d0b8..2852775a0 100644
--- a/src/gs-review-histogram.ui
+++ b/src/gs-review-histogram.ui
@@ -8,7 +8,10 @@
         <property name="visible">True</property>
         <property name="row-spacing">6</property>
         <property name="column-spacing">6</property>
-        <property name="margin">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
+        <property name="margin-start">6</property>
+        <property name="margin-end">6</property>
        <child>
           <object class="GtkLabel" id="label_value">
            <property name="halign">start</property>
diff --git a/src/gs-safety-context-dialog.ui b/src/gs-safety-context-dialog.ui
index ebcf48493..5af8107ca 100644
--- a/src/gs-safety-context-dialog.ui
+++ b/src/gs-safety-context-dialog.ui
@@ -18,7 +18,10 @@
 
                 <child>
                   <object class="GtkBox">
-                    <property name="margin">20</property>
+                    <property name="margin-top">20</property>
+                    <property name="margin-bottom">20</property>
+                    <property name="margin-start">20</property>
+                    <property name="margin-end">20</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">12</property>
                     <property name="visible">True</property>
@@ -109,7 +112,10 @@
                             <child>
                               <object class="GtkBox">
                                 <property name="visible">True</property>
-                                <property name="margin">12</property>
+                                <property name="margin-top">12</property>
+                                <property name="margin-bottom">12</property>
+                                <property name="margin-start">12</property>
+                                <property name="margin-end">12</property>
                                 <property name="orientation">horizontal</property>
                                 <property name="spacing">12</property>
                                 <child>
@@ -148,7 +154,10 @@
                             <property name="activatable">False</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="margin">12</property>
+                                <property name="margin-top">12</property>
+                                <property name="margin-bottom">12</property>
+                                <property name="margin-start">12</property>
+                                <property name="margin-end">12</property>
                                 <property name="visible">True</property>
                                 <property name="orientation">horizontal</property>
                                 <property name="spacing">12</property>
@@ -188,7 +197,10 @@
                             <property name="activatable">False</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="margin">12</property>
+                                <property name="margin-top">12</property>
+                                <property name="margin-bottom">12</property>
+                                <property name="margin-start">12</property>
+                                <property name="margin-end">12</property>
                                 <property name="visible">True</property>
                                 <property name="orientation">horizontal</property>
                                 <property name="spacing">12</property>
diff --git a/src/gs-screenshot-carousel.ui b/src/gs-screenshot-carousel.ui
index 3db71d43c..b9ce56a00 100644
--- a/src/gs-screenshot-carousel.ui
+++ b/src/gs-screenshot-carousel.ui
@@ -40,7 +40,10 @@
                             <property name="visible">True</property>
                             <property name="width-request">64</property>
                             <property name="height-request">64</property>
-                            <property name="margin">9</property>
+                            <property name="margin-top">9</property>
+                            <property name="margin-bottom">9</property>
+                            <property name="margin-start">9</property>
+                            <property name="margin-end">9</property>
                             <signal name="clicked" 
handler="gs_screenshot_carousel_button_previous_clicked_cb" swapped="yes"/>
                             <accessibility>
                               <!-- Translators: This is the accessible description for a button to go to the 
previous screenshot in the screenshot carousel. -->
@@ -79,7 +82,10 @@
                             <property name="visible">True</property>
                             <property name="width-request">64</property>
                             <property name="height-request">64</property>
-                            <property name="margin">9</property>
+                            <property name="margin-top">9</property>
+                            <property name="margin-bottom">9</property>
+                            <property name="margin-start">9</property>
+                            <property name="margin-end">9</property>
                             <signal name="clicked" handler="gs_screenshot_carousel_button_next_clicked_cb" 
swapped="yes"/>
                             <accessibility>
                               <!-- Translators: This is the accessible description for a button to go to the 
next screenshot in the screenshot carousel. -->
diff --git a/src/gs-storage-context-dialog.ui b/src/gs-storage-context-dialog.ui
index 32cc83380..0297d5d3e 100644
--- a/src/gs-storage-context-dialog.ui
+++ b/src/gs-storage-context-dialog.ui
@@ -18,7 +18,10 @@
 
                 <child>
                   <object class="GtkBox">
-                    <property name="margin">20</property>
+                    <property name="margin-top">20</property>
+                    <property name="margin-bottom">20</property>
+                    <property name="margin-start">20</property>
+                    <property name="margin-end">20</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">12</property>
                     <property name="visible">True</property>
diff --git a/src/gs-updates-page.ui b/src/gs-updates-page.ui
index 54c9415bf..356486ca2 100644
--- a/src/gs-updates-page.ui
+++ b/src/gs-updates-page.ui
@@ -12,7 +12,6 @@
         <child>
           <object class="GtkBox" id="box_end_of_life">
             <property name="visible">False</property>
-            <property name="border_width">0</property>
             <property name="orientation">horizontal</property>
             <property name="spacing">18</property>
             <style>
diff --git a/src/gs-upgrade-banner.ui b/src/gs-upgrade-banner.ui
index fc809a657..ec763e874 100644
--- a/src/gs-upgrade-banner.ui
+++ b/src/gs-upgrade-banner.ui
@@ -68,7 +68,10 @@
                 <property name="halign">center</property>
                 <property name="valign">end</property>
                 <property name="spacing">12</property>
-                <property name="margin">18</property>
+                <property name="margin-top">18</property>
+                <property name="margin-bottom">18</property>
+                <property name="margin-start">18</property>
+                <property name="margin-end">18</property>
                 <style>
                   <class name="upgrade-buttons"/>
                 </style>
@@ -110,7 +113,10 @@
                 <property name="hexpand">True</property>
                 <property name="valign">end</property>
                 <property name="spacing">12</property>
-                <property name="margin">18</property>
+                <property name="margin-top">18</property>
+                <property name="margin-bottom">18</property>
+                <property name="margin-start">18</property>
+                <property name="margin-end">18</property>
                 <style>
                   <class name="upgrade-buttons"/>
                 </style>
@@ -204,7 +210,10 @@
                 <property name="halign">center</property>
                 <property name="valign">end</property>
                 <property name="spacing">12</property>
-                <property name="margin">18</property>
+                <property name="margin-top">18</property>
+                <property name="margin-bottom">18</property>
+                <property name="margin-start">18</property>
+                <property name="margin-end">18</property>
                 <style>
                   <class name="upgrade-buttons"/>
                 </style>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]