-rw-r--r-- | library/qpeapplication.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index b21428a..95c4a1b 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -973,192 +973,197 @@ void QPEApplication::applyStyle() | |||
973 | int nostyle = 0; | 973 | int nostyle = 0; |
974 | for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) { | 974 | for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) { |
975 | if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) { | 975 | if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) { |
976 | nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 ); | 976 | nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 ); |
977 | break; | 977 | break; |
978 | } | 978 | } |
979 | } | 979 | } |
980 | 980 | ||
981 | // Widget style | 981 | // Widget style |
982 | QString style = config.readEntry( "Style", "Light" ); | 982 | QString style = config.readEntry( "Style", "Light" ); |
983 | 983 | ||
984 | // don't set a custom style | 984 | // don't set a custom style |
985 | if ( nostyle & Opie::Force_Style ) | 985 | if ( nostyle & Opie::Force_Style ) |
986 | style = "Light"; | 986 | style = "Light"; |
987 | 987 | ||
988 | internalSetStyle ( style ); | 988 | internalSetStyle ( style ); |
989 | 989 | ||
990 | // Colors | 990 | // Colors |
991 | QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) ); | 991 | QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) ); |
992 | QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) ); | 992 | QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) ); |
993 | QPalette pal( btncolor, bgcolor ); | 993 | QPalette pal( btncolor, bgcolor ); |
994 | QString color = config.readEntry( "Highlight", "#800000" ); | 994 | QString color = config.readEntry( "Highlight", "#800000" ); |
995 | pal.setColor( QColorGroup::Highlight, QColor( color ) ); | 995 | pal.setColor( QColorGroup::Highlight, QColor( color ) ); |
996 | color = config.readEntry( "HighlightedText", "#FFFFFF" ); | 996 | color = config.readEntry( "HighlightedText", "#FFFFFF" ); |
997 | pal.setColor( QColorGroup::HighlightedText, QColor( color ) ); | 997 | pal.setColor( QColorGroup::HighlightedText, QColor( color ) ); |
998 | color = config.readEntry( "Text", "#000000" ); | 998 | color = config.readEntry( "Text", "#000000" ); |
999 | pal.setColor( QColorGroup::Text, QColor( color ) ); | 999 | pal.setColor( QColorGroup::Text, QColor( color ) ); |
1000 | color = config.readEntry( "ButtonText", "#000000" ); | 1000 | color = config.readEntry( "ButtonText", "#000000" ); |
1001 | pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) ); | 1001 | pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) ); |
1002 | color = config.readEntry( "Base", "#FFFFFF" ); | 1002 | color = config.readEntry( "Base", "#FFFFFF" ); |
1003 | pal.setColor( QColorGroup::Base, QColor( color ) ); | 1003 | pal.setColor( QColorGroup::Base, QColor( color ) ); |
1004 | 1004 | ||
1005 | pal.setColor( QPalette::Disabled, QColorGroup::Text, | 1005 | pal.setColor( QPalette::Disabled, QColorGroup::Text, |
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 | ||
1041 | void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) | 1041 | void 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)" ) { | ||
1070 | int r; | ||
1071 | stream >> r; | ||
1072 | setCurrentRotation( r ); | ||
1073 | } | ||
1069 | else if ( msg == "shutdown()" ) { | 1074 | else if ( msg == "shutdown()" ) { |
1070 | if ( type() == GuiServer ) | 1075 | if ( type() == GuiServer ) |
1071 | shutdown(); | 1076 | shutdown(); |
1072 | } | 1077 | } |
1073 | else if ( msg == "quit()" ) { | 1078 | else if ( msg == "quit()" ) { |
1074 | if ( type() != GuiServer ) | 1079 | if ( type() != GuiServer ) |
1075 | tryQuit(); | 1080 | tryQuit(); |
1076 | } | 1081 | } |
1077 | else if ( msg == "forceQuit()" ) { | 1082 | else if ( msg == "forceQuit()" ) { |
1078 | if ( type() != GuiServer ) | 1083 | if ( type() != GuiServer ) |
1079 | quit(); | 1084 | quit(); |
1080 | } | 1085 | } |
1081 | else if ( msg == "restart()" ) { | 1086 | else if ( msg == "restart()" ) { |
1082 | if ( type() == GuiServer ) | 1087 | if ( type() == GuiServer ) |
1083 | restart(); | 1088 | restart(); |
1084 | } | 1089 | } |
1085 | else if ( msg == "language(QString)" ) { | 1090 | else if ( msg == "language(QString)" ) { |
1086 | if ( type() == GuiServer ) { | 1091 | if ( type() == GuiServer ) { |
1087 | QString l; | 1092 | QString l; |
1088 | stream >> l; | 1093 | stream >> l; |
1089 | QString cl = getenv( "LANG" ); | 1094 | QString cl = getenv( "LANG" ); |
1090 | if ( cl != l ) { | 1095 | if ( cl != l ) { |
1091 | if ( l.isNull() ) | 1096 | if ( l.isNull() ) |
1092 | unsetenv( "LANG" ); | 1097 | unsetenv( "LANG" ); |
1093 | else | 1098 | else |
1094 | setenv( "LANG", l.latin1(), 1 ); | 1099 | setenv( "LANG", l.latin1(), 1 ); |
1095 | restart(); | 1100 | restart(); |
1096 | } | 1101 | } |
1097 | } | 1102 | } |
1098 | } | 1103 | } |
1099 | else if ( msg == "timeChange(QString)" ) { | 1104 | else if ( msg == "timeChange(QString)" ) { |
1100 | QString t; | 1105 | QString t; |
1101 | stream >> t; | 1106 | stream >> t; |
1102 | if ( t.isNull() ) | 1107 | if ( t.isNull() ) |
1103 | unsetenv( "TZ" ); | 1108 | unsetenv( "TZ" ); |
1104 | else | 1109 | else |
1105 | setenv( "TZ", t.latin1(), 1 ); | 1110 | setenv( "TZ", t.latin1(), 1 ); |
1106 | // emit the signal so everyone else knows... | 1111 | // emit the signal so everyone else knows... |
1107 | emit timeChanged(); | 1112 | emit timeChanged(); |
1108 | } | 1113 | } |
1109 | else if ( msg == "execute(QString)" ) { | 1114 | else if ( msg == "execute(QString)" ) { |
1110 | if ( type() == GuiServer ) { | 1115 | if ( type() == GuiServer ) { |
1111 | QString t; | 1116 | QString t; |
1112 | stream >> t; | 1117 | stream >> t; |
1113 | Global::execute( t ); | 1118 | Global::execute( t ); |
1114 | } | 1119 | } |
1115 | } | 1120 | } |
1116 | else if ( msg == "execute(QString,QString)" ) { | 1121 | else if ( msg == "execute(QString,QString)" ) { |
1117 | if ( type() == GuiServer ) { | 1122 | if ( type() == GuiServer ) { |
1118 | QString t, d; | 1123 | QString t, d; |
1119 | stream >> t >> d; | 1124 | stream >> t >> d; |
1120 | Global::execute( t, d ); | 1125 | Global::execute( t, d ); |
1121 | } | 1126 | } |
1122 | } | 1127 | } |
1123 | else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) { | 1128 | else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) { |
1124 | if ( type() == GuiServer ) { | 1129 | if ( type() == GuiServer ) { |
1125 | QDateTime when; | 1130 | QDateTime when; |
1126 | QCString channel, message; | 1131 | QCString channel, message; |
1127 | int data; | 1132 | int data; |
1128 | stream >> when >> channel >> message >> data; | 1133 | stream >> when >> channel >> message >> data; |
1129 | AlarmServer::addAlarm( when, channel, message, data ); | 1134 | AlarmServer::addAlarm( when, channel, message, data ); |
1130 | } | 1135 | } |
1131 | } | 1136 | } |
1132 | else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) { | 1137 | else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) { |
1133 | if ( type() == GuiServer ) { | 1138 | if ( type() == GuiServer ) { |
1134 | QDateTime when; | 1139 | QDateTime when; |
1135 | QCString channel, message; | 1140 | QCString channel, message; |
1136 | int data; | 1141 | int data; |
1137 | stream >> when >> channel >> message >> data; | 1142 | stream >> when >> channel >> message >> data; |
1138 | AlarmServer::deleteAlarm( when, channel, message, data ); | 1143 | AlarmServer::deleteAlarm( when, channel, message, data ); |
1139 | } | 1144 | } |
1140 | } | 1145 | } |
1141 | else if ( msg == "clockChange(bool)" ) { | 1146 | else if ( msg == "clockChange(bool)" ) { |
1142 | int tmp; | 1147 | int tmp; |
1143 | stream >> tmp; | 1148 | stream >> tmp; |
1144 | emit clockChanged( tmp ); | 1149 | emit clockChanged( tmp ); |
1145 | } | 1150 | } |
1146 | else if ( msg == "weekChange(bool)" ) { | 1151 | else if ( msg == "weekChange(bool)" ) { |
1147 | int tmp; | 1152 | int tmp; |
1148 | stream >> tmp; | 1153 | stream >> tmp; |
1149 | emit weekChanged( tmp ); | 1154 | emit weekChanged( tmp ); |
1150 | } | 1155 | } |
1151 | else if ( msg == "setDateFormat(DateFormat)" ) { | 1156 | else if ( msg == "setDateFormat(DateFormat)" ) { |
1152 | DateFormat tmp; | 1157 | DateFormat tmp; |
1153 | stream >> tmp; | 1158 | stream >> tmp; |
1154 | emit dateFormatChanged( tmp ); | 1159 | emit dateFormatChanged( tmp ); |
1155 | } | 1160 | } |
1156 | else if ( msg == "setVolume(int,int)" ) { | 1161 | else if ( msg == "setVolume(int,int)" ) { |
1157 | int t, v; | 1162 | int t, v; |
1158 | stream >> t >> v; | 1163 | stream >> t >> v; |
1159 | setVolume( t, v ); | 1164 | setVolume( t, v ); |
1160 | emit volumeChanged( muted ); | 1165 | emit volumeChanged( muted ); |
1161 | } | 1166 | } |
1162 | else if ( msg == "volumeChange(bool)" ) { | 1167 | else if ( msg == "volumeChange(bool)" ) { |
1163 | stream >> muted; | 1168 | stream >> muted; |
1164 | setVolume(); | 1169 | setVolume(); |