New upstream version 0.25.3upstream/0.25.3

1 files changed, 28 insertions, 25 deletions

diff --git a/plugins/shotwell-publishing-extras/yandex_publish_model.ui b/plugins/shotwell-publishing-extras/yandex_publish_model.ui
index 1d9cc22..e1cc54d 100644
--- a/plugins/shotwell-publishing-extras/yandex_publish_model.ui
+++ b/plugins/shotwell-publishing-extras/yandex_publish_model.ui
@@ -28,15 +28,18 @@
   <object class="GtkWindow" id="publish_options_window">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkVBox" id="content">
+      <object class="GtkBox" id="content">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
+        <property name="margin_left">30</property>
+        <property name="margin_right">30</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkTable" id="table1">
+          <object class="GtkGrid" id="table1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">2</property>
-            <property name="n_columns">2</property>
             <child>
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
@@ -44,25 +47,13 @@
                 <property name="label" translatable="yes">_Albums (or write new):</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">album_list</property>
-                <property name="xalign">0.30000001192092896</property>
               </object>
               <packing>
+                <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="ypad">6</property>
-                <property name="label" translatable="yes">Access _type:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">access_type_list</property>
-                <property name="xalign">0</property>
-              </object>
-            </child>
-            <child>
               <object class="GtkComboBoxText" id="access_type_list">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -70,8 +61,7 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_padding">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
@@ -82,10 +72,23 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
                 <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_padding">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="margin_left">6</property>
+                <property name="margin_right">6</property>
+                <property name="label" translatable="yes">Access _type:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">access_type_list</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
           </object>
@@ -104,8 +107,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
+            <property name="halign">start</property>
             <property name="use_underline">True</property>
-            <property name="xalign">0.30000001192092896</property>
             <property name="draw_indicator">True</property>
           </object>
           <packing>
@@ -121,8 +124,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
+            <property name="halign">start</property>
             <property name="use_underline">True</property>
-            <property name="xalign">0.30000001192092896</property>
             <property name="draw_indicator">True</property>
           </object>
           <packing>
@@ -132,7 +135,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox1">
+          <object class="GtkButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">2</property>