-rw-r--r-- | core/launcher/main.cpp | 2 |
1 files changed, 1 insertions, 1 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 | |||
@@ -70,49 +70,49 @@ void initEnvironment() | |||
70 | config.setGroup( "Location" ); | 70 | config.setGroup( "Location" ); |
71 | QString tz = config.readEntry( "Timezone", getenv("TZ") ).stripWhiteSpace(); | 71 | QString tz = config.readEntry( "Timezone", getenv("TZ") ).stripWhiteSpace(); |
72 | 72 | ||
73 | // timezone | 73 | // timezone |
74 | if (tz.isNull() || tz.isEmpty()) tz = "America/New_York"; | 74 | if (tz.isNull() || tz.isEmpty()) tz = "America/New_York"; |
75 | setenv( "TZ", tz, 1 ); | 75 | setenv( "TZ", tz, 1 ); |
76 | config.writeEntry( "Timezone", tz); | 76 | config.writeEntry( "Timezone", tz); |
77 | 77 | ||
78 | // language | 78 | // language |
79 | config.setGroup( "Language" ); | 79 | config.setGroup( "Language" ); |
80 | QString lang = config.readEntry( "Language", getenv("LANG") ).stripWhiteSpace(); | 80 | QString lang = config.readEntry( "Language", getenv("LANG") ).stripWhiteSpace(); |
81 | if( lang.isNull() || lang.isEmpty()) lang = "en_US"; | 81 | if( lang.isNull() || lang.isEmpty()) lang = "en_US"; |
82 | setenv( "LANG", lang, 1 ); | 82 | setenv( "LANG", lang, 1 ); |
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 | ||
108 | config.setGroup( "Keyboard" ); | 108 | config.setGroup( "Keyboard" ); |
109 | 109 | ||
110 | int ard = config.readNumEntry( "RepeatDelay" ); | 110 | int ard = config.readNumEntry( "RepeatDelay" ); |
111 | int arp = config.readNumEntry( "RepeatPeriod" ); | 111 | int arp = config.readNumEntry( "RepeatPeriod" ); |
112 | if ( ard > 0 && arp > 0 ) | 112 | if ( ard > 0 && arp > 0 ) |
113 | qwsSetKeyboardAutoRepeat( ard, arp ); | 113 | qwsSetKeyboardAutoRepeat( ard, arp ); |
114 | 114 | ||
115 | QString layout = config.readEntry( "Layout", "us101" ); | 115 | QString layout = config.readEntry( "Layout", "us101" ); |
116 | Server::setKeyboardLayout( layout ); | 116 | Server::setKeyboardLayout( layout ); |
117 | } | 117 | } |
118 | 118 | ||