[PC-BSD Commits] r21563 - pcbsd-projects/PCDM

[svn at pcbsd.org]

Author: kenmoore
Date: 2013-02-16 00:43:15 +0000 (Sat, 16 Feb 2013)
New Revision: 21563

Modified:
   pcbsd-projects/PCDM/pcdm-gui.cpp
   pcbsd-projects/PCDM/pcdm-gui.h
Log:
Remove the big time drain from the main startup loop (finding keyboard models/layouts) and move it into the sub-window initialization



Modified: pcbsd-projects/PCDM/pcdm-gui.cpp
===================================================================
--- pcbsd-projects/PCDM/pcdm-gui.cpp	2013-02-16 00:36:50 UTC (rev 21562)
+++ pcbsd-projects/PCDM/pcdm-gui.cpp	2013-02-16 00:43:15 UTC (rev 21563)
@@ -48,11 +48,6 @@
 void PCDMgui::createGUIfromTheme(){
   QString style;
   QString tmpIcon; //used for checking image files before loading them
-  //Fill a couple global variables
-  kModels = Backend::keyModels();
-  qDebug() << "GUI Time: kModels Ready:" << QString::number(timer->elapsed()) + " ms";
-  kLayouts = Backend::keyLayouts();
-  qDebug() << "GUI Time: kLayouts Ready:" << QString::number(timer->elapsed()) + " ms";
   //Set the background image
   if( currentTheme->itemIsEnabled("background") ){
     tmpIcon = currentTheme->itemIcon("background");
@@ -368,6 +363,10 @@
 }
 
 void PCDMgui::slotChangeKeyboardLayout(){
+  //Fill a couple global variables
+  QStringList kModels = Backend::keyModels();
+  QStringList kLayouts = Backend::keyLayouts();
+  //Startup the GUI
   wKey = new widgetKeyboard(this);
   wKey->programInit(kModels, kLayouts);
   wKey->setWindowModality(Qt::ApplicationModal);

Modified: pcbsd-projects/PCDM/pcdm-gui.h
===================================================================
--- pcbsd-projects/PCDM/pcdm-gui.h	2013-02-16 00:36:50 UTC (rev 21562)
+++ pcbsd-projects/PCDM/pcdm-gui.h	2013-02-16 00:43:15 UTC (rev 21563)
@@ -62,7 +62,6 @@
     QLineEdit* pwline;
     //QX11EmbedContainer* container;
     QProcess* vkbd;
-    QStringList kModels, kLayouts;
     ThemeStruct* currentTheme;
     QTime* timer;