author | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-19 22:07:06 (UTC) |
commit | 29c556ffc9b1497cd996ceb46d646b1eaf1288be (patch) (unidiff) | |
tree | b89c424de93f541bc80908c93172eb4e601e8c02 | |
parent | c502394063598e63591e06072802f1c5a9e0c266 (diff) | |
download | opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.zip opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.tar.gz opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.tar.bz2 |
Split calibrate out as a standalone application, and ensure taskbar depends
on it. This makes ts debugging easier, having a seperate calibration tool
around, and as a side affect fixes calibration on the C700, which previously
required a reboot to take effect.
-rw-r--r-- | core/apps/calibrate/main.cpp | 20 | ||||
-rw-r--r-- | core/apps/calibrate/opie-calibrate.control | 8 | ||||
-rw-r--r-- | core/launcher/desktop.cpp | 2 | ||||
-rw-r--r-- | core/launcher/launcher.pro | 4 | ||||
-rw-r--r-- | core/launcher/main.cpp | 15 | ||||
-rw-r--r-- | core/launcher/opie-taskbar.control | 4 | ||||
-rw-r--r-- | core/launcher/taskbar.cpp | 17 | ||||
-rw-r--r-- | core/launcher/taskbar.h | 2 |
8 files changed, 32 insertions, 40 deletions
diff --git a/core/apps/calibrate/main.cpp b/core/apps/calibrate/main.cpp index d1ad083..1c295eb 100644 --- a/core/apps/calibrate/main.cpp +++ b/core/apps/calibrate/main.cpp | |||
@@ -10,33 +10,37 @@ | |||
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "calibrate.h" | 21 | #include "calibrate.h" |
22 | 22 | ||
23 | #include <qfile.h> | 23 | #include <qfile.h> |
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | 25 | ||
26 | #ifdef QWS | ||
27 | #include <qwindowsystem_qws.h> | ||
28 | #endif | ||
29 | |||
26 | int main( int argc, char ** argv ) | 30 | int main( int argc, char ** argv ) |
27 | { | 31 | { |
28 | QPEApplication a( argc, argv ); | 32 | QPEApplication a( argc, argv ); |
29 | int retval = 0; | 33 | int retval = 0; |
30 | 34 | ||
31 | #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) | 35 | #ifdef QWS |
32 | if ( !QFile::exists( "/etc/pointercal" ) ) { | 36 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
37 | #endif | ||
33 | // Make sure calibration widget starts on top. | 38 | // Make sure calibration widget starts on top. |
34 | Calibrate *cal = new Calibrate; | 39 | Calibrate cal; |
35 | a.setMainWidget(cal); | 40 | a.setMainWidget(&cal); |
36 | a.showMainWidget(cal); | 41 | a.showMainWidget(&cal); |
37 | retval = a.exec(); | 42 | return a.exec(); |
38 | delete cal; | 43 | #ifdef QWS |
39 | } | 44 | } |
40 | #endif | 45 | #endif |
41 | return retval; | ||
42 | } | 46 | } |
diff --git a/core/apps/calibrate/opie-calibrate.control b/core/apps/calibrate/opie-calibrate.control new file mode 100644 index 0000000..6eafb94 --- a/dev/null +++ b/core/apps/calibrate/opie-calibrate.control | |||
@@ -0,0 +1,8 @@ | |||
1 | Files: bin/calibrate apps/Settings/Calibrate.desktop | ||
2 | Priority: required | ||
3 | Section: opie/system | ||
4 | Maintainer: Project Opie <opie@handhelds.org> | ||
5 | Architecture: arm | ||
6 | Version: $QPE_VERSION-$SUB_VERSION.3 | ||
7 | Depends: libqpe1, libqt2-emb | ||
8 | Description: Opie calibration tool | ||
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 6def126..ef0bf4c 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -85,33 +85,32 @@ public: | |||
85 | return message; | 85 | return message; |
86 | } | 86 | } |
87 | 87 | ||
88 | private: | 88 | private: |
89 | int keyCode; | 89 | int keyCode; |
90 | QCString channel, message; | 90 | QCString channel, message; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | typedef QValueList<QCopKeyRegister> KeyRegisterList; | 93 | typedef QValueList<QCopKeyRegister> KeyRegisterList; |
94 | KeyRegisterList keyRegisterList; | 94 | KeyRegisterList keyRegisterList; |
95 | 95 | ||
96 | static Desktop* qpedesktop = 0; | 96 | static Desktop* qpedesktop = 0; |
97 | static int loggedin = 0; | 97 | static int loggedin = 0; |
98 | static void login( bool at_poweron ) | 98 | static void login( bool at_poweron ) |
99 | { | 99 | { |
100 | if ( !loggedin ) { | 100 | if ( !loggedin ) { |
101 | Global::terminateBuiltin( "calibrate" ); | ||
102 | Password::authenticate( at_poweron ); | 101 | Password::authenticate( at_poweron ); |
103 | loggedin = 1; | 102 | loggedin = 1; |
104 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); | 103 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); |
105 | } | 104 | } |
106 | } | 105 | } |
107 | 106 | ||
108 | bool Desktop::screenLocked() | 107 | bool Desktop::screenLocked() |
109 | { | 108 | { |
110 | return loggedin == 0; | 109 | return loggedin == 0; |
111 | } | 110 | } |
112 | 111 | ||
113 | /* | 112 | /* |
114 | Priority is number of alerts that are needed to pop up | 113 | Priority is number of alerts that are needed to pop up |
115 | alert. | 114 | alert. |
116 | */ | 115 | */ |
117 | class DesktopPowerAlerter : public QMessageBox | 116 | class DesktopPowerAlerter : public QMessageBox |
@@ -609,33 +608,32 @@ static bool hasVisibleWindow( const QString& clientname ) | |||
609 | const QList<QWSWindow> &list = qwsServer->clientWindows(); | 608 | const QList<QWSWindow> &list = qwsServer->clientWindows(); |
610 | QWSWindow* w; | 609 | QWSWindow* w; |
611 | for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) { | 610 | for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) { |
612 | if ( w->client() ->identity() == clientname && !w->isFullyObscured() ) | 611 | if ( w->client() ->identity() == clientname && !w->isFullyObscured() ) |
613 | return TRUE; | 612 | return TRUE; |
614 | } | 613 | } |
615 | #endif | 614 | #endif |
616 | return FALSE; | 615 | return FALSE; |
617 | } | 616 | } |
618 | 617 | ||
619 | 618 | ||
620 | void Desktop::executeOrModify( const QString& appLnkFile ) | 619 | void Desktop::executeOrModify( const QString& appLnkFile ) |
621 | { | 620 | { |
622 | AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile ); | 621 | AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile ); |
623 | if ( lnk.isValid() ) { | 622 | if ( lnk.isValid() ) { |
624 | QCString app = lnk.exec().utf8(); | 623 | QCString app = lnk.exec().utf8(); |
625 | Global::terminateBuiltin( "calibrate" ); | ||
626 | if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) { | 624 | if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) { |
627 | // MRUList::addTask( &lnk ); | 625 | // MRUList::addTask( &lnk ); |
628 | if ( hasVisibleWindow( app ) ) | 626 | if ( hasVisibleWindow( app ) ) |
629 | QCopChannel::send( "QPE/Application/" + app, "nextView()" ); | 627 | QCopChannel::send( "QPE/Application/" + app, "nextView()" ); |
630 | else | 628 | else |
631 | QCopChannel::send( "QPE/Application/" + app, "raise()" ); | 629 | QCopChannel::send( "QPE/Application/" + app, "raise()" ); |
632 | } | 630 | } |
633 | else { | 631 | else { |
634 | lnk.execute(); | 632 | lnk.execute(); |
635 | } | 633 | } |
636 | } | 634 | } |
637 | } | 635 | } |
638 | 636 | ||
639 | // autoStarts apps on resume and start | 637 | // autoStarts apps on resume and start |
640 | void Desktop::execAutoStart() | 638 | void Desktop::execAutoStart() |
641 | { | 639 | { |
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro index d0a573b..007e48c 100644 --- a/core/launcher/launcher.pro +++ b/core/launcher/launcher.pro | |||
@@ -4,33 +4,32 @@ DESTDIR = ../../bin | |||
4 | HEADERS = background.h \ | 4 | HEADERS = background.h \ |
5 | desktop.h \ | 5 | desktop.h \ |
6 | screensaver.h \ | 6 | screensaver.h \ |
7 | mediummountgui.h \ | 7 | mediummountgui.h \ |
8 | info.h \ | 8 | info.h \ |
9 | appicons.h \ | 9 | appicons.h \ |
10 | taskbar.h \ | 10 | taskbar.h \ |
11 | sidething.h \ | 11 | sidething.h \ |
12 | runningappbar.h \ | 12 | runningappbar.h \ |
13 | stabmon.h \ | 13 | stabmon.h \ |
14 | inputmethods.h \ | 14 | inputmethods.h \ |
15 | systray.h \ | 15 | systray.h \ |
16 | wait.h \ | 16 | wait.h \ |
17 | shutdownimpl.h \ | 17 | shutdownimpl.h \ |
18 | launcher.h \ | 18 | launcher.h \ |
19 | launcherview.h \ | 19 | launcherview.h \ |
20 | ../../core/apps/calibrate/calibrate.h \ | ||
21 | startmenu.h \ | 20 | startmenu.h \ |
22 | transferserver.h \ | 21 | transferserver.h \ |
23 | qcopbridge.h \ | 22 | qcopbridge.h \ |
24 | packageslave.h \ | 23 | packageslave.h \ |
25 | irserver.h \ | 24 | irserver.h \ |
26 | ../../rsync/buf.h \ | 25 | ../../rsync/buf.h \ |
27 | ../../rsync/checksum.h \ | 26 | ../../rsync/checksum.h \ |
28 | ../../rsync/command.h \ | 27 | ../../rsync/command.h \ |
29 | ../../rsync/emit.h \ | 28 | ../../rsync/emit.h \ |
30 | ../../rsync/job.h \ | 29 | ../../rsync/job.h \ |
31 | ../../rsync/netint.h \ | 30 | ../../rsync/netint.h \ |
32 | ../../rsync/protocol.h \ | 31 | ../../rsync/protocol.h \ |
33 | ../../rsync/prototab.h \ | 32 | ../../rsync/prototab.h \ |
34 | ../../rsync/rsync.h \ | 33 | ../../rsync/rsync.h \ |
35 | ../../rsync/search.h \ | 34 | ../../rsync/search.h \ |
36 | ../../rsync/stream.h \ | 35 | ../../rsync/stream.h \ |
@@ -45,33 +44,32 @@ HEADERS = background.h \ | |||
45 | SOURCES = background.cpp \ | 44 | SOURCES = background.cpp \ |
46 | desktop.cpp \ | 45 | desktop.cpp \ |
47 | screensaver.cpp \ | 46 | screensaver.cpp \ |
48 | mediummountgui.cpp \ | 47 | mediummountgui.cpp \ |
49 | info.cpp \ | 48 | info.cpp \ |
50 | appicons.cpp \ | 49 | appicons.cpp \ |
51 | taskbar.cpp \ | 50 | taskbar.cpp \ |
52 | sidething.cpp \ | 51 | sidething.cpp \ |
53 | runningappbar.cpp \ | 52 | runningappbar.cpp \ |
54 | stabmon.cpp \ | 53 | stabmon.cpp \ |
55 | inputmethods.cpp \ | 54 | inputmethods.cpp \ |
56 | systray.cpp \ | 55 | systray.cpp \ |
57 | wait.cpp \ | 56 | wait.cpp \ |
58 | shutdownimpl.cpp \ | 57 | shutdownimpl.cpp \ |
59 | launcher.cpp \ | 58 | launcher.cpp \ |
60 | launcherview.cpp \ | 59 | launcherview.cpp \ |
61 | ../../core/apps/calibrate/calibrate.cpp \ | ||
62 | transferserver.cpp \ | 60 | transferserver.cpp \ |
63 | packageslave.cpp \ | 61 | packageslave.cpp \ |
64 | irserver.cpp \ | 62 | irserver.cpp \ |
65 | qcopbridge.cpp \ | 63 | qcopbridge.cpp \ |
66 | startmenu.cpp \ | 64 | startmenu.cpp \ |
67 | main.cpp \ | 65 | main.cpp \ |
68 | ../../rsync/base64.c \ | 66 | ../../rsync/base64.c \ |
69 | ../../rsync/buf.c \ | 67 | ../../rsync/buf.c \ |
70 | ../../rsync/checksum.c \ | 68 | ../../rsync/checksum.c \ |
71 | ../../rsync/command.c \ | 69 | ../../rsync/command.c \ |
72 | ../../rsync/delta.c \ | 70 | ../../rsync/delta.c \ |
73 | ../../rsync/emit.c \ | 71 | ../../rsync/emit.c \ |
74 | ../../rsync/hex.c \ | 72 | ../../rsync/hex.c \ |
75 | ../../rsync/job.c \ | 73 | ../../rsync/job.c \ |
76 | ../../rsync/mdfour.c \ | 74 | ../../rsync/mdfour.c \ |
77 | ../../rsync/mksum.c \ | 75 | ../../rsync/mksum.c \ |
@@ -81,34 +79,32 @@ SOURCES = background.cpp \ | |||
81 | ../../rsync/prototab.c \ | 79 | ../../rsync/prototab.c \ |
82 | ../../rsync/readsums.c \ | 80 | ../../rsync/readsums.c \ |
83 | ../../rsync/scoop.c \ | 81 | ../../rsync/scoop.c \ |
84 | ../../rsync/search.c \ | 82 | ../../rsync/search.c \ |
85 | ../../rsync/stats.c \ | 83 | ../../rsync/stats.c \ |
86 | ../../rsync/stream.c \ | 84 | ../../rsync/stream.c \ |
87 | ../../rsync/sumset.c \ | 85 | ../../rsync/sumset.c \ |
88 | ../../rsync/trace.c \ | 86 | ../../rsync/trace.c \ |
89 | ../../rsync/tube.c \ | 87 | ../../rsync/tube.c \ |
90 | ../../rsync/util.c \ | 88 | ../../rsync/util.c \ |
91 | ../../rsync/version.c \ | 89 | ../../rsync/version.c \ |
92 | ../../rsync/whole.c \ | 90 | ../../rsync/whole.c \ |
93 | ../../rsync/qrsync.cpp | 91 | ../../rsync/qrsync.cpp |
94 | INTERFACES= syncdialog.ui | 92 | INTERFACES= syncdialog.ui |
95 | INCLUDEPATH += ../../include | 93 | INCLUDEPATH += ../../include |
96 | DEPENDPATH+= ../../include . | 94 | DEPENDPATH+= ../../include . |
97 | INCLUDEPATH += ../../core/apps/calibrate | ||
98 | DEPENDPATH+= ../../core/apps/calibrate | ||
99 | INCLUDEPATH += ../../rsync | 95 | INCLUDEPATH += ../../rsync |
100 | DEPENDPATH+= ../../rsync | 96 | DEPENDPATH+= ../../rsync |
101 | TARGET = qpe | 97 | TARGET = qpe |
102 | LIBS += -lqpe -lcrypt -lopie | 98 | LIBS += -lqpe -lcrypt -lopie |
103 | 99 | ||
104 | TRANSLATIONS = ../../i18n/de/qpe.ts \ | 100 | TRANSLATIONS = ../../i18n/de/qpe.ts \ |
105 | ../../i18n/xx/qpe.ts \ | 101 | ../../i18n/xx/qpe.ts \ |
106 | ../../i18n/en/qpe.ts \ | 102 | ../../i18n/en/qpe.ts \ |
107 | ../../i18n/es/qpe.ts \ | 103 | ../../i18n/es/qpe.ts \ |
108 | ../../i18n/fr/qpe.ts \ | 104 | ../../i18n/fr/qpe.ts \ |
109 | ../../i18n/hu/qpe.ts \ | 105 | ../../i18n/hu/qpe.ts \ |
110 | ../../i18n/ja/qpe.ts \ | 106 | ../../i18n/ja/qpe.ts \ |
111 | ../../i18n/ko/qpe.ts \ | 107 | ../../i18n/ko/qpe.ts \ |
112 | ../../i18n/no/qpe.ts \ | 108 | ../../i18n/no/qpe.ts \ |
113 | ../../i18n/pl/qpe.ts \ | 109 | ../../i18n/pl/qpe.ts \ |
114 | ../../i18n/pt/qpe.ts \ | 110 | ../../i18n/pt/qpe.ts \ |
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 20a1ecd..e96eeae 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -17,48 +17,47 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "desktop.h" | 21 | #include "desktop.h" |
22 | #include "taskbar.h" | 22 | #include "taskbar.h" |
23 | #include "stabmon.h" | 23 | #include "stabmon.h" |
24 | 24 | ||
25 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
26 | #include <qpe/network.h> | 26 | #include <qpe/network.h> |
27 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
28 | #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) | 28 | #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) |
29 | #include <qpe/custom.h> | 29 | #include <qpe/custom.h> |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #include <opie/odevice.h> | 32 | #include <opie/odevice.h> |
33 | #include <opie/oprocess.h> | ||
33 | 34 | ||
34 | #include <qmessagebox.h> | 35 | #include <qmessagebox.h> |
35 | #include <qfile.h> | 36 | #include <qfile.h> |
36 | #include <qimage.h> | 37 | #include <qimage.h> |
37 | #include <qwindowsystem_qws.h> | 38 | #include <qwindowsystem_qws.h> |
38 | #include <qwsmouse_qws.h> | 39 | #include <qwsmouse_qws.h> |
39 | #include <qpe/qcopenvelope_qws.h> | 40 | #include <qpe/qcopenvelope_qws.h> |
40 | #include <qpe/alarmserver.h> | 41 | #include <qpe/alarmserver.h> |
41 | 42 | ||
42 | #include <stdlib.h> | 43 | #include <stdlib.h> |
43 | #include <stdio.h> | 44 | #include <stdio.h> |
44 | #include <signal.h> | 45 | #include <signal.h> |
45 | #include <unistd.h> | 46 | #include <unistd.h> |
46 | 47 | ||
47 | #include "../calibrate/calibrate.h" | ||
48 | |||
49 | using namespace Opie; | 48 | using namespace Opie; |
50 | 49 | ||
51 | void initEnvironment() | 50 | void initEnvironment() |
52 | { | 51 | { |
53 | int rot; | 52 | int rot; |
54 | Config config("locale"); | 53 | Config config("locale"); |
55 | 54 | ||
56 | config.setGroup( "Location" ); | 55 | config.setGroup( "Location" ); |
57 | QString tz = config.readEntry( "Timezone", getenv("TZ") ); | 56 | QString tz = config.readEntry( "Timezone", getenv("TZ") ); |
58 | 57 | ||
59 | // if not timezone set, pick New York | 58 | // if not timezone set, pick New York |
60 | if (tz.isNull()) | 59 | if (tz.isNull()) |
61 | tz = "America/New_York"; | 60 | tz = "America/New_York"; |
62 | 61 | ||
63 | setenv( "TZ", tz, 1 ); | 62 | setenv( "TZ", tz, 1 ); |
64 | config.writeEntry( "Timezone", tz); | 63 | config.writeEntry( "Timezone", tz); |
@@ -105,36 +104,40 @@ int initApplication( int argc, char ** argv ) | |||
105 | AlarmServer::initialize(); | 104 | AlarmServer::initialize(); |
106 | 105 | ||
107 | Desktop *d = new Desktop(); | 106 | Desktop *d = new Desktop(); |
108 | 107 | ||
109 | QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); | 108 | QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); |
110 | QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); | 109 | QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); |
111 | QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); | 110 | QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); |
112 | QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); | 111 | QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); |
113 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); | 112 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); |
114 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); | 113 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); |
115 | 114 | ||
116 | (void)new SysFileMonitor(d); | 115 | (void)new SysFileMonitor(d); |
117 | Network::createServer(d); | 116 | Network::createServer(d); |
118 | 117 | ||
119 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 118 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
120 | if ( !QFile::exists( "/etc/pointercal" ) ) { | 119 | if ( !QFile::exists( "/etc/pointercal" ) ) { |
121 | // Make sure calibration widget starts on top. | 120 | OProcess cal; |
122 | Calibrate *cal = new Calibrate; | 121 | cal << "calibrate"; |
123 | cal->exec(); | 122 | |
124 | delete cal; | 123 | if ( ! cal.start(OProcess::Block, OProcess::NoCommunication) ) { |
124 | QMessageBox::warning( 0, "Unable to calibrate", | ||
125 | "Failed to start the calibration tool.\n" | ||
126 | ); | ||
127 | } | ||
125 | } | 128 | } |
126 | } | 129 | } |
127 | 130 | ||
128 | d->show(); | 131 | d->show(); |
129 | 132 | ||
130 | if ( QDate::currentDate ( ). year ( ) < 2000 ) { | 133 | if ( QDate::currentDate ( ). year ( ) < 2000 ) { |
131 | if ( QMessageBox::information ( 0, DesktopApplication::tr( "Information" ), DesktopApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ). arg( TimeString::dateString ( QDate::currentDate ( ))), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) { | 134 | if ( QMessageBox::information ( 0, DesktopApplication::tr( "Information" ), DesktopApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ). arg( TimeString::dateString ( QDate::currentDate ( ))), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) { |
132 | QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" ); | 135 | QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" ); |
133 | e << QString ( ); | 136 | e << QString ( ); |
134 | } | 137 | } |
135 | } | 138 | } |
136 | 139 | ||
137 | int rv = a.exec(); | 140 | int rv = a.exec(); |
138 | 141 | ||
139 | delete d; | 142 | delete d; |
140 | 143 | ||
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control index c0430b7..db66a05 100644 --- a/core/launcher/opie-taskbar.control +++ b/core/launcher/opie-taskbar.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie | 1 | Files: bin/qpe pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie |
2 | Priority: required | 2 | Priority: required |
3 | Section: opie/system | 3 | Section: opie/system |
4 | Maintainer: Project Opie <opie@handhelds.org> | 4 | Maintainer: Project Opie <opie@handhelds.org> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION.3 | 6 | Version: $QPE_VERSION-$SUB_VERSION.3 |
7 | Depends: opie-base | 7 | Depends: opie-base, opie-calibrate |
8 | Replaces: opie-rotation | 8 | Replaces: opie-rotation |
9 | Description: Launcher for Opie | 9 | Description: Launcher for Opie |
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp index 8af568d..8158128 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp | |||
@@ -9,33 +9,32 @@ | |||
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | *********************************************************************/ | 19 | *********************************************************************/ |
20 | 20 | ||
21 | #include "startmenu.h" | 21 | #include "startmenu.h" |
22 | #include "inputmethods.h" | 22 | #include "inputmethods.h" |
23 | #include "runningappbar.h" | 23 | #include "runningappbar.h" |
24 | #include "systray.h" | 24 | #include "systray.h" |
25 | #include "calibrate.h" | ||
26 | #include "wait.h" | 25 | #include "wait.h" |
27 | #include "appicons.h" | 26 | #include "appicons.h" |
28 | 27 | ||
29 | #include "taskbar.h" | 28 | #include "taskbar.h" |
30 | #include "desktop.h" | 29 | #include "desktop.h" |
31 | 30 | ||
32 | #include <qpe/qpeapplication.h> | 31 | #include <qpe/qpeapplication.h> |
33 | #include <qpe/qcopenvelope_qws.h> | 32 | #include <qpe/qcopenvelope_qws.h> |
34 | #include <qpe/global.h> | 33 | #include <qpe/global.h> |
35 | 34 | ||
36 | #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) | 35 | #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) |
37 | #include <qpe/custom.h> | 36 | #include <qpe/custom.h> |
38 | #endif | 37 | #endif |
39 | 38 | ||
40 | #include <opie/odevice.h> | 39 | #include <opie/odevice.h> |
41 | 40 | ||
@@ -69,41 +68,38 @@ using namespace Opie; | |||
69 | 68 | ||
70 | 69 | ||
71 | #ifdef SINGLE_APP | 70 | #ifdef SINGLE_APP |
72 | #define APP(a,b,c,d) FACTORY(b) | 71 | #define APP(a,b,c,d) FACTORY(b) |
73 | #include "../launcher/apps.h" | 72 | #include "../launcher/apps.h" |
74 | #undef APP | 73 | #undef APP |
75 | #endif // SINGLE_APP | 74 | #endif // SINGLE_APP |
76 | 75 | ||
77 | static Global::Command builtins[] = { | 76 | static Global::Command builtins[] = { |
78 | 77 | ||
79 | #ifdef SINGLE_APP | 78 | #ifdef SINGLE_APP |
80 | #define APP(a,b,c,d) { a, new##b, c }, | 79 | #define APP(a,b,c,d) { a, new##b, c }, |
81 | #include "../launcher/apps.h" | 80 | #include "../launcher/apps.h" |
82 | #undef APP | 81 | #undef APP |
83 | #endif | 82 | #endif |
84 | 83 | ||
85 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) | ||
86 | { "calibrate", TaskBar::calibrate, 1, 0 }, | ||
87 | #endif | ||
88 | #if !defined(QT_QWS_CASSIOPEIA) | 84 | #if !defined(QT_QWS_CASSIOPEIA) |
89 | { "shutdown", Global::shutdown, 1, 0 }, | 85 | { "shutdown", Global::shutdown, 1, 0 }, |
90 | // { "run", run, 1, 0 }, | 86 | // { "run", run, 1, 0 }, |
91 | #endif | 87 | #endif |
92 | 88 | ||
93 | { 0, TaskBar::calibrate, 0, 0 }, | 89 | { 0, 0, 0, 0 }, |
94 | }; | 90 | }; |
95 | 91 | ||
96 | static bool initNumLock() | 92 | static bool initNumLock() |
97 | { | 93 | { |
98 | #ifdef QPE_INITIAL_NUMLOCK_STATE | 94 | #ifdef QPE_INITIAL_NUMLOCK_STATE |
99 | QPE_INITIAL_NUMLOCK_STATE | 95 | QPE_INITIAL_NUMLOCK_STATE |
100 | #endif | 96 | #endif |
101 | return FALSE; | 97 | return FALSE; |
102 | } | 98 | } |
103 | 99 | ||
104 | class LockKeyState : public QWidget | 100 | class LockKeyState : public QWidget |
105 | { | 101 | { |
106 | public: | 102 | public: |
107 | LockKeyState( QWidget *parent ) : | 103 | LockKeyState( QWidget *parent ) : |
108 | QWidget(parent), | 104 | QWidget(parent), |
109 | nl(initNumLock()), cl(FALSE) | 105 | nl(initNumLock()), cl(FALSE) |
@@ -293,43 +289,32 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data ) | |||
293 | 289 | ||
294 | ODevice::inst ( )-> setLedState ( l, status ? ( canblink ? Led_BlinkSlow : Led_On ) : Led_Off ); | 290 | ODevice::inst ( )-> setLedState ( l, status ? ( canblink ? Led_BlinkSlow : Led_On ) : Led_Off ); |
295 | } | 291 | } |
296 | } | 292 | } |
297 | else if ( msg == "toggleMenu()" ) { | 293 | else if ( msg == "toggleMenu()" ) { |
298 | if ( sm-> launchMenu-> isVisible ( )) | 294 | if ( sm-> launchMenu-> isVisible ( )) |
299 | sm-> launch ( ); | 295 | sm-> launch ( ); |
300 | else { | 296 | else { |
301 | QCopEnvelope e ( "QPE/System", "toggleApplicationMenu()" ); | 297 | QCopEnvelope e ( "QPE/System", "toggleApplicationMenu()" ); |
302 | } | 298 | } |
303 | } | 299 | } |
304 | else if ( msg == "toggleStartMenu()" ) { | 300 | else if ( msg == "toggleStartMenu()" ) { |
305 | sm-> launch ( ); | 301 | sm-> launch ( ); |
306 | } | 302 | } |
307 | } | 303 | } |
308 | 304 | ||
309 | QWidget *TaskBar::calibrate(bool) | ||
310 | { | ||
311 | #ifdef Q_WS_QWS | ||
312 | Calibrate *c = new Calibrate; | ||
313 | c->show(); | ||
314 | return c; | ||
315 | #else | ||
316 | return 0; | ||
317 | #endif | ||
318 | } | ||
319 | |||
320 | void TaskBar::toggleNumLockState() | 305 | void TaskBar::toggleNumLockState() |
321 | { | 306 | { |
322 | if ( lockState ) lockState->toggleNumLockState(); | 307 | if ( lockState ) lockState->toggleNumLockState(); |
323 | } | 308 | } |
324 | 309 | ||
325 | void TaskBar::toggleCapsLockState() | 310 | void TaskBar::toggleCapsLockState() |
326 | { | 311 | { |
327 | if ( lockState ) lockState->toggleCapsLockState(); | 312 | if ( lockState ) lockState->toggleCapsLockState(); |
328 | } | 313 | } |
329 | 314 | ||
330 | void TaskBar::toggleSymbolInput() | 315 | void TaskBar::toggleSymbolInput() |
331 | { | 316 | { |
332 | if ( inputMethods->currentShown() == "Unicode" ) { | 317 | if ( inputMethods->currentShown() == "Unicode" ) { |
333 | inputMethods->hideInputMethod(); | 318 | inputMethods->hideInputMethod(); |
334 | } else { | 319 | } else { |
335 | inputMethods->showInputMethod("Unicode"); | 320 | inputMethods->showInputMethod("Unicode"); |
diff --git a/core/launcher/taskbar.h b/core/launcher/taskbar.h index a0bf395..575a8c9 100644 --- a/core/launcher/taskbar.h +++ b/core/launcher/taskbar.h | |||
@@ -29,34 +29,32 @@ class InputMethods; | |||
29 | class Wait; | 29 | class Wait; |
30 | class SysTray; | 30 | class SysTray; |
31 | //class MRUList; | 31 | //class MRUList; |
32 | class RunningAppBar; | 32 | class RunningAppBar; |
33 | class QWidgetStack; | 33 | class QWidgetStack; |
34 | class QTimer; | 34 | class QTimer; |
35 | class QLabel; | 35 | class QLabel; |
36 | class StartMenu; | 36 | class StartMenu; |
37 | class LockKeyState; | 37 | class LockKeyState; |
38 | 38 | ||
39 | class TaskBar : public QHBox { | 39 | class TaskBar : public QHBox { |
40 | Q_OBJECT | 40 | Q_OBJECT |
41 | public: | 41 | public: |
42 | TaskBar(); | 42 | TaskBar(); |
43 | ~TaskBar(); | 43 | ~TaskBar(); |
44 | 44 | ||
45 | static QWidget *calibrate( bool ); | ||
46 | |||
47 | bool recoverMemory(); | 45 | bool recoverMemory(); |
48 | 46 | ||
49 | StartMenu *startMenu() const { return sm; } | 47 | StartMenu *startMenu() const { return sm; } |
50 | public slots: | 48 | public slots: |
51 | void startWait(); | 49 | void startWait(); |
52 | void stopWait(const QString&); | 50 | void stopWait(const QString&); |
53 | void stopWait(); | 51 | void stopWait(); |
54 | void clearStatusBar(); | 52 | void clearStatusBar(); |
55 | void toggleNumLockState(); | 53 | void toggleNumLockState(); |
56 | void toggleCapsLockState(); | 54 | void toggleCapsLockState(); |
57 | void toggleSymbolInput(); | 55 | void toggleSymbolInput(); |
58 | 56 | ||
59 | protected: | 57 | protected: |
60 | void resizeEvent( QResizeEvent * ); | 58 | void resizeEvent( QResizeEvent * ); |
61 | void styleChange( QStyle & ); | 59 | void styleChange( QStyle & ); |
62 | void setStatusMessage( const QString &text ); | 60 | void setStatusMessage( const QString &text ); |