| -rw-r--r-- | core/launcher/main.cpp | 20 | ||||
| -rw-r--r-- | packages | 1 |
2 files changed, 2 insertions, 19 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 1e5eb46..49b41d6 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -45,123 +45,107 @@ #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) #include "../calibrate/calibrate.h" #endif using namespace Opie; void initEnvironment( ) { Config config("locale"); config.setGroup( "Location" ); QString tz = config.readEntry( "Timezone", getenv("TZ") ); // if not timezone set, pick New York if (tz.isNull()) tz = "America/New_York"; setenv( "TZ", tz, 1 ); config.writeEntry( "Timezone", tz); config.setGroup( "Language" ); QString lang = config.readEntry( "Language", getenv("LANG") ); if ( !lang.isNull() ) setenv( "LANG", lang, 1 ); - } int initApplication( int argc, char ** argv ) { - struct ODevice *odev = ODevice::inst(); - initEnvironment( ); #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_EBX) setenv( "QWS_SIZE", "240x320", 0 ); #endif //Don't flicker at startup: QWSServer::setDesktopBackground( QImage() ); DesktopApplication a( argc, argv, QApplication::GuiServer ); - int rot; - switch ( odev-> rotation( ) ) { - case None: - rot = 0; - case Rot90: - rot = 90; - case Rot180: - rot = 180; - case Rot270: - rot = 270; - } - a.setDefaultRotation( rot ); - - odev-> setSoftSuspend ( true ); + ODevice::inst ( )-> setSoftSuspend ( true ); { // init backlight QCopEnvelope e("QPE/System", "setBacklight(int)" ); e << -3; // Forced on } AlarmServer::initialize(); Desktop *d = new Desktop(); QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); (void)new SysFileMonitor(d); Network::createServer(d); #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) if ( !QFile::exists( "/etc/pointercal" ) ) { // Make sure calibration widget starts on top. Calibrate *cal = new Calibrate; cal->exec(); delete cal; } #endif d->show(); if ( QDate::currentDate ( ). year ( ) < 2000 ) { 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 ) { QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" ); e << QString ( ); } } int rv = a.exec(); delete d; - odev-> setSoftSuspend ( false ); + ODevice::inst ( )-> setSoftSuspend ( false ); return rv; } static const char *pidfile_path = "/var/run/opie.pid"; void create_pidfile ( ) { FILE *f; if (( f = ::fopen ( pidfile_path, "w" ))) { ::fprintf ( f, "%d", getpid ( )); ::fclose ( f ); } } void remove_pidfile ( ) { ::unlink ( pidfile_path ); } void handle_sigterm ( int /* sig */ ) { if ( qApp ) @@ -1,35 +1,34 @@ CONFIG_APPSKEY noncore/settings/appskey appskey.pro CONFIG_BINARY noncore/tools/calc2/binary binary.pro CONFIG_CALC2 noncore/tools/calc2 calc2.pro CONFIG_CALIBRATE core/apps/calibrate calibrate.pro CONFIG_CHESS noncore/games/chess chess.pro CONFIG_CONVERTER noncore/unsupported/opiemail/converter converter.pro CONFIG_DIALUP noncore/unsupported/netsetup/dialup dialup.pro CONFIG_DICTIONARY noncore/apps/dictionary dictionary.pro CONFIG_GSMTOOL noncore/comm/gsmtool gsmtool.pro CONFIG_KEYVIEW development/keyview keyview.pro -CONFIG_ROTTEST development/rottest rottest.pro CONFIG_LAN noncore/unsupported/netsetup/lan lan.pro CONFIG_LIB noncore/unsupported/opiemail/lib lib.pro CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeg libffmpeg.pro CONFIG_LIBFLASH core/multimedia/opieplayer/libflash libflash.pro CONFIG_LIBOPIE_PIM libopie/pim pim.pro CONFIG_LIBSQL libsql libsql.pro CONFIG_MOBILEMSG noncore/comm/mobilemsg mobilemsg.pro CONFIG_NETMONAPPLET noncore/unsupported/netmonapplet netmonapplet.pro CONFIG_NETSETUP noncore/unsupported/netsetup netsetup.pro CONFIG_OFILESELECTOR libopie/ofileselector ofileselector.pro CONFIG_OPIE-WRITE noncore/apps/opie-write opie-write.pro CONFIG_OPIEMAIL noncore/unsupported/opiemail opiemail.pro CONFIG_POP3 noncore/unsupported/opiemail/ifaces/pop3 pop3.pro CONFIG_QUICKEXEC quickexec quickexec.pro CONFIG_RESTARTAPPLET core/applets/restartapplet restartapplet.pro CONFIG_RESTARTAPPLET2 core/applets/restartapplet2 restartapplet2.pro CONFIG_SDMON noncore/unsupported/sdmon sdmon.pro CONFIG_SIMPLE noncore/tools/calc2/simple simple.pro CONFIG_SMTP noncore/unsupported/opiemail/ifaces/smtp smtp.pro CONFIG_SPREADSHEET noncore/unsupported/spreadsheet spreadsheet.pro CONFIG_SYSTEMTIME noncore/unsupported/systemtime systemtime.pro CONFIG_TEST libsql/test test.pro CONFIG_TEST noncore/apps/opie-console/test test.pro CONFIG_UBROWSER noncore/net/ubrowser ubrowser.pro |