author | mickeyl <mickeyl> | 2003-10-27 19:06:54 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-27 19:06:54 (UTC) |
commit | f0a15a9866f9eddfe10596e63a1e6300b92b9e3f (patch) (unidiff) | |
tree | 8e2829bdd6ba17db418fa5ef19b3e7a06f4003e2 /noncore/comm | |
parent | df9d9d818c9667ba8e614e5c09f0e121e9225dfd (diff) | |
download | opie-f0a15a9866f9eddfe10596e63a1e6300b92b9e3f.zip opie-f0a15a9866f9eddfe10596e63a1e6300b92b9e3f.tar.gz opie-f0a15a9866f9eddfe10596e63a1e6300b92b9e3f.tar.bz2 |
merge noncore/comm/*
-rw-r--r-- | noncore/comm/keypebble/keypebble.pro | 8 | ||||
-rw-r--r-- | noncore/comm/keypebble/krfbdecoder.cpp | 7 | ||||
-rw-r--r-- | noncore/comm/keypebble/kvnc.cpp | 18 | ||||
-rw-r--r-- | noncore/comm/keypebble/kvnc.h | 7 | ||||
-rw-r--r-- | noncore/comm/keypebble/main.cpp | 11 |
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,4 +1,2 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = d3des.h \ | 2 | HEADERS = d3des.h \ |
@@ -29,3 +27,3 @@ INTERFACES = kvncconndlgbase.ui \ | |||
29 | kvncbookmarkdlgbase.ui | 27 | kvncbookmarkdlgbase.ui |
30 | TARGET = keypebble | 28 | |
31 | INCLUDEPATH += $(OPIEDIR)/include | 29 | INCLUDEPATH += $(OPIEDIR)/include |
@@ -34,2 +32,4 @@ LIBS += -lqpe | |||
34 | 32 | ||
33 | TARGET = keypebble | ||
34 | |||
35 | TRANSLATIONS = ../../../i18n/de/keypebble.ts \ | 35 | TRANSLATIONS = ../../../i18n/de/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 | |||
@@ -336,3 +336,3 @@ void KRFBDecoder::sendAllowedEncodings() | |||
336 | 336 | ||
337 | static CARD16 noEncodings = con->options()->encodings(); | 337 | CARD16 noEncodings = con->options()->encodings(); |
338 | noEncodings = Swap16IfLE( noEncodings ); | 338 | noEncodings = Swap16IfLE( noEncodings ); |
@@ -561,4 +561,7 @@ void KRFBDecoder::gotRawRectChunk() | |||
561 | } | 561 | } |
562 | else | 562 | else { |
563 | // we are now ready for the next update - no need to wait for the timer | ||
563 | currentState = Idle; | 564 | currentState = Idle; |
565 | sendUpdateRequest (1); | ||
566 | } | ||
564 | } | 567 | } |
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 | |||
@@ -29,4 +29,4 @@ | |||
29 | static int u_id = 1; | 29 | static int u_id = 1; |
30 | static int get_unique_id() | 30 | static int get_unique_id() |
31 | { | 31 | { |
32 | return u_id++; | 32 | return u_id++; |
@@ -58,3 +58,3 @@ const int StatusTextId = 0; | |||
58 | 58 | ||
59 | KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp) | 59 | KVNC::KVNC( QWidget *parent, const char *name, WFlags f) : QMainWindow( 0, name ,WStyle_ContextHelp) |
60 | { | 60 | { |
@@ -68,3 +68,3 @@ KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp) | |||
68 | stack->addWidget(bookmarkSelector,get_unique_id()); | 68 | stack->addWidget(bookmarkSelector,get_unique_id()); |
69 | stack->raiseWidget( bookmarkSelector ); | 69 | stack->raiseWidget( bookmarkSelector ); |
70 | 70 | ||
@@ -105,3 +105,3 @@ KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp) | |||
105 | n->addTo( bar ); | 105 | n->addTo( bar ); |
106 | 106 | ||
107 | QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "fileopen" ), | 107 | QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "fileopen" ), |
@@ -222,7 +222,7 @@ void KVNC::toggleFullScreen() | |||
222 | canvas->show(); | 222 | canvas->show(); |
223 | 223 | ||
224 | fullScreenAction->setText( tr("Stop Full Screen") ); | 224 | fullScreenAction->setText( tr("Stop Full Screen") ); |
225 | } | 225 | } |
226 | 226 | ||
227 | 227 | ||
228 | fullscreen = !fullscreen; | 228 | fullscreen = !fullscreen; |
@@ -268,3 +268,3 @@ void KVNC::disconnected() | |||
268 | 268 | ||
269 | if ( fullscreen ) | 269 | if ( fullscreen ) |
270 | toggleFullScreen(); | 270 | toggleFullScreen(); |
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 | |||
@@ -24,5 +24,5 @@ class KVNC : public QMainWindow | |||
24 | Q_OBJECT | 24 | Q_OBJECT |
25 | public: | 25 | public: |
26 | KVNC( const char *name = 0 ); | 26 | KVNC( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); |
27 | ~KVNC(); | 27 | ~KVNC(); |
28 | 28 | ||
@@ -36,2 +36,3 @@ public slots: | |||
36 | void closeConnection(); | 36 | void closeConnection(); |
37 | static QString appName() { return QString::fromLatin1("keypebble"); } | ||
37 | 38 | ||
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 | |||
@@ -2,14 +2,9 @@ | |||
2 | 2 | ||
3 | #include <qurl.h> | 3 | |
4 | #include <qpe/qpeapplication.h> | 4 | #include <qpe/qpeapplication.h> |
5 | #include "kvnc.h" | 5 | #include "kvnc.h" |
6 | #include <opie/oapplicationfactory.h> | ||
6 | 7 | ||
7 | int main( int argc, char **argv ) | ||
8 | { | ||
9 | QPEApplication app( argc, argv ); | ||
10 | KVNC *view = new KVNC( "Keypebble" ); | ||
11 | app.showMainWidget( view ); | ||
12 | 8 | ||
13 | return app.exec(); | ||
14 | } | ||
15 | 9 | ||
10 | OPIE_EXPORT_APP( OApplicationFactory<KVNC> ) | ||