summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-10-27 19:06:54 (UTC)
committer mickeyl <mickeyl>2003-10-27 19:06:54 (UTC)
commitf0a15a9866f9eddfe10596e63a1e6300b92b9e3f (patch) (side-by-side diff)
tree8e2829bdd6ba17db418fa5ef19b3e7a06f4003e2
parentdf9d9d818c9667ba8e614e5c09f0e121e9225dfd (diff)
downloadopie-f0a15a9866f9eddfe10596e63a1e6300b92b9e3f.zip
opie-f0a15a9866f9eddfe10596e63a1e6300b92b9e3f.tar.gz
opie-f0a15a9866f9eddfe10596e63a1e6300b92b9e3f.tar.bz2
merge noncore/comm/*
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/comm/keypebble/keypebble.pro8
-rw-r--r--noncore/comm/keypebble/krfbdecoder.cpp7
-rw-r--r--noncore/comm/keypebble/kvnc.cpp18
-rw-r--r--noncore/comm/keypebble/kvnc.h7
-rw-r--r--noncore/comm/keypebble/main.cpp11
5 files changed, 25 insertions, 26 deletions
diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro
index 7af60f9..b3cb172 100644
--- a/noncore/comm/keypebble/keypebble.pro
+++ b/noncore/comm/keypebble/keypebble.pro
@@ -1,6 +1,4 @@
-TEMPLATE = app
-CONFIG += qt warn_on release
-DESTDIR = $(OPIEDIR)/bin
+CONFIG += qt warn_on release quick-app
HEADERS = d3des.h \
krfbbuffer.h \
krfbcanvas.h \
@@ -27,11 +25,13 @@ SOURCES = d3des.c \
main.cpp
INTERFACES = kvncconndlgbase.ui \
kvncbookmarkdlgbase.ui
-TARGET = keypebble
+
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
+TARGET = keypebble
+
TRANSLATIONS = ../../../i18n/de/keypebble.ts \
../../../i18n/nl/keypebble.ts \
../../../i18n/da/keypebble.ts \
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index 33418ae..dc90d9c 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -334,7 +334,7 @@ void KRFBDecoder::sendAllowedEncodings()
con->write( &SetEncodingsId, 1 );
con->write( padding, 1 );
- static CARD16 noEncodings = con->options()->encodings();
+ CARD16 noEncodings = con->options()->encodings();
noEncodings = Swap16IfLE( noEncodings );
con->write( &noEncodings, 2 );
@@ -559,8 +559,11 @@ void KRFBDecoder::gotRawRectChunk()
connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) );
con->waitForData( RectHeaderLength );
}
- else
+ else {
+ // we are now ready for the next update - no need to wait for the timer
currentState = Idle;
+ sendUpdateRequest (1);
+ }
}
}
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index 48a442c..c89dec5 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -27,8 +27,8 @@
#include "krfbserver.h"
static int u_id = 1;
-static int get_unique_id()
-{
+static int get_unique_id()
+{
return u_id++;
}
@@ -56,7 +56,7 @@ static char * menu_xpm[] = {
const int StatusTextId = 0;
-KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp)
+KVNC::KVNC( QWidget *parent, const char *name, WFlags f) : QMainWindow( 0, name ,WStyle_ContextHelp)
{
setCaption( tr("VNC Viewer") );
fullscreen = false;
@@ -66,7 +66,7 @@ KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp)
bookmarkSelector=new KVNCBookmarkDlg();
stack->addWidget(bookmarkSelector,get_unique_id());
- stack->raiseWidget( bookmarkSelector );
+ stack->raiseWidget( bookmarkSelector );
canvas = new KRFBCanvas( stack, "canvas" );
stack->addWidget(canvas,get_unique_id());
@@ -103,7 +103,7 @@ KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp)
connect( n, SIGNAL( activated() ),
this, SLOT( newConnection() ) );
n->addTo( bar );
-
+
QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "fileopen" ),
QString::null, 0, this, 0 );
connect( o, SIGNAL( activated() ),
@@ -220,11 +220,11 @@ void KVNC::toggleFullScreen()
canvas->setFocus();
canvas->grabKeyboard();
canvas->show();
-
+
fullScreenAction->setText( tr("Stop Full Screen") );
}
-
-
+
+
fullscreen = !fullscreen;
}
@@ -266,7 +266,7 @@ void KVNC::loggedIn()
void KVNC::disconnected()
{
- if ( fullscreen )
+ if ( fullscreen )
toggleFullScreen();
static QString msg = tr( "Connection closed" );
statusMessage( msg );
diff --git a/noncore/comm/keypebble/kvnc.h b/noncore/comm/keypebble/kvnc.h
index 51c7151..7b7cc91 100644
--- a/noncore/comm/keypebble/kvnc.h
+++ b/noncore/comm/keypebble/kvnc.h
@@ -22,9 +22,9 @@ class QToolBar;
class KVNC : public QMainWindow
{
Q_OBJECT
-public:
- KVNC( const char *name = 0 );
- ~KVNC();
+public:
+ KVNC( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+ ~KVNC();
public slots:
void newConnection();
@@ -34,6 +34,7 @@ public slots:
void openConnection(void);
void toggleFullScreen();
void closeConnection();
+ static QString appName() { return QString::fromLatin1("keypebble"); }
protected:
void setupActions();
diff --git a/noncore/comm/keypebble/main.cpp b/noncore/comm/keypebble/main.cpp
index bc7782c..11f67fc 100644
--- a/noncore/comm/keypebble/main.cpp
+++ b/noncore/comm/keypebble/main.cpp
@@ -1,15 +1,10 @@
-#include <qurl.h>
+
#include <qpe/qpeapplication.h>
#include "kvnc.h"
+#include <opie/oapplicationfactory.h>
-int main( int argc, char **argv )
-{
- QPEApplication app( argc, argv );
- KVNC *view = new KVNC( "Keypebble" );
- app.showMainWidget( view );
- return app.exec();
-}
+OPIE_EXPORT_APP( OApplicationFactory<KVNC> )