author | kergoth <kergoth> | 2003-03-26 23:18:14 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-03-26 23:18:14 (UTC) |
commit | a99096fa8b72704bcec0b76a6ad2107c3db70f13 (patch) (unidiff) | |
tree | c4cd6d45d3aa97cab24d50eb0ac79ecbb16855a8 | |
parent | a57325de7183c21df6b5ff06eff8cf7e3c328ef4 (diff) | |
download | opie-a99096fa8b72704bcec0b76a6ad2107c3db70f13.zip opie-a99096fa8b72704bcec0b76a6ad2107c3db70f13.tar.gz opie-a99096fa8b72704bcec0b76a6ad2107c3db70f13.tar.bz2 |
Add a second call to defaultRotation, to ensrue deforient matches reality, if we loaded the rotation from Config or ODevice.
-rw-r--r-- | core/launcher/main.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 0b38738..fa4df3c 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -42,96 +42,97 @@ | |||
42 | #include <stdlib.h> | 42 | #include <stdlib.h> |
43 | #include <stdio.h> | 43 | #include <stdio.h> |
44 | #include <signal.h> | 44 | #include <signal.h> |
45 | #include <unistd.h> | 45 | #include <unistd.h> |
46 | 46 | ||
47 | #include "../calibrate/calibrate.h" | 47 | #include "../calibrate/calibrate.h" |
48 | 48 | ||
49 | using namespace Opie; | 49 | using namespace Opie; |
50 | 50 | ||
51 | void initEnvironment() | 51 | void initEnvironment() |
52 | { | 52 | { |
53 | int rot; | 53 | int rot; |
54 | Config config("locale"); | 54 | Config config("locale"); |
55 | 55 | ||
56 | config.setGroup( "Location" ); | 56 | config.setGroup( "Location" ); |
57 | QString tz = config.readEntry( "Timezone", getenv("TZ") ); | 57 | QString tz = config.readEntry( "Timezone", getenv("TZ") ); |
58 | 58 | ||
59 | // if not timezone set, pick New York | 59 | // if not timezone set, pick New York |
60 | if (tz.isNull()) | 60 | if (tz.isNull()) |
61 | tz = "America/New_York"; | 61 | tz = "America/New_York"; |
62 | 62 | ||
63 | setenv( "TZ", tz, 1 ); | 63 | setenv( "TZ", tz, 1 ); |
64 | config.writeEntry( "Timezone", tz); | 64 | config.writeEntry( "Timezone", tz); |
65 | 65 | ||
66 | config.setGroup( "Language" ); | 66 | config.setGroup( "Language" ); |
67 | QString lang = config.readEntry( "Language", getenv("LANG") ); | 67 | QString lang = config.readEntry( "Language", getenv("LANG") ); |
68 | if ( !lang.isNull() ) | 68 | if ( !lang.isNull() ) |
69 | setenv( "LANG", lang, 1 ); | 69 | setenv( "LANG", lang, 1 ); |
70 | 70 | ||
71 | #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) | 71 | #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) |
72 | setenv( "QWS_SIZE", "240x320", 0 ); | 72 | setenv( "QWS_SIZE", "240x320", 0 ); |
73 | #endif | 73 | #endif |
74 | 74 | ||
75 | /* | 75 | /* |
76 | * Rotation: | 76 | * Rotation: |
77 | * 1. use env var if set | 77 | * 1. use env var if set |
78 | * 2. use saved default if set | 78 | * 2. use saved default if set |
79 | * 3. use physical orientation (currently fails due to ODevice | 79 | * 3. use physical orientation (currently fails due to ODevice |
80 | * using a QPixmap and therefore requiring a QApplication) | 80 | * using a QPixmap and therefore requiring a QApplication) |
81 | */ | 81 | */ |
82 | if ( ( rot = QPEApplication::defaultRotation ( ) ) == 0 ) { | 82 | if ( ( rot = QPEApplication::defaultRotation ( ) ) == 0 ) { |
83 | Config config("qpe"); | 83 | Config config("qpe"); |
84 | config.setGroup( "Rotation" ); | 84 | config.setGroup( "Rotation" ); |
85 | if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 ) | 85 | if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 ) |
86 | rot = ODevice::inst ( )-> rotation ( ) * 90; | 86 | rot = ODevice::inst ( )-> rotation ( ) * 90; |
87 | } | 87 | } |
88 | 88 | ||
89 | setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1); | 89 | setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1); |
90 | QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */ | ||
90 | } | 91 | } |
91 | 92 | ||
92 | 93 | ||
93 | int initApplication( int argc, char ** argv ) | 94 | int initApplication( int argc, char ** argv ) |
94 | { | 95 | { |
95 | initEnvironment(); | 96 | initEnvironment(); |
96 | 97 | ||
97 | //Don't flicker at startup: | 98 | //Don't flicker at startup: |
98 | QWSServer::setDesktopBackground( QImage() ); | 99 | QWSServer::setDesktopBackground( QImage() ); |
99 | 100 | ||
100 | DesktopApplication a( argc, argv, QApplication::GuiServer ); | 101 | DesktopApplication a( argc, argv, QApplication::GuiServer ); |
101 | 102 | ||
102 | ODevice::inst ( )-> setSoftSuspend ( true ); | 103 | ODevice::inst ( )-> setSoftSuspend ( true ); |
103 | 104 | ||
104 | { // init backlight | 105 | { // init backlight |
105 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); | 106 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); |
106 | e << -3; // Forced on | 107 | e << -3; // Forced on |
107 | } | 108 | } |
108 | 109 | ||
109 | AlarmServer::initialize(); | 110 | AlarmServer::initialize(); |
110 | 111 | ||
111 | Desktop *d = new Desktop(); | 112 | Desktop *d = new Desktop(); |
112 | 113 | ||
113 | QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); | 114 | QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); |
114 | QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); | 115 | QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); |
115 | QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); | 116 | QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); |
116 | QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); | 117 | QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); |
117 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); | 118 | QObject::connect( &a, SIGNAL(capsLockStateToggle()), d, SLOT(toggleCapsLockState()) ); |
118 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); | 119 | QObject::connect( &a, SIGNAL(prepareForRestart()), d, SLOT(terminateServers()) ); |
119 | 120 | ||
120 | (void)new SysFileMonitor(d); | 121 | (void)new SysFileMonitor(d); |
121 | Network::createServer(d); | 122 | Network::createServer(d); |
122 | 123 | ||
123 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 124 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
124 | if ( !QFile::exists( "/etc/pointercal" ) ) { | 125 | if ( !QFile::exists( "/etc/pointercal" ) ) { |
125 | // Make sure calibration widget starts on top. | 126 | // Make sure calibration widget starts on top. |
126 | Calibrate *cal = new Calibrate; | 127 | Calibrate *cal = new Calibrate; |
127 | cal->exec(); | 128 | cal->exec(); |
128 | delete cal; | 129 | delete cal; |
129 | } | 130 | } |
130 | } | 131 | } |
131 | 132 | ||
132 | d->show(); | 133 | d->show(); |
133 | 134 | ||
134 | if ( QDate::currentDate ( ). year ( ) < 2000 ) { | 135 | if ( QDate::currentDate ( ). year ( ) < 2000 ) { |
135 | 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 ) { | 136 | 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 ) { |
136 | QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" ); | 137 | QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" ); |
137 | e << QString ( ); | 138 | e << QString ( ); |