author | mickeyl <mickeyl> | 2005-06-26 12:34:25 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-26 12:34:25 (UTC) |
commit | 7eb3ca44b7ff351221b190840270c62c12be6402 (patch) (unidiff) | |
tree | 3323eceba9047d56824021f2a3fe4469f61fbe43 | |
parent | b4d2fa56d4b4608656f6b5cf3ff9375708395e91 (diff) | |
download | opie-7eb3ca44b7ff351221b190840270c62c12be6402.zip opie-7eb3ca44b7ff351221b190840270c62c12be6402.tar.gz opie-7eb3ca44b7ff351221b190840270c62c12be6402.tar.bz2 |
get preffered qte driver name from ODevice instead of hard coding it to
"Transformed". Patch courtesy Manuel Teira.
-rw-r--r-- | core/launcher/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 5bbed59..8ed8710 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -83,25 +83,25 @@ void initEnvironment() | |||
83 | config.writeEntry("Language", lang); | 83 | config.writeEntry("Language", lang); |
84 | config.write(); | 84 | config.write(); |
85 | 85 | ||
86 | // rotation | 86 | // rotation |
87 | int t = ODevice::inst()->rotation(); | 87 | int t = ODevice::inst()->rotation(); |
88 | odebug << "ODevice reports transformation to be " << t << oendl; | 88 | odebug << "ODevice reports transformation to be " << t << oendl; |
89 | 89 | ||
90 | QString env( getenv("QWS_DISPLAY") ); | 90 | QString env( getenv("QWS_DISPLAY") ); |
91 | if ( env.isEmpty() ) | 91 | if ( env.isEmpty() ) |
92 | { | 92 | { |
93 | int rot = ODevice::inst()->rotation() * 90; | 93 | int rot = ODevice::inst()->rotation() * 90; |
94 | QString qws_display = QString("Transformed:Rot%1:0").arg(rot); | 94 | QString qws_display = QString( "%1:Rot%2:0").arg(ODevice::inst()->qteDriver()).arg(rot); |
95 | odebug << "setting QWS_DISPLAY to '" << qws_display << "'" << oendl; | 95 | odebug << "setting QWS_DISPLAY to '" << qws_display << "'" << oendl; |
96 | setenv("QWS_DISPLAY", (const char*) qws_display, 1); | 96 | setenv("QWS_DISPLAY", (const char*) qws_display, 1); |
97 | } | 97 | } |
98 | else | 98 | else |
99 | odebug << "QWS_DISPLAY already set as '" << env << "' - overriding ODevice transformation" << oendl; | 99 | odebug << "QWS_DISPLAY already set as '" << env << "' - overriding ODevice transformation" << oendl; |
100 | 100 | ||
101 | QPEApplication::defaultRotation(); /* to ensure deforient matches reality */ | 101 | QPEApplication::defaultRotation(); /* to ensure deforient matches reality */ |
102 | } | 102 | } |
103 | 103 | ||
104 | static void initKeyboard() | 104 | static void initKeyboard() |
105 | { | 105 | { |
106 | Config config("qpe"); | 106 | Config config("qpe"); |
107 | 107 | ||
@@ -168,13 +168,13 @@ int initApplication( int argc, char ** argv ) | |||
168 | new SysFileMonitor(s); | 168 | new SysFileMonitor(s); |
169 | #ifdef QWS | 169 | #ifdef QWS |
170 | Network::createServer(s); | 170 | Network::createServer(s); |
171 | #endif | 171 | #endif |
172 | s->show(); | 172 | s->show(); |
173 | 173 | ||
174 | #if 0 | 174 | #if 0 |
175 | if ( QDate::currentDate().year() < 2005 ) | 175 | if ( QDate::currentDate().year() < 2005 ) |
176 | { | 176 | { |
177 | if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ), | 177 | if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ), |
178 | ServerApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ) | 178 | ServerApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ) |
179 | .arg( TimeString::dateString( QDate::currentDate())), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) | 179 | .arg( TimeString::dateString( QDate::currentDate())), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) |
180 | { | 180 | { |
@@ -185,13 +185,13 @@ int initApplication( int argc, char ** argv ) | |||
185 | #endif | 185 | #endif |
186 | 186 | ||
187 | create_pidfile(); | 187 | create_pidfile(); |
188 | odebug << "--> mainloop in" << oendl; | 188 | odebug << "--> mainloop in" << oendl; |
189 | int rv = a.exec(); | 189 | int rv = a.exec(); |
190 | odebug << "<-- mainloop out" << oendl; | 190 | odebug << "<-- mainloop out" << oendl; |
191 | remove_pidfile(); | 191 | remove_pidfile(); |
192 | odebug << "removing server object..." << oendl; | 192 | odebug << "removing server object..." << oendl; |
193 | delete s; | 193 | delete s; |
194 | 194 | ||
195 | odebug << "returning from qpe/initapplication..." << oendl; | 195 | odebug << "returning from qpe/initapplication..." << oendl; |
196 | return rv; | 196 | return rv; |
197 | } | 197 | } |