From da8f522b838e7af0c580f64b148f33159e64ee1b Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Sun, 22 Dec 2019 19:35:08 +0100
Subject: time-admin: Fix UI validation

---
 capplets/time-admin/src/time-admin.ui | 82 ++++++++++++++++++++---------------
 1 file changed, 47 insertions(+), 35 deletions(-)

(limited to 'capplets')

diff --git a/capplets/time-admin/src/time-admin.ui b/capplets/time-admin/src/time-admin.ui
index 3f192f99..0362b38a 100644
--- a/capplets/time-admin/src/time-admin.ui
+++ b/capplets/time-admin/src/time-admin.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.0 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk+" version="3.22"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">23</property>
     <property name="step_increment">1</property>
@@ -17,6 +17,16 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkImage" id="save_button_img">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">document-save</property>
+  </object>
+  <object class="GtkImage" id="window_close_button_img">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">window-close</property>
+  </object>
   <object class="GtkApplicationWindow" id="window1">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Time and Date Manager</property>
@@ -24,9 +34,6 @@
     <property name="window_position">center</property>
     <property name="icon_name">preferences-system-time</property>
     <signal name="delete-event" handler="on_window_quit" swapped="no"/>
-    <child>
-      <placeholder/>
-    </child>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
@@ -36,8 +43,8 @@
           <object class="GtkFrame">
             <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">6</property>
             <property name="label_xalign">0</property>
@@ -46,8 +53,8 @@
               <object class="GtkAlignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">6</property>
-                <property name="margin_right">6</property>
+                <property name="margin_start">6</property>
+                <property name="margin_end">6</property>
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkGrid">
@@ -69,13 +76,13 @@
                     </child>
                     <child>
                       <object class="GtkSwitch" id="switch1">
-                        <accessibility>
-                          <relation type="labelled-by" target="a11y-switch-label"/>
-                        </accessibility>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="halign">start</property>
                         <signal name="state-set" handler="on_switch1_state_set" swapped="no"/>
+                        <accessibility>
+                          <relation type="labelled-by" target="a11y-switch-label"/>
+                        </accessibility>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -117,10 +124,6 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="button1">
-                            <accessibility>
-                              <action action_name="click" translatable="yes">Click the button to edit time zone.</action>
-                              <relation target="entry1" type="labelled-by"/>
-                            </accessibility>
                             <property name="label">gtk-edit</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -128,6 +131,10 @@
                             <property name="use_stock">True</property>
                             <property name="always_show_image">True</property>
                             <signal name="clicked" handler="on_button1_clicked" swapped="no"/>
+                            <accessibility>
+                              <action action_name="click" translatable="yes">Click the button to edit time zone.</action>
+                              <relation type="labelled-by" target="entry1"/>
+                            </accessibility>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -166,8 +173,8 @@
           <object class="GtkFrame">
             <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">6</property>
             <property name="margin_bottom">6</property>
             <property name="label_xalign">0</property>
@@ -176,8 +183,8 @@
               <object class="GtkAlignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">6</property>
-                <property name="margin_right">6</property>
+                <property name="margin_start">6</property>
+                <property name="margin_end">6</property>
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkBox">
@@ -190,7 +197,7 @@
                     <child>
                       <object class="GtkSpinButton" id="spin1">
                         <property name="visible">True</property>
-                        <property name="sensitive" bind-source="button2" bind-property="sensitive"/>
+                        <property name="sensitive" bind-source="button2" bind-property="sensitive">False</property>
                         <property name="can_focus">True</property>
                         <property name="max_length">2</property>
                         <property name="caps_lock_warning">False</property>
@@ -207,7 +214,7 @@
                     <child>
                       <object class="GtkSpinButton" id="spin2">
                         <property name="visible">True</property>
-                        <property name="sensitive" bind-source="button2" bind-property="sensitive"/>
+                        <property name="sensitive" bind-source="button2" bind-property="sensitive">False</property>
                         <property name="can_focus">True</property>
                         <property name="max_length">2</property>
                         <property name="caps_lock_warning">False</property>
@@ -224,7 +231,7 @@
                     <child>
                       <object class="GtkSpinButton" id="spin3">
                         <property name="visible">True</property>
-                        <property name="sensitive" bind-source="button2" bind-property="sensitive"/>
+                        <property name="sensitive" bind-source="button2" bind-property="sensitive">False</property>
                         <property name="can_focus">True</property>
                         <property name="max_length">2</property>
                         <property name="caps_lock_warning">False</property>
@@ -264,8 +271,8 @@
           <object class="GtkFrame">
             <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">6</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
@@ -273,14 +280,14 @@
               <object class="GtkAlignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">6</property>
-                <property name="margin_right">6</property>
+                <property name="margin_start">6</property>
+                <property name="margin_end">6</property>
                 <property name="margin_top">6</property>
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkCalendar" id="calendar1">
                     <property name="visible">True</property>
-                    <property name="sensitive" bind-source="button2" bind-property="sensitive"/>
+                    <property name="sensitive" bind-source="button2" bind-property="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="year">2019</property>
                     <property name="month">5</property>
@@ -311,8 +318,8 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="margin_left">18</property>
-            <property name="margin_right">18</property>
+            <property name="margin_start">18</property>
+            <property name="margin_end">18</property>
             <property name="margin_top">18</property>
             <property name="margin_bottom">18</property>
             <property name="spacing">12</property>
@@ -321,7 +328,7 @@
               <object class="GtkLockButton" id="button4">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="margin_right">18</property>
+                <property name="margin_start">18</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -334,11 +341,12 @@
                 <accessibility>
                   <action action_name="click" translatable="yes">Click to save the specified date and time.</action>
                 </accessibility>
-                <property name="label">gtk-save</property>
+                <property name="label" translatable="yes">_Save</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">save_button_img</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button2_clicked" swapped="no"/>
               </object>
               <packing>
@@ -349,11 +357,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button3">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">window_close_button_img</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button3_clicked" swapped="no"/>
               </object>
               <packing>
@@ -371,5 +380,8 @@
         </child>
       </object>
     </child>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
   </object>
 </interface>
-- 
cgit v1.2.1