summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 5e88086..3b6a987 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1251,100 +1251,101 @@ int QPEApplication::defaultRotation()
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*/
1265void QPEApplication::setDefaultRotation( int r ) 1265void 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
1287extern void qws_clearLoadedFonts(); 1287extern void qws_clearLoadedFonts();
1288 1288
1289void QPEApplication::setCurrentMode( int x, int y, int depth ) 1289void 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#if QT_VERSION > 236
1299 // Reconfigure the GuiServer 1300 // Reconfigure the GuiServer
1300 qwsServer->beginDisplayReconfigure(); 1301 qwsServer->beginDisplayReconfigure();
1301 qwsServer->endDisplayReconfigure(); 1302 qwsServer->endDisplayReconfigure();
1302 1303#endif
1303 // Get all the running apps to reset 1304 // Get all the running apps to reset
1304 QCopEnvelope env( "QPE/System", "reset()" ); 1305 QCopEnvelope env( "QPE/System", "reset()" );
1305 } 1306 }
1306} 1307}
1307 1308
1308void QPEApplication::reset() { 1309void QPEApplication::reset() {
1309 // Reconnect to the screen 1310 // Reconnect to the screen
1310 qt_screen->disconnect(); 1311 qt_screen->disconnect();
1311 qt_screen->connect( QString::null ); 1312 qt_screen->connect( QString::null );
1312 1313
1313 // Redraw everything 1314 // Redraw everything
1314 applyStyle(); 1315 applyStyle();
1315} 1316}
1316 1317
1317#if (QT_VERSION < 238) && defined Q_OS_MACX 1318#if (QT_VERSION < 238) && defined Q_OS_MACX
1318bool qt_left_hand_scrollbars = false; 1319bool qt_left_hand_scrollbars = false;
1319#else 1320#else
1320#ifdef Q_OS_MACX 1321#ifdef Q_OS_MACX
1321#define WEAK_SYMBOL __attribute__((weak_import)) 1322#define WEAK_SYMBOL __attribute__((weak_import))
1322#else 1323#else
1323#define WEAK_SYMBOL __attribute__((weak)) 1324#define WEAK_SYMBOL __attribute__((weak))
1324#endif 1325#endif
1325extern bool qt_left_hand_scrollbars WEAK_SYMBOL; 1326extern bool qt_left_hand_scrollbars WEAK_SYMBOL;
1326#endif 1327#endif
1327 1328
1328/*! 1329/*!
1329 \internal 1330 \internal
1330*/ 1331*/
1331void QPEApplication::applyStyle() 1332void QPEApplication::applyStyle()
1332{ 1333{
1333 Config config( "qpe" ); 1334 Config config( "qpe" );
1334 config.setGroup( "Appearance" ); 1335 config.setGroup( "Appearance" );
1335 1336
1336#if QT_VERSION > 233 1337#if QT_VERSION > 233
1337#if !defined(OPIE_NO_OVERRIDE_QT) 1338#if !defined(OPIE_NO_OVERRIDE_QT)
1338 // don't block ourselves ... 1339 // don't block ourselves ...
1339 Opie::force_appearance = 0; 1340 Opie::force_appearance = 0;
1340 1341
1341 static QString appname = Opie::binaryName ( ); 1342 static QString appname = Opie::binaryName ( );
1342 1343
1343 QStringList ex = config. readListEntry ( "NoStyle", ';' ); 1344 QStringList ex = config. readListEntry ( "NoStyle", ';' );
1344 int nostyle = 0; 1345 int nostyle = 0;
1345 for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) { 1346 for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) {
1346 if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) { 1347 if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) {
1347 nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 ); 1348 nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 );
1348 break; 1349 break;
1349 } 1350 }
1350 } 1351 }