summaryrefslogtreecommitdiff
path: root/library
authorsimon <simon>2003-03-26 10:02:13 (UTC)
committer simon <simon>2003-03-26 10:02:13 (UTC)
commitff08ba81efbc0e2dcb3907f576ff4f078f2b7438 (patch) (unidiff)
tree645738d443f9eb5220b1ca1d2e922572aeec8e17 /library
parentb7a2238dad7f8f44c3354168d8e2685705616c78 (diff)
downloadopie-ff08ba81efbc0e2dcb3907f576ff4f078f2b7438.zip
opie-ff08ba81efbc0e2dcb3907f576ff4f078f2b7438.tar.gz
opie-ff08ba81efbc0e2dcb3907f576ff4f078f2b7438.tar.bz2
- Kommando zurueck :)
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp8
-rw-r--r--library/qpeapplication.h5
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
@@ -974,197 +974,195 @@ void QPEApplication::applyStyle()
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
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 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 }
1123 else if ( msg == "execute(QString,QString)" ) { 1121 else if ( msg == "execute(QString,QString)" ) {
1124 if ( type() == GuiServer ) { 1122 if ( type() == GuiServer ) {
1125 QString t, d; 1123 QString t, d;
1126 stream >> t >> d; 1124 stream >> t >> d;
1127 Global::execute( t, d ); 1125 Global::execute( t, d );
1128 } 1126 }
1129 } 1127 }
1130 else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) { 1128 else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) {
1131 if ( type() == GuiServer ) { 1129 if ( type() == GuiServer ) {
1132 QDateTime when; 1130 QDateTime when;
1133 QCString channel, message; 1131 QCString channel, message;
1134 int data; 1132 int data;
1135 stream >> when >> channel >> message >> data; 1133 stream >> when >> channel >> message >> data;
1136 AlarmServer::addAlarm( when, channel, message, data ); 1134 AlarmServer::addAlarm( when, channel, message, data );
1137 } 1135 }
1138 } 1136 }
1139 else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) { 1137 else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) {
1140 if ( type() == GuiServer ) { 1138 if ( type() == GuiServer ) {
1141 QDateTime when; 1139 QDateTime when;
1142 QCString channel, message; 1140 QCString channel, message;
1143 int data; 1141 int data;
1144 stream >> when >> channel >> message >> data; 1142 stream >> when >> channel >> message >> data;
1145 AlarmServer::deleteAlarm( when, channel, message, data ); 1143 AlarmServer::deleteAlarm( when, channel, message, data );
1146 } 1144 }
1147 } 1145 }
1148 else if ( msg == "clockChange(bool)" ) { 1146 else if ( msg == "clockChange(bool)" ) {
1149 int tmp; 1147 int tmp;
1150 stream >> tmp; 1148 stream >> tmp;
1151 emit clockChanged( tmp ); 1149 emit clockChanged( tmp );
1152 } 1150 }
1153 else if ( msg == "weekChange(bool)" ) { 1151 else if ( msg == "weekChange(bool)" ) {
1154 int tmp; 1152 int tmp;
1155 stream >> tmp; 1153 stream >> tmp;
1156 emit weekChanged( tmp ); 1154 emit weekChanged( tmp );
1157 } 1155 }
1158 else if ( msg == "setDateFormat(DateFormat)" ) { 1156 else if ( msg == "setDateFormat(DateFormat)" ) {
1159 DateFormat tmp; 1157 DateFormat tmp;
1160 stream >> tmp; 1158 stream >> tmp;
1161 emit dateFormatChanged( tmp ); 1159 emit dateFormatChanged( tmp );
1162 } 1160 }
1163 else if ( msg == "setVolume(int,int)" ) { 1161 else if ( msg == "setVolume(int,int)" ) {
1164 int t, v; 1162 int t, v;
1165 stream >> t >> v; 1163 stream >> t >> v;
1166 setVolume( t, v ); 1164 setVolume( t, v );
1167 emit volumeChanged( muted ); 1165 emit volumeChanged( muted );
1168 } 1166 }
1169 else if ( msg == "volumeChange(bool)" ) { 1167 else if ( msg == "volumeChange(bool)" ) {
1170 stream >> muted; 1168 stream >> muted;
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 82954d0..4c37ea6 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -72,126 +72,121 @@ public:
72 }; 72 };
73 73
74 enum screenSaverHint { 74 enum screenSaverHint {
75 Disable = 0, 75 Disable = 0,
76 DisableLightOff = 1, 76 DisableLightOff = 1,
77 DisableSuspend = 2, 77 DisableSuspend = 2,
78 Enable = 100 78 Enable = 100
79 }; 79 };
80 80
81 static void setInputMethodHint( QWidget *, InputMethodHint ); 81 static void setInputMethodHint( QWidget *, InputMethodHint );
82 static InputMethodHint inputMethodHint( QWidget * ); 82 static InputMethodHint inputMethodHint( QWidget * );
83 83
84 void showMainWidget( QWidget*, bool nomax=FALSE ); 84 void showMainWidget( QWidget*, bool nomax=FALSE );
85 void showMainDocumentWidget( QWidget*, bool nomax=FALSE ); 85 void showMainDocumentWidget( QWidget*, bool nomax=FALSE );
86 static void showDialog( QDialog*, bool nomax=FALSE ); 86 static void showDialog( QDialog*, bool nomax=FALSE );
87 static int execDialog( QDialog*, bool nomax=FALSE ); 87 static int execDialog( QDialog*, bool nomax=FALSE );
88 88
89 static void setKeepRunning(); 89 static void setKeepRunning();
90 bool keepRunning() const; 90 bool keepRunning() const;
91 91
92 bool keyboardGrabbed() const; 92 bool keyboardGrabbed() const;
93 93
94 int exec(); 94 int exec();
95 95
96signals: 96signals:
97 void clientMoused(); 97 void clientMoused();
98 void timeChanged(); 98 void timeChanged();
99 void clockChanged( bool pm ); 99 void clockChanged( bool pm );
100 void micChanged( bool muted ); 100 void micChanged( bool muted );
101 void volumeChanged( bool muted ); 101 void volumeChanged( bool muted );
102 void appMessage( const QCString& msg, const QByteArray& data); 102 void appMessage( const QCString& msg, const QByteArray& data);
103 void weekChanged( bool startOnMonday ); 103 void weekChanged( bool startOnMonday );
104 void dateFormatChanged( DateFormat ); 104 void dateFormatChanged( DateFormat );
105 void flush(); 105 void flush();
106 void reload(); 106 void reload();
107 107
108private slots: 108private slots:
109 void systemMessage( const QCString &msg, const QByteArray &data ); 109 void systemMessage( const QCString &msg, const QByteArray &data );
110 void pidMessage( const QCString &msg, const QByteArray &data ); 110 void pidMessage( const QCString &msg, const QByteArray &data );
111 void removeSenderFromStylusDict(); 111 void removeSenderFromStylusDict();
112 void hideOrQuit(); 112 void hideOrQuit();
113 113
114protected: 114protected:
115 bool qwsEventFilter( QWSEvent * ); 115 bool qwsEventFilter( QWSEvent * );
116 void internalSetStyle( const QString &style ); 116 void internalSetStyle( const QString &style );
117 void prepareForTermination(bool willrestart); 117 void prepareForTermination(bool willrestart);
118 virtual void restart(); 118 virtual void restart();
119 virtual void shutdown(); 119 virtual void shutdown();
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
127private: 127private:
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
142inline void QPEApplication::showDialog( QDialog* d, bool nomax ) 142inline 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
158inline int QPEApplication::execDialog( QDialog* d, bool nomax ) 158inline 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
164enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */ 164enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
165 165
166inline void QPEApplication::setCurrentRotation( int r ) 166inline 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