summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-06-26 12:34:25 (UTC)
committer mickeyl <mickeyl>2005-06-26 12:34:25 (UTC)
commit7eb3ca44b7ff351221b190840270c62c12be6402 (patch) (side-by-side diff)
tree3323eceba9047d56824021f2a3fe4469f61fbe43
parentb4d2fa56d4b4608656f6b5cf3ff9375708395e91 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp10
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
@@ -77,37 +77,37 @@ void initEnvironment()
// language
config.setGroup( "Language" );
QString lang = config.readEntry( "Language", getenv("LANG") ).stripWhiteSpace();
if( lang.isNull() || lang.isEmpty()) lang = "en_US";
setenv( "LANG", lang, 1 );
config.writeEntry("Language", lang);
config.write();
// rotation
int t = ODevice::inst()->rotation();
odebug << "ODevice reports transformation to be " << t << oendl;
-
+
QString env( getenv("QWS_DISPLAY") );
if ( env.isEmpty() )
{
int rot = ODevice::inst()->rotation() * 90;
- QString qws_display = QString("Transformed:Rot%1:0").arg(rot);
+ QString qws_display = QString( "%1:Rot%2:0").arg(ODevice::inst()->qteDriver()).arg(rot);
odebug << "setting QWS_DISPLAY to '" << qws_display << "'" << oendl;
setenv("QWS_DISPLAY", (const char*) qws_display, 1);
}
else
odebug << "QWS_DISPLAY already set as '" << env << "' - overriding ODevice transformation" << oendl;
- QPEApplication::defaultRotation(); /* to ensure deforient matches reality */
+ QPEApplication::defaultRotation(); /* to ensure deforient matches reality */
}
static void initKeyboard()
{
Config config("qpe");
config.setGroup( "Keyboard" );
int ard = config.readNumEntry( "RepeatDelay" );
int arp = config.readNumEntry( "RepeatPeriod" );
if ( ard > 0 && arp > 0 )
qwsSetKeyboardAutoRepeat( ard, arp );
@@ -162,42 +162,42 @@ int initApplication( int argc, char ** argv )
QCopEnvelope e("QPE/System", "setBacklight(int)" );
e << -3; // Forced on
}
AlarmServer::initialize();
Server *s = new Server();
new SysFileMonitor(s);
#ifdef QWS
Network::createServer(s);
#endif
s->show();
-#if 0
+#if 0
if ( QDate::currentDate().year() < 2005 )
{
if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ),
ServerApplication::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 ( );
}
}
#endif
create_pidfile();
odebug << "--> mainloop in" << oendl;
int rv = a.exec();
odebug << "<-- mainloop out" << oendl;
- remove_pidfile();
+ remove_pidfile();
odebug << "removing server object..." << oendl;
delete s;
odebug << "returning from qpe/initapplication..." << oendl;
return rv;
}
static const char *pidfile_path = "/var/run/opie.pid";
void create_pidfile()
{
FILE *f;