Merge 0fc66ed into 653de08

yast · Nov 20, 2018 · e055142 · e055142
2 parents 653de08 + 0fc66ed
commit e055142
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 17 deletions.
diff --git a/package/yast2-ntp-client.changes b/package/yast2-ntp-client.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Nov 14 21:32:26 UTC 2018 - knut.andersse@suse.com
+
+- Aligned "Synchronize Now" button and "NTP Server Address" box not
+  breaking previous fix and not hiding the manual checkbox in
+  TextMode (bnc#893065, bsc#1039985).
+- 4.0.16
+
 -------------------------------------------------------------------
 Thu Nov  8 19:20:26 UTC 2018 - knut.andersse@suse.com
 

diff --git a/package/yast2-ntp-client.spec b/package/yast2-ntp-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ntp-client
-Version:        4.0.15
+Version:        4.0.16
 Release:        0
 Summary:        YaST2 - NTP Client Configuration
 License:        GPL-2.0+

diff --git a/src/clients/ntp-client_proposal.rb b/src/clients/ntp-client_proposal.rb
@@ -210,21 +210,36 @@ def ui_init(rp, first_time)
       rp = deep_copy(rp)
       cont = VBox(
         VSpacing(0.5),
+        HBox(
+          HSpacing(3),
+          HWeight(
+            1,
+            Left(
+              ComboBox(
+                Id(:ntp_address),
+                Opt(:editable, :hstretch),
+                # TRANSLATORS: combo box label
+                _("&NTP Server Address")
+              )
+            )
+          ),
+          HWeight(
+            1,
+            VBox(
+              # In TextMode and empty label is not filling an extra space, so
+              # an explicit vertical space was added in order to move down the
+              # push button being aligned with the combo box input.
+              UI.TextMode ? VSpacing(1) : Label(""),
+              # TRANSLATORS: push button label
+              Left(PushButton(Id(:ntp_now), _("S&ynchronize now")))
+            )
+          )
+        ),
         HBox(
           HSpacing(3),
           HWeight(
             1,
             VBox(
-              VSpacing(0.5),
-              Left(
-                ComboBox(
-                  Id(:ntp_address),
-                  Opt(:editable, :hstretch),
-                  # combo box label
-                  _("&NTP Server Address")
-                )
-              ),
-              VSpacing(0.3),
               HBox(
                 HSpacing(0.5),
                 # check box label
@@ -238,7 +253,7 @@ def ui_init(rp, first_time)
               ),
               HBox(
                 HSpacing(0.5),
-                # check box label
+                # TRANSLATORS: check box label
                 Left(
                   CheckBox(Id(:ntp_save), _("&Save NTP Configuration"), true)
                 )
@@ -248,11 +263,7 @@ def ui_init(rp, first_time)
           HWeight(
             1,
             VBox(
-              Label(""),
-              # push button label
-              Left(PushButton(Id(:ntp_now), _("S&ynchronize now"))),
-              VSpacing(0.3),
-              # push button label
+              # TRANSLATORS: push button label
               # bnc#449615: only simple config for inst-sys
               Stage.initial ? Label("") : Left(PushButton(Id(:ntp_configure), _("&Configure..."))),
               Label("")