Merge branch 'fix-austrian-keymap'

CHANGES

@@ -8,6 +8,7 @@ website will have to do for older versions.
 This release contains contributions from (alphabetically by first name):
  - Alf Gaida
  - Caio Carvalho
+ - Kevin Kofler
  - Philip Mueller
 
 ## Core ##
@@ -16,6 +17,8 @@ This release contains contributions from (alphabetically by first name):
 
  * The *partition* module supports RAID devices, but only when Calamares
    is compiled with the newest KPMCore release.
+ * The *keyboard* module now handles the (bogus) Austrian keymap for
+   the system console properly.
 
 # 3.2.2 (2018-09-04) #
 

src/modules/keyboard/SetKeyboardLayoutJob.cpp

@@ -65,6 +65,8 @@ SetKeyboardLayoutJob::prettyName() const
 QString
 SetKeyboardLayoutJob::findConvertedKeymap( const QString& convertedKeymapPath ) const
 {
+    cDebug() << "Looking for converted keymap in" << convertedKeymapPath;
+    
     // No search path supplied, assume the distribution does not provide
     // converted keymaps
     if ( convertedKeymapPath.isEmpty() )
@@ -76,8 +78,7 @@ SetKeyboardLayoutJob::findConvertedKeymap( const QString& convertedKeymapPath )
     if ( convertedKeymapDir.exists( name + ".map" )
             || convertedKeymapDir.exists( name + ".map.gz" ) )
     {
-        cDebug() << "Found converted keymap" << name;
-
+        cDebug() << ".. Found converted keymap" << name;
         return name;
     }
 
@@ -88,6 +89,8 @@ SetKeyboardLayoutJob::findConvertedKeymap( const QString& convertedKeymapPath )
 QString
 SetKeyboardLayoutJob::findLegacyKeymap() const
 {
+    cDebug() << "Looking for legacy keymap in QRC";
+    
     int bestMatching = 0;
     QString name;
 
@@ -137,7 +140,7 @@ SetKeyboardLayoutJob::findLegacyKeymap() const
         // The best matching entry so far, then let's save that
         if ( matching >= qMax( bestMatching, 1 ) )
         {
-            cDebug() << "Found legacy keymap" << mapping[0]
+            cDebug() << ".. Found legacy keymap" << mapping[0]
                      << "with score" << matching;
 
             if ( matching > bestMatching )

src/modules/keyboard/kbd-model-map

@@ -6,6 +6,9 @@
 # This is the version from 534644b7be7b240eb0fbbe06e20cbecbe8206767,
 # committed 2015-01-22 01:07:24 .
 #
+# Updates:
+#  - 2018-09-26 Added "Austrian" keyboard (de at). Issue #1035
+#
 # Generated from system-config-keyboard's model list
 # consolelayout		xlayout	xmodel		xvariant	xoptions
 sg			ch	pc105		de_nodeadkeys	terminate:ctrl_alt_bksp
@@ -15,6 +18,7 @@ trq			tr	pc105		-		terminate:ctrl_alt_bksp
 uk			gb	pc105		-		terminate:ctrl_alt_bksp
 is-latin1		is	pc105		-		terminate:ctrl_alt_bksp
 de			de	pc105		-		terminate:ctrl_alt_bksp
+de			at	pc105		-		terminate:ctrl_alt_bksp
 la-latin1		latam	pc105		-		terminate:ctrl_alt_bksp
 us			us	pc105+inet	-		terminate:ctrl_alt_bksp
 ko			kr	pc105		-		terminate:ctrl_alt_bksp