mkipks

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
@@ -50,21 +50,22 @@
 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 );
 }
 
@@ -72,5 +73,7 @@ void initEnvironment()
 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)
@@ -82,10 +85,23 @@ int initApplication( int argc, char ** argv )
     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();
@@ -105,8 +121,8 @@ int initApplication( int argc, char ** argv )
 #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
@@ -114,10 +130,10 @@ int initApplication( int argc, char ** argv )
     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();
@@ -125,5 +141,5 @@ int initApplication( int argc, char ** argv )
     delete d;
 
-	ODevice::inst ( )-> setSoftSuspend ( false );
+    odev-> setSoftSuspend ( false );
 
     return rv;
@@ -134,21 +150,21 @@ 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 ( );
 }
 
@@ -157,12 +173,12 @@ 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 );
diff --git a/mkipks b/mkipks
index ffa4ef5..d4e4b38 100755
--- a/mkipks
+++ b/mkipks
@@ -2,4 +2,5 @@
 
 [ -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
diff --git a/packages b/packages
index b05f90a..fc26ef8 100644
--- a/packages
+++ b/packages
@@ -9,4 +9,5 @@ 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