-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 |
7 files changed, 32 insertions, 20 deletions
diff --git a/core/apps/calibrate/opie-calibrate.control b/core/apps/calibrate/opie-calibrate.control deleted file mode 100644 index 6eafb94..0000000 --- a/core/apps/calibrate/opie-calibrate.control +++ b/dev/null | |||
@@ -1,8 +0,0 @@ | |||
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 ef0bf4c..6def126 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -93,16 +93,17 @@ private: | |||
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" ); | ||
101 | Password::authenticate( at_poweron ); | 102 | Password::authenticate( at_poweron ); |
102 | loggedin = 1; | 103 | loggedin = 1; |
103 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); | 104 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); |
104 | } | 105 | } |
105 | } | 106 | } |
106 | 107 | ||
107 | bool Desktop::screenLocked() | 108 | bool Desktop::screenLocked() |
108 | { | 109 | { |
@@ -616,16 +617,17 @@ static bool hasVisibleWindow( const QString& clientname ) | |||
616 | } | 617 | } |
617 | 618 | ||
618 | 619 | ||
619 | void Desktop::executeOrModify( const QString& appLnkFile ) | 620 | void Desktop::executeOrModify( const QString& appLnkFile ) |
620 | { | 621 | { |
621 | AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile ); | 622 | AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile ); |
622 | if ( lnk.isValid() ) { | 623 | if ( lnk.isValid() ) { |
623 | QCString app = lnk.exec().utf8(); | 624 | QCString app = lnk.exec().utf8(); |
625 | Global::terminateBuiltin( "calibrate" ); | ||
624 | if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) { | 626 | if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) { |
625 | // MRUList::addTask( &lnk ); | 627 | // MRUList::addTask( &lnk ); |
626 | if ( hasVisibleWindow( app ) ) | 628 | if ( hasVisibleWindow( app ) ) |
627 | QCopChannel::send( "QPE/Application/" + app, "nextView()" ); | 629 | QCopChannel::send( "QPE/Application/" + app, "nextView()" ); |
628 | else | 630 | else |
629 | QCopChannel::send( "QPE/Application/" + app, "raise()" ); | 631 | QCopChannel::send( "QPE/Application/" + app, "raise()" ); |
630 | } | 632 | } |
631 | else { | 633 | else { |
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro index ba01954..f5597c5 100644 --- a/core/launcher/launcher.pro +++ b/core/launcher/launcher.pro | |||
@@ -12,16 +12,17 @@ HEADERS = background.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 \ | ||
20 | startmenu.h \ | 21 | startmenu.h \ |
21 | transferserver.h \ | 22 | transferserver.h \ |
22 | qcopbridge.h \ | 23 | qcopbridge.h \ |
23 | packageslave.h \ | 24 | packageslave.h \ |
24 | irserver.h \ | 25 | irserver.h \ |
25 | ../../rsync/buf.h \ | 26 | ../../rsync/buf.h \ |
26 | ../../rsync/checksum.h \ | 27 | ../../rsync/checksum.h \ |
27 | ../../rsync/command.h \ | 28 | ../../rsync/command.h \ |
@@ -52,16 +53,17 @@ SOURCES = background.cpp \ | |||
52 | runningappbar.cpp \ | 53 | runningappbar.cpp \ |
53 | stabmon.cpp \ | 54 | stabmon.cpp \ |
54 | inputmethods.cpp \ | 55 | inputmethods.cpp \ |
55 | systray.cpp \ | 56 | systray.cpp \ |
56 | wait.cpp \ | 57 | wait.cpp \ |
57 | shutdownimpl.cpp \ | 58 | shutdownimpl.cpp \ |
58 | launcher.cpp \ | 59 | launcher.cpp \ |
59 | launcherview.cpp \ | 60 | launcherview.cpp \ |
61 | ../../core/apps/calibrate/calibrate.cpp \ | ||
60 | transferserver.cpp \ | 62 | transferserver.cpp \ |
61 | packageslave.cpp \ | 63 | packageslave.cpp \ |
62 | irserver.cpp \ | 64 | irserver.cpp \ |
63 | qcopbridge.cpp \ | 65 | qcopbridge.cpp \ |
64 | startmenu.cpp \ | 66 | startmenu.cpp \ |
65 | main.cpp \ | 67 | main.cpp \ |
66 | ../../rsync/base64.c \ | 68 | ../../rsync/base64.c \ |
67 | ../../rsync/buf.c \ | 69 | ../../rsync/buf.c \ |
@@ -87,16 +89,18 @@ SOURCES = background.cpp \ | |||
87 | ../../rsync/tube.c \ | 89 | ../../rsync/tube.c \ |
88 | ../../rsync/util.c \ | 90 | ../../rsync/util.c \ |
89 | ../../rsync/version.c \ | 91 | ../../rsync/version.c \ |
90 | ../../rsync/whole.c \ | 92 | ../../rsync/whole.c \ |
91 | ../../rsync/qrsync.cpp | 93 | ../../rsync/qrsync.cpp |
92 | INTERFACES= syncdialog.ui | 94 | INTERFACES= syncdialog.ui |
93 | INCLUDEPATH += ../../include | 95 | INCLUDEPATH += ../../include |
94 | DEPENDPATH+= ../../include . | 96 | DEPENDPATH+= ../../include . |
97 | INCLUDEPATH += ../../core/apps/calibrate | ||
98 | DEPENDPATH+= ../../core/apps/calibrate | ||
95 | INCLUDEPATH += ../../rsync | 99 | INCLUDEPATH += ../../rsync |
96 | DEPENDPATH+= ../../rsync | 100 | DEPENDPATH+= ../../rsync |
97 | TARGET = qpe | 101 | TARGET = qpe |
98 | LIBS += -lqpe -lcrypt -lopie | 102 | LIBS += -lqpe -lcrypt -lopie |
99 | 103 | ||
100 | TRANSLATIONS = ../../i18n/de/qpe.ts \ | 104 | TRANSLATIONS = ../../i18n/de/qpe.ts \ |
101 | ../../i18n/nl/qpe.ts \ | 105 | ../../i18n/nl/qpe.ts \ |
102 | ../../i18n/xx/qpe.ts \ | 106 | ../../i18n/xx/qpe.ts \ |
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index e96eeae..20a1ecd 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -25,31 +25,32 @@ | |||
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> | ||
34 | 33 | ||
35 | #include <qmessagebox.h> | 34 | #include <qmessagebox.h> |
36 | #include <qfile.h> | 35 | #include <qfile.h> |
37 | #include <qimage.h> | 36 | #include <qimage.h> |
38 | #include <qwindowsystem_qws.h> | 37 | #include <qwindowsystem_qws.h> |
39 | #include <qwsmouse_qws.h> | 38 | #include <qwsmouse_qws.h> |
40 | #include <qpe/qcopenvelope_qws.h> | 39 | #include <qpe/qcopenvelope_qws.h> |
41 | #include <qpe/alarmserver.h> | 40 | #include <qpe/alarmserver.h> |
42 | 41 | ||
43 | #include <stdlib.h> | 42 | #include <stdlib.h> |
44 | #include <stdio.h> | 43 | #include <stdio.h> |
45 | #include <signal.h> | 44 | #include <signal.h> |
46 | #include <unistd.h> | 45 | #include <unistd.h> |
47 | 46 | ||
47 | #include "../calibrate/calibrate.h" | ||
48 | |||
48 | using namespace Opie; | 49 | using namespace Opie; |
49 | 50 | ||
50 | void initEnvironment() | 51 | void initEnvironment() |
51 | { | 52 | { |
52 | int rot; | 53 | int rot; |
53 | Config config("locale"); | 54 | Config config("locale"); |
54 | 55 | ||
55 | config.setGroup( "Location" ); | 56 | config.setGroup( "Location" ); |
@@ -112,24 +113,20 @@ int initApplication( int argc, char ** argv ) | |||
112 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); | 113 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); |
113 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); | 114 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); |
114 | 115 | ||
115 | (void)new SysFileMonitor(d); | 116 | (void)new SysFileMonitor(d); |
116 | Network::createServer(d); | 117 | Network::createServer(d); |
117 | 118 | ||
118 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 119 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
119 | if ( !QFile::exists( "/etc/pointercal" ) ) { | 120 | if ( !QFile::exists( "/etc/pointercal" ) ) { |
120 | OProcess cal; | 121 | // Make sure calibration widget starts on top. |
121 | cal << "calibrate"; | 122 | Calibrate *cal = new Calibrate; |
122 | 123 | cal->exec(); | |
123 | if ( ! cal.start(OProcess::Block, OProcess::NoCommunication) ) { | 124 | delete cal; |
124 | QMessageBox::warning( 0, "Unable to calibrate", | ||
125 | "Failed to start the calibration tool.\n" | ||
126 | ); | ||
127 | } | ||
128 | } | 125 | } |
129 | } | 126 | } |
130 | 127 | ||
131 | d->show(); | 128 | d->show(); |
132 | 129 | ||
133 | if ( QDate::currentDate ( ). year ( ) < 2000 ) { | 130 | if ( QDate::currentDate ( ). year ( ) < 2000 ) { |
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 ) { | 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 ) { |
135 | QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" ); | 132 | QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" ); |
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control index db66a05..c0430b7 100644 --- a/core/launcher/opie-taskbar.control +++ b/core/launcher/opie-taskbar.control | |||
@@ -1,9 +1,9 @@ | |||
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 | 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 |
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, opie-calibrate | 7 | Depends: opie-base |
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 8158128..8af568d 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp | |||
@@ -17,16 +17,17 @@ | |||
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" | ||
25 | #include "wait.h" | 26 | #include "wait.h" |
26 | #include "appicons.h" | 27 | #include "appicons.h" |
27 | 28 | ||
28 | #include "taskbar.h" | 29 | #include "taskbar.h" |
29 | #include "desktop.h" | 30 | #include "desktop.h" |
30 | 31 | ||
31 | #include <qpe/qpeapplication.h> | 32 | #include <qpe/qpeapplication.h> |
32 | #include <qpe/qcopenvelope_qws.h> | 33 | #include <qpe/qcopenvelope_qws.h> |
@@ -76,22 +77,25 @@ using namespace Opie; | |||
76 | static Global::Command builtins[] = { | 77 | static Global::Command builtins[] = { |
77 | 78 | ||
78 | #ifdef SINGLE_APP | 79 | #ifdef SINGLE_APP |
79 | #define APP(a,b,c,d) { a, new##b, c }, | 80 | #define APP(a,b,c,d) { a, new##b, c }, |
80 | #include "../launcher/apps.h" | 81 | #include "../launcher/apps.h" |
81 | #undef APP | 82 | #undef APP |
82 | #endif | 83 | #endif |
83 | 84 | ||
85 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) | ||
86 | { "calibrate", TaskBar::calibrate, 1, 0 }, | ||
87 | #endif | ||
84 | #if !defined(QT_QWS_CASSIOPEIA) | 88 | #if !defined(QT_QWS_CASSIOPEIA) |
85 | { "shutdown", Global::shutdown, 1, 0 }, | 89 | { "shutdown", Global::shutdown, 1, 0 }, |
86 | // { "run", run, 1, 0 }, | 90 | // { "run", run, 1, 0 }, |
87 | #endif | 91 | #endif |
88 | 92 | ||
89 | { 0, 0, 0, 0 }, | 93 | { 0, TaskBar::calibrate, 0, 0 }, |
90 | }; | 94 | }; |
91 | 95 | ||
92 | static bool initNumLock() | 96 | static bool initNumLock() |
93 | { | 97 | { |
94 | #ifdef QPE_INITIAL_NUMLOCK_STATE | 98 | #ifdef QPE_INITIAL_NUMLOCK_STATE |
95 | QPE_INITIAL_NUMLOCK_STATE | 99 | QPE_INITIAL_NUMLOCK_STATE |
96 | #endif | 100 | #endif |
97 | return FALSE; | 101 | return FALSE; |
@@ -297,16 +301,27 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data ) | |||
297 | QCopEnvelope e ( "QPE/System", "toggleApplicationMenu()" ); | 301 | QCopEnvelope e ( "QPE/System", "toggleApplicationMenu()" ); |
298 | } | 302 | } |
299 | } | 303 | } |
300 | else if ( msg == "toggleStartMenu()" ) { | 304 | else if ( msg == "toggleStartMenu()" ) { |
301 | sm-> launch ( ); | 305 | sm-> launch ( ); |
302 | } | 306 | } |
303 | } | 307 | } |
304 | 308 | ||
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 | |||
305 | void TaskBar::toggleNumLockState() | 320 | void TaskBar::toggleNumLockState() |
306 | { | 321 | { |
307 | if ( lockState ) lockState->toggleNumLockState(); | 322 | if ( lockState ) lockState->toggleNumLockState(); |
308 | } | 323 | } |
309 | 324 | ||
310 | void TaskBar::toggleCapsLockState() | 325 | void TaskBar::toggleCapsLockState() |
311 | { | 326 | { |
312 | if ( lockState ) lockState->toggleCapsLockState(); | 327 | if ( lockState ) lockState->toggleCapsLockState(); |
diff --git a/core/launcher/taskbar.h b/core/launcher/taskbar.h index 575a8c9..a0bf395 100644 --- a/core/launcher/taskbar.h +++ b/core/launcher/taskbar.h | |||
@@ -37,16 +37,18 @@ 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 | |||
45 | bool recoverMemory(); | 47 | bool recoverMemory(); |
46 | 48 | ||
47 | StartMenu *startMenu() const { return sm; } | 49 | StartMenu *startMenu() const { return sm; } |
48 | public slots: | 50 | public slots: |
49 | void startWait(); | 51 | void startWait(); |
50 | void stopWait(const QString&); | 52 | void stopWait(const QString&); |
51 | void stopWait(); | 53 | void stopWait(); |
52 | void clearStatusBar(); | 54 | void clearStatusBar(); |