3 files changed, 62 insertions, 44 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 49b41d6..1e5eb46 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -36,142 +36,158 @@
 #include <qimage.h>
 #include <qwindowsystem_qws.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/alarmserver.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <unistd.h>
 
 #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
 #include "../calibrate/calibrate.h"
 #endif
 
 using namespace Opie;
 
-void initEnvironment()
+void initEnvironment( )
 {
-  Config config("locale");
-  config.setGroup( "Location" );
-  QString tz = config.readEntry( "Timezone", getenv("TZ") );
+    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";
+    // if not timezone set, pick New York
+    if (tz.isNull())
+        tz = "America/New_York";
 
-  setenv( "TZ", tz, 1 );
-  config.writeEntry( "Timezone", tz);
+    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 );
 
-  config.setGroup( "Language" );
-  QString lang = config.readEntry( "Language", getenv("LANG") );
-  if ( !lang.isNull() )
-    setenv( "LANG", lang, 1 );
 }
 
 
 int initApplication( int argc, char ** argv )
 {
-    initEnvironment();
+    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 );
 
-        ODevice::inst ( )-> setSoftSuspend ( true );
+    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 );
 
-        { // init backlight
-            QCopEnvelope e("QPE/System", "setBacklight(int)" );
-            e << -3; // Forced on
-        }
+    { // 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;
+    // 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 ( );                                     
-                }
-        }
+    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;
 
-        ODevice::inst ( )-> setSoftSuspend ( false );
+    odev-> setSoftSuspend ( false );
 
     return rv;
 }
 
 static const char *pidfile_path = "/var/run/opie.pid";
 
 void create_pidfile ( )
 {
-        FILE *f;
+    FILE *f;
 
-        if (( f = ::fopen ( pidfile_path, "w" ))) {
-                ::fprintf ( f, "%d", getpid ( ));
-                ::fclose ( f );
-        }
+    if (( f = ::fopen ( pidfile_path, "w" ))) {
+        ::fprintf ( f, "%d", getpid ( ));
+        ::fclose ( f );
+    }
 }
 
 void remove_pidfile ( )
 {
-        ::unlink ( pidfile_path );
+    ::unlink ( pidfile_path );
 }
 
 void handle_sigterm ( int /* sig */ )
 {
-        if ( qApp )
-                qApp-> quit ( );
+    if ( qApp )
+        qApp-> quit ( );
 }
 
 int main( int argc, char ** argv )
 {
     ::signal ( SIGCHLD, SIG_IGN );
 
-        ::signal ( SIGTERM, handle_sigterm );
-        ::signal ( SIGINT, handle_sigterm );
+    ::signal ( SIGTERM, handle_sigterm );
+    ::signal ( SIGINT, handle_sigterm );
 
-        ::setsid ( );
-        ::setpgid ( 0, 0 );
+    ::setsid ( );
+    ::setpgid ( 0, 0 );
 
-        ::atexit ( remove_pidfile );
-        create_pidfile ( );
+    ::atexit ( remove_pidfile );
+    create_pidfile ( );
 
     int retVal = initApplication ( argc, argv );
 
     // Kill them. Kill them all.
     ::kill ( 0, SIGTERM );
     ::sleep ( 1 );
     ::kill ( 0, SIGKILL );
 
     return retVal;
 }
 
diff --git a/mkipks b/mkipks
index ffa4ef5..d4e4b38 100755
--- a/mkipks
+++ b/mkipks
@@ -1,19 +1,20 @@
 #!/bin/sh
 
 [ -z "$QTE_VERSION" ] && QTE_VERSION=2.3.4
+[ -z "$QTE_BASEVERSION" ] && QTE_BASEVERSION=2.3.4
 [ -z "$QTE_REVISION" ] && QTE_REVISION=3
 DEB_VERSION=2.0
 
 # Have to do this here, since CVS can't store symlinks
 
 mkdir -p $OPIEDIR/etc/rcS.d
 ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash
 
 VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
 VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
 VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
 SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h)
 if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
 then
     [ -z "$VERSION_CVS" ] && VERSION_CVS="$(date +%Y%m%d)"
     SUB_VERSION=$VERSION_CVS
diff --git a/packages b/packages
index b05f90a..fc26ef8 100644
--- a/packages
+++ b/packages
@@ -1,26 +1,27 @@
         CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
         CONFIG_BINARY   noncore/tools/calc2/binarybinary.pro
         CONFIG_CALC2    noncore/tools/calc2calc2.pro
         CONFIG_CALIBRATE        core/apps/calibratecalibrate.pro
         CONFIG_CHESS    noncore/games/chesschess.pro
         CONFIG_CONVERTER        noncore/unsupported/opiemail/converterconverter.pro
         CONFIG_DIALUP   noncore/unsupported/netsetup/dialupdialup.pro
         CONFIG_DICTIONARY       noncore/apps/dictionarydictionary.pro
         CONFIG_GSMTOOL  noncore/comm/gsmtoolgsmtool.pro
         CONFIG_KEYVIEW  development/keyviewkeyview.pro
+        CONFIG_ROTTEST  development/rottestrottest.pro
         CONFIG_LAN      noncore/unsupported/netsetup/lanlan.pro
         CONFIG_LIB      noncore/unsupported/opiemail/liblib.pro
         CONFIG_LIBFFMPEG        core/multimedia/opieplayer/libffmpeglibffmpeg.pro
         CONFIG_LIBFLASH         core/multimedia/opieplayer/libflashlibflash.pro
         CONFIG_LIBOPIE_PIM      libopie/pimpim.pro
         CONFIG_LIBSQL   libsqllibsql.pro
         CONFIG_MOBILEMSG        noncore/comm/mobilemsgmobilemsg.pro
         CONFIG_NETMONAPPLET     noncore/unsupported/netmonappletnetmonapplet.pro
         CONFIG_NETSETUP         noncore/unsupported/netsetupnetsetup.pro
         CONFIG_OFILESELECTOR    libopie/ofileselectorofileselector.pro
         CONFIG_OPIE-WRITE       noncore/apps/opie-writeopie-write.pro
         CONFIG_OPIEMAIL         noncore/unsupported/opiemailopiemail.pro
         CONFIG_POP3     noncore/unsupported/opiemail/ifaces/pop3pop3.pro
         CONFIG_QUICKEXEC        quickexecquickexec.pro
         CONFIG_RESTARTAPPLET    core/applets/restartappletrestartapplet.pro
         CONFIG_RESTARTAPPLET2   core/applets/restartapplet2restartapplet2.pro