GNOME.org
 

[gnome-games] ui: Stop using margin property

commit a75cff2fb18f593448644e7c71711456418cc5f1
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Fri Oct 16 01:44:27 2020 +0500

    ui: Stop using margin property
    
    It's gone in GTK4.

 data/ui/checkmark-item.ui                          |  5 ++-
 data/ui/collection-action-window.ui                | 44 ++++++++++++++++++----
 data/ui/collection-view.ui                         |  5 ++-
 data/ui/media-menu-button.ui                       |  5 ++-
 data/ui/platform-list-item.ui                      |  5 ++-
 data/ui/preferences-page.ui                        |  7 +++-
 data/ui/snapshot-row.ui                            | 10 ++++-
 data/ui/snapshots-list.ui                          | 15 ++++++--
 .../data/ui/nintendo-64-pak-controller.ui          |  5 ++-
 .../data/ui/nintendo-64-pak-switcher.ui            |  5 ++-
 10 files changed, 86 insertions(+), 20 deletions(-)
---
diff --git a/data/ui/checkmark-item.ui b/data/ui/checkmark-item.ui
index 6069f3e7..f0fe2b87 100644
--- a/data/ui/checkmark-item.ui
+++ b/data/ui/checkmark-item.ui
@@ -5,7 +5,10 @@
     <property name="visible">true</property>
     <child>
       <object class="GtkBox">
-        <property name="margin">10</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
+        <property name="margin-start">10</property>
+        <property name="margin-end">10</property>
         <property name="spacing">12</property>
         <property name="visible">true</property>
         <child>
diff --git a/data/ui/collection-action-window.ui b/data/ui/collection-action-window.ui
index 36d07f1b..ff5eabcb 100644
--- a/data/ui/collection-action-window.ui
+++ b/data/ui/collection-action-window.ui
@@ -101,7 +101,10 @@
                       <object class="HdyClamp">
                         <property name="visible">True</property>
                         <property name="maximum-size">400</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>
                         <child>
                           <object class="GtkListBox" id="list_box">
                             <property name="visible">True</property>
@@ -132,7 +135,10 @@
                             <property name="visible">True</property>
                             <property name="pixel-size">96</property>
                             <property name="icon-name">folder-symbolic</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="dim-label"/>
                             </style>
@@ -144,7 +150,10 @@
                             <property name="label" translatable="yes">No collections found</property>
                             <property name="justify">center</property>
                             <property name="wrap">True</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>
                             <style>
                               <class name="dim-label"/>
                             </style>
@@ -172,7 +181,10 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Create Collection</property>
                         <property name="halign">center</property>
-                        <property name="margin">24</property>
+                        <property name="margin-top">24</property>
+                        <property name="margin-bottom">24</property>
+                        <property name="margin-start">24</property>
+                        <property name="margin-end">24</property>
                         <property name="action-name">collection-action.new-collection</property>
                         <child internal-child="accessible">
                           <object class="AtkObject">
@@ -240,6 +252,9 @@
                     <property name="icon-name">folder-new-symbolic</property>
                     <property name="vexpand">True</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="dim-label"/>
                     </style>
@@ -251,6 +266,9 @@
                     <property name="label" translatable="yes">Enter a collection name</property>
                     <property name="valign">end</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>
                   </object>
                 </child>
                 <child>
@@ -259,7 +277,10 @@
                     <property name="width-request">300</property>
                     <property name="height-request">10</property>
                     <property name="halign">center</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>
                     <signal name="notify::text" handler="on_collection_name_entry_changed"/>
                     <signal name="activate" handler="create_collection"/>
                   </object>
@@ -268,7 +289,10 @@
                   <object class="GtkLabel" id="error_label">
                     <property name="visible">True</property>
                     <property name="valign">end</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>
                     <style>
                       <class name="dim-label"/>
                     </style>
@@ -280,7 +304,10 @@
                     <property name="label" translatable="yes">C_reate</property>
                     <property name="use-underline">True</property>
                     <property name="sensitive" bind-source="GamesCollectionActionWindow" 
bind-property="is-collection-name-valid" bind-flags="sync-create"/>
-                    <property name="margin">24</property>
+                    <property name="margin-top">24</property>
+                    <property name="margin-bottom">24</property>
+                    <property name="margin-start">24</property>
+                    <property name="margin-end">24</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="action-name">collection-action.create-collection</property>
@@ -309,7 +336,10 @@
       <object class="GtkImage">
         <property name="visible">True</property>
         <property name="icon-name">list-add-symbolic</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>
       </object>
     </child>
   </object>
diff --git a/data/ui/collection-view.ui b/data/ui/collection-view.ui
index 0ee77597..686f4fb2 100644
--- a/data/ui/collection-view.ui
+++ b/data/ui/collection-view.ui
@@ -568,7 +568,10 @@
       <object class="GtkBox">
         <property name="visible">true</property>
         <property name="orientation">vertical</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="spacing">12</property>
         <child>
           <object class="GtkLabel">
diff --git a/data/ui/media-menu-button.ui b/data/ui/media-menu-button.ui
index 6fff5a39..aebb126a 100644
--- a/data/ui/media-menu-button.ui
+++ b/data/ui/media-menu-button.ui
@@ -40,7 +40,10 @@
     <child>
       <object class="GtkFrame">
         <property name="visible">True</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="shadow-type">in</property>
         <child>
           <object class="GtkListBox" id="list_box">
diff --git a/data/ui/platform-list-item.ui b/data/ui/platform-list-item.ui
index 08e90d09..ecfb1d61 100644
--- a/data/ui/platform-list-item.ui
+++ b/data/ui/platform-list-item.ui
@@ -6,7 +6,10 @@
     <child>
       <object class="GtkLabel" id="label">
         <property name="visible">true</property>
-        <property name="margin">10</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
+        <property name="margin-start">10</property>
+        <property name="margin-end">10</property>
         <property name="wrap">true</property>
         <property name="xalign">0</property>
       </object>
diff --git a/data/ui/preferences-page.ui b/data/ui/preferences-page.ui
index 2b299cfc..663bd6ae 100644
--- a/data/ui/preferences-page.ui
+++ b/data/ui/preferences-page.ui
@@ -22,8 +22,11 @@
                       <object class="GtkBox" id="box">
                         <property name="visible">True</property>
                         <property name="orientation">vertical</property>
-                        <property name="margin">18</property>
-                        <property name="spacing">12</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="spacing">18</property>
                       </object>
                     </child>
                   </object>
diff --git a/data/ui/snapshot-row.ui b/data/ui/snapshot-row.ui
index 1e5ded98..aab0e226 100644
--- a/data/ui/snapshot-row.ui
+++ b/data/ui/snapshot-row.ui
@@ -13,12 +13,18 @@
         <child>
           <object class="GtkBox">
             <property name="visible">true</property>
-            <property name="margin">2</property>
+            <property name="margin-top">2</property>
+            <property name="margin-bottom">2</property>
+            <property name="margin-start">2</property>
+            <property name="margin-end">2</property>
             <child>
               <object class="GamesSnapshotThumbnail" id="thumbnail">
                 <property name="visible">true</property>
                 <property name="valign">start</property>
-                <property name="margin">7</property>
+                <property name="margin-top">7</property>
+                <property name="margin-bottom">7</property>
+                <property name="margin-start">7</property>
+                <property name="margin-end">7</property>
               </object>
             </child>
             <child>
diff --git a/data/ui/snapshots-list.ui b/data/ui/snapshots-list.ui
index 7d32d65d..dd4199ff 100644
--- a/data/ui/snapshots-list.ui
+++ b/data/ui/snapshots-list.ui
@@ -40,7 +40,10 @@
                         <child>
                           <object class="GtkBox">
                             <property name="visible">True</property>
-                            <property name="margin">2</property>
+                            <property name="margin-top">2</property>
+                            <property name="margin-bottom">2</property>
+                            <property name="margin-start">2</property>
+                            <property name="margin-end">2</property>
                             <child>
                               <object class="GtkImage">
                                 <property name="visible">True</property>
@@ -48,7 +51,10 @@
                                 <property name="pixel-size">32</property>
                                 <property name="width-request">64</property>
                                 <property name="height-request">64</property>
-                                <property name="margin">7</property>
+                                <property name="margin-top">7</property>
+                                <property name="margin-bottom">7</property>
+                                <property name="margin-start">7</property>
+                                <property name="margin-end">7</property>
                                 <style>
                                   <class name="snapshot-thumbnail"/>
                                 </style>
@@ -121,7 +127,10 @@
       <object class="GtkBox">
         <property name="visible">true</property>
         <property name="orientation">vertical</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="spacing">12</property>
         <child>
           <object class="GtkLabel">
diff --git a/plugins/nintendo-64/data/ui/nintendo-64-pak-controller.ui 
b/plugins/nintendo-64/data/ui/nintendo-64-pak-controller.ui
index 34d7cde9..f9602bed 100644
--- a/plugins/nintendo-64/data/ui/nintendo-64-pak-controller.ui
+++ b/plugins/nintendo-64/data/ui/nintendo-64-pak-controller.ui
@@ -8,7 +8,10 @@
       <object class="GtkLabel" id="title">
         <property name="visible" bind-source="GamesNintendo64PakController" bind-property="show-title" 
bind-flags="sync-create|bidirectional"/>
         <property name="xalign">0</property>
-        <property name="margin">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>
         <attributes>
           <attribute name="weight" value="bold"/>
           <attribute name="scale" value="0.8"/>
diff --git a/plugins/nintendo-64/data/ui/nintendo-64-pak-switcher.ui 
b/plugins/nintendo-64/data/ui/nintendo-64-pak-switcher.ui
index 355da19b..6f98325f 100644
--- a/plugins/nintendo-64/data/ui/nintendo-64-pak-switcher.ui
+++ b/plugins/nintendo-64/data/ui/nintendo-64-pak-switcher.ui
@@ -41,7 +41,10 @@
       <object class="GtkBox" id="controllers_box">
         <property name="visible">True</property>
         <property name="orientation">vertical</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="spacing">6</property>
       </object>
     </child>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]