convert blue-pin to be quicklaunchable. patch courtesy Thomas Themel.

3 files changed, 78 insertions, 3 deletions

diff --git a/noncore/net/opietooth/blue-pin/main.cc b/noncore/net/opietooth/blue-pin/main.cc
index aa360aa..29e46ae 100644
--- a/noncore/net/opietooth/blue-pin/main.cc
+++ b/noncore/net/opietooth/blue-pin/main.cc
@@ -4,7 +4,10 @@
 
 #include <qpe/qpeapplication.h>
+#include <opie2/oapplicationfactory.h>
 
 #include "pindlg.h"
 
+using namespace Opie::Core;
+OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::PinDlg> )
 
 int main( int argc, char* argv[] )
diff --git a/noncore/net/opietooth/blue-pin/pindlg.cc b/noncore/net/opietooth/blue-pin/pindlg.cc
index f0b2309..96be1e5 100644
--- a/noncore/net/opietooth/blue-pin/pindlg.cc
+++ b/noncore/net/opietooth/blue-pin/pindlg.cc
@@ -24,13 +24,37 @@ PinDlg::PinDlg( const QString& status,
     test( mac );
     txtStatus->setText(status);
-    QPEApplication::showDialog( this );
+    if(!m_mac.isEmpty())
+            QPEApplication::showDialog( this );
+}
+
+PinDlg::PinDlg(QWidget* parent,
+               const char* name, 
+               Qt::WFlags f )
+        : PinDlgBase( parent, name, f )
+{
+    m_mac = makeMacFromArgs();
+
+    if(m_mac.isEmpty())
+    {
+        // can't obtain MAC
+        printf("ERR\n"); 
+        qApp->quit();
+    }
+    else
+    {
+        test( m_mac );
+        txtStatus->setText(makeTextFromArgs());
+        QPEApplication::showDialog( this ) ; 
+    }
 }
 
 PinDlg::~PinDlg()
 {}
+
 void PinDlg::setMac( const QString& mac )
 {
     txtStatus->setText( mac );
 }
+
 QString PinDlg::pin() const
 {
@@ -49,8 +73,43 @@ void PinDlg::test( const QString& mac )
             //QTimer::singleShot(100,  this,  SLOT(accept() ) );
         }
+    }
+
+}
+
+QString PinDlg::makeTextFromArgs()
+{
+    if(qApp->argc() > 2)
+    {
+        QCString dir(qApp->argv()[1]) ;
+        QCString bdaddr(qApp->argv()[2]) ;
+        
+        QCString name;
+        if ( qApp->argc() > 3 ) {
+            name = qApp->argv()[3];
+        }
+        QString status;
+        if (dir == "out" ) {
+            status = QObject::tr("Outgoing connection to ");
+        } else
+            status = QObject::tr("Incoming connection from ");
 
+        status += name;
+        status += "<br>";
+        status += "[" + bdaddr + "]";
+        
+        return status ;
     }
+    else
+        return QString();
+}
 
+QString PinDlg::makeMacFromArgs()
+{
+    if(qApp->argc() < 3)
+        return QString();
+    else
+        return qApp->argv()[2] ;
 }
+
 void PinDlg::accept()
 {
@@ -61,4 +120,6 @@ void PinDlg::accept()
         cfg.writeEntryCrypt("pin", lnePin->text() );
     }
+    printf("PIN:%s\n", lnePin->text().latin1());
     QDialog::accept();
+    qApp->quit();
 }
diff --git a/noncore/net/opietooth/blue-pin/pindlg.h b/noncore/net/opietooth/blue-pin/pindlg.h
index 5e5a763..5f7dc55 100644
--- a/noncore/net/opietooth/blue-pin/pindlg.h
+++ b/noncore/net/opietooth/blue-pin/pindlg.h
@@ -11,14 +11,25 @@ namespace OpieTooth {
         
     public:
-        PinDlg(const QString& text,
-               const QString& mac,
+        PinDlg(const QString& text="",
+               const QString& mac="",
                QWidget* parent = 0,
                const char* name= 0 );
+        
+        PinDlg(QWidget* parent,
+               const char* name, 
+               Qt::WFlags f );
+
         ~PinDlg();
         void setMac( const QString& );
         QString pin() const;
+
+        static QString appName() { return QString::fromLatin1("bluepin") ; } 
         
     private:
         void test( const QString& mac );
+
+        QString makeTextFromArgs();
+        QString makeMacFromArgs();
+
         QString m_mac;