move connection work to the lib

4 files changed, 123 insertions, 175 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index b5a09e5..04fa117 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -333,7 +333,7 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         QPopupMenu *popup =0l;
         if ( it != list.end() ) {
 	    qWarning("Searching id %d %s", it.key(), it.data().latin1() );
-            popup = m_popHelper.find( it.key() /*1*/,
+            popup = m_popHelper.find( 4358,
                                       service->services(),
                                       (BTDeviceItem*)service->parent() );
 	}else {
diff --git a/noncore/net/opietooth/manager/bluetoothbase.ui b/noncore/net/opietooth/manager/bluetoothbase.ui
index b51c8c6..9ff970f 100644
--- a/noncore/net/opietooth/manager/bluetoothbase.ui
+++ b/noncore/net/opietooth/manager/bluetoothbase.ui
@@ -11,7 +11,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>228</width>
+            <width>224</width>
             <height>320</height>
         </rect>
     </property>
@@ -19,20 +19,32 @@
         <name>caption</name>
         <string>Form1</string>
     </property>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <property>
+        <name>layoutSpacing</name>
+    </property>
+    <vbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>0</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>0</number>
+        </property>
     <widget>
         <class>QTabWidget</class>
         <property stdset="1">
             <name>name</name>
             <cstring>Status</cstring>
         </property>
-        <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>0</x>
-                <y>0</y>
-                <width>260</width>
-                <height>350</height>
-            </rect>
+            <property>
+                <name>layoutMargin</name>
+            </property>
+            <property>
+                <name>layoutSpacing</name>
         </property>
         <widget>
             <class>QWidget</class>
@@ -44,48 +56,15 @@
                 <name>title</name>
                 <string>Devices</string>
             </attribute>
-            <spacer>
-                <property>
-                    <name>name</name>
-                    <cstring>Spacer3</cstring>
-                </property>
-                <property stdset="1">
-                    <name>orientation</name>
-                    <enum>Vertical</enum>
-                </property>
-                <property stdset="1">
-                    <name>sizeType</name>
-                    <enum>Expanding</enum>
-                </property>
-                <property>
-                    <name>sizeHint</name>
-                    <size>
-                        <width>20</width>
-                        <height>20</height>
-                    </size>
-                </property>
-            </spacer>
-            <spacer>
-                <property>
-                    <name>name</name>
-                    <cstring>Spacer1</cstring>
-                </property>
+                <vbox>
                 <property stdset="1">
-                    <name>orientation</name>
-                    <enum>Vertical</enum>
+                        <name>margin</name>
+                        <number>2</number>
                 </property>
                 <property stdset="1">
-                    <name>sizeType</name>
-                    <enum>Fixed</enum>
-                </property>
-                <property>
-                    <name>sizeHint</name>
-                    <size>
-                        <width>20</width>
-                        <height>20</height>
-                    </size>
+                        <name>spacing</name>
+                        <number>2</number>
                 </property>
-            </spacer>
             <widget>
                 <class>QListView</class>
                 <column>
@@ -120,15 +99,6 @@
                     <name>name</name>
                     <cstring>ListView2</cstring>
                 </property>
-                <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>0</x>
-                        <y>0</y>
-                        <width>230</width>
-                        <height>230</height>
-                    </rect>
-                </property>
             </widget>
             <widget>
                 <class>QPushButton</class>
@@ -137,15 +107,6 @@
                     <cstring>PushButton2</cstring>
                 </property>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>40</x>
-                        <y>231</y>
-                        <width>154</width>
-                        <height>30</height>
-                    </rect>
-                </property>
-                <property stdset="1">
                     <name>sizePolicy</name>
                     <sizepolicy>
                         <hsizetype>0</hsizetype>
@@ -157,6 +118,7 @@
                     <string>Scan for Devices</string>
                 </property>
             </widget>
+                </vbox>
         </widget>
         <widget>
             <class>QWidget</class>
@@ -168,6 +130,15 @@
                 <name>title</name>
                 <string>Connections</string>
             </attribute>
+                <vbox>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>2</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>2</number>
+                    </property>
             <widget>
                 <class>QListView</class>
                 <column>
@@ -216,16 +187,8 @@
                     <name>name</name>
                     <cstring>ListView4</cstring>
                 </property>
-                <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>0</x>
-                        <y>0</y>
-                        <width>240</width>
-                        <height>240</height>
-                    </rect>
-                </property>
             </widget>
+                </vbox>
         </widget>
         <widget>
             <class>QWidget</class>
@@ -237,20 +200,35 @@
                 <name>title</name>
                 <string>Config</string>
             </attribute>
+                <vbox>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>2</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>2</number>
+                    </property>
             <widget>
-                <class>QLabel</class>
+                        <class>QLayoutWidget</class>
                 <property stdset="1">
                     <name>name</name>
-                    <cstring>deviceNameLabel</cstring>
+                            <cstring>Layout2</cstring>
                 </property>
+                        <hbox>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>10</x>
-                        <y>10</y>
-                        <width>70</width>
-                        <height>20</height>
-                    </rect>
+                                <name>margin</name>
+                                <number>0</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget>
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>deviceNameLabel</cstring>
                 </property>
                 <property stdset="1">
                     <name>text</name>
@@ -258,19 +236,34 @@
                 </property>
             </widget>
             <widget>
-                <class>QLabel</class>
+                                <class>QLineEdit</class>
                 <property stdset="1">
                     <name>name</name>
-                    <cstring>passkeyLabel</cstring>
+                                    <cstring>deviceNameLine</cstring>
                 </property>
+                            </widget>
+                        </hbox>
+                    </widget>
+                    <widget>
+                        <class>QLayoutWidget</class>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>10</x>
-                        <y>50</y>
-                        <width>80</width>
-                        <height>20</height>
-                    </rect>
+                            <name>name</name>
+                            <cstring>Layout3</cstring>
+                        </property>
+                        <hbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>0</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget>
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>passkeyLabel</cstring>
                 </property>
                 <property stdset="1">
                     <name>text</name>
@@ -284,34 +277,18 @@
                     <cstring>passkeyLine</cstring>
                 </property>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>98</x>
-                        <y>53</y>
-                        <width>120</width>
-                        <height>22</height>
-                    </rect>
-                </property>
-                <property stdset="1">
                     <name>echoMode</name>
                     <enum>Password</enum>
                 </property>
             </widget>
+                        </hbox>
+                    </widget>
             <widget>
                 <class>QLayoutWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>Layout5</cstring>
                 </property>
-                <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>10</x>
-                        <y>100</y>
-                        <width>188</width>
-                        <height>120</height>
-                    </rect>
-                </property>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
@@ -368,41 +345,17 @@
                 </vbox>
             </widget>
             <widget>
-                <class>QLineEdit</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>deviceNameLine</cstring>
-                </property>
-                <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>98</x>
-                        <y>13</y>
-                        <width>120</width>
-                        <height>22</height>
-                    </rect>
-                </property>
-            </widget>
-            <widget>
                 <class>QPushButton</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>configApplyButton</cstring>
                 </property>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>60</x>
-                        <y>230</y>
-                        <width>99</width>
-                        <height>32</height>
-                    </rect>
-                </property>
-                <property stdset="1">
                     <name>text</name>
                     <string>Apply</string>
                 </property>
             </widget>
+                </vbox>
         </widget>
         <widget>
             <class>QWidget</class>
@@ -414,6 +367,15 @@
                 <name>title</name>
                 <string>Status</string>
             </attribute>
+                <vbox>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>2</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>2</number>
+                    </property>
             <widget>
                 <class>QLabel</class>
                 <property stdset="1">
@@ -421,20 +383,13 @@
                     <cstring>StatusLabel</cstring>
                 </property>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>10</x>
-                        <y>10</y>
-                        <width>220</width>
-                        <height>250</height>
-                    </rect>
-                </property>
-                <property stdset="1">
                     <name>text</name>
                     <string>Status Label</string>
                 </property>
             </widget>
+                </vbox>
         </widget>
     </widget>
+    </vbox>
 </widget>
 </UI>
diff --git a/noncore/net/opietooth/manager/panpopup.cpp b/noncore/net/opietooth/manager/panpopup.cpp
index d3d1347..61e632b 100644
--- a/noncore/net/opietooth/manager/panpopup.cpp
+++ b/noncore/net/opietooth/manager/panpopup.cpp
@@ -14,51 +14,43 @@ PanPopup::PanPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu()  {
     qWarning("PanPopup c'tor");
 
     m_item = item;
-    m_panconnect = 0l;
-    QAction *a, *b;
+    QAction *a, *b, *c;
 
+    m_panconnection = 0l;
     /* connect action */
+
+
     a = new QAction( ); // so it's get deleted
-    a->setText( "connect" );
+    a->setText( tr("connect") );
     a->addTo( this );
     connect( a, SIGNAL( activated() ), this, SLOT( slotConnect() ) );
 
+
     b = new QAction();
-    b->setText( "connect+conf" );
+    b->setText( tr( "connect+conf" ) );
     b->addTo( this );
     connect( b, SIGNAL( activated() ), this, SLOT( slotConnectAndConfig() ) );
+
+    c = new QAction();
+    c->setText( tr( "disconnect" ) );
+    c->addTo( this );
+    connect( c, SIGNAL( activated() ), this, SLOT( slotDisconnect() ) );
+
 };
 
 PanPopup::~PanPopup() {
-    delete m_panconnect;
+
 }
 
 void PanPopup::slotConnect() {
-
-
-    // SHOULD move to lib
-    // before pand must be in "pand --listen --role panu" mode ( client )
-
-    m_panconnect = new OProcess();
-    *m_panconnect << "pand" << "--connect" << m_item->mac();
-
-    connect( m_panconnect, SIGNAL( processExited( OProcess* ) ) ,
-             this, SLOT( slotConnectExited( OProcess* ) ) );
-    connect( m_panconnect, SIGNAL( receivedStdout( OProcess*, char*, int ) ),
-             this, SLOT( slotConnectOut( OProcess*, char*, int ) ) );
-    if (!m_panconnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
-        qWarning( "could not start" );
-        delete m_panconnect;
-    }
+    m_panconnection = new StartPanConnection( m_item->mac() );
+    m_panconnection->start();
 }
 
-void PanPopup::slotExited( OProcess* proc ) {
-    delete m_panconnect;
+void PanPopup::slotDisconnect()  {
+    m_panconnection->stop();
 }
 
-void PanPopup::slotStdOut(OProcess* proc, char* chars, int len)
-{}
-
 
 void PanPopup::slotConnectAndConfig() {
     slotConnect();
diff --git a/noncore/net/opietooth/manager/panpopup.h b/noncore/net/opietooth/manager/panpopup.h
index 9d99f5e..1496f3a 100644
--- a/noncore/net/opietooth/manager/panpopup.h
+++ b/noncore/net/opietooth/manager/panpopup.h
@@ -3,10 +3,12 @@
 
 #include <qpopupmenu.h>
 #include <qaction.h>
-#include <opie/oprocess.h>
+
+#include <startpanconnection.h>
 
 #include "btdeviceitem.h"
 
+
 namespace OpieTooth {
 
     class PanPopup : public QPopupMenu {
@@ -19,13 +21,12 @@ namespace OpieTooth {
 
     private:
         QAction* m_push;
-	OProcess* m_panconnect;
+	OpieTooth::StartPanConnection* m_panconnection;
 	OpieTooth::BTDeviceItem *m_item;
     private slots:
         void slotConnect();
+        void slotDisconnect();
         void slotConnectAndConfig();
-	void slotExited( OProcess* proc );
-	void slotStdOut( OProcess* proc, char* chars, int len );
     };
 };