Update....

Start the Slave

Add the Iface for OKeyConfigWidget

5 files changed, 20 insertions, 8 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 38a621e..729b64f 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -95,3 +95,3 @@ PIconView::PIconView( QWidget* wid, Config* cfg )
     {
-//        QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" );
+        QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" );
     }
@@ -124,2 +124,5 @@ PIconView::PIconView( QWidget* wid, Config* cfg )
 PIconView::~PIconView() {
+    {
+        QCopEnvelope( "QPE/Application/opie-eye_slave", "refDown()" );
+    }
 }
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 0a2fcab..ea765d1 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -15,4 +15,4 @@
 
-#include <opie/oapplicationfactory.h>
-#include <opie/otabwidget.h>
+#include <opie2/oapplicationfactory.h>
+#include <opie2/otabwidget.h>
 
@@ -26,3 +26,3 @@
 
-OPIE_EXPORT_APP( OApplicationFactory<PMainWindow> )
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow> )
 
@@ -86,3 +86,3 @@ void PMainWindow::slotConfig() {
     QHBoxLayout *lay = new QHBoxLayout(&dlg);
-    OTabWidget *wid = new OTabWidget(&dlg );
+    Opie::Ui::OTabWidget *wid = new Opie::Ui::OTabWidget(&dlg );
     lay->addWidget( wid );
diff --git a/noncore/graphics/opie-eye/phunk_view.pro b/noncore/graphics/opie-eye/phunk_view.pro
index 21178ee..0bb5679 100644
--- a/noncore/graphics/opie-eye/phunk_view.pro
+++ b/noncore/graphics/opie-eye/phunk_view.pro
@@ -31,3 +31,3 @@ DEPENDPATH  += $(OPIEDIR)/include
 
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopieui2
 
diff --git a/noncore/graphics/opie-eye/slave/slavereciever.cpp b/noncore/graphics/opie-eye/slave/slavereciever.cpp
index c8e33d4..bbbbb30 100644
--- a/noncore/graphics/opie-eye/slave/slavereciever.cpp
+++ b/noncore/graphics/opie-eye/slave/slavereciever.cpp
@@ -59,3 +59,3 @@ SlaveObjects* slaveObjects() {
 SlaveReciever::SlaveReciever( QObject* par)
-    : QObject( par )
+    : QObject( par ), m_refs( 0 )
 {
@@ -122,2 +122,6 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar)
         }
+    }else if ( string == "refUp()" ) {
+        m_refs++;
+    }else if ( string == "refDown()" ) {
+        m_refs--;
     }
@@ -130,3 +134,6 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar)
 
-    QPEApplication::setKeepRunning();
+    if ( m_refs )
+        QPEApplication::setKeepRunning();
+    else
+        qApp->quit();
 
diff --git a/noncore/graphics/opie-eye/slave/slavereciever.h b/noncore/graphics/opie-eye/slave/slavereciever.h
index 214bfc6..b5aaccf 100644
--- a/noncore/graphics/opie-eye/slave/slavereciever.h
+++ b/noncore/graphics/opie-eye/slave/slavereciever.h
@@ -54,2 +54,4 @@ private:
     PixmapList m_inPix, m_outPix;
+private:
+    int m_refs;
 };