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 | |
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 | 2 | ||||
-rw-r--r-- | noncore/comm/keypebble/kvnc.h | 3 | ||||
-rw-r--r-- | noncore/comm/keypebble/main.cpp | 11 |
5 files changed, 15 insertions, 16 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,7 +1,5 @@ | |||
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 \ |
5 | krfbbuffer.h \ | 3 | krfbbuffer.h \ |
6 | krfbcanvas.h \ | 4 | krfbcanvas.h \ |
7 | krfbconnection.h \ | 5 | krfbconnection.h \ |
@@ -26,13 +24,15 @@ SOURCES = d3des.c \ | |||
26 | kvncbookmarkdlg.cpp \ | 24 | kvncbookmarkdlg.cpp \ |
27 | main.cpp | 25 | main.cpp |
28 | INTERFACES= kvncconndlgbase.ui \ | 26 | INTERFACES= kvncconndlgbase.ui \ |
29 | kvncbookmarkdlgbase.ui | 27 | kvncbookmarkdlgbase.ui |
30 | TARGET = keypebble | 28 | |
31 | INCLUDEPATH += $(OPIEDIR)/include | 29 | INCLUDEPATH += $(OPIEDIR)/include |
32 | DEPENDPATH += $(OPIEDIR)/include | 30 | DEPENDPATH += $(OPIEDIR)/include |
33 | LIBS += -lqpe | 31 | LIBS += -lqpe |
34 | 32 | ||
33 | TARGET = keypebble | ||
34 | |||
35 | TRANSLATIONS = ../../../i18n/de/keypebble.ts \ | 35 | TRANSLATIONS = ../../../i18n/de/keypebble.ts \ |
36 | ../../../i18n/nl/keypebble.ts \ | 36 | ../../../i18n/nl/keypebble.ts \ |
37 | ../../../i18n/da/keypebble.ts \ | 37 | ../../../i18n/da/keypebble.ts \ |
38 | ../../../i18n/xx/keypebble.ts \ | 38 | ../../../i18n/xx/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 | |||
@@ -333,9 +333,9 @@ void KRFBDecoder::sendAllowedEncodings() | |||
333 | static CARD8 padding[1]; | 333 | static CARD8 padding[1]; |
334 | con->write( &SetEncodingsId, 1 ); | 334 | con->write( &SetEncodingsId, 1 ); |
335 | con->write( padding, 1 ); | 335 | con->write( padding, 1 ); |
336 | 336 | ||
337 | static CARD16 noEncodings = con->options()->encodings(); | 337 | CARD16 noEncodings = con->options()->encodings(); |
338 | noEncodings = Swap16IfLE( noEncodings ); | 338 | noEncodings = Swap16IfLE( noEncodings ); |
339 | con->write( &noEncodings, 2 ); | 339 | con->write( &noEncodings, 2 ); |
340 | 340 | ||
341 | if ( con->options()->corre ) | 341 | if ( con->options()->corre ) |
@@ -558,10 +558,13 @@ void KRFBDecoder::gotRawRectChunk() | |||
558 | currentState = AwaitingRectHeader; | 558 | currentState = AwaitingRectHeader; |
559 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) ); | 559 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) ); |
560 | con->waitForData( RectHeaderLength ); | 560 | con->waitForData( RectHeaderLength ); |
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 | } |
565 | } | 568 | } |
566 | 569 | ||
567 | // | 570 | // |
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 | |||
@@ -55,9 +55,9 @@ static char * menu_xpm[] = { | |||
55 | " "}; | 55 | " "}; |
56 | 56 | ||
57 | const int StatusTextId = 0; | 57 | 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 | { |
61 | setCaption( tr("VNC Viewer") ); | 61 | setCaption( tr("VNC Viewer") ); |
62 | fullscreen = false; | 62 | fullscreen = false; |
63 | 63 | ||
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; | |||
22 | class KVNC : public QMainWindow | 22 | class KVNC : public QMainWindow |
23 | { | 23 | { |
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 | ||
29 | public slots: | 29 | public slots: |
30 | void newConnection(); | 30 | void newConnection(); |
@@ -33,8 +33,9 @@ public slots: | |||
33 | void openConnection(QString); | 33 | void openConnection(QString); |
34 | void openConnection(void); | 34 | void openConnection(void); |
35 | void toggleFullScreen(); | 35 | void toggleFullScreen(); |
36 | void closeConnection(); | 36 | void closeConnection(); |
37 | static QString appName() { return QString::fromLatin1("keypebble"); } | ||
37 | 38 | ||
38 | protected: | 39 | protected: |
39 | void setupActions(); | 40 | void setupActions(); |
40 | 41 | ||
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 @@ | |||
1 | 1 | ||
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> ) | ||