Merge pull request #927 from shundhammer/huha-merge-sp1-branch

Merge SLE-15-SP1 branch to master
yast · May 16, 2019 · a288305 · a288305
2 parents 6ada9db + ecec2c1
commit a288305
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/library/wizard/src/modules/Wizard.rb b/library/wizard/src/modules/Wizard.rb
@@ -279,22 +279,25 @@ def GenericDialog(button_box)
       VBox(
         Id(:WizardDialog),
         ReplacePoint(Id(:topmenu), Empty()),
-        HBox(
-          HSpacing(1),
-          VBox(
-            VSpacing(0.2),
-            HBox(
-              # translators: dialog title to appear before any content is initialized
-              Heading(Id(:title), Opt(:hstretch), _("Initializing ...")),
-              HStretch(),
-              ReplacePoint(Id(:relnotes_rp), Empty())
+        VWeight(
+          1, # Layout trick: Lower layout priority with weight
+          HBox(
+            HSpacing(1),
+            VBox(
+              VSpacing(0.2),
+              HBox(
+                # translators: dialog title to appear before any content is initialized
+                Heading(Id(:title), Opt(:hstretch), _("Initializing ...")),
+                HStretch(),
+                ReplacePoint(Id(:relnotes_rp), Empty())
+              ),
+              VWeight(
+                1, # Layout trick: Lower layout priority with weight
+                HVCenter(Opt(:hvstretch), ReplacePoint(Id(:contents), Empty()))
+              )
             ),
-            VWeight(
-              1, # Layout trick: Lower layout priority with weight
-              HVCenter(Opt(:hvstretch), ReplacePoint(Id(:contents), Empty()))
-            )
-          ),
-          HSpacing(1)
+            HSpacing(1)
+          )
         ),
         ReplacePoint(Id(:rep_button_box), button_box),
         VSpacing(0.2)

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 16 09:01:59 UTC 2019 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Make sure the wizard buttons always remain visible in NCurses
+  (bsc#1133367)
+- 4.2.3
+
 -------------------------------------------------------------------
 Tue May  7 13:10:46 UTC 2019 - Steffen Winterfeldt <snwint@suse.com>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.2.2
+Version:        4.2.3
 Release:        0
 Summary:        YaST2 Main Package
 License:        GPL-2.0-only