summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 7463074..f5bf0c5 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1006,131 +1006,133 @@ void QPEApplication::applyStyle()
1006 pal.color( QPalette::Active, QColorGroup::Background ).dark() ); 1006 pal.color( QPalette::Active, QColorGroup::Background ).dark() );
1007 1007
1008 setPalette( pal, TRUE ); 1008 setPalette( pal, TRUE );
1009 1009
1010 // Window Decoration 1010 // Window Decoration
1011 QString dec = config.readEntry( "Decoration", "Qtopia" ); 1011 QString dec = config.readEntry( "Decoration", "Qtopia" );
1012 1012
1013 // don't set a custom deco 1013 // don't set a custom deco
1014 if ( nostyle & Opie::Force_Decoration ) 1014 if ( nostyle & Opie::Force_Decoration )
1015 dec = ""; 1015 dec = "";
1016 1016
1017 //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle); 1017 //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle);
1018 1018
1019 if ( dec != d->decorationName ) { 1019 if ( dec != d->decorationName ) {
1020 qwsSetDecoration( new QPEDecoration( dec ) ); 1020 qwsSetDecoration( new QPEDecoration( dec ) );
1021 d->decorationName = dec; 1021 d->decorationName = dec;
1022 } 1022 }
1023 1023
1024 // Font 1024 // Font
1025 QString ff = config.readEntry( "FontFamily", font().family() ); 1025 QString ff = config.readEntry( "FontFamily", font().family() );
1026 int fs = config.readNumEntry( "FontSize", font().pointSize() ); 1026 int fs = config.readNumEntry( "FontSize", font().pointSize() );
1027 1027
1028 // don't set a custom font 1028 // don't set a custom font
1029 if ( nostyle & Opie::Force_Font ) { 1029 if ( nostyle & Opie::Force_Font ) {
1030 ff = "Helvetica"; 1030 ff = "Helvetica";
1031 fs = 10; 1031 fs = 10;
1032 } 1032 }
1033 1033
1034 setFont ( QFont ( ff, fs ), true ); 1034 setFont ( QFont ( ff, fs ), true );
1035 1035
1036 // revert to global blocking policy ... 1036 // revert to global blocking policy ...
1037 Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None; 1037 Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None;
1038 Opie::force_appearance &= ~nostyle; 1038 Opie::force_appearance &= ~nostyle;
1039} 1039}
1040 1040
1041void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) 1041void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data )
1042{ 1042{
1043#ifdef Q_WS_QWS 1043#ifdef Q_WS_QWS
1044 QDataStream stream( data, IO_ReadOnly ); 1044 QDataStream stream( data, IO_ReadOnly );
1045 if ( msg == "applyStyle()" ) { 1045 if ( msg == "applyStyle()" ) {
1046 applyStyle(); 1046 applyStyle();
1047 } 1047 }
1048 else if ( msg == "toggleApplicationMenu()" ) { 1048 else if ( msg == "toggleApplicationMenu()" ) {
1049 QWidget *active = activeWindow ( ); 1049 QWidget *active = activeWindow ( );
1050 1050
1051 if ( active ) { 1051 if ( active ) {
1052 QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( ); 1052 QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( );
1053 bool oldactive = man-> isActive ( ); 1053 bool oldactive = man-> isActive ( );
1054 1054
1055 man-> setActive( !man-> isActive() ); 1055 man-> setActive( !man-> isActive() );
1056 1056
1057 if ( !oldactive && !man-> isActive ( )) { // no menubar to toggle -> try O-Menu 1057 if ( !oldactive && !man-> isActive ( )) { // no menubar to toggle -> try O-Menu
1058 QCopEnvelope e ( "QPE/TaskBar", "toggleStartMenu()" ); 1058 QCopEnvelope e ( "QPE/TaskBar", "toggleStartMenu()" );
1059 } 1059 }
1060 } 1060 }
1061 } 1061 }
1062 else if ( msg == "setDefaultRotation(int)" ) { 1062 else if ( msg == "setDefaultRotation(int)" ) {
1063 if ( type() == GuiServer ) { 1063 if ( type() == GuiServer ) {
1064 int r; 1064 int r;
1065 stream >> r; 1065 stream >> r;
1066 setDefaultRotation( r ); 1066 setDefaultRotation( r );
1067 } 1067 }
1068 } 1068 }
1069 else if ( msg == "setCurrentRotation(int)" ) { 1069 else if ( msg == "setCurrentRotation(int)" ) {
1070 int r; 1070 if ( type() == GuiServer ) {
1071 stream >> r; 1071 int r;
1072 setCurrentRotation( r ); 1072 stream >> r;
1073 setCurrentRotation( r );
1074 }
1073 } 1075 }
1074 else if ( msg == "shutdown()" ) { 1076 else if ( msg == "shutdown()" ) {
1075 if ( type() == GuiServer ) 1077 if ( type() == GuiServer )
1076 shutdown(); 1078 shutdown();
1077 } 1079 }
1078 else if ( msg == "quit()" ) { 1080 else if ( msg == "quit()" ) {
1079 if ( type() != GuiServer ) 1081 if ( type() != GuiServer )
1080 tryQuit(); 1082 tryQuit();
1081 } 1083 }
1082 else if ( msg == "forceQuit()" ) { 1084 else if ( msg == "forceQuit()" ) {
1083 if ( type() != GuiServer ) 1085 if ( type() != GuiServer )
1084 quit(); 1086 quit();
1085 } 1087 }
1086 else if ( msg == "restart()" ) { 1088 else if ( msg == "restart()" ) {
1087 if ( type() == GuiServer ) 1089 if ( type() == GuiServer )
1088 restart(); 1090 restart();
1089 } 1091 }
1090 else if ( msg == "language(QString)" ) { 1092 else if ( msg == "language(QString)" ) {
1091 if ( type() == GuiServer ) { 1093 if ( type() == GuiServer ) {
1092 QString l; 1094 QString l;
1093 stream >> l; 1095 stream >> l;
1094 QString cl = getenv( "LANG" ); 1096 QString cl = getenv( "LANG" );
1095 if ( cl != l ) { 1097 if ( cl != l ) {
1096 if ( l.isNull() ) 1098 if ( l.isNull() )
1097 unsetenv( "LANG" ); 1099 unsetenv( "LANG" );
1098 else 1100 else
1099 setenv( "LANG", l.latin1(), 1 ); 1101 setenv( "LANG", l.latin1(), 1 );
1100 restart(); 1102 restart();
1101 } 1103 }
1102 } 1104 }
1103 } 1105 }
1104 else if ( msg == "timeChange(QString)" ) { 1106 else if ( msg == "timeChange(QString)" ) {
1105 QString t; 1107 QString t;
1106 stream >> t; 1108 stream >> t;
1107 if ( t.isNull() ) 1109 if ( t.isNull() )
1108 unsetenv( "TZ" ); 1110 unsetenv( "TZ" );
1109 else 1111 else
1110 setenv( "TZ", t.latin1(), 1 ); 1112 setenv( "TZ", t.latin1(), 1 );
1111 // emit the signal so everyone else knows... 1113 // emit the signal so everyone else knows...
1112 emit timeChanged(); 1114 emit timeChanged();
1113 } 1115 }
1114 else if ( msg == "execute(QString)" ) { 1116 else if ( msg == "execute(QString)" ) {
1115 if ( type() == GuiServer ) { 1117 if ( type() == GuiServer ) {
1116 QString t; 1118 QString t;
1117 stream >> t; 1119 stream >> t;
1118 Global::execute( t ); 1120 Global::execute( t );
1119 } 1121 }
1120 } 1122 }
1121 else if ( msg == "execute(QString,QString)" ) { 1123 else if ( msg == "execute(QString,QString)" ) {
1122 if ( type() == GuiServer ) { 1124 if ( type() == GuiServer ) {
1123 QString t, d; 1125 QString t, d;
1124 stream >> t >> d; 1126 stream >> t >> d;
1125 Global::execute( t, d ); 1127 Global::execute( t, d );
1126 } 1128 }
1127 } 1129 }
1128 else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) { 1130 else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) {
1129 if ( type() == GuiServer ) { 1131 if ( type() == GuiServer ) {
1130 QDateTime when; 1132 QDateTime when;
1131 QCString channel, message; 1133 QCString channel, message;
1132 int data; 1134 int data;
1133 stream >> when >> channel >> message >> data; 1135 stream >> when >> channel >> message >> data;
1134 AlarmServer::addAlarm( when, channel, message, data ); 1136 AlarmServer::addAlarm( when, channel, message, data );
1135 } 1137 }
1136 } 1138 }