summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-23 23:59:36 (UTC)
committer zecke <zecke>2004-03-23 23:59:36 (UTC)
commitc8acbf192ca4aa64ed66306ca872cb3860590b3c (patch) (side-by-side diff)
treead81a8681bd755185e8ba4e3fbded2f1869c1607
parent6a1e8a9f03d8b552a51ab0b45ec5b1959af6eb73 (diff)
downloadopie-c8acbf192ca4aa64ed66306ca872cb3860590b3c.zip
opie-c8acbf192ca4aa64ed66306ca872cb3860590b3c.tar.gz
opie-c8acbf192ca4aa64ed66306ca872cb3860590b3c.tar.bz2
Update....
Start the Slave Add the Iface for OKeyConfigWidget
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/okeyconfigwidget.h96
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.cpp5
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp8
-rw-r--r--noncore/graphics/opie-eye/phunk_view.pro2
-rw-r--r--noncore/graphics/opie-eye/slave/slavereciever.cpp11
-rw-r--r--noncore/graphics/opie-eye/slave/slavereciever.h2
6 files changed, 116 insertions, 8 deletions
diff --git a/libopie2/opieui/okeyconfigwidget.h b/libopie2/opieui/okeyconfigwidget.h
new file mode 100644
index 0000000..d76ea46
--- a/dev/null
+++ b/libopie2/opieui/okeyconfigwidget.h
@@ -0,0 +1,96 @@
+#ifndef ODP_KEY_CONFIG_WIDGET_H
+#define ODP_KEY_CONFIG_WIDGET_H
+
+#include <opie2/oconfig.h>
+
+#include <qstring.h>
+#include <qpixmap.h>
+#include <qbytearray.h>
+#include <qhbox.h>
+#include <qvaluelist.h>
+
+class QKeyEvent;
+
+namespace Opie {
+namespace Ui {
+
+class OKeyConfigItem {
+ friend class OKeyConfigManager;
+public:
+ typedef QValueList<OKeyConfigItem> OKeyConfigItemList;
+ OKeyConfigItem( const QString& text = QString::null , const QCString& config_key = QCString(),
+ const QPixmap& symbol = QPixmap(),
+ int key = 0, int mod = 0,
+ int default_key = 0, int default_modified = 0 );
+ ~OKeyConfigItem();
+
+ QString text()const;
+ QPixmap pixmap()const;
+ int key()const;
+ int modifier()const;
+ int defaultKey()const;
+ int defaultModifier()const;
+
+ void setText( const QString& text );
+ void setPixmap( const QPixmap& );
+ void setKey( int );
+ void setModied( int );
+ void setDefaultKey( int );
+ void setDefaultModifier( int );
+
+ bool isConfigured()const;
+ bool isEmpty()const;
+private:
+ QString m_text;
+ QCString m_config;
+ QPixmap m_pix;
+ int m_key;
+ int m_mod;
+ int m_defKey;
+ int m_defMod;
+ class Private;
+ Private *d;
+};
+
+
+class OKeyConfig : public QObject {
+ Q_OBJECT
+public:
+ OKeyConfig(Opie::Core::OConfig *conf = 0, bool grabkeyboard);
+ ~OKeyConfig();
+
+ void load();
+ void save();
+
+ OKeyConfigItem handleKeyEvent( QKeyEvent* );
+ QString handleKeyEventString( QKeyEvent* );
+
+ void addKeyConfig( const OKeyConfigItem& );
+ void removeKeyConfig( const OKeyConfigItem& );
+signals:
+ void keyConfigChanged( OKeyConfig* );
+
+private:
+ OKeyConfigItemList m_keys;
+};
+
+
+class OKeyConfigWidget : public QHBox {
+ Q_OBJECT
+public:
+ enum ChangeMode { Imediate, Queu };
+ OKeyConfigWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+ OKeyConfigWidget( OKeyConfig *, QWidget* parent = 0, const char* = 0, WFlags = 0 );
+ ~OKeyConfigWidget();
+
+ void setChangeMode( enum ChangeMode );
+ ChangeMode changeMode()const;
+
+ void reload();
+};
+
+}
+}
+
+
+#endif
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
@@ -88,17 +88,17 @@ namespace {
}
}
PIconView::PIconView( QWidget* wid, Config* cfg )
: QVBox( wid ), m_cfg( cfg )
{
{
-// QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" );
+ QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" );
}
m_path = QDir::homeDirPath();
QHBox *hbox = new QHBox( this );
QLabel* lbl = new QLabel( hbox );
lbl->setText( tr("View as" ) );
m_views = new QComboBox( hbox, "View As" );
@@ -117,16 +117,19 @@ PIconView::PIconView( QWidget* wid, Config* cfg )
int viewerWidth = dw-style().scrollBarExtent().width();
m_view->setGridX( viewerWidth-2*m_view->spacing() );
m_view->setGridY( fontMetrics().height()*2+40 );
loadViews();
slotViewChanged( m_views->currentItem() );
}
PIconView::~PIconView() {
+ {
+ QCopEnvelope( "QPE/Application/opie-eye_slave", "refDown()" );
+ }
}
void PIconView::slotDirUp() {
QDir dir( m_path );
dir.cdUp();
slotChangeDir( dir.absPath() );
}
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
@@ -8,28 +8,28 @@
#include <qlayout.h>
#include <qdialog.h>
#include <qmap.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qpe/ir.h>
-#include <opie/oapplicationfactory.h>
-#include <opie/otabwidget.h>
+#include <opie2/oapplicationfactory.h>
+#include <opie2/otabwidget.h>
#include <iface/ifaceinfo.h>
#include <iface/dirview.h>
#include "iconview.h"
#include "filesystem.h"
#include "mainwindow.h"
-OPIE_EXPORT_APP( OApplicationFactory<PMainWindow> )
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow> )
PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
: QMainWindow( wid, name, style ), m_cfg("phunkview")
{
setCaption( QObject::tr("Opie Eye Caramba" ) );
m_cfg.setGroup("Zecke_view" );
/*
* Initialize ToolBar and IconView
@@ -79,17 +79,17 @@ PMainWindow::~PMainWindow() {
}
void PMainWindow::slotConfig() {
QDialog dlg(this, 0, true);
dlg.setCaption( tr("Phunk View - Config" ) );
QHBoxLayout *lay = new QHBoxLayout(&dlg);
- OTabWidget *wid = new OTabWidget(&dlg );
+ Opie::Ui::OTabWidget *wid = new Opie::Ui::OTabWidget(&dlg );
lay->addWidget( wid );
ViewMap *vM = viewMap();
ViewMap::Iterator _it = vM->begin();
QMap<PDirView*, QWidget*> lst;
for( ; _it != vM->end(); ++_it ) {
PDirView *view = (_it.data())(m_cfg);
PInterfaceInfo *inf = view->interfaceInfo();
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
@@ -24,11 +24,11 @@ SOURCES = gui/iconview.cpp gui/filesystem.cpp gui/mainwindow.cpp \
INTERFACES =
# list of ui files
INCLUDEPATH += . $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopieui2
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
@@ -52,17 +52,17 @@ QDataStream &operator>>( QDataStream& s, ImageInfo& i ) {
SlaveObjects* slaveObjects() {
if ( !_slaveObj )
_slaveObj = new SlaveObjects;
return _slaveObj;
}
SlaveReciever::SlaveReciever( QObject* par)
- : QObject( par )
+ : QObject( par ), m_refs( 0 )
{
m_inf = new QTimer(this);
connect(m_inf,SIGNAL(timeout()),
this, SLOT(slotImageInfo()));
m_pix = new QTimer(this);
connect(m_pix,SIGNAL(timeout()),
this, SLOT(slotThumbNail()));
@@ -115,25 +115,32 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar)
m_inPix.append(pix);
}else if ( string == "pixmapInfos(PixmapInfos)" ) {
PixmapList list;
stream >> list;
for(PixmapList::Iterator it = list.begin(); it != list.end(); ++it ) {
qWarning( "Got %d %d " + (*it).file, (*it).width , (*it).height );
m_inPix.append(*it);
}
+ }else if ( string == "refUp()" ) {
+ m_refs++;
+ }else if ( string == "refDown()" ) {
+ m_refs--;
}
if (!m_inf->isActive() && !m_inList.isEmpty() )
m_inf->start(5);
if (!m_pix->isActive() && !m_inPix.isEmpty() )
m_pix->start(5);
- QPEApplication::setKeepRunning();
+ if ( m_refs )
+ QPEApplication::setKeepRunning();
+ else
+ qApp->quit();
}
PixmapList SlaveReciever::outPix()const {
return m_outPix;
}
StringList SlaveReciever::outInf()const{
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
@@ -47,12 +47,14 @@ public:
private slots:
void slotSend();
void slotImageInfo();
void slotThumbNail();
private:
QTimer *m_inf, *m_pix, *m_out;
StringList m_inList, m_outList;
PixmapList m_inPix, m_outPix;
+private:
+ int m_refs;
};
#endif