[PC-BSD Commits] r20178 - in pcbsd/branches/9.1/src-qt4: pc-firstbootgui pc-installgui

[svn at pcbsd.org]

Author: kris
Date: 2012-11-12 16:02:18 +0000 (Mon, 12 Nov 2012)
New Revision: 20178

Modified:
   pcbsd/branches/9.1/src-qt4/pc-firstbootgui/backend.cpp
   pcbsd/branches/9.1/src-qt4/pc-installgui/backend.cpp
Log:

MFC the fixes to keyboard layouts in the installer / first boot gui



Modified: pcbsd/branches/9.1/src-qt4/pc-firstbootgui/backend.cpp
===================================================================
--- pcbsd/branches/9.1/src-qt4/pc-firstbootgui/backend.cpp	2012-11-12 16:01:41 UTC (rev 20177)
+++ pcbsd/branches/9.1/src-qt4/pc-firstbootgui/backend.cpp	2012-11-12 16:02:18 UTC (rev 20178)
@@ -152,6 +152,8 @@
             code = line;
             code.truncate(line.indexOf(" "));
             desc = line.remove(0, line.indexOf(" "));
+	    desc.replace("(", "'");
+	    desc.replace(")", "'");
             _layouts.append(desc.simplified() + " - (" + code.simplified() + ")");
         }
     }

Modified: pcbsd/branches/9.1/src-qt4/pc-installgui/backend.cpp
===================================================================
--- pcbsd/branches/9.1/src-qt4/pc-installgui/backend.cpp	2012-11-12 16:01:41 UTC (rev 20177)
+++ pcbsd/branches/9.1/src-qt4/pc-installgui/backend.cpp	2012-11-12 16:02:18 UTC (rev 20178)
@@ -152,6 +152,8 @@
             code = line;
             code.truncate(line.indexOf(" "));
             desc = line.remove(0, line.indexOf(" "));
+            desc.replace("(", "'");
+            desc.replace(")", "'");
             _layouts.append(desc.simplified() + " - (" + code.simplified() + ")");
         }
     }
@@ -167,11 +169,12 @@
     if ( savedKeyVariants.empty() )
     {
       Process p(QStringList() << "xkeyboard-variants");
-      if (p.waitForFinished()) {
-        while (p.canReadLine()) {
-            line = p.readLine();
-            savedKeyVariants << line;
-        }
+      while(p.state() == QProcess::Starting || p.state() == QProcess::Running)
+        QCoreApplication::processEvents();
+
+      while (p.canReadLine()) {
+          line = p.readLine().simplified();
+          savedKeyVariants << line;
       }
     }