author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (unidiff) | |
tree | b40bb13a1b4f05b4eda61cf0c4a02e32719a70c4 /core/settings | |
parent | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (diff) | |
download | opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.zip opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.gz opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.bz2 |
merge core/settings/*
- light-and-power and security were a bit ugly, so I recommend someone
who actually dealt with these files looking into if I got it right
(not to tell about the frustratation about the fact that the ones who
dealt with these files didn't do the merge in the first place :(
24 files changed, 94 insertions, 130 deletions
diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro index b10b619..e1c6724 100644 --- a/core/settings/button/button.pro +++ b/core/settings/button/button.pro | |||
@@ -1,5 +1,4 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | 2 | |
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = buttonsettings.h \ | 3 | HEADERS = buttonsettings.h \ |
5 | buttonutils.h \ | 4 | buttonutils.h \ |
@@ -16,5 +15,5 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
16 | DEPENDPATH += $(OPIEDIR)/include | 15 | DEPENDPATH += $(OPIEDIR)/include |
17 | LIBS += -lqpe -lopie | 16 | LIBS += -lqpe -lopie |
18 | TARGET = buttonsettings | 17 | TARGET = buttonsettings |
19 | 18 | ||
20 | TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \ | 19 | TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \ |
@@ -36,5 +35,3 @@ TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \ | |||
36 | ../../../i18n/da/buttonsettings.ts | 35 | ../../../i18n/da/buttonsettings.ts |
37 | 36 | ||
38 | |||
39 | |||
40 | include ( $(OPIEDIR)/include.pro ) | 37 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp index 942d5e4..b6a07a8 100644 --- a/core/settings/button/buttonsettings.cpp +++ b/core/settings/button/buttonsettings.cpp | |||
@@ -16,5 +16,5 @@ | |||
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
@@ -51,5 +51,5 @@ struct buttoninfo { | |||
51 | QLabel *m_hicon; | 51 | QLabel *m_hicon; |
52 | QLabel *m_hlabel; | 52 | QLabel *m_hlabel; |
53 | 53 | ||
54 | bool m_pdirty : 1; | 54 | bool m_pdirty : 1; |
55 | bool m_hdirty : 1; | 55 | bool m_hdirty : 1; |
@@ -57,5 +57,5 @@ struct buttoninfo { | |||
57 | 57 | ||
58 | 58 | ||
59 | ButtonSettings::ButtonSettings ( ) | 59 | ButtonSettings::ButtonSettings ( QWidget *parent , const char *name, bool modal, WFlags f ) |
60 | : QDialog ( 0, "ButtonSettings", false, WStyle_ContextHelp ) | 60 | : QDialog ( 0, "ButtonSettings", false, WStyle_ContextHelp ) |
61 | { | 61 | { |
@@ -66,8 +66,8 @@ ButtonSettings::ButtonSettings ( ) | |||
66 | 66 | ||
67 | QVBoxLayout *toplay = new QVBoxLayout ( this, 3, 3 ); | 67 | QVBoxLayout *toplay = new QVBoxLayout ( this, 3, 3 ); |
68 | 68 | ||
69 | QLabel *l = new QLabel ( tr( "<center>Press or hold the button you want to remap.</center>" ), this ); | 69 | QLabel *l = new QLabel ( tr( "<center>Press or hold the button you want to remap.</center>" ), this ); |
70 | toplay-> addWidget ( l ); | 70 | toplay-> addWidget ( l ); |
71 | 71 | ||
72 | QGridLayout *lay = new QGridLayout ( toplay ); | 72 | QGridLayout *lay = new QGridLayout ( toplay ); |
73 | lay-> setMargin ( 0 ); | 73 | lay-> setMargin ( 0 ); |
@@ -78,5 +78,5 @@ ButtonSettings::ButtonSettings ( ) | |||
78 | 78 | ||
79 | m_infos. setAutoDelete ( true ); | 79 | m_infos. setAutoDelete ( true ); |
80 | 80 | ||
81 | int i = 1; | 81 | int i = 1; |
82 | int index = 0; | 82 | int index = 0; |
@@ -96,15 +96,15 @@ ButtonSettings::ButtonSettings ( ) | |||
96 | bi-> m_pdirty = false; | 96 | bi-> m_pdirty = false; |
97 | bi-> m_hdirty = false; | 97 | bi-> m_hdirty = false; |
98 | 98 | ||
99 | l = new QLabel ( this ); | 99 | l = new QLabel ( this ); |
100 | l-> setPixmap (( *it ). pixmap ( )); | 100 | l-> setPixmap (( *it ). pixmap ( )); |
101 | 101 | ||
102 | lay-> addMultiCellWidget ( l, i, i + 1, 0, 0 ); | 102 | lay-> addMultiCellWidget ( l, i, i + 1, 0, 0 ); |
103 | 103 | ||
104 | l = new QLabel ( tr( "Press:" ), this ); | 104 | l = new QLabel ( tr( "Press:" ), this ); |
105 | lay-> addWidget ( l, i, 1, AlignLeft | AlignBottom ); | 105 | lay-> addWidget ( l, i, 1, AlignLeft | AlignBottom ); |
106 | l = new QLabel ( tr( "Hold:" ), this ); | 106 | l = new QLabel ( tr( "Hold:" ), this ); |
107 | lay-> addWidget ( l, i + 1, 1, AlignLeft | AlignTop ); | 107 | lay-> addWidget ( l, i + 1, 1, AlignLeft | AlignTop ); |
108 | 108 | ||
109 | l = new QLabel ( this ); | 109 | l = new QLabel ( this ); |
110 | l-> setFixedSize ( 16, 16 ); | 110 | l-> setFixedSize ( 16, 16 ); |
@@ -116,5 +116,5 @@ ButtonSettings::ButtonSettings ( ) | |||
116 | lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom ); | 116 | lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom ); |
117 | bi-> m_plabel = l; | 117 | bi-> m_plabel = l; |
118 | 118 | ||
119 | l = new QLabel ( this ); | 119 | l = new QLabel ( this ); |
120 | l-> setFixedSize ( 16, 16 ); | 120 | l-> setFixedSize ( 16, 16 ); |
@@ -126,9 +126,9 @@ ButtonSettings::ButtonSettings ( ) | |||
126 | lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop ); | 126 | lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop ); |
127 | bi-> m_hlabel = l; | 127 | bi-> m_hlabel = l; |
128 | 128 | ||
129 | i += 2; | 129 | i += 2; |
130 | 130 | ||
131 | m_infos. append ( bi ); | 131 | m_infos. append ( bi ); |
132 | } | 132 | } |
133 | 133 | ||
134 | toplay-> addStretch ( 10 ); | 134 | toplay-> addStretch ( 10 ); |
@@ -136,10 +136,10 @@ ButtonSettings::ButtonSettings ( ) | |||
136 | m_last_button = 0; | 136 | m_last_button = 0; |
137 | m_lock = false; | 137 | m_lock = false; |
138 | 138 | ||
139 | m_timer = new QTimer ( this ); | 139 | m_timer = new QTimer ( this ); |
140 | connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( keyTimeout ( ))); | 140 | connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( keyTimeout ( ))); |
141 | 141 | ||
142 | updateLabels ( ); | 142 | updateLabels ( ); |
143 | 143 | ||
144 | QPEApplication::grabKeyboard ( ); | 144 | QPEApplication::grabKeyboard ( ); |
145 | } | 145 | } |
@@ -154,5 +154,5 @@ void ButtonSettings::updateLabels ( ) | |||
154 | for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) { | 154 | for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) { |
155 | qCopInfo cip = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_pmsg ); | 155 | qCopInfo cip = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_pmsg ); |
156 | 156 | ||
157 | (*it)-> m_picon-> setPixmap ( cip. m_icon ); | 157 | (*it)-> m_picon-> setPixmap ( cip. m_icon ); |
158 | (*it)-> m_plabel-> setText ( cip. m_name ); | 158 | (*it)-> m_plabel-> setText ( cip. m_name ); |
@@ -169,7 +169,7 @@ buttoninfo *ButtonSettings::buttonInfoForKeycode ( ushort key ) | |||
169 | for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) { | 169 | for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) { |
170 | if ((*it)-> m_button-> keycode ( ) == key ) | 170 | if ((*it)-> m_button-> keycode ( ) == key ) |
171 | return *it; | 171 | return *it; |
172 | } | 172 | } |
173 | return 0; | 173 | return 0; |
174 | } | 174 | } |
175 | 175 | ||
@@ -177,6 +177,6 @@ void ButtonSettings::keyPressEvent ( QKeyEvent *e ) | |||
177 | { | 177 | { |
178 | buttoninfo *bi = buttonInfoForKeycode ( e-> key ( )); | 178 | buttoninfo *bi = buttonInfoForKeycode ( e-> key ( )); |
179 | 179 | ||
180 | if ( bi && !e-> isAutoRepeat ( )) { | 180 | if ( bi && !e-> isAutoRepeat ( )) { |
181 | m_timer-> stop ( ); | 181 | m_timer-> stop ( ); |
182 | m_last_button = bi; | 182 | m_last_button = bi; |
@@ -190,8 +190,8 @@ void ButtonSettings::keyReleaseEvent ( QKeyEvent *e ) | |||
190 | { | 190 | { |
191 | buttoninfo *bi = buttonInfoForKeycode ( e-> key ( )); | 191 | buttoninfo *bi = buttonInfoForKeycode ( e-> key ( )); |
192 | 192 | ||
193 | if ( bi && !e-> isAutoRepeat ( ) && m_timer-> isActive ( )) { | 193 | if ( bi && !e-> isAutoRepeat ( ) && m_timer-> isActive ( )) { |
194 | m_timer-> stop ( ); | 194 | m_timer-> stop ( ); |
195 | edit ( bi, false ); | 195 | edit ( bi, false ); |
196 | } | 196 | } |
197 | else | 197 | else |
@@ -209,15 +209,15 @@ void ButtonSettings::keyTimeout ( ) | |||
209 | void ButtonSettings::edit ( buttoninfo *bi, bool hold ) | 209 | void ButtonSettings::edit ( buttoninfo *bi, bool hold ) |
210 | { | 210 | { |
211 | 211 | ||
212 | if ( m_lock ) | 212 | if ( m_lock ) |
213 | return; | 213 | return; |
214 | m_lock = true; | 214 | m_lock = true; |
215 | 215 | ||
216 | RemapDlg *d = new RemapDlg ( bi-> m_button, hold, this ); | 216 | RemapDlg *d = new RemapDlg ( bi-> m_button, hold, this ); |
217 | 217 | ||
218 | d-> showMaximized ( ); | 218 | d-> showMaximized ( ); |
219 | if ( d-> exec ( ) == QDialog::Accepted ) { | 219 | if ( d-> exec ( ) == QDialog::Accepted ) { |
220 | 220 | ||
221 | 221 | ||
222 | if ( hold ) { | 222 | if ( hold ) { |
223 | bi-> m_hmsg = d-> message ( ); | 223 | bi-> m_hmsg = d-> message ( ); |
@@ -228,10 +228,10 @@ void ButtonSettings::edit ( buttoninfo *bi, bool hold ) | |||
228 | bi-> m_pdirty = true; | 228 | bi-> m_pdirty = true; |
229 | } | 229 | } |
230 | 230 | ||
231 | updateLabels ( ); | 231 | updateLabels ( ); |
232 | } | 232 | } |
233 | 233 | ||
234 | delete d; | 234 | delete d; |
235 | 235 | ||
236 | m_lock = false; | 236 | m_lock = false; |
237 | } | 237 | } |
@@ -241,5 +241,5 @@ void ButtonSettings::accept ( ) | |||
241 | for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) { | 241 | for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) { |
242 | buttoninfo *bi = *it; | 242 | buttoninfo *bi = *it; |
243 | 243 | ||
244 | if ( bi-> m_pdirty ) | 244 | if ( bi-> m_pdirty ) |
245 | ODevice::inst ( )-> remapPressedAction ( bi-> m_index, bi-> m_pmsg ); | 245 | ODevice::inst ( )-> remapPressedAction ( bi-> m_index, bi-> m_pmsg ); |
diff --git a/core/settings/button/buttonsettings.h b/core/settings/button/buttonsettings.h index d41a209..67694d3 100644 --- a/core/settings/button/buttonsettings.h +++ b/core/settings/button/buttonsettings.h | |||
@@ -43,7 +43,8 @@ class ButtonSettings : public QDialog { | |||
43 | 43 | ||
44 | public: | 44 | public: |
45 | ButtonSettings ( ); | 45 | ButtonSettings ( QWidget *parent = 0, const char *name = 0, bool modal = FALSE,WFlags f = 0 ); |
46 | ~ButtonSettings ( ); | 46 | ~ButtonSettings ( ); |
47 | 47 | ||
48 | static QString appName() { return QString::fromLatin1("buttonsettings"); } | ||
48 | virtual void accept ( ); | 49 | virtual void accept ( ); |
49 | virtual void done ( int r ); | 50 | virtual void done ( int r ); |
diff --git a/core/settings/button/main.cpp b/core/settings/button/main.cpp index db274f8..c063c3c 100644 --- a/core/settings/button/main.cpp +++ b/core/settings/button/main.cpp | |||
@@ -16,5 +16,5 @@ | |||
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
@@ -29,15 +29,5 @@ | |||
29 | 29 | ||
30 | #include <qpe/qpeapplication.h> | 30 | #include <qpe/qpeapplication.h> |
31 | #include <opie/oapplicationfactory.h> | ||
31 | 32 | ||
32 | 33 | OPIE_EXPORT_APP( OApplicationFactory<ButtonSettings> ) | |
33 | int main ( int argc, char** argv ) | ||
34 | { | ||
35 | QPEApplication a ( argc,argv ); | ||
36 | |||
37 | ButtonSettings dlg; | ||
38 | a. showMainWidget ( &dlg ); | ||
39 | dlg. showMaximized ( ); | ||
40 | |||
41 | return a. exec ( ); | ||
42 | } | ||
43 | |||
diff --git a/core/settings/citytime/citytime.h b/core/settings/citytime/citytime.h index 63e3102..cc3d487 100644 --- a/core/settings/citytime/citytime.h +++ b/core/settings/citytime/citytime.h | |||
@@ -37,5 +37,5 @@ public: | |||
37 | CityTime(QWidget* parent = 0, const char *name = 0, WFlags fl = 0); | 37 | CityTime(QWidget* parent = 0, const char *name = 0, WFlags fl = 0); |
38 | ~CityTime(); | 38 | ~CityTime(); |
39 | 39 | static QString appName() { return QString::fromLatin1("citytime"); } | |
40 | public slots: | 40 | public slots: |
41 | void beginNewTz(); | 41 | void beginNewTz(); |
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro index c7f4d08..402bcf6 100644 --- a/core/settings/citytime/citytime.pro +++ b/core/settings/citytime/citytime.pro | |||
@@ -1,13 +1,11 @@ | |||
1 | CONFIG += qt warn_on release | 1 | CONFIG += qt warn_on release quick-app |
2 | TEMPLATE = app | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | #INTERFACES = citytimebase.ui | ||
5 | HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h | 2 | HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h |
6 | SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp | 3 | SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp |
7 | TARGET = citytime | ||
8 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
9 | DEPENDPATH += $(OPIEDIR)/include | 5 | DEPENDPATH += $(OPIEDIR)/include |
10 | LIBS += -lqpe | 6 | LIBS += -lqpe |
11 | 7 | ||
8 | TARGET= citytime | ||
9 | |||
12 | TRANSLATIONS = ../../../i18n/de/citytime.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/citytime.ts \ |
13 | ../../../i18n/nl/citytime.ts \ | 11 | ../../../i18n/nl/citytime.ts \ |
diff --git a/core/settings/citytime/main.cpp b/core/settings/citytime/main.cpp index e8664c6..69bfe44 100644 --- a/core/settings/citytime/main.cpp +++ b/core/settings/citytime/main.cpp | |||
@@ -21,10 +21,5 @@ | |||
21 | #include "citytime.h" | 21 | #include "citytime.h" |
22 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
23 | #include <opie/oapplicationfactory.h> | ||
23 | 24 | ||
24 | int main( int argc, char** argv ) | 25 | OPIE_EXPORT_APP( OApplicationFactory<CityTime> ) |
25 | { | ||
26 | QPEApplication a( argc, argv ); | ||
27 | CityTime main; | ||
28 | a.showMainWidget( &main ); | ||
29 | return a.exec(); | ||
30 | } | ||
diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro index cea268d..9d05832 100644 --- a/core/settings/launcher/launcher.pro +++ b/core/settings/launcher/launcher.pro | |||
@@ -1,5 +1,3 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = launchersettings.h \ | 2 | HEADERS = launchersettings.h \ |
5 | tabssettings.h \ | 3 | tabssettings.h \ |
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp index 3982194..efc4a86 100644 --- a/core/settings/launcher/launchersettings.cpp +++ b/core/settings/launcher/launchersettings.cpp | |||
@@ -38,5 +38,6 @@ | |||
38 | #include "inputmethodsettings.h" | 38 | #include "inputmethodsettings.h" |
39 | 39 | ||
40 | LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) | 40 | LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) |
41 | : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) | ||
41 | { | 42 | { |
42 | setCaption ( tr( "Launcher Settings" )); | 43 | setCaption ( tr( "Launcher Settings" )); |
diff --git a/core/settings/launcher/launchersettings.h b/core/settings/launcher/launchersettings.h index 71165a3..7458d8b 100644 --- a/core/settings/launcher/launchersettings.h +++ b/core/settings/launcher/launchersettings.h | |||
@@ -40,5 +40,6 @@ class LauncherSettings : public QDialog { | |||
40 | 40 | ||
41 | public: | 41 | public: |
42 | LauncherSettings ( ); | 42 | static QString appName() { return QString::fromLatin1("launchersettings"); } |
43 | LauncherSettings (QWidget *parent = 0, const char* name = 0, WFlags fl = 0 ); | ||
43 | 44 | ||
44 | virtual void accept ( ); | 45 | virtual void accept ( ); |
diff --git a/core/settings/launcher/main.cpp b/core/settings/launcher/main.cpp index f65dab8..4cc1d35 100644 --- a/core/settings/launcher/main.cpp +++ b/core/settings/launcher/main.cpp | |||
@@ -29,15 +29,7 @@ | |||
29 | 29 | ||
30 | #include <qpe/qpeapplication.h> | 30 | #include <qpe/qpeapplication.h> |
31 | #include <opie/oapplicationfactory.h> | ||
31 | 32 | ||
33 | OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> ) | ||
32 | 34 | ||
33 | int main ( int argc, char** argv ) | ||
34 | { | ||
35 | QPEApplication a ( argc,argv ); | ||
36 | |||
37 | LauncherSettings dlg; | ||
38 | a. showMainWidget ( &dlg ); | ||
39 | dlg. showMaximized ( ); | ||
40 | |||
41 | return a. exec ( ); | ||
42 | } | ||
43 | 35 | ||
diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp index 6fca621..faa7cf4 100644 --- a/core/settings/launcher/menusettings.cpp +++ b/core/settings/launcher/menusettings.cpp | |||
@@ -17,5 +17,5 @@ | |||
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
18 | ..}^=.= = ; Public License for more details. | 18 | ..}^=.= = ; Public License for more details. |
19 | ++= -. .` .: | 19 | ++= -. .` .: |
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
@@ -61,8 +61,11 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name ) | |||
61 | 61 | ||
62 | lay-> addWidget ( m_list ); | 62 | lay-> addWidget ( m_list ); |
63 | 63 | ||
64 | m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this ); | 64 | m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this ); |
65 | lay-> addWidget ( m_menutabs ); | 65 | lay-> addWidget ( m_menutabs ); |
66 | 66 | ||
67 | m_menusubpopup = new QCheckBox ( tr( "Show Applications in subpopups" ), this ); | ||
68 | lay-> addWidget ( m_menusubpopup ); | ||
69 | |||
67 | QWhatsThis::add ( m_list, tr( "Check the applets that you want to have included in the O-Menu." )); | 70 | QWhatsThis::add ( m_list, tr( "Check the applets that you want to have included in the O-Menu." )); |
68 | QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." )); | 71 | QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." )); |
@@ -120,4 +123,5 @@ void MenuSettings::init ( ) | |||
120 | cfg. setGroup ( "Menu" ); | 123 | cfg. setGroup ( "Menu" ); |
121 | m_menutabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true )); | 124 | m_menutabs-> setChecked ( cfg. readBoolEntry ( "LauncherTabs", true )); |
125 | m_menusubpopup-> setChecked ( cfg. readBoolEntry ( "LauncherSubPopup", true )); | ||
122 | } | 126 | } |
123 | 127 | ||
@@ -150,5 +154,10 @@ void MenuSettings::accept ( ) | |||
150 | cfg. writeEntry ( "LauncherTabs", m_menutabs-> isChecked ( )); | 154 | cfg. writeEntry ( "LauncherTabs", m_menutabs-> isChecked ( )); |
151 | } | 155 | } |
152 | 156 | ||
157 | if ( m_menusubpopup-> isChecked ( ) != cfg. readBoolEntry ( "LauncherSubPopup", true )) { | ||
158 | apps_changed = true; | ||
159 | cfg. writeEntry ( "LauncherSubPopup", m_menusubpopup-> isChecked ( )); | ||
160 | } | ||
161 | |||
153 | cfg. write ( ); | 162 | cfg. write ( ); |
154 | 163 | ||
@@ -158,5 +167,8 @@ void MenuSettings::accept ( ) | |||
158 | } | 167 | } |
159 | if ( apps_changed ) { | 168 | if ( apps_changed ) { |
169 | // currently use reloadApplets() since reloadApps is now used exclusive for server | ||
170 | // to refresh the tabs. But what we want here is also a refresh of the startmenu entries | ||
160 | QCopEnvelope ( "QPE/TaskBar", "reloadApps()" ); | 171 | QCopEnvelope ( "QPE/TaskBar", "reloadApps()" ); |
172 | QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" ); | ||
161 | } | 173 | } |
162 | } | 174 | } |
diff --git a/core/settings/launcher/menusettings.h b/core/settings/launcher/menusettings.h index 5986958..5bb7afa 100644 --- a/core/settings/launcher/menusettings.h +++ b/core/settings/launcher/menusettings.h | |||
@@ -55,5 +55,5 @@ private: | |||
55 | QMap <QString, QCheckListItem *> m_applets; | 55 | QMap <QString, QCheckListItem *> m_applets; |
56 | bool m_applets_changed; | 56 | bool m_applets_changed; |
57 | QCheckBox *m_menutabs; | 57 | QCheckBox *m_menutabs, *m_menusubpopup; |
58 | }; | 58 | }; |
59 | 59 | ||
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp index 7cd00bd..3d8b456 100644 --- a/core/settings/launcher/tabssettings.cpp +++ b/core/settings/launcher/tabssettings.cpp | |||
@@ -82,6 +82,6 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name ) | |||
82 | lay-> addMultiCellWidget ( m_bigbusy, 5, 5, 0, 1 ); | 82 | lay-> addMultiCellWidget ( m_bigbusy, 5, 5, 0, 1 ); |
83 | 83 | ||
84 | m_busyblink = new QCheckBox ( tr( "Enable blinking busy indicator" ), this ); | 84 | m_busyani = new QCheckBox ( tr( "Enable animated busy indicator" ), this ); |
85 | lay-> addMultiCellWidget ( m_busyblink, 6, 6, 0, 1 ); | 85 | lay-> addMultiCellWidget ( m_busyani, 6, 6, 0, 1 ); |
86 | 86 | ||
87 | p1-> setEnabled ( false ); | 87 | p1-> setEnabled ( false ); |
@@ -95,5 +95,5 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name ) | |||
95 | QWhatsThis::add ( p3, tr( "Deletes a Tab from the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." )); | 95 | QWhatsThis::add ( p3, tr( "Deletes a Tab from the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." )); |
96 | QWhatsThis::add ( m_bigbusy, tr( "Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar." )); | 96 | QWhatsThis::add ( m_bigbusy, tr( "Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar." )); |
97 | QWhatsThis::add ( m_busyblink, tr( "Activate this, if you want a blinking busy indicator for starting applications in the Launcher." )); | 97 | QWhatsThis::add ( m_busyani, tr( "Activate this, if you want an animatedbusy indicator for starting applications in the Launcher." )); |
98 | } | 98 | } |
99 | 99 | ||
@@ -121,5 +121,5 @@ void TabsSettings::init ( ) | |||
121 | 121 | ||
122 | cfg. setGroup ( "GUI" ); | 122 | cfg. setGroup ( "GUI" ); |
123 | m_busyblink-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "blink" ); | 123 | m_busyani-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "animated" ); |
124 | m_bigbusy->setChecked( cfg. readBoolEntry ( "BigBusy" ) ); | 124 | m_bigbusy->setChecked( cfg. readBoolEntry ( "BigBusy" ) ); |
125 | } | 125 | } |
@@ -265,5 +265,5 @@ void TabsSettings::accept ( ) | |||
265 | } | 265 | } |
266 | cfg. setGroup ( "GUI" ); | 266 | cfg. setGroup ( "GUI" ); |
267 | QString busytype = QString ( m_busyblink-> isChecked ( ) ? "blink" : "" ); | 267 | QString busytype = QString ( m_busyani-> isChecked ( ) ? "Animated" : "" ); |
268 | cfg. writeEntry ( "BusyType", busytype ); | 268 | cfg. writeEntry ( "BusyType", busytype ); |
269 | 269 | ||
diff --git a/core/settings/launcher/tabssettings.h b/core/settings/launcher/tabssettings.h index 439def6..600c65c 100644 --- a/core/settings/launcher/tabssettings.h +++ b/core/settings/launcher/tabssettings.h | |||
@@ -60,5 +60,5 @@ private: | |||
60 | QStringList m_ids; | 60 | QStringList m_ids; |
61 | QMap <QString, TabConfig> m_tabs; | 61 | QMap <QString, TabConfig> m_tabs; |
62 | QCheckBox *m_busyblink, *m_bigbusy; | 62 | QCheckBox *m_busyani, *m_bigbusy; |
63 | }; | 63 | }; |
64 | 64 | ||
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro index 9304fa8..4972701 100644 --- a/core/settings/light-and-power/light-and-power.pro +++ b/core/settings/light-and-power/light-and-power.pro | |||
@@ -1,5 +1,3 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on debug | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = light.h sensor.h calibration.h | 2 | HEADERS = light.h sensor.h calibration.h |
5 | SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp | 3 | SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp |
@@ -8,4 +6,5 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
8 | DEPENDPATH+= ../$(OPIEDIR)/include | 6 | DEPENDPATH+= ../$(OPIEDIR)/include |
9 | LIBS += -lqpe -lopie | 7 | LIBS += -lqpe -lopie |
8 | |||
10 | TARGET = light-and-power | 9 | TARGET = light-and-power |
11 | 10 | ||
diff --git a/core/settings/light-and-power/light.h b/core/settings/light-and-power/light.h index c48e5f6..83d5520 100644 --- a/core/settings/light-and-power/light.h +++ b/core/settings/light-and-power/light.h | |||
@@ -43,4 +43,5 @@ public: | |||
43 | LightSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 43 | LightSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
44 | ~LightSettings(); | 44 | ~LightSettings(); |
45 | static QString appName() { return QString::fromLatin1("light-and-power"); } | ||
45 | 46 | ||
46 | protected: | 47 | protected: |
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui index 1f5d594..e4d5f0e 100644 --- a/core/settings/light-and-power/lightsettingsbase.ui +++ b/core/settings/light-and-power/lightsettingsbase.ui | |||
@@ -1264,9 +1264,9 @@ | |||
1264 | <image> | 1264 | <image> |
1265 | <name>image0</name> | 1265 | <name>image0</name> |
1266 | <data format="XPM.GZ" length="680">789c5dd04d6ac3301005e0bd4f21ec5d280931b1c0941ca1a5cb42e962a4194956e2d8f9e9a294debd9e9168ec3cbcd0f72ca1b1372bf5fef6a2569be27a835b67950d70512bfceafbef8fcffd4f516eb59a9e7aabb6e55351ae9555afc389787d9ed6556bdbb6b5cc2b1376d0c08e79115a0090b74326258e4cb333b591cd27a66d6c6d1b669fa9134988162c328f99945831b1c11a65f32153271a2121a0cc1c3329b16392a69a3413327562101201c9669f4989c874dad54e36bb4c9d6885ce8173f2df24158049abff0eec14a479371de1f859573944873e00dd3b8353ba18e3e1de1dbcf7d04d31b3b39033eb8e1052aad9bdc64be262bec0b784e5cc81c78387efe0ae5b767decba785a76c3380cc379d9ad2fe3787df82fb394bfcfc51f5517a686</data> | 1266 | <data format="XPM.GZ" length="1025">789c5dd2cd4ec2401846e13d57d1c08e18a58a20312e44f913419626c6c5cc500a42f92b60c178eff6bc2642fd0e8b79be0d43e945d17b1df4bce2452ede98cdc4796e6cd65e71b88da2fddbfbdd572eef57bcf4532e7b7efe2c973ff79cd75fcc03cefdf45ca859820368aa045f440d7c1287047b6240f0591c11ec425b22d881ce27d8122b0417a22138122dc17b51030f70582258107d821fe225c18d784d702b56092ec51b824eac11dc8b96e0a3e808c6a206b6c580e0270c4a0413d127b8162f09866299a011af095ab142b02e56093e8837049b628d6043d49f04e7a22518898ee04ed46f8013510303382a115c893ec1997845702a96098ec52ac1a168492fa4a660acfb3dfded2c0f37189deec2b16672b2fb98ce66d35934378be36eb94a671dc7f1e6b8dbee263bf39924c9feb83b84260cd3d73b5c1e77f7f587df399c7caf8b348f99fb357836cdec9d1bd374ead99d2e9d6477ad7692b43bd9dd53f7b9d7eb6777e72fddeee0df733999fcf76dee0748aaf77c</data> |
1267 | </image> | 1267 | </image> |
1268 | <image> | 1268 | <image> |
1269 | <name>image1</name> | 1269 | <name>image1</name> |
1270 | <data format="XPM.GZ" length="1220">789c5dd35f53e2301000f0773e4507de981ba4a5443a37f7a028fe41101514bcb987344d0515a8b4a0e0dc77bfee6e36d0dbe121bf4d48361b38aa3ae341cfa91e95d24c6633e5a8a95c39d5683d9f6f7ffff9f55d2abbc2c93fcd63c72dff28956b8e72facb8586f1733eae042a080205f480d2974de903eb4825a5c4d927434d9c30435c3c26861ed105863ef31118692584043e18cae306700ad43af27c9cbd00c622120d2cf8c350d65bc02b66230056984d0f786ea83d9c7d67fab89562d2b92ba2f6e8bb4343d10a81236680579086927a1532a957d7c898b7fa32146e1db865d28d7acc26def7de50b6b0aa3b4b2ce3cc507bb8d58c498b0796b8386252cd1b62ec51199f96d8c95326f5aacfa49d6f99b455db50d0e235935ea1c3a43e279678c14ba6c0e62c99f40a5d4bbcc21b931afbc20c23e0c250d2e21b26d5bcb3c4d913265d21b5c417cc9874d09c49bfd857c358e1b931530ba0b6c4ff510da3224345239b8b74bee6657a989bbd62bc1de4dee7108b65f2b1cfadd22ccdd69bcde7d73eb7dd9dec92d376bb7db6cf9d77924e02b1dde72e2e4d5c1d9c7bddbdc9a3db2bd4d74ff3e8176bbe856206c5dc1d947c5fcc3d0c47a3e16331f7349e4c26cfc55cadeebade7f7d3988f2df9fa57f7da120b4</data> | 1270 | <data format="XPM.GZ" length="1885">789c75d4576fdb301000e077ff0ac17c0b8a8bad49a2e843f61ece4e8a3e481cde198eb3d1ff5eeaeecca675ecb3047cd68922ef282f2f4557c707d1d272e3715a4efb3ad2bd72122d99a7f1f8ede7af1f1f8d663b8ffcb75051dcfcd66876a6918e0eef6e6d0d31f010aaf2a1d1e3da6551077a88c60fdaa14d694b87eea36d692b1c5cf4d88edd45bbaa5525e8516d2f1f685bdb289de7065da28dae8aac36e0f8d69a38add067b55d6cb224470bb6cc52f4153a316582f9c2906d2a255ed7e8d4b882d65791fd7585d79fd199512dac071cb0758cf383db99539a3f8d97d95ca1e1059ddb386ba3713daeb04a61bda0629725adef1a2d6d92517d045b4a346ca295cd12ca3f65e7ec36bbc8b03f60d85a513d24dab74752fd36d0952ddad81f18b0353faf605b89fb037a649756b4fe0cad5dace8f9fb6863754c4ec92e96e4989d48ead7989df2facfd1d66539d5ef929de734bf55b473719bee5f0bc6fec17a30f577979d70bff6d8694ceb599939a1fc437696d2f8c7c1347e2798f28f8269bf3c05d37ed909a67e9fb073beff62e69cfa336517bcdf6f8269be8f6c59d07a5a334baad756308dbf3db3a2fa256c45ef37bcb34b45e3bd06d37cdf662e69fc8799e97d86fb609aff2498ea77174cf5cbd9155d17c0d69aeaa78269ff8e8269bf0e83a91e8e6d2c3dafcbb66c1b2ce9cfee6f8080122ad09f7ffb37070c58703ebad083fe57393080218cfc41e7f17c0edcc21ddcc3034cfcf911a6f004cf73392ff00a6ff0ee8f1558853558878db99c4dd8826d7fecc02eec61eccfe51cc0211cc13174e004a303a7733967700e179fe212aebe58d735dc408be306da0bea1343c2912eac6106b95ffbc49f8b85391294afdf4880108b7244292aa17d186117e638d1153dd1f7315894e3b38662e463fcf9b7ff73be8ae6efef8d3f188ce126</data> |
1271 | </image> | 1271 | </image> |
1272 | </images> | 1272 | </images> |
@@ -1288,18 +1288,18 @@ | |||
1288 | </connections> | 1288 | </connections> |
1289 | <tabstops> | 1289 | <tabstops> |
1290 | <tabstop>brightness</tabstop> | ||
1290 | <tabstop>interval_dim</tabstop> | 1291 | <tabstop>interval_dim</tabstop> |
1291 | <tabstop>interval_lightoff</tabstop> | 1292 | <tabstop>interval_lightoff</tabstop> |
1292 | <tabstop>interval_suspend</tabstop> | 1293 | <tabstop>interval_suspend</tabstop> |
1293 | <tabstop>LcdOffOnly</tabstop> | 1294 | <tabstop>LcdOffOnly</tabstop> |
1294 | <tabstop>brightness</tabstop> | ||
1295 | <tabstop>auto_brightness</tabstop> | 1295 | <tabstop>auto_brightness</tabstop> |
1296 | <tabstop>CalibrateLightSensor</tabstop> | 1296 | <tabstop>CalibrateLightSensor</tabstop> |
1297 | <tabstop>brightness</tabstop> | ||
1297 | <tabstop>tabs</tabstop> | 1298 | <tabstop>tabs</tabstop> |
1298 | <tabstop>interval_lightoff_ac</tabstop> | 1299 | <tabstop>interval_lightoff</tabstop> |
1299 | <tabstop>interval_suspend_ac</tabstop> | 1300 | <tabstop>interval_suspend</tabstop> |
1300 | <tabstop>interval_dim_ac</tabstop> | 1301 | <tabstop>interval_dim</tabstop> |
1301 | <tabstop>LcdOffOnly_ac</tabstop> | 1302 | <tabstop>LcdOffOnly_ac</tabstop> |
1302 | <tabstop>brightness_ac</tabstop> | 1303 | <tabstop>auto_brightness</tabstop> |
1303 | <tabstop>auto_brightness_ac</tabstop> | ||
1304 | <tabstop>CalibrateLightSensor_ac</tabstop> | 1304 | <tabstop>CalibrateLightSensor_ac</tabstop> |
1305 | <tabstop>lowSpinBox</tabstop> | 1305 | <tabstop>lowSpinBox</tabstop> |
diff --git a/core/settings/light-and-power/main.cpp b/core/settings/light-and-power/main.cpp index ecacf69..68d433b 100644 --- a/core/settings/light-and-power/main.cpp +++ b/core/settings/light-and-power/main.cpp | |||
@@ -24,15 +24,6 @@ | |||
24 | #include <qpe/qcopenvelope_qws.h> | 24 | #include <qpe/qcopenvelope_qws.h> |
25 | #include <qpe/global.h> | 25 | #include <qpe/global.h> |
26 | #include <opie/oapplicationfactory.h> | ||
26 | 27 | ||
27 | 28 | ||
28 | int main(int argc, char** argv) | 29 | OPIE_EXPORT_APP( OApplicationFactory<LightSettings> ) |
29 | { | ||
30 | QPEApplication a(argc,argv); | ||
31 | |||
32 | LightSettings dlg; | ||
33 | |||
34 | a.showMainWidget(&dlg); | ||
35 | |||
36 | return a.exec(); | ||
37 | } | ||
38 | |||
diff --git a/core/settings/security/main.cpp b/core/settings/security/main.cpp index c15bb31..3141fb8 100644 --- a/core/settings/security/main.cpp +++ b/core/settings/security/main.cpp | |||
@@ -25,14 +25,8 @@ | |||
25 | #include "security.h" | 25 | #include "security.h" |
26 | 26 | ||
27 | #include <opie/oapplicationfactory.h> | ||
27 | 28 | ||
28 | int main(int argc, char** argv) | 29 | OPIE_EXPORT_APP( OApplicationFactory<Security> ) |
29 | { | ||
30 | QPEApplication a(argc,argv); | ||
31 | 30 | ||
32 | Security dlg; | ||
33 | 31 | ||
34 | a.showMainWidget(&dlg); | ||
35 | |||
36 | return a.exec(); | ||
37 | } | ||
38 | 32 | ||
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 42a39c2..81363d2 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp | |||
@@ -121,5 +121,4 @@ void Security::show() | |||
121 | //reject(); | 121 | //reject(); |
122 | } else { | 122 | } else { |
123 | |||
124 | if (!valid) // security passcode was not asked yet, so ask now | 123 | if (!valid) // security passcode was not asked yet, so ask now |
125 | { | 124 | { |
@@ -240,5 +239,4 @@ void Security::applySecurity() | |||
240 | { | 239 | { |
241 | if ( valid ) { | 240 | if ( valid ) { |
242 | |||
243 | Config cfg("Security"); | 241 | Config cfg("Security"); |
244 | cfg.setGroup("Passcode"); | 242 | cfg.setGroup("Passcode"); |
@@ -271,7 +269,4 @@ void Security::applySecurity() | |||
271 | } | 269 | } |
272 | 270 | ||
273 | cfg.setGroup("SyncMode"); | ||
274 | cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 ); | ||
275 | |||
276 | } | 271 | } |
277 | } | 272 | } |
diff --git a/core/settings/security/security.h b/core/settings/security/security.h index 2f18f91..52d56de 100644 --- a/core/settings/security/security.h +++ b/core/settings/security/security.h | |||
@@ -30,4 +30,5 @@ class Security : public SecurityBase | |||
30 | 30 | ||
31 | public: | 31 | public: |
32 | static QString appName() { return QString::fromLatin1("security"); } | ||
32 | Security( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 33 | Security( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
33 | ~Security(); | 34 | ~Security(); |
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro index c359537..67995d4 100644 --- a/core/settings/security/security.pro +++ b/core/settings/security/security.pro | |||
@@ -1,5 +1,3 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = security.h | 2 | HEADERS = security.h |
5 | SOURCES = security.cpp main.cpp | 3 | SOURCES = security.cpp main.cpp |
diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui index 73290e5..9fb63a8 100644 --- a/core/settings/security/securitybase.ui +++ b/core/settings/security/securitybase.ui | |||
@@ -12,5 +12,5 @@ | |||
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>339</width> | 14 | <width>329</width> |
15 | <height>483</height> | 15 | <height>483</height> |
16 | </rect> | 16 | </rect> |