author | zecke <zecke> | 2004-03-23 23:59:36 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-23 23:59:36 (UTC) |
commit | c8acbf192ca4aa64ed66306ca872cb3860590b3c (patch) (unidiff) | |
tree | ad81a8681bd755185e8ba4e3fbded2f1869c1607 /noncore/graphics/opie-eye | |
parent | 6a1e8a9f03d8b552a51ab0b45ec5b1959af6eb73 (diff) | |
download | opie-c8acbf192ca4aa64ed66306ca872cb3860590b3c.zip opie-c8acbf192ca4aa64ed66306ca872cb3860590b3c.tar.gz opie-c8acbf192ca4aa64ed66306ca872cb3860590b3c.tar.bz2 |
Update....
Start the Slave
Add the Iface for OKeyConfigWidget
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 5 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 8 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/phunk_view.pro | 2 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/slave/slavereciever.cpp | 11 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/slave/slavereciever.h | 2 |
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 | |||
@@ -93,7 +93,7 @@ PIconView::PIconView( QWidget* wid, Config* cfg ) | |||
93 | : QVBox( wid ), m_cfg( cfg ) | 93 | : QVBox( wid ), m_cfg( cfg ) |
94 | { | 94 | { |
95 | { | 95 | { |
96 | // QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" ); | 96 | QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" ); |
97 | } | 97 | } |
98 | m_path = QDir::homeDirPath(); | 98 | m_path = QDir::homeDirPath(); |
99 | 99 | ||
@@ -122,6 +122,9 @@ PIconView::PIconView( QWidget* wid, Config* cfg ) | |||
122 | } | 122 | } |
123 | 123 | ||
124 | PIconView::~PIconView() { | 124 | PIconView::~PIconView() { |
125 | { | ||
126 | QCopEnvelope( "QPE/Application/opie-eye_slave", "refDown()" ); | ||
127 | } | ||
125 | } | 128 | } |
126 | 129 | ||
127 | void PIconView::slotDirUp() { | 130 | void PIconView::slotDirUp() { |
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 | |||
@@ -13,8 +13,8 @@ | |||
13 | #include <qpe/config.h> | 13 | #include <qpe/config.h> |
14 | #include <qpe/ir.h> | 14 | #include <qpe/ir.h> |
15 | 15 | ||
16 | #include <opie/oapplicationfactory.h> | 16 | #include <opie2/oapplicationfactory.h> |
17 | #include <opie/otabwidget.h> | 17 | #include <opie2/otabwidget.h> |
18 | 18 | ||
19 | #include <iface/ifaceinfo.h> | 19 | #include <iface/ifaceinfo.h> |
20 | #include <iface/dirview.h> | 20 | #include <iface/dirview.h> |
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "mainwindow.h" | 25 | #include "mainwindow.h" |
26 | 26 | ||
27 | OPIE_EXPORT_APP( OApplicationFactory<PMainWindow> ) | 27 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow> ) |
28 | 28 | ||
29 | PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | 29 | PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) |
30 | : QMainWindow( wid, name, style ), m_cfg("phunkview") | 30 | : QMainWindow( wid, name, style ), m_cfg("phunkview") |
@@ -84,7 +84,7 @@ void PMainWindow::slotConfig() { | |||
84 | dlg.setCaption( tr("Phunk View - Config" ) ); | 84 | dlg.setCaption( tr("Phunk View - Config" ) ); |
85 | 85 | ||
86 | QHBoxLayout *lay = new QHBoxLayout(&dlg); | 86 | QHBoxLayout *lay = new QHBoxLayout(&dlg); |
87 | OTabWidget *wid = new OTabWidget(&dlg ); | 87 | Opie::Ui::OTabWidget *wid = new Opie::Ui::OTabWidget(&dlg ); |
88 | lay->addWidget( wid ); | 88 | lay->addWidget( wid ); |
89 | ViewMap *vM = viewMap(); | 89 | ViewMap *vM = viewMap(); |
90 | ViewMap::Iterator _it = vM->begin(); | 90 | ViewMap::Iterator _it = vM->begin(); |
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 | |||
@@ -29,6 +29,6 @@ DEPENDPATH += $(OPIEDIR)/include | |||
29 | 29 | ||
30 | 30 | ||
31 | 31 | ||
32 | LIBS += -lqpe -lopie | 32 | LIBS += -lqpe -lopieui2 |
33 | 33 | ||
34 | include ( $(OPIEDIR)/include.pro ) | 34 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -57,7 +57,7 @@ SlaveObjects* slaveObjects() { | |||
57 | } | 57 | } |
58 | 58 | ||
59 | SlaveReciever::SlaveReciever( QObject* par) | 59 | SlaveReciever::SlaveReciever( QObject* par) |
60 | : QObject( par ) | 60 | : QObject( par ), m_refs( 0 ) |
61 | { | 61 | { |
62 | m_inf = new QTimer(this); | 62 | m_inf = new QTimer(this); |
63 | connect(m_inf,SIGNAL(timeout()), | 63 | connect(m_inf,SIGNAL(timeout()), |
@@ -120,6 +120,10 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) | |||
120 | qWarning( "Got %d %d " + (*it).file, (*it).width , (*it).height ); | 120 | qWarning( "Got %d %d " + (*it).file, (*it).width , (*it).height ); |
121 | m_inPix.append(*it); | 121 | m_inPix.append(*it); |
122 | } | 122 | } |
123 | }else if ( string == "refUp()" ) { | ||
124 | m_refs++; | ||
125 | }else if ( string == "refDown()" ) { | ||
126 | m_refs--; | ||
123 | } | 127 | } |
124 | 128 | ||
125 | if (!m_inf->isActive() && !m_inList.isEmpty() ) | 129 | if (!m_inf->isActive() && !m_inList.isEmpty() ) |
@@ -128,7 +132,10 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) | |||
128 | if (!m_pix->isActive() && !m_inPix.isEmpty() ) | 132 | if (!m_pix->isActive() && !m_inPix.isEmpty() ) |
129 | m_pix->start(5); | 133 | m_pix->start(5); |
130 | 134 | ||
131 | QPEApplication::setKeepRunning(); | 135 | if ( m_refs ) |
136 | QPEApplication::setKeepRunning(); | ||
137 | else | ||
138 | qApp->quit(); | ||
132 | 139 | ||
133 | } | 140 | } |
134 | 141 | ||
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 | |||
@@ -52,6 +52,8 @@ private: | |||
52 | QTimer *m_inf, *m_pix, *m_out; | 52 | QTimer *m_inf, *m_pix, *m_out; |
53 | StringList m_inList, m_outList; | 53 | StringList m_inList, m_outList; |
54 | PixmapList m_inPix, m_outPix; | 54 | PixmapList m_inPix, m_outPix; |
55 | private: | ||
56 | int m_refs; | ||
55 | }; | 57 | }; |
56 | 58 | ||
57 | 59 | ||