-rw-r--r-- | library/qpeapplication.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 3b6a987..59ca61b 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -1239,102 +1239,106 @@ static int deforient = -1; | |||
1239 | /*! | 1239 | /*! |
1240 | \internal | 1240 | \internal |
1241 | */ | 1241 | */ |
1242 | int QPEApplication::defaultRotation() | 1242 | int QPEApplication::defaultRotation() |
1243 | { | 1243 | { |
1244 | if ( deforient < 0 ) { | 1244 | if ( deforient < 0 ) { |
1245 | QString d = getenv( "QWS_DISPLAY" ); | 1245 | QString d = getenv( "QWS_DISPLAY" ); |
1246 | if ( d.contains( "Rot90" ) ) { | 1246 | if ( d.contains( "Rot90" ) ) { |
1247 | deforient = 90; | 1247 | deforient = 90; |
1248 | } | 1248 | } |
1249 | else if ( d.contains( "Rot180" ) ) { | 1249 | else if ( d.contains( "Rot180" ) ) { |
1250 | deforient = 180; | 1250 | deforient = 180; |
1251 | } | 1251 | } |
1252 | else if ( d.contains( "Rot270" ) ) { | 1252 | else if ( d.contains( "Rot270" ) ) { |
1253 | deforient = 270; | 1253 | deforient = 270; |
1254 | } | 1254 | } |
1255 | else { | 1255 | else { |
1256 | deforient = 0; | 1256 | deforient = 0; |
1257 | } | 1257 | } |
1258 | } | 1258 | } |
1259 | return deforient; | 1259 | return deforient; |
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | /*! | 1262 | /*! |
1263 | \internal | 1263 | \internal |
1264 | */ | 1264 | */ |
1265 | void QPEApplication::setDefaultRotation( int r ) | 1265 | void QPEApplication::setDefaultRotation( int r ) |
1266 | { | 1266 | { |
1267 | if ( qApp->type() == GuiServer ) { | 1267 | if ( qApp->type() == GuiServer ) { |
1268 | deforient = r; | 1268 | deforient = r; |
1269 | setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 ); | 1269 | setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 ); |
1270 | Config config("qpe"); | 1270 | Config config("qpe"); |
1271 | config.setGroup( "Rotation" ); | 1271 | config.setGroup( "Rotation" ); |
1272 | config.writeEntry( "Rot", r ); | 1272 | config.writeEntry( "Rot", r ); |
1273 | } | 1273 | } |
1274 | else { | 1274 | else { |
1275 | #ifndef QT_NO_COP | 1275 | #ifndef QT_NO_COP |
1276 | { QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" ); | 1276 | { QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" ); |
1277 | e << r; | 1277 | e << r; |
1278 | } | 1278 | } |
1279 | #endif | 1279 | #endif |
1280 | 1280 | ||
1281 | } | 1281 | } |
1282 | } | 1282 | } |
1283 | 1283 | ||
1284 | #include <qgfx_qws.h> | 1284 | #include <qgfx_qws.h> |
1285 | #include <qwindowsystem_qws.h> | 1285 | #include <qwindowsystem_qws.h> |
1286 | 1286 | ||
1287 | #if QT_VERSION > 236 | ||
1287 | extern void qws_clearLoadedFonts(); | 1288 | extern void qws_clearLoadedFonts(); |
1289 | #endif | ||
1288 | 1290 | ||
1289 | void QPEApplication::setCurrentMode( int x, int y, int depth ) | 1291 | void QPEApplication::setCurrentMode( int x, int y, int depth ) |
1290 | { | 1292 | { |
1291 | // Reset the caches | 1293 | // Reset the caches |
1294 | #if QT_VERSION > 236 | ||
1292 | qws_clearLoadedFonts(); | 1295 | qws_clearLoadedFonts(); |
1296 | #endif | ||
1293 | QPixmapCache::clear(); | 1297 | QPixmapCache::clear(); |
1294 | 1298 | ||
1295 | // Change the screen mode | 1299 | // Change the screen mode |
1296 | qt_screen->setMode(x, y, depth); | 1300 | qt_screen->setMode(x, y, depth); |
1297 | 1301 | ||
1298 | if ( qApp->type() == GuiServer ) { | 1302 | if ( qApp->type() == GuiServer ) { |
1299 | #if QT_VERSION > 236 | 1303 | #if QT_VERSION > 236 |
1300 | // Reconfigure the GuiServer | 1304 | // Reconfigure the GuiServer |
1301 | qwsServer->beginDisplayReconfigure(); | 1305 | qwsServer->beginDisplayReconfigure(); |
1302 | qwsServer->endDisplayReconfigure(); | 1306 | qwsServer->endDisplayReconfigure(); |
1303 | #endif | 1307 | #endif |
1304 | // Get all the running apps to reset | 1308 | // Get all the running apps to reset |
1305 | QCopEnvelope env( "QPE/System", "reset()" ); | 1309 | QCopEnvelope env( "QPE/System", "reset()" ); |
1306 | } | 1310 | } |
1307 | } | 1311 | } |
1308 | 1312 | ||
1309 | void QPEApplication::reset() { | 1313 | void QPEApplication::reset() { |
1310 | // Reconnect to the screen | 1314 | // Reconnect to the screen |
1311 | qt_screen->disconnect(); | 1315 | qt_screen->disconnect(); |
1312 | qt_screen->connect( QString::null ); | 1316 | qt_screen->connect( QString::null ); |
1313 | 1317 | ||
1314 | // Redraw everything | 1318 | // Redraw everything |
1315 | applyStyle(); | 1319 | applyStyle(); |
1316 | } | 1320 | } |
1317 | 1321 | ||
1318 | #if (QT_VERSION < 238) && defined Q_OS_MACX | 1322 | #if (QT_VERSION < 238) && defined Q_OS_MACX |
1319 | bool qt_left_hand_scrollbars = false; | 1323 | bool qt_left_hand_scrollbars = false; |
1320 | #else | 1324 | #else |
1321 | #ifdef Q_OS_MACX | 1325 | #ifdef Q_OS_MACX |
1322 | #define WEAK_SYMBOL __attribute__((weak_import)) | 1326 | #define WEAK_SYMBOL __attribute__((weak_import)) |
1323 | #else | 1327 | #else |
1324 | #define WEAK_SYMBOL __attribute__((weak)) | 1328 | #define WEAK_SYMBOL __attribute__((weak)) |
1325 | #endif | 1329 | #endif |
1326 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; | 1330 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; |
1327 | #endif | 1331 | #endif |
1328 | 1332 | ||
1329 | /*! | 1333 | /*! |
1330 | \internal | 1334 | \internal |
1331 | */ | 1335 | */ |
1332 | void QPEApplication::applyStyle() | 1336 | void QPEApplication::applyStyle() |
1333 | { | 1337 | { |
1334 | Config config( "qpe" ); | 1338 | Config config( "qpe" ); |
1335 | config.setGroup( "Appearance" ); | 1339 | config.setGroup( "Appearance" ); |
1336 | 1340 | ||
1337 | #if QT_VERSION > 233 | 1341 | #if QT_VERSION > 233 |
1338 | #if !defined(OPIE_NO_OVERRIDE_QT) | 1342 | #if !defined(OPIE_NO_OVERRIDE_QT) |
1339 | // don't block ourselves ... | 1343 | // don't block ourselves ... |
1340 | Opie::force_appearance = 0; | 1344 | Opie::force_appearance = 0; |