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

[svn at pcbsd.org]

Author: kenmoore
Date: 2013-01-24 17:28:30 +0000 (Thu, 24 Jan 2013)
New Revision: 21126

Added:
   pcbsd-projects/PCDM/startPCDM
Removed:
   pcbsd-projects/PCDM/PCDM-multi
Modified:
   pcbsd-projects/PCDM/PCDM.pro
   pcbsd-projects/PCDM/pcdm-gui.cpp
Log:
Clean up the PCDM project file, setup the PCDM-session binary to run a single instance of the login manager, and use startPCDM to be the (future) XDMCP front-end to watch for logins to then startup a session.



Modified: pcbsd-projects/PCDM/PCDM.pro
===================================================================
--- pcbsd-projects/PCDM/PCDM.pro	2013-01-24 16:37:22 UTC (rev 21125)
+++ pcbsd-projects/PCDM/PCDM.pro	2013-01-24 17:28:30 UTC (rev 21126)
@@ -1,5 +1,5 @@
 
-TARGET = PCDM-single
+TARGET = PCDM-session
 target.path=/usr/local/bin
 TEMPLATE = app
 LIBS += -lpcbsd -lpam
@@ -94,11 +94,11 @@
 		i18n/PCDM_zu.ts
 
 dotrans.path=/usr/local/share/PCDM/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/PCDM/i18n/
 
-scripts=PCDM-multi
+scripts=startPCDM
 scripts.path=/usr/local/bin
-scripts.extra=cp PCDM-multi /usr/local/bin/PCDM-multi
+scripts.extra=cp startPCDM /usr/local/bin/startPCDM
 
 INSTALLS += scripts dotrans target
 

Modified: pcbsd-projects/PCDM/pcdm-gui.cpp
===================================================================
--- pcbsd-projects/PCDM/pcdm-gui.cpp	2013-01-24 16:37:22 UTC (rev 21125)
+++ pcbsd-projects/PCDM/pcdm-gui.cpp	2013-01-24 17:28:30 UTC (rev 21126)
@@ -298,7 +298,7 @@
 }
 
 void PCDMgui::slotChangeKeyboardLayout(){
-  wKey = new widgetKeyboard();
+  wKey = new widgetKeyboard(this);
   wKey->programInit(kModels, kLayouts);
   wKey->setWindowModality(Qt::ApplicationModal);
   wKey->show();