Merge branch 'SLE-12-SP2-CASP' into aio-master

yast · Jan 30, 2017 · 8696976 · 8696976
2 parents 5fc0d15 + 9c7327b
commit 8696976
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/keyboard/src/lib/y2country/widgets.rb b/keyboard/src/lib/y2country/widgets.rb
@@ -26,7 +26,8 @@
 
 module Y2Country
   module Widgets
-    class KeyboardSelection < CWM::SelectionBox
+    # Common parts for {KeyboardSelection} and {KeyboardSelectionCombo}.
+    module KeyboardSelectionBase
       # param default [String] ID for default keyboard layout if not selected.
       # Allowed values are defined in /usr/share/YaST2/data/keyboard_raw.ycp
       def initialize(default)
@@ -80,5 +81,17 @@ def help
         )
       end
     end
+
+    class KeyboardSelection < CWM::SelectionBox
+      include KeyboardSelectionBase
+    end
+
+    class KeyboardSelectionCombo < CWM::ComboBox
+      include KeyboardSelectionBase
+
+      def opt
+        [:notify, :hstretch]
+      end
+    end
   end
 end
diff --git a/package/yast2-country.changes b/package/yast2-country.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 20 16:17:01 UTC 2017 - mvidner@suse.com
+
+- Added Y2Country::Widgets::KeyboardSelectionCombo (FATE#322328)
+- 3.2.7
+
 -------------------------------------------------------------------
 Mon Dec 19 13:03:21 UTC 2016 - igonzalezsosa@suse.com
 

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