Merge branch 'master' of github.com:yast/yast-installation into expor…

…t_config Conflicts: package/yast2-installation.changes
yast · Jan 21, 2014 · 1022df5 · 1022df5
2 parents 0d3effc + 72448f2
commit 1022df5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -6,6 +6,12 @@ Tue Jan 21 12:15:21 UTC 2014 - jreidinger@suse.com
   (FATE#308539)
 - Add "Export Configuration" menu item in textual installation
   (FATE#308539)
+- 3.1.21
+
+-------------------------------------------------------------------
+Tue Jan 21 08:48:17 UTC 2014 - jsrain@suse.cz
+
+- adjusted UI according to Ken's comments (fate#314695)
 - 3.1.20
 
 -------------------------------------------------------------------

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

diff --git a/src/clients/inst_complex_welcome.rb b/src/clients/inst_complex_welcome.rb
@@ -120,21 +120,16 @@ def main
         Left(
           HSquash(
             HBox(
-              HSquash(Icon.Simple("yast-language")),
-              @text_mode ? Empty() : HSpacing(2),
-              Left(@languagesel),
-              HSpacing(1),
-              HSquash(Icon.Simple("yast-keyboard")),
-              @text_mode ? Empty() : HSpacing(2),
-              Left(@keyboardsel),
-              HSpacing(10)
+              HWeight(1, Left(@languagesel)),
+              HSpacing(3),
+              HWeight(1, Left(@keyboardsel))
             )
           )
         ),
         VSpacing(1),
         VWeight(1, VStretch()),
         VWeight(
-          20,
+          30,
           Left(
             HSquash(
               VBox(
@@ -229,8 +224,6 @@ def main
         UI.ChangeWidget(Id(:keyboard), :Value, @kbd)
       end
 
-      Wizard.SetTitleIcon("suse")
-
       # Get the user input.
       #
       @ret = nil