[PC-BSD Commits] r15287 - pcbsd/current/src-qt4/pc-bluetoothmanager

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-02-13 18:56:02 +0000 (Mon, 13 Feb 2012)
New Revision: 15287

Modified:
   pcbsd/current/src-qt4/pc-bluetoothmanager/btmaingui.cpp
   pcbsd/current/src-qt4/pc-bluetoothmanager/main.cpp
Log:
Try to fix the singleInstance stuff for the bluetooth gui



Modified: pcbsd/current/src-qt4/pc-bluetoothmanager/btmaingui.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-bluetoothmanager/btmaingui.cpp	2012-02-13 17:56:35 UTC (rev 15286)
+++ pcbsd/current/src-qt4/pc-bluetoothmanager/btmaingui.cpp	2012-02-13 18:56:02 UTC (rev 15287)
@@ -382,7 +382,6 @@
 
 void btmaingui::slotSingleInstance()
 {
-  
   this->showNormal();
   this->activateWindow();
   this->raise();

Modified: pcbsd/current/src-qt4/pc-bluetoothmanager/main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-bluetoothmanager/main.cpp	2012-02-13 17:56:35 UTC (rev 15286)
+++ pcbsd/current/src-qt4/pc-bluetoothmanager/main.cpp	2012-02-13 18:56:02 UTC (rev 15287)
@@ -1,4 +1,3 @@
-
 #include <qtranslator.h>
 #include <qtextcodec.h>
 #include <qlocale.h>
@@ -26,12 +25,13 @@
    translator.load( QString("pc-bluetoothmanager_") + langCode, PREFIX + "/share/pcbsd/i18n/" );
    a.installTranslator( &translator );
    qDebug() << "Locale:" << langCode;
-   btmaingui tray;
-   QApplication::setQuitOnLastWindowClosed(false);
 
+   btmaingui w;
+   //QApplication::setQuitOnLastWindowClosed(false);
+
    // Init our program
-   QObject::connect(&a, SIGNAL(messageReceived(const QString&)), &tray, SLOT(slotSingleInstance()) );
-
-   tray.firstRun();
+   QObject::connect(&a, SIGNAL(messageReceived(const QString&)), &w, SLOT(slotSingleInstance()) );
+   w.show();
+   w.firstRun();
    return  a.exec();
 }