author | zecke <zecke> | 2003-08-28 14:42:16 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-08-28 14:42:16 (UTC) |
commit | 2765a1008ca0ea05af1762616a827d1f3c35431e (patch) (unidiff) | |
tree | 385268125d4f12dc2f0bc3cb1f02216d29cffbb6 | |
parent | fcc9c16cbd679ebc459ff0ec6228bbdedbfdfe1d (diff) | |
download | opie-2765a1008ca0ea05af1762616a827d1f3c35431e.zip opie-2765a1008ca0ea05af1762616a827d1f3c35431e.tar.gz opie-2765a1008ca0ea05af1762616a827d1f3c35431e.tar.bz2 |
Opiefy and include Opie changes
-rw-r--r-- | core/launcher/server.cpp | 141 | ||||
-rw-r--r-- | core/launcher/server.h | 13 |
2 files changed, 115 insertions, 39 deletions
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp index 08baa8e..450d8e5 100644 --- a/core/launcher/server.cpp +++ b/core/launcher/server.cpp | |||
@@ -34,3 +34,5 @@ | |||
34 | #include "applauncher.h" | 34 | #include "applauncher.h" |
35 | #if 0 | ||
35 | #include "suspendmonitor.h" | 36 | #include "suspendmonitor.h" |
37 | #endif | ||
36 | #include "documentlist.h" | 38 | #include "documentlist.h" |
@@ -38,8 +40,5 @@ | |||
38 | #include <qtopia/applnk.h> | 40 | #include <qtopia/applnk.h> |
39 | #include <qtopia/categories.h> | 41 | #include <qtopia/private/categories.h> |
40 | #include <qtopia/mimetype.h> | 42 | #include <qtopia/mimetype.h> |
41 | #include <qtopia/config.h> | 43 | #include <qtopia/config.h> |
42 | #include <qtopia/services.h> | ||
43 | #include <qtopia/devicebuttonmanager.h> | ||
44 | #include <qtopia/pluginloader.h> | ||
45 | #include <qtopia/resource.h> | 44 | #include <qtopia/resource.h> |
@@ -48,3 +47,2 @@ | |||
48 | 47 | ||
49 | #ifdef Q_WS_QWS | ||
50 | #include <qtopia/qcopenvelope_qws.h> | 48 | #include <qtopia/qcopenvelope_qws.h> |
@@ -52,3 +50,2 @@ | |||
52 | #include <qgfx_qws.h> | 50 | #include <qgfx_qws.h> |
53 | #endif | ||
54 | #include <qtopia/global.h> | 51 | #include <qtopia/global.h> |
@@ -56,8 +53,6 @@ | |||
56 | 53 | ||
57 | #ifdef Q_OS_WIN32 | 54 | #include <opie/odevicebutton.h> |
58 | #include <io.h> | 55 | #include <opie/odevice.h> |
59 | #include <process.h> | 56 | |
60 | #else | ||
61 | #include <unistd.h> | 57 | #include <unistd.h> |
62 | #endif | ||
63 | #include <qmainwindow.h> | 58 | #include <qmainwindow.h> |
@@ -71,2 +66,4 @@ extern QRect qt_maxWindowRect; | |||
71 | 66 | ||
67 | using namespace Opie; | ||
68 | |||
72 | static QWidget *calibrate(bool) | 69 | static QWidget *calibrate(bool) |
@@ -111,2 +108,3 @@ static Global::Command builtins[] = { | |||
111 | 108 | ||
109 | /* FIXME defines need to be defined*/ | ||
112 | #if defined(QPE_NEED_CALIBRATION) | 110 | #if defined(QPE_NEED_CALIBRATION) |
@@ -138,7 +136,10 @@ Server::Server() : | |||
138 | tid_xfer = 0; | 136 | tid_xfer = 0; |
139 | tid_today = startTimer(3600*2*1000); | 137 | /* ### FIXME ### */ |
138 | /* tid_today = startTimer(3600*2*1000);*/ | ||
140 | last_today_show = QDate::currentDate(); | 139 | last_today_show = QDate::currentDate(); |
141 | 140 | ||
142 | tsmMonitor = new TempScreenSaverMonitor(); | 141 | #if 0 |
142 | tsmMonitor = new TempScreenSaverMode(); | ||
143 | connect( tsmMonitor, SIGNAL(forceSuspend()), qApp, SIGNAL(power()) ); | 143 | connect( tsmMonitor, SIGNAL(forceSuspend()), qApp, SIGNAL(power()) ); |
144 | #endif | ||
144 | 145 | ||
@@ -161,3 +162,4 @@ Server::Server() : | |||
161 | packageHandler = new PackageHandler( this ); | 162 | packageHandler = new PackageHandler( this ); |
162 | connect(qApp, SIGNAL(activate(const DeviceButton*,bool)),this,SLOT(activate(const DeviceButton*,bool))); | 163 | connect(qApp, SIGNAL(activate(const Opie::ODeviceButton*,bool)), |
164 | this,SLOT(activate(const Opie::ODeviceButton*,bool))); | ||
163 | 165 | ||
@@ -192,3 +194,5 @@ Server::~Server() | |||
192 | delete serverGui; | 194 | delete serverGui; |
195 | #if 0 | ||
193 | delete tsmMonitor; | 196 | delete tsmMonitor; |
197 | #endif | ||
194 | } | 198 | } |
@@ -220,13 +224,19 @@ static bool hasVisibleWindow(const QString& clientname, bool partial) | |||
220 | 224 | ||
221 | void Server::activate(const DeviceButton* button, bool held) | 225 | void Server::activate(const Opie::ODeviceButton* button, bool held) |
222 | { | 226 | { |
223 | Global::terminateBuiltin("calibrate"); // No tr | 227 | Global::terminateBuiltin("calibrate"); // No tr |
224 | ServiceRequest sr; | 228 | Opie::OQCopMessage om; |
225 | if ( held ) { | 229 | if ( held ) { |
226 | sr = button->heldAction(); | 230 | om = button->heldAction(); |
227 | } else { | 231 | } else { |
228 | sr = button->pressedAction(); | 232 | om = button->pressedAction(); |
229 | } | 233 | } |
234 | |||
235 | if ( om.channel() != "ignore" ) | ||
236 | om.send(); | ||
237 | |||
230 | // A button with no action defined, will return a null ServiceRequest. Don't attempt | 238 | // A button with no action defined, will return a null ServiceRequest. Don't attempt |
231 | // to send/do anything with this as it will crash | 239 | // to send/do anything with this as it will crash |
240 | /* ### FIXME */ | ||
241 | #if 0 | ||
232 | if ( !sr.isNull() ) { | 242 | if ( !sr.isNull() ) { |
@@ -243,2 +253,3 @@ void Server::activate(const DeviceButton* button, bool held) | |||
243 | } | 253 | } |
254 | #endif | ||
244 | } | 255 | } |
@@ -309,3 +320,6 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
309 | qcopBridge->authorizeConnections(); | 320 | qcopBridge->authorizeConnections(); |
310 | } else if ( msg == "setTempScreenSaverMode(int,int)" ) { | 321 | } |
322 | /* ### FIXME support TempScreenSaverMode */ | ||
323 | #if 0 | ||
324 | else if ( msg == "setTempScreenSaverMode(int,int)" ) { | ||
311 | int mode, pid; | 325 | int mode, pid; |
@@ -313,3 +327,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
313 | tsmMonitor->setTempMode(mode, pid); | 327 | tsmMonitor->setTempMode(mode, pid); |
314 | } else if ( msg == "linkChanged(QString)" ) { | 328 | } |
329 | #endif | ||
330 | else if ( msg == "linkChanged(QString)" ) { | ||
315 | QString link; | 331 | QString link; |
@@ -362,6 +378,13 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
362 | 378 | ||
363 | } else if ( msg == "sendVersionInfo()" ) { | 379 | } |
380 | /* | ||
381 | * QtopiaDesktop relies on the major number | ||
382 | * to start with 1. We're at 0.9 | ||
383 | * so wee need to fake at least 1.4 to be able | ||
384 | * to sync with QtopiaDesktop1.6 | ||
385 | */ | ||
386 | else if ( msg == "sendVersionInfo()" ) { | ||
364 | QCopEnvelope e( "QPE/Desktop", "versionInfo(QString,QString)" ); | 387 | QCopEnvelope e( "QPE/Desktop", "versionInfo(QString,QString)" ); |
365 | QString v = QPE_VERSION; | 388 | /* ### FIXME Architecture ### */ |
366 | e << Global::version() << Global::architecture(); | 389 | e << QString::fromLatin1("1.7") << "Uncustomized Device"; |
367 | } else if ( msg == "sendCardInfo()" ) { | 390 | } else if ( msg == "sendCardInfo()" ) { |
@@ -457,2 +480,45 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
457 | cfg.writeEntry( "Layout", kb ); | 480 | cfg.writeEntry( "Layout", kb ); |
481 | } else if ( msg == "autoStart(QString)" ) { | ||
482 | QString appName; | ||
483 | stream >> appName; | ||
484 | Config cfg( "autostart" ); | ||
485 | cfg.setGroup( "AutoStart" ); | ||
486 | if ( appName.compare("clear") == 0){ | ||
487 | cfg.writeEntry("Apps", ""); | ||
488 | } | ||
489 | } else if ( msg == "autoStart(QString,QString)" ) { | ||
490 | QString modifier, appName; | ||
491 | stream >> modifier >> appName; | ||
492 | Config cfg( "autostart" ); | ||
493 | cfg.setGroup( "AutoStart" ); | ||
494 | if ( modifier.compare("add") == 0 ){ | ||
495 | // only add if appname is entered | ||
496 | if (!appName.isEmpty()) { | ||
497 | cfg.writeEntry("Apps", appName); | ||
498 | } | ||
499 | } else if (modifier.compare("remove") == 0 ) { | ||
500 | // need to change for multiple entries | ||
501 | // actually remove is right now simular to clear, but in future there | ||
502 | // should be multiple apps in autostart possible. | ||
503 | QString checkName; | ||
504 | checkName = cfg.readEntry("Apps", ""); | ||
505 | if (checkName == appName) { | ||
506 | cfg.writeEntry("Apps", ""); | ||
507 | } | ||
508 | } | ||
509 | // case the autostart feature should be delayed | ||
510 | } else if ( msg == "autoStart(QString,QString,QString)") { | ||
511 | QString modifier, appName, delay; | ||
512 | stream >> modifier >> appName >> delay; | ||
513 | Config cfg( "autostart" ); | ||
514 | |||
515 | cfg.setGroup( "AutoStart" ); | ||
516 | if ( modifier.compare("add") == 0 ){ | ||
517 | // only add it appname is entered | ||
518 | if (!appName.isEmpty()) { | ||
519 | cfg.writeEntry("Apps", appName); | ||
520 | cfg.writeEntry("Delay", delay); | ||
521 | } | ||
522 | } else { | ||
523 | } | ||
458 | } | 524 | } |
@@ -468,5 +534,4 @@ void Server::receiveTaskBar(const QCString &msg, const QByteArray &data) | |||
468 | } else if ( msg == "soundAlarm()" ) { | 534 | } else if ( msg == "soundAlarm()" ) { |
469 | soundAlarm(); | 535 | ServerApplication::soundAlarm(); |
470 | } | 536 | } |
471 | #ifdef CUSTOM_LEDS | ||
472 | else if ( msg == "setLed(int,bool)" ) { | 537 | else if ( msg == "setLed(int,bool)" ) { |
@@ -474,5 +539,11 @@ void Server::receiveTaskBar(const QCString &msg, const QByteArray &data) | |||
474 | stream >> led >> status; | 539 | stream >> led >> status; |
475 | CUSTOM_LEDS( led, status ); | 540 | |
541 | QValueList <OLed> ll = ODevice::inst ( )-> ledList ( ); | ||
542 | if ( ll. count ( )){ | ||
543 | OLed l = ll. contains ( Led_Mail ) ? Led_Mail : ll [0]; | ||
544 | bool canblink = ODevice::inst ( )-> ledStateList ( l ). contains ( Led_BlinkSlow ); | ||
545 | |||
546 | ODevice::inst ( )-> setLedState ( l, status ? ( canblink ? Led_BlinkSlow : Led_On ) : Led_Off ); | ||
547 | } | ||
476 | } | 548 | } |
477 | #endif | ||
478 | } | 549 | } |
@@ -572,3 +643,6 @@ void Server::timerEvent( QTimerEvent *e ) | |||
572 | startTransferServer(); | 643 | startTransferServer(); |
573 | } else if ( e->timerId() == tid_today ) { | 644 | } |
645 | /* ### FIXME today startin */ | ||
646 | #if 0 | ||
647 | else if ( e->timerId() == tid_today ) { | ||
574 | QDate today = QDate::currentDate(); | 648 | QDate today = QDate::currentDate(); |
@@ -586,2 +660,3 @@ void Server::timerEvent( QTimerEvent *e ) | |||
586 | } | 660 | } |
661 | #endif | ||
587 | } | 662 | } |
@@ -605,2 +680,3 @@ void Server::pokeTimeMonitors() | |||
605 | { | 680 | { |
681 | #if 0 | ||
606 | // inform all TimeMonitors | 682 | // inform all TimeMonitors |
@@ -612,2 +688,3 @@ void Server::pokeTimeMonitors() | |||
612 | } | 688 | } |
689 | #endif | ||
613 | } | 690 | } |
@@ -622,3 +699,5 @@ void Server::applicationTerminated(int pid, const QString &app) | |||
622 | serverGui->applicationStateChanged( app, ServerInterface::Terminated ); | 699 | serverGui->applicationStateChanged( app, ServerInterface::Terminated ); |
700 | #if 0 | ||
623 | tsmMonitor->applicationTerminated( pid ); | 701 | tsmMonitor->applicationTerminated( pid ); |
702 | #endif | ||
624 | } | 703 | } |
@@ -638,8 +717,2 @@ void Server::storageChanged() | |||
638 | 717 | ||
639 | void Server::soundAlarm() | ||
640 | { | ||
641 | #ifdef CUSTOM_SOUND_ALARM | ||
642 | CUSTOM_SOUND_ALARM; | ||
643 | #endif | ||
644 | } | ||
645 | 718 | ||
diff --git a/core/launcher/server.h b/core/launcher/server.h index 21b03af..91bf883 100644 --- a/core/launcher/server.h +++ b/core/launcher/server.h | |||
@@ -31,3 +31,2 @@ class TransferServer; | |||
31 | class PackageHandler; | 31 | class PackageHandler; |
32 | class DeviceButton; | ||
33 | class ServiceRequest; | 32 | class ServiceRequest; |
@@ -40,2 +39,5 @@ class DocumentList; | |||
40 | class ServerInterface; | 39 | class ServerInterface; |
40 | namespace Opie { | ||
41 | class ODeviceButton; | ||
42 | } | ||
41 | 43 | ||
@@ -51,3 +53,2 @@ public: | |||
51 | 53 | ||
52 | static void soundAlarm(); | ||
53 | static bool setKeyboardLayout( const QString &kb ); | 54 | static bool setKeyboardLayout( const QString &kb ); |
@@ -61,3 +62,3 @@ public slots: | |||
61 | private slots: | 62 | private slots: |
62 | void activate(const DeviceButton*,bool); | 63 | void activate(const Opie::ODeviceButton*,bool); |
63 | void syncConnectionClosed( const QHostAddress & ); | 64 | void syncConnectionClosed( const QHostAddress & ); |
@@ -74,2 +75,3 @@ protected: | |||
74 | private: | 75 | private: |
76 | void layout(); | ||
75 | void startTransferServer(); | 77 | void startTransferServer(); |
@@ -82,4 +84,5 @@ private: | |||
82 | int tid_xfer; | 84 | int tid_xfer; |
83 | int tid_today; | 85 | /* ### FIXME two below### */ |
84 | TempScreenSaverMonitor *tsmMonitor; | 86 | // int tid_today; |
87 | // TempScreenSaverMonitor *tsmMonitor; | ||
85 | StorageInfo *storage; | 88 | StorageInfo *storage; |