Merge 024f4dc into f9c6b4f

yast · Nov 20, 2018 · 1f1b968 · 1f1b968
2 parents f9c6b4f + 024f4dc
commit 1f1b968
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/package/yast2-country.changes b/package/yast2-country.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov 20 09:25:14 UTC 2018 - knut.anderssen@suse.com
+
+- Aligned "Synchronize Now" button and "NTP Server Address" box not
+  breaking previous fix and not hidding the manual checkbox in
+  TextMode (bnc#893065, bsc#1039985).
+- 4.0.26
+
 -------------------------------------------------------------------
 Mon Nov 12 14:32:16 UTC 2018 - knut.anderssen@suse.com
 

diff --git a/package/yast2-country.spec b/package/yast2-country.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-country
-Version:        4.0.25
+Version:        4.0.26
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/timezone/src/include/timezone/dialogs.rb b/timezone/src/include/timezone/dialogs.rb
@@ -302,6 +302,7 @@ def SetTimeDialog
 
 
       cont = VBox(
+          VSpacing(UI.TextMode ? 1 : 0),
           HBox(
           HWeight(1, VBox()),
           HWeight(
@@ -316,7 +317,7 @@ def SetTimeDialog
                   HSpacing(3),
                   VBox(
                     Left(timeterm),
-                    VSpacing(),
+                    UI.TextMode ? Empty() : VSpacing(),
                     Left(dateterm),
                     VSpacing(),
                     HBox(
@@ -333,7 +334,7 @@ def SetTimeDialog
                     )
                   )
                 ),
-                VSpacing(1),
+                VSpacing(UI.TextMode ? 0.5 : 1),
                 Left(
                   RadioButton(
                     Id(:ntp),
@@ -349,7 +350,7 @@ def SetTimeDialog
           ),
           HWeight(1, VBox())
         ),
-        VSpacing(2)
+        VSpacing(UI.TextMode ? 0 : 2),
       )
 
       Wizard.OpenAcceptDialog