-rw-r--r-- | library/qpeapplication.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index f4a7f74..db8297f 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -1269,104 +1269,108 @@ void QPEApplication::setDefaultRotation( int 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 | extern void qws_clearLoadedFonts(); | 1287 | extern void qws_clearLoadedFonts(); |
1288 | 1288 | ||
1289 | void QPEApplication::setCurrentMode( int x, int y, int depth ) | 1289 | void QPEApplication::setCurrentMode( int x, int y, int depth ) |
1290 | { | 1290 | { |
1291 | // Reset the caches | 1291 | // Reset the caches |
1292 | qws_clearLoadedFonts(); | 1292 | qws_clearLoadedFonts(); |
1293 | QPixmapCache::clear(); | 1293 | QPixmapCache::clear(); |
1294 | 1294 | ||
1295 | // Change the screen mode | 1295 | // Change the screen mode |
1296 | qt_screen->setMode(x, y, depth); | 1296 | qt_screen->setMode(x, y, depth); |
1297 | 1297 | ||
1298 | if ( qApp->type() == GuiServer ) { | 1298 | if ( qApp->type() == GuiServer ) { |
1299 | // Reconfigure the GuiServer | 1299 | // Reconfigure the GuiServer |
1300 | qwsServer->beginDisplayReconfigure(); | 1300 | qwsServer->beginDisplayReconfigure(); |
1301 | qwsServer->endDisplayReconfigure(); | 1301 | qwsServer->endDisplayReconfigure(); |
1302 | 1302 | ||
1303 | // Get all the running apps to reset | 1303 | // Get all the running apps to reset |
1304 | QCopEnvelope env( "QPE/System", "reset()" ); | 1304 | QCopEnvelope env( "QPE/System", "reset()" ); |
1305 | } | 1305 | } |
1306 | } | 1306 | } |
1307 | 1307 | ||
1308 | void QPEApplication::reset() { | 1308 | void QPEApplication::reset() { |
1309 | // Reconnect to the screen | 1309 | // Reconnect to the screen |
1310 | qt_screen->disconnect(); | 1310 | qt_screen->disconnect(); |
1311 | qt_screen->connect( QString::null ); | 1311 | qt_screen->connect( QString::null ); |
1312 | 1312 | ||
1313 | // Redraw everything | 1313 | // Redraw everything |
1314 | applyStyle(); | 1314 | applyStyle(); |
1315 | } | 1315 | } |
1316 | 1316 | ||
1317 | 1317 | #if QT_VERSION > 238 | |
1318 | #ifdef Q_OS_MACX | 1318 | #ifdef Q_OS_MACX |
1319 | #define WEAK_SYMBOL __attribute__((weak_import)) | 1319 | #define WEAK_SYMBOL __attribute__((weak_import)) |
1320 | #else | 1320 | #else |
1321 | #define WEAK_SYMBOL __attribute__((weak)) | 1321 | #define WEAK_SYMBOL __attribute__((weak)) |
1322 | #endif | 1322 | #endif |
1323 | 1323 | ||
1324 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; | 1324 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; |
1325 | |||
1326 | #else | ||
1327 | bool qt_left_hand_scrollbars = false; | ||
1328 | #endif | ||
1325 | /*! | 1329 | /*! |
1326 | \internal | 1330 | \internal |
1327 | */ | 1331 | */ |
1328 | void QPEApplication::applyStyle() | 1332 | void QPEApplication::applyStyle() |
1329 | { | 1333 | { |
1330 | Config config( "qpe" ); | 1334 | Config config( "qpe" ); |
1331 | config.setGroup( "Appearance" ); | 1335 | config.setGroup( "Appearance" ); |
1332 | 1336 | ||
1333 | #if QT_VERSION > 233 | 1337 | #if QT_VERSION > 233 |
1334 | #if !defined(OPIE_NO_OVERRIDE_QT) | 1338 | #if !defined(OPIE_NO_OVERRIDE_QT) |
1335 | // don't block ourselves ... | 1339 | // don't block ourselves ... |
1336 | Opie::force_appearance = 0; | 1340 | Opie::force_appearance = 0; |
1337 | 1341 | ||
1338 | static QString appname = Opie::binaryName ( ); | 1342 | static QString appname = Opie::binaryName ( ); |
1339 | 1343 | ||
1340 | QStringList ex = config. readListEntry ( "NoStyle", ';' ); | 1344 | QStringList ex = config. readListEntry ( "NoStyle", ';' ); |
1341 | int nostyle = 0; | 1345 | int nostyle = 0; |
1342 | for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) { | 1346 | for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) { |
1343 | if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) { | 1347 | if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) { |
1344 | nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 ); | 1348 | nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 ); |
1345 | break; | 1349 | break; |
1346 | } | 1350 | } |
1347 | } | 1351 | } |
1348 | #else | 1352 | #else |
1349 | int nostyle = 0; | 1353 | int nostyle = 0; |
1350 | #endif | 1354 | #endif |
1351 | 1355 | ||
1352 | // Widget style | 1356 | // Widget style |
1353 | QString style = config.readEntry( "Style", "FlatStyle" ); | 1357 | QString style = config.readEntry( "Style", "FlatStyle" ); |
1354 | 1358 | ||
1355 | // don't set a custom style | 1359 | // don't set a custom style |
1356 | if ( nostyle & Opie::Force_Style ) | 1360 | if ( nostyle & Opie::Force_Style ) |
1357 | style = "FlatStyle"; | 1361 | style = "FlatStyle"; |
1358 | 1362 | ||
1359 | internalSetStyle ( style ); | 1363 | internalSetStyle ( style ); |
1360 | 1364 | ||
1361 | // Colors - from /etc/colors/Liquid.scheme | 1365 | // Colors - from /etc/colors/Liquid.scheme |
1362 | QColor bgcolor( config.readEntry( "Background", "#E0E0E0" ) ); | 1366 | QColor bgcolor( config.readEntry( "Background", "#E0E0E0" ) ); |
1363 | QColor btncolor( config.readEntry( "Button", "#96c8fa" ) ); | 1367 | QColor btncolor( config.readEntry( "Button", "#96c8fa" ) ); |
1364 | QPalette pal( btncolor, bgcolor ); | 1368 | QPalette pal( btncolor, bgcolor ); |
1365 | QString color = config.readEntry( "Highlight", "#73adef" ); | 1369 | QString color = config.readEntry( "Highlight", "#73adef" ); |
1366 | pal.setColor( QColorGroup::Highlight, QColor( color ) ); | 1370 | pal.setColor( QColorGroup::Highlight, QColor( color ) ); |
1367 | color = config.readEntry( "HighlightedText", "#FFFFFF" ); | 1371 | color = config.readEntry( "HighlightedText", "#FFFFFF" ); |
1368 | pal.setColor( QColorGroup::HighlightedText, QColor( color ) ); | 1372 | pal.setColor( QColorGroup::HighlightedText, QColor( color ) ); |
1369 | color = config.readEntry( "Text", "#000000" ); | 1373 | color = config.readEntry( "Text", "#000000" ); |
1370 | pal.setColor( QColorGroup::Text, QColor( color ) ); | 1374 | pal.setColor( QColorGroup::Text, QColor( color ) ); |
1371 | color = config.readEntry( "ButtonText", "#000000" ); | 1375 | color = config.readEntry( "ButtonText", "#000000" ); |
1372 | pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) ); | 1376 | pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) ); |