-rw-r--r-- | library/qpeapplication.cpp | 8 | ||||
-rw-r--r-- | library/qpeapplication.h | 5 |
2 files changed, 3 insertions, 10 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index f5bf0c5..7463074 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -1022,101 +1022,99 @@ void QPEApplication::applyStyle() | |||
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)" ) { | 1069 | else if ( msg == "setCurrentRotation(int)" ) { |
1070 | if ( type() == GuiServer ) { | 1070 | int r; |
1071 | int r; | 1071 | stream >> r; |
1072 | stream >> r; | 1072 | setCurrentRotation( r ); |
1073 | setCurrentRotation( r ); | ||
1074 | } | ||
1075 | } | 1073 | } |
1076 | else if ( msg == "shutdown()" ) { | 1074 | else if ( msg == "shutdown()" ) { |
1077 | if ( type() == GuiServer ) | 1075 | if ( type() == GuiServer ) |
1078 | shutdown(); | 1076 | shutdown(); |
1079 | } | 1077 | } |
1080 | else if ( msg == "quit()" ) { | 1078 | else if ( msg == "quit()" ) { |
1081 | if ( type() != GuiServer ) | 1079 | if ( type() != GuiServer ) |
1082 | tryQuit(); | 1080 | tryQuit(); |
1083 | } | 1081 | } |
1084 | else if ( msg == "forceQuit()" ) { | 1082 | else if ( msg == "forceQuit()" ) { |
1085 | if ( type() != GuiServer ) | 1083 | if ( type() != GuiServer ) |
1086 | quit(); | 1084 | quit(); |
1087 | } | 1085 | } |
1088 | else if ( msg == "restart()" ) { | 1086 | else if ( msg == "restart()" ) { |
1089 | if ( type() == GuiServer ) | 1087 | if ( type() == GuiServer ) |
1090 | restart(); | 1088 | restart(); |
1091 | } | 1089 | } |
1092 | else if ( msg == "language(QString)" ) { | 1090 | else if ( msg == "language(QString)" ) { |
1093 | if ( type() == GuiServer ) { | 1091 | if ( type() == GuiServer ) { |
1094 | QString l; | 1092 | QString l; |
1095 | stream >> l; | 1093 | stream >> l; |
1096 | QString cl = getenv( "LANG" ); | 1094 | QString cl = getenv( "LANG" ); |
1097 | if ( cl != l ) { | 1095 | if ( cl != l ) { |
1098 | if ( l.isNull() ) | 1096 | if ( l.isNull() ) |
1099 | unsetenv( "LANG" ); | 1097 | unsetenv( "LANG" ); |
1100 | else | 1098 | else |
1101 | setenv( "LANG", l.latin1(), 1 ); | 1099 | setenv( "LANG", l.latin1(), 1 ); |
1102 | restart(); | 1100 | restart(); |
1103 | } | 1101 | } |
1104 | } | 1102 | } |
1105 | } | 1103 | } |
1106 | else if ( msg == "timeChange(QString)" ) { | 1104 | else if ( msg == "timeChange(QString)" ) { |
1107 | QString t; | 1105 | QString t; |
1108 | stream >> t; | 1106 | stream >> t; |
1109 | if ( t.isNull() ) | 1107 | if ( t.isNull() ) |
1110 | unsetenv( "TZ" ); | 1108 | unsetenv( "TZ" ); |
1111 | else | 1109 | else |
1112 | setenv( "TZ", t.latin1(), 1 ); | 1110 | setenv( "TZ", t.latin1(), 1 ); |
1113 | // emit the signal so everyone else knows... | 1111 | // emit the signal so everyone else knows... |
1114 | emit timeChanged(); | 1112 | emit timeChanged(); |
1115 | } | 1113 | } |
1116 | else if ( msg == "execute(QString)" ) { | 1114 | else if ( msg == "execute(QString)" ) { |
1117 | if ( type() == GuiServer ) { | 1115 | if ( type() == GuiServer ) { |
1118 | QString t; | 1116 | QString t; |
1119 | stream >> t; | 1117 | stream >> t; |
1120 | Global::execute( t ); | 1118 | Global::execute( t ); |
1121 | } | 1119 | } |
1122 | } | 1120 | } |
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 82954d0..4c37ea6 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -120,78 +120,73 @@ protected: | |||
120 | bool eventFilter( QObject *, QEvent * ); | 120 | bool eventFilter( QObject *, QEvent * ); |
121 | void timerEvent( QTimerEvent * ); | 121 | void timerEvent( QTimerEvent * ); |
122 | bool raiseAppropriateWindow(); | 122 | bool raiseAppropriateWindow(); |
123 | virtual void tryQuit(); | 123 | virtual void tryQuit(); |
124 | 124 | ||
125 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) | 125 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) |
126 | 126 | ||
127 | private: | 127 | private: |
128 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); | 128 | void mapToDefaultAction( QWSKeyEvent *ke, int defKey ); |
129 | 129 | ||
130 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 130 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
131 | QCopChannel *sysChannel; | 131 | QCopChannel *sysChannel; |
132 | QCopChannel *pidChannel; | 132 | QCopChannel *pidChannel; |
133 | #endif | 133 | #endif |
134 | QPEApplicationData *d; | 134 | QPEApplicationData *d; |
135 | 135 | ||
136 | bool reserved_sh; | 136 | bool reserved_sh; |
137 | 137 | ||
138 | 138 | ||
139 | 139 | ||
140 | }; | 140 | }; |
141 | 141 | ||
142 | inline void QPEApplication::showDialog( QDialog* d, bool nomax ) | 142 | inline void QPEApplication::showDialog( QDialog* d, bool nomax ) |
143 | { | 143 | { |
144 | QSize sh = d->sizeHint(); | 144 | QSize sh = d->sizeHint(); |
145 | int w = QMAX(sh.width(),d->width()); | 145 | int w = QMAX(sh.width(),d->width()); |
146 | int h = QMAX(sh.height(),d->height()); | 146 | int h = QMAX(sh.height(),d->height()); |
147 | if ( !nomax | 147 | if ( !nomax |
148 | && ( w > qApp->desktop()->width()*3/4 | 148 | && ( w > qApp->desktop()->width()*3/4 |
149 | || h > qApp->desktop()->height()*3/4 ) ) | 149 | || h > qApp->desktop()->height()*3/4 ) ) |
150 | { | 150 | { |
151 | d->showMaximized(); | 151 | d->showMaximized(); |
152 | } else { | 152 | } else { |
153 | d->resize(w,h); | 153 | d->resize(w,h); |
154 | d->show(); | 154 | d->show(); |
155 | } | 155 | } |
156 | } | 156 | } |
157 | 157 | ||
158 | inline int QPEApplication::execDialog( QDialog* d, bool nomax ) | 158 | inline int QPEApplication::execDialog( QDialog* d, bool nomax ) |
159 | { | 159 | { |
160 | showDialog(d,nomax); | 160 | showDialog(d,nomax); |
161 | return d->exec(); | 161 | return d->exec(); |
162 | } | 162 | } |
163 | 163 | ||
164 | enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ | 164 | enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ |
165 | 165 | ||
166 | inline void QPEApplication::setCurrentRotation( int r ) | 166 | inline void QPEApplication::setCurrentRotation( int r ) |
167 | { | 167 | { |
168 | if ( qApp->type() != GuiServer ) { | ||
169 | QCopEnvelope e( "QPE/System", "setCurrentRotation(int)" ); | ||
170 | e << r; | ||
171 | return; | ||
172 | } | ||
173 | Transformation e; | 168 | Transformation e; |
174 | 169 | ||
175 | switch (r) { | 170 | switch (r) { |
176 | case 0: | 171 | case 0: |
177 | e = Rot0; | 172 | e = Rot0; |
178 | break; | 173 | break; |
179 | case 90: | 174 | case 90: |
180 | e = Rot90; | 175 | e = Rot90; |
181 | break; | 176 | break; |
182 | case 180: | 177 | case 180: |
183 | e = Rot180; | 178 | e = Rot180; |
184 | break; | 179 | break; |
185 | case 270: | 180 | case 270: |
186 | e = Rot270; | 181 | e = Rot270; |
187 | break; | 182 | break; |
188 | default: | 183 | default: |
189 | return; | 184 | return; |
190 | } | 185 | } |
191 | 186 | ||
192 | qDebug("calling qApp->desktop()->qwsDisplay()->setTransformation( %d )\n", e); | 187 | qDebug("calling qApp->desktop()->qwsDisplay()->setTransformation( %d )\n", e); |
193 | qApp->desktop()->qwsDisplay()->setTransformation( e ); | 188 | qApp->desktop()->qwsDisplay()->setTransformation( e ); |
194 | } | 189 | } |
195 | 190 | ||
196 | 191 | ||
197 | #endif | 192 | #endif |