GNOME.org
 

[pitivi] viewer: update deprecated margin api

commit c9aa7afb57dbaf29744f62787a90bdc5e4d8b764
Author: thejaskiranps <thejaskiranps gmail com>
Date:   Fri Apr 8 01:06:06 2022 +0530

    viewer: update deprecated margin api

 data/ui/clipcolor.ui                               |  4 ++--
 data/ui/cliptransformation.ui                      |  6 +++---
 .../frei0r-filter-3-point-color-balance.ui         |  4 ++--
 data/ui/customwidgets/frei0r-filter-alphaspot.ui   |  2 +-
 data/ui/customwidgets/pitivi:object_effect.ui      |  2 +-
 data/ui/greeter.ui                                 |  2 +-
 data/ui/mainmenubutton.ui                          |  4 ++--
 data/ui/project_info.ui                            |  8 ++++----
 data/ui/projectsettings.ui                         |  2 +-
 data/ui/renderingdialog.ui                         |  2 --
 data/ui/titleeditor.ui                             | 12 ++++++------
 data/ui/trackerperspective.ui                      |  1 -
 pitivi/clipproperties.py                           |  2 +-
 pitivi/dialogs/prefs.py                            | 22 +++++++++++-----------
 pitivi/greeterperspective.py                       |  2 +-
 pitivi/timeline/layer.py                           |  4 ++--
 pitivi/trackerperspective.py                       |  2 +-
 pitivi/viewer/viewer.py                            | 10 +++++-----
 18 files changed, 44 insertions(+), 47 deletions(-)
---
diff --git a/data/ui/clipcolor.ui b/data/ui/clipcolor.ui
index c994f9369..0d7f82a13 100644
--- a/data/ui/clipcolor.ui
+++ b/data/ui/clipcolor.ui
@@ -6,8 +6,8 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="halign">start</property>
-    <property name="margin_left">12</property>
-    <property name="margin_right">12</property>
+    <property name="margin_start">12</property>
+    <property name="margin_end">12</property>
     <property name="margin_top">12</property>
     <property name="margin_bottom">12</property>
     <property name="spacing">5</property>
diff --git a/data/ui/cliptransformation.ui b/data/ui/cliptransformation.ui
index fd1171a66..0b48498b9 100644
--- a/data/ui/cliptransformation.ui
+++ b/data/ui/cliptransformation.ui
@@ -42,7 +42,7 @@
     <property name="can_focus">False</property>
     <property name="halign">start</property>
     <property name="valign">start</property>
-    <property name="margin_left">12</property>
+    <property name="margin_start">12</property>
     <property name="margin_top">6</property>
     <property name="margin_bottom">6</property>
     <property name="row_spacing">6</property>
@@ -256,8 +256,8 @@
         <property name="width_request">175</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">25</property>
-        <property name="margin_right">25</property>
+        <property name="margin_start">25</property>
+        <property name="margin_end">25</property>
         <property name="margin_top">25</property>
         <property name="margin_bottom">25</property>
         <child>
diff --git a/data/ui/customwidgets/frei0r-filter-3-point-color-balance.ui 
b/data/ui/customwidgets/frei0r-filter-3-point-color-balance.ui
index 0d92a5453..a694d6209 100644
--- a/data/ui/customwidgets/frei0r-filter-3-point-color-balance.ui
+++ b/data/ui/customwidgets/frei0r-filter-3-point-color-balance.ui
@@ -477,7 +477,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="margin_left">19</property>
+            <property name="margin_start">19</property>
             <property name="label" translatable="yes">Split preview</property>
           </object>
           <packing>
@@ -490,7 +490,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="margin_left">19</property>
+            <property name="margin_start">19</property>
             <property name="label" translatable="yes">Source image on left</property>
             <property name="xalign">0.5</property>
           </object>
diff --git a/data/ui/customwidgets/frei0r-filter-alphaspot.ui 
b/data/ui/customwidgets/frei0r-filter-alphaspot.ui
index 4b3794a49..8721ad4c7 100644
--- a/data/ui/customwidgets/frei0r-filter-alphaspot.ui
+++ b/data/ui/customwidgets/frei0r-filter-alphaspot.ui
@@ -277,7 +277,7 @@
       <object class="GtkSeparator" id="separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_right">328</property>
+        <property name="margin_end">328</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
diff --git a/data/ui/customwidgets/pitivi:object_effect.ui b/data/ui/customwidgets/pitivi:object_effect.ui
index 8888a91a6..3da06b878 100644
--- a/data/ui/customwidgets/pitivi:object_effect.ui
+++ b/data/ui/customwidgets/pitivi:object_effect.ui
@@ -31,7 +31,7 @@
         <property name="can-focus">True</property>
         <property name="receives-default">True</property>
         <property name="halign">start</property>
-        <property name="margin-left">2</property>
+        <property name="margin-start">2</property>
         <property name="hexpand">True</property>
         <property name="use-alpha">True</property>
         <property name="title" translatable="yes">Pick the clip color</property>
diff --git a/data/ui/greeter.ui b/data/ui/greeter.ui
index 489809800..ba3819381 100644
--- a/data/ui/greeter.ui
+++ b/data/ui/greeter.ui
@@ -50,7 +50,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="margin_right">12</property>
+            <property name="margin_end">12</property>
             <property name="hexpand">True</property>
             <property name="label" translatable="yes">Updated</property>
           </object>
diff --git a/data/ui/mainmenubutton.ui b/data/ui/mainmenubutton.ui
index 73a4a0292..bc9869cab 100644
--- a/data/ui/mainmenubutton.ui
+++ b/data/ui/mainmenubutton.ui
@@ -8,8 +8,8 @@
       <object class="GtkBox" id="menu_box">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">12</property>
-        <property name="margin_right">12</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
         <property name="margin_top">8</property>
         <property name="margin_bottom">8</property>
         <property name="orientation">vertical</property>
diff --git a/data/ui/project_info.ui b/data/ui/project_info.ui
index b880c6051..4d019fbfc 100644
--- a/data/ui/project_info.ui
+++ b/data/ui/project_info.ui
@@ -10,7 +10,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="receives_default">False</property>
-        <property name="margin_right">12</property>
+        <property name="margin_end">12</property>
         <property name="use_stock">True</property>
         <property name="draw_indicator">True</property>
       </object>
@@ -28,7 +28,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="valign">center</property>
-        <property name="margin_right">12</property>
+        <property name="margin_end">12</property>
         <property name="vexpand">True</property>
         <property name="orientation">vertical</property>
         <child>
@@ -79,7 +79,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
-                <property name="margin_left">200</property>
+                <property name="margin_start">200</property>
                 <property name="hexpand">True</property>
               </object>
               <packing>
@@ -102,7 +102,7 @@
             <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">end</property>
-            <property name="margin_right">200</property>
+            <property name="margin_end">200</property>
             <property name="vexpand">True</property>
           </object>
           <packing>
diff --git a/data/ui/projectsettings.ui b/data/ui/projectsettings.ui
index 4e6895140..c0acb3b4d 100644
--- a/data/ui/projectsettings.ui
+++ b/data/ui/projectsettings.ui
@@ -413,7 +413,7 @@
                           <object class="GtkEntry" id="author_entry">
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
-                            <property name="margin-right">10</property>
+                            <property name="margin-end">10</property>
                             <property name="hexpand">True</property>
                             <property name="invisible-char">●</property>
                           </object>
diff --git a/data/ui/renderingdialog.ui b/data/ui/renderingdialog.ui
index c94a5e860..128dd82bb 100644
--- a/data/ui/renderingdialog.ui
+++ b/data/ui/renderingdialog.ui
@@ -154,8 +154,6 @@
                       <object class="GtkGrid" id="preset_button_grid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">3</property>
-                        <property name="margin_right">3</property>
                         <property name="margin_start">3</property>
                         <property name="margin_end">3</property>
                         <property name="margin_top">3</property>
diff --git a/data/ui/titleeditor.ui b/data/ui/titleeditor.ui
index 1241c61ab..d120565bc 100644
--- a/data/ui/titleeditor.ui
+++ b/data/ui/titleeditor.ui
@@ -29,8 +29,8 @@
           <object class="GtkBox" id="base_table">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">12</property>
-            <property name="margin_right">12</property>
+            <property name="margin_start">12</property>
+            <property name="margin_end">12</property>
             <property name="margin_top">12</property>
             <property name="margin_bottom">12</property>
             <property name="orientation">vertical</property>
@@ -83,7 +83,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="margin_left">5</property>
+                    <property name="margin_start">5</property>
                     <property name="use_alpha">True</property>
                     <property name="title" translatable="yes">Pick a text color</property>
                     <property name="rgba">rgb(239,41,41)</property>
@@ -118,7 +118,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="margin_left">5</property>
+                    <property name="margin_start">5</property>
                     <property name="use_alpha">True</property>
                     <property name="title" translatable="yes">Pick a background color</property>
                     <property name="rgba">rgb(255,255,255)</property>
@@ -152,7 +152,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="margin_left">5</property>
+                    <property name="margin_start">5</property>
                     <property name="use_alpha">True</property>
                     <property name="title" translatable="yes">Pick an outline color</property>
                     <property name="rgba">rgba(0,0,0,0)</property>
@@ -229,7 +229,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="valign">start</property>
-                <property name="margin_left">12</property>
+                <property name="margin_start">12</property>
                 <property name="margin_top">6</property>
                 <property name="row_spacing">8</property>
                 <property name="column_spacing">6</property>
diff --git a/data/ui/trackerperspective.ui b/data/ui/trackerperspective.ui
index 3c87234ea..c357436e3 100644
--- a/data/ui/trackerperspective.ui
+++ b/data/ui/trackerperspective.ui
@@ -386,7 +386,6 @@
               <object class="GtkComboBox" id="algorithm_combo_box">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="margin-right">4</property>
                 <property name="margin-end">4</property>
                 <property name="active">3</property>
               </object>
diff --git a/pitivi/clipproperties.py b/pitivi/clipproperties.py
index a685602f5..86281480c 100644
--- a/pitivi/clipproperties.py
+++ b/pitivi/clipproperties.py
@@ -665,7 +665,7 @@ class EffectProperties(Gtk.Expander, Loggable):
 
         remove_effect_button = Gtk.Button.new_from_icon_name("window-close",
                                                              Gtk.IconSize.BUTTON)
-        remove_effect_button.props.margin_right = PADDING
+        remove_effect_button.props.margin_end = PADDING
 
         row_widgets_box = Gtk.Box()
         row_drag_icon = Gtk.Image.new_from_pixbuf(self.drag_lines_pixbuf)
diff --git a/pitivi/dialogs/prefs.py b/pitivi/dialogs/prefs.py
index 2f673e2ac..fc228c75f 100644
--- a/pitivi/dialogs/prefs.py
+++ b/pitivi/dialogs/prefs.py
@@ -248,12 +248,12 @@ class PreferencesDialog(Loggable):
 
             label_widget = Gtk.Label(label=label)
             label_widget.set_alignment(0.0, 0.5)
-            label_widget.props.margin_right = PADDING * 3
+            label_widget.props.margin_end = PADDING * 3
             label_widget.props.margin_top = PADDING * 2
             label_widget.props.margin_bottom = PADDING * 2
             label_size_group.add_widget(label_widget)
 
-            widget.props.margin_right = PADDING * 3
+            widget.props.margin_end = PADDING * 3
             widget.props.margin_top = PADDING * 2
             widget.props.margin_bottom = PADDING * 2
             prop_size_group.add_widget(widget)
@@ -269,7 +269,7 @@ class PreferencesDialog(Loggable):
                 box.pack_start(box1, False, False, 0)
                 box.pack_start(extra_widget, False, False, SPACING)
 
-            box.props.margin_left = PADDING * 3
+            box.props.margin_start = PADDING * 3
 
             row = Gtk.ListBoxRow()
             row.set_activatable(False)
@@ -442,22 +442,22 @@ class PreferencesDialog(Loggable):
             accel_label.set_state_flags(Gtk.StateFlags.INSENSITIVE, True)
 
         title_label.props.xalign = 0
-        title_label.props.margin_left = PADDING * 3
-        title_label.props.margin_right = PADDING * 3
+        title_label.props.margin_start = PADDING * 3
+        title_label.props.margin_end = PADDING * 3
         title_label.props.margin_top = PADDING * 2
         title_label.props.margin_bottom = PADDING * 2
         self.description_size_group.add_widget(title_label)
 
         accel_label.props.xalign = 0
-        accel_label.props.margin_left = PADDING * 3
-        accel_label.props.margin_right = PADDING * 2
+        accel_label.props.margin_start = PADDING * 3
+        accel_label.props.margin_end = PADDING * 2
         self.accel_size_group.add_widget(accel_label)
 
         # Add the third column with the reset button.
         button = Gtk.Button.new_from_icon_name("edit-clear-all-symbolic",
                                                Gtk.IconSize.MENU)
         button.set_tooltip_text(_("Reset the shortcut to the default accelerator"))
-        button.props.margin_right = PADDING / 2
+        button.props.margin_end = PADDING / 2
         button.set_relief(Gtk.ReliefStyle.NONE)
         button.connect("clicked", self.__reset_accelerator_cb, item)
         button.set_sensitive(accel_changed)
@@ -492,8 +492,8 @@ class PreferencesDialog(Loggable):
             header.set_markup("<b>%s</b>" % group_title)
             header.props.margin_top = PADDING if not prev_group else PADDING * 8
             header.props.margin_bottom = PADDING * 2
-            header.props.margin_left = 1
-            header.props.margin_right = PADDING * 2
+            header.props.margin_start = 1
+            header.props.margin_end = PADDING * 2
             header.props.xalign = 0
             alter_style_class("group_title", header, "font-size: small;")
             header.get_style_context().add_class("group_title")
@@ -879,7 +879,7 @@ class PluginsBox(Gtk.ListBox):
         inner_box.set_halign(Gtk.Align.FILL)
         inner_box.props.margin_top = PADDING * 3
         inner_box.props.margin_bottom = PADDING
-        inner_box.props.margin_right = PADDING * 2
+        inner_box.props.margin_end = PADDING * 2
         inner_box.pack_start(header, True, True, 0)
         inner_box.pack_start(button, False, False, 0)
 
diff --git a/pitivi/greeterperspective.py b/pitivi/greeterperspective.py
index b822460d8..a575fb0be 100644
--- a/pitivi/greeterperspective.py
+++ b/pitivi/greeterperspective.py
@@ -448,7 +448,7 @@ class GreeterPerspective(Perspective):
         grid = Gtk.Grid()
         grid.props.row_spacing = SPACING
         grid.props.column_spacing = PADDING
-        grid.props.margin_left = SPACING
+        grid.props.margin_start = SPACING
         grid.props.margin_top = SPACING * 2
 
         for row_index, dep in enumerate(MISSING_SOFT_DEPS.values()):
diff --git a/pitivi/timeline/layer.py b/pitivi/timeline/layer.py
index 36b02df0e..2b80a78c6 100644
--- a/pitivi/timeline/layer.py
+++ b/pitivi/timeline/layer.py
@@ -85,8 +85,8 @@ class LayerControls(Gtk.EventBox, Loggable):
         name_row = Gtk.Box()
         name_row.set_orientation(Gtk.Orientation.HORIZONTAL)
         name_row.props.margin_top = PADDING
-        name_row.props.margin_left = PADDING
-        name_row.props.margin_right = PADDING
+        name_row.props.margin_start = PADDING
+        name_row.props.margin_end = PADDING
         vbox.pack_start(name_row, False, False, 0)
 
         self.menubutton = Gtk.MenuButton.new()
diff --git a/pitivi/trackerperspective.py b/pitivi/trackerperspective.py
index b12bcaf23..7f44abedc 100644
--- a/pitivi/trackerperspective.py
+++ b/pitivi/trackerperspective.py
@@ -664,7 +664,7 @@ class TrackerPerspective(Perspective):
         back_button.set_always_show_image(True)
         back_button.set_tooltip_text(_("Go back"))
         back_button.connect("clicked", self.__back_button_clicked_cb)
-        back_button.set_margin_right(4 * PADDING)
+        back_button.set_margin_end(4 * PADDING)
         headerbar.pack_start(back_button)
         headerbar.props.title = os.path.basename(self.asset.props.id)
         headerbar.show_all()
diff --git a/pitivi/viewer/viewer.py b/pitivi/viewer/viewer.py
index 00266d52e..0ea7a183e 100644
--- a/pitivi/viewer/viewer.py
+++ b/pitivi/viewer/viewer.py
@@ -272,8 +272,8 @@ class ViewerContainer(Gtk.Box, Loggable):
 
         # Peak Meters
         self.peak_meter_box = Gtk.Box()
-        self.peak_meter_box.set_margin_right(SPACING)
-        self.peak_meter_box.set_margin_left(SPACING)
+        self.peak_meter_box.set_margin_end(SPACING)
+        self.peak_meter_box.set_margin_start(SPACING)
         self.peak_meter_box.set_margin_bottom(SPACING)
         self.peak_meter_box.set_margin_top(SPACING)
         self.peak_meter_box.set_property("valign", Gtk.Align.CENTER)
@@ -284,7 +284,7 @@ class ViewerContainer(Gtk.Box, Loggable):
         self.peak_meter_scale = PeakMeterScale()
         self.peak_meter_scale.set_property("valign", Gtk.Align.FILL)
         self.peak_meter_scale.set_property("halign", Gtk.Align.CENTER)
-        self.peak_meter_scale.set_margin_left(SPACING)
+        self.peak_meter_scale.set_margin_start(SPACING)
         self.peak_meter_box.pack_end(self.peak_meter_scale, False, False, 0)
         self.viewer_row_box.pack_end(self.peak_meter_box, False, False, 0)
         self.peak_meter_scale.connect("configure-event", self.__peak_meter_scale_configure_event_cb)
@@ -294,8 +294,8 @@ class ViewerContainer(Gtk.Box, Loggable):
         bbox.set_orientation(Gtk.Orientation.HORIZONTAL)
         bbox.set_property("valign", Gtk.Align.CENTER)
         bbox.set_property("halign", Gtk.Align.CENTER)
-        bbox.set_margin_left(SPACING)
-        bbox.set_margin_right(SPACING)
+        bbox.set_margin_start(SPACING)
+        bbox.set_margin_end(SPACING)
         self.pack_end(bbox, False, False, 0)
 
         self.guidelines_button = Gtk.MenuButton.new()
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]