-rw-r--r-- | library/qpeapplication.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index db8297f..cfe0497 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -1293,60 +1293,59 @@ void QPEApplication::setCurrentMode( int x, int y, int depth ) | |||
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 | #if QT_VERSION > 238 | 1317 | #if (QT_VERSION < 238) & Q_OS_MACX |
1318 | bool qt_left_hand_scrollbars = false; | ||
1319 | #else | ||
1318 | #ifdef Q_OS_MACX | 1320 | #ifdef Q_OS_MACX |
1319 | #define WEAK_SYMBOL __attribute__((weak_import)) | 1321 | #define WEAK_SYMBOL __attribute__((weak_import)) |
1320 | #else | 1322 | #else |
1321 | #define WEAK_SYMBOL __attribute__((weak)) | 1323 | #define WEAK_SYMBOL __attribute__((weak)) |
1322 | #endif | 1324 | #endif |
1323 | |||
1324 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; | 1325 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; |
1325 | |||
1326 | #else | ||
1327 | bool qt_left_hand_scrollbars = false; | ||
1328 | #endif | 1326 | #endif |
1327 | |||
1329 | /*! | 1328 | /*! |
1330 | \internal | 1329 | \internal |
1331 | */ | 1330 | */ |
1332 | void QPEApplication::applyStyle() | 1331 | void QPEApplication::applyStyle() |
1333 | { | 1332 | { |
1334 | Config config( "qpe" ); | 1333 | Config config( "qpe" ); |
1335 | config.setGroup( "Appearance" ); | 1334 | config.setGroup( "Appearance" ); |
1336 | 1335 | ||
1337 | #if QT_VERSION > 233 | 1336 | #if QT_VERSION > 233 |
1338 | #if !defined(OPIE_NO_OVERRIDE_QT) | 1337 | #if !defined(OPIE_NO_OVERRIDE_QT) |
1339 | // don't block ourselves ... | 1338 | // don't block ourselves ... |
1340 | Opie::force_appearance = 0; | 1339 | Opie::force_appearance = 0; |
1341 | 1340 | ||
1342 | static QString appname = Opie::binaryName ( ); | 1341 | static QString appname = Opie::binaryName ( ); |
1343 | 1342 | ||
1344 | QStringList ex = config. readListEntry ( "NoStyle", ';' ); | 1343 | QStringList ex = config. readListEntry ( "NoStyle", ';' ); |
1345 | int nostyle = 0; | 1344 | int nostyle = 0; |
1346 | for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) { | 1345 | for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) { |
1347 | if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) { | 1346 | if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) { |
1348 | nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 ); | 1347 | nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 ); |
1349 | break; | 1348 | break; |
1350 | } | 1349 | } |
1351 | } | 1350 | } |
1352 | #else | 1351 | #else |