summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/button/button.pro9
-rw-r--r--core/settings/button/buttonsettings.cpp66
-rw-r--r--core/settings/button/buttonsettings.h3
-rw-r--r--core/settings/button/main.cpp16
-rw-r--r--core/settings/citytime/citytime.h2
-rw-r--r--core/settings/citytime/citytime.pro8
-rw-r--r--core/settings/citytime/main.cpp9
-rw-r--r--core/settings/launcher/launcher.pro4
-rw-r--r--core/settings/launcher/launchersettings.cpp3
-rw-r--r--core/settings/launcher/launchersettings.h3
-rw-r--r--core/settings/launcher/main.cpp12
-rw-r--r--core/settings/launcher/menusettings.cpp18
-rw-r--r--core/settings/launcher/menusettings.h2
-rw-r--r--core/settings/launcher/tabssettings.cpp10
-rw-r--r--core/settings/launcher/tabssettings.h2
-rw-r--r--core/settings/light-and-power/light-and-power.pro5
-rw-r--r--core/settings/light-and-power/light.h1
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui16
-rw-r--r--core/settings/light-and-power/main.cpp13
-rw-r--r--core/settings/security/main.cpp10
-rw-r--r--core/settings/security/security.cpp5
-rw-r--r--core/settings/security/security.h1
-rw-r--r--core/settings/security/security.pro4
-rw-r--r--core/settings/security/securitybase.ui2
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,40 +1,37 @@
1TEMPLATE = app 1CONFIG += qt warn_on release quick-app
2CONFIG += qt warn_on release 2
3DESTDIR = $(OPIEDIR)/bin
4HEADERS = buttonsettings.h \ 3HEADERS = buttonsettings.h \
5 buttonutils.h \ 4 buttonutils.h \
6 remapdlg.h 5 remapdlg.h
7 6
8SOURCES = main.cpp \ 7SOURCES = main.cpp \
9 buttonsettings.cpp \ 8 buttonsettings.cpp \
10 buttonutils.cpp \ 9 buttonutils.cpp \
11 remapdlg.cpp 10 remapdlg.cpp
12 11
13INTERFACES = remapdlgbase.ui 12INTERFACES = remapdlgbase.ui
14 13
15INCLUDEPATH += $(OPIEDIR)/include 14INCLUDEPATH += $(OPIEDIR)/include
16DEPENDPATH += $(OPIEDIR)/include 15DEPENDPATH += $(OPIEDIR)/include
17LIBS += -lqpe -lopie 16LIBS += -lqpe -lopie
18TARGET = buttonsettings 17 TARGET = buttonsettings
19 18
20TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \ 19TRANSLATIONS = ../../../i18n/de/buttonsettings.ts \
21 ../../../i18n/nl/buttonsettings.ts \ 20 ../../../i18n/nl/buttonsettings.ts \
22 ../../../i18n/xx/buttonsettings.ts \ 21 ../../../i18n/xx/buttonsettings.ts \
23 ../../../i18n/en/buttonsettings.ts \ 22 ../../../i18n/en/buttonsettings.ts \
24 ../../../i18n/es/buttonsettings.ts \ 23 ../../../i18n/es/buttonsettings.ts \
25 ../../../i18n/fr/buttonsettings.ts \ 24 ../../../i18n/fr/buttonsettings.ts \
26 ../../../i18n/hu/buttonsettings.ts \ 25 ../../../i18n/hu/buttonsettings.ts \
27 ../../../i18n/ja/buttonsettings.ts \ 26 ../../../i18n/ja/buttonsettings.ts \
28 ../../../i18n/ko/buttonsettings.ts \ 27 ../../../i18n/ko/buttonsettings.ts \
29 ../../../i18n/no/buttonsettings.ts \ 28 ../../../i18n/no/buttonsettings.ts \
30 ../../../i18n/pl/buttonsettings.ts \ 29 ../../../i18n/pl/buttonsettings.ts \
31 ../../../i18n/pt/buttonsettings.ts \ 30 ../../../i18n/pt/buttonsettings.ts \
32 ../../../i18n/pt_BR/buttonsettings.ts \ 31 ../../../i18n/pt_BR/buttonsettings.ts \
33 ../../../i18n/sl/buttonsettings.ts \ 32 ../../../i18n/sl/buttonsettings.ts \
34 ../../../i18n/zh_CN/buttonsettings.ts \ 33 ../../../i18n/zh_CN/buttonsettings.ts \
35 ../../../i18n/zh_TW/buttonsettings.ts \ 34 ../../../i18n/zh_TW/buttonsettings.ts \
36 ../../../i18n/da/buttonsettings.ts 35 ../../../i18n/da/buttonsettings.ts
37 36
38
39
40include ( $(OPIEDIR)/include.pro ) 37include ( $(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
@@ -1,256 +1,256 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
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;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27
28#include <qlayout.h> 28#include <qlayout.h>
29#include <qlabel.h> 29#include <qlabel.h>
30#include <qtimer.h> 30#include <qtimer.h>
31 31
32#include <qpe/qpeapplication.h> 32#include <qpe/qpeapplication.h>
33 33
34#include <opie/odevice.h> 34#include <opie/odevice.h>
35 35
36#include "buttonsettings.h" 36#include "buttonsettings.h"
37#include "buttonutils.h" 37#include "buttonutils.h"
38#include "remapdlg.h" 38#include "remapdlg.h"
39 39
40using namespace Opie; 40using namespace Opie;
41 41
42struct buttoninfo { 42struct buttoninfo {
43 const ODeviceButton *m_button; 43 const ODeviceButton *m_button;
44 int m_index; 44 int m_index;
45 45
46 OQCopMessage m_pmsg; 46 OQCopMessage m_pmsg;
47 QLabel *m_picon; 47 QLabel *m_picon;
48 QLabel *m_plabel; 48 QLabel *m_plabel;
49 49
50 OQCopMessage m_hmsg; 50 OQCopMessage m_hmsg;
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;
56}; 56};
57 57
58 58
59ButtonSettings::ButtonSettings ( ) 59ButtonSettings::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{
62 const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( ); 62 const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( );
63 (void) ButtonUtils::inst ( ); // initialise 63 (void) ButtonUtils::inst ( ); // initialise
64 64
65 setCaption ( tr( "Button Settings" )); 65 setCaption ( tr( "Button Settings" ));
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 );
74 lay-> setColStretch ( 0, 0 ); 74 lay-> setColStretch ( 0, 0 );
75 lay-> setColStretch ( 1, 0 ); 75 lay-> setColStretch ( 1, 0 );
76 lay-> setColStretch ( 2, 0 ); 76 lay-> setColStretch ( 2, 0 );
77 lay-> setColStretch ( 3, 10 ); 77 lay-> setColStretch ( 3, 10 );
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;
83 for ( QValueList<ODeviceButton>::ConstIterator it = buttons. begin ( ); it != buttons. end ( ); it++ ) { 83 for ( QValueList<ODeviceButton>::ConstIterator it = buttons. begin ( ); it != buttons. end ( ); it++ ) {
84 if ( it != buttons. begin ( )) { 84 if ( it != buttons. begin ( )) {
85 QFrame *f = new QFrame ( this ); 85 QFrame *f = new QFrame ( this );
86 f-> setFrameStyle ( QFrame::Sunken | QFrame::VLine ); 86 f-> setFrameStyle ( QFrame::Sunken | QFrame::VLine );
87 lay-> addMultiCellWidget ( f, i, i, 0, 3 ); 87 lay-> addMultiCellWidget ( f, i, i, 0, 3 );
88 i++; 88 i++;
89 } 89 }
90 90
91 buttoninfo *bi = new buttoninfo ( ); 91 buttoninfo *bi = new buttoninfo ( );
92 bi-> m_button = &(*it); 92 bi-> m_button = &(*it);
93 bi-> m_index = index++; 93 bi-> m_index = index++;
94 bi-> m_pmsg = (*it). pressedAction ( ); 94 bi-> m_pmsg = (*it). pressedAction ( );
95 bi-> m_hmsg = (*it). heldAction ( ); 95 bi-> m_hmsg = (*it). heldAction ( );
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 );
111 lay-> addWidget ( l, i, 2, AlignLeft | AlignBottom ); 111 lay-> addWidget ( l, i, 2, AlignLeft | AlignBottom );
112 bi-> m_picon = l; 112 bi-> m_picon = l;
113 113
114 l = new QLabel ( this ); 114 l = new QLabel ( this );
115 l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine ); 115 l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
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 );
121 lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop ); 121 lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop );
122 bi-> m_hicon = l; 122 bi-> m_hicon = l;
123 123
124 l = new QLabel ( this ); 124 l = new QLabel ( this );
125 l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine ); 125 l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
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 );
135 135
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}
146 146
147ButtonSettings::~ButtonSettings ( ) 147ButtonSettings::~ButtonSettings ( )
148{ 148{
149 QPEApplication::ungrabKeyboard ( ); 149 QPEApplication::ungrabKeyboard ( );
150} 150}
151 151
152void ButtonSettings::updateLabels ( ) 152void ButtonSettings::updateLabels ( )
153{ 153{
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 );
159 159
160 qCopInfo cih = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_hmsg ); 160 qCopInfo cih = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_hmsg );
161 161
162 (*it)-> m_hicon-> setPixmap ( cih. m_icon ); 162 (*it)-> m_hicon-> setPixmap ( cih. m_icon );
163 (*it)-> m_hlabel-> setText ( cih. m_name ); 163 (*it)-> m_hlabel-> setText ( cih. m_name );
164 } 164 }
165} 165}
166 166
167buttoninfo *ButtonSettings::buttonInfoForKeycode ( ushort key ) 167buttoninfo *ButtonSettings::buttonInfoForKeycode ( ushort key )
168{ 168{
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
176void ButtonSettings::keyPressEvent ( QKeyEvent *e ) 176void 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;
183 m_timer-> start ( ODevice::inst ( )-> buttonHoldTime ( ), true ); 183 m_timer-> start ( ODevice::inst ( )-> buttonHoldTime ( ), true );
184 } 184 }
185 else 185 else
186 QDialog::keyPressEvent ( e ); 186 QDialog::keyPressEvent ( e );
187} 187}
188 188
189void ButtonSettings::keyReleaseEvent ( QKeyEvent *e ) 189void 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
198 QDialog::keyReleaseEvent ( e ); 198 QDialog::keyReleaseEvent ( e );
199} 199}
200 200
201void ButtonSettings::keyTimeout ( ) 201void ButtonSettings::keyTimeout ( )
202{ 202{
203 if ( m_last_button ) { 203 if ( m_last_button ) {
204 edit ( m_last_button, true ); 204 edit ( m_last_button, true );
205 m_last_button = false; 205 m_last_button = false;
206 } 206 }
207} 207}
208 208
209void ButtonSettings::edit ( buttoninfo *bi, bool hold ) 209void 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 ( );
224 bi-> m_hdirty = true; 224 bi-> m_hdirty = true;
225 } 225 }
226 else { 226 else {
227 bi-> m_pmsg = d-> message ( ); 227 bi-> m_pmsg = d-> message ( );
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}
238 238
239void ButtonSettings::accept ( ) 239void ButtonSettings::accept ( )
240{ 240{
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 );
246 if ( bi-> m_hdirty ) 246 if ( bi-> m_hdirty )
247 ODevice::inst ( )-> remapHeldAction ( bi-> m_index, bi-> m_hmsg ); 247 ODevice::inst ( )-> remapHeldAction ( bi-> m_index, bi-> m_hmsg );
248 } 248 }
249 QDialog::accept ( ); 249 QDialog::accept ( );
250} 250}
251 251
252void ButtonSettings::done ( int r ) 252void ButtonSettings::done ( int r )
253{ 253{
254 QDialog::done ( r ); 254 QDialog::done ( r );
255 close ( ); 255 close ( );
256} 256}
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
@@ -1,75 +1,76 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
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;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27
28#ifndef __BUTTON_SETTINGS_H__ 28#ifndef __BUTTON_SETTINGS_H__
29#define __BUTTON_SETTINGS_H__ 29#define __BUTTON_SETTINGS_H__
30 30
31#include <qdialog.h> 31#include <qdialog.h>
32#include <qlist.h> 32#include <qlist.h>
33#include <opie/odevice.h> 33#include <opie/odevice.h>
34 34
35class QTimer; 35class QTimer;
36 36
37using namespace Opie; 37using namespace Opie;
38 38
39class buttoninfo; 39class buttoninfo;
40 40
41class ButtonSettings : public QDialog { 41class ButtonSettings : public QDialog {
42 Q_OBJECT 42 Q_OBJECT
43 43
44public: 44public:
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 );
50 51
51private slots: 52private slots:
52 void keyTimeout ( ); 53 void keyTimeout ( );
53 void updateLabels ( ); 54 void updateLabels ( );
54 55
55protected: 56protected:
56 virtual void keyPressEvent ( QKeyEvent *e ); 57 virtual void keyPressEvent ( QKeyEvent *e );
57 virtual void keyReleaseEvent ( QKeyEvent *e ); 58 virtual void keyReleaseEvent ( QKeyEvent *e );
58 59
59private: 60private:
60 buttoninfo *buttonInfoForKeycode ( ushort key ); 61 buttoninfo *buttonInfoForKeycode ( ushort key );
61 62
62 void edit ( buttoninfo *bi, bool hold ); 63 void edit ( buttoninfo *bi, bool hold );
63 QString qcopToString ( const OQCopMessage &c ); 64 QString qcopToString ( const OQCopMessage &c );
64 65
65 private: 66 private:
66 QTimer *m_timer; 67 QTimer *m_timer;
67 buttoninfo *m_last_button; 68 buttoninfo *m_last_button;
68 69
69 QList <buttoninfo> m_infos; 70 QList <buttoninfo> m_infos;
70 bool m_lock; 71 bool m_lock;
71}; 72};
72 73
73#endif 74#endif
74 75
75 76
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
@@ -1,43 +1,33 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
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;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27
28#include "buttonsettings.h" 28#include "buttonsettings.h"
29 29
30#include <qpe/qpeapplication.h> 30#include <qpe/qpeapplication.h>
31#include <opie/oapplicationfactory.h>
31 32
32 33OPIE_EXPORT_APP( OApplicationFactory<ButtonSettings> )
33int 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
@@ -1,68 +1,68 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#ifndef TIMEWIDGETIMPL_H 21#ifndef TIMEWIDGETIMPL_H
22#define TIMEWIDGETIMPL_H 22#define TIMEWIDGETIMPL_H
23 23
24#include <qlist.h> 24#include <qlist.h>
25#include <qwidget.h> 25#include <qwidget.h>
26 26
27#include "citytimebase.h" 27#include "citytimebase.h"
28 28
29const int CITIES = 6; // the number of cities... 29const int CITIES = 6; // the number of cities...
30 30
31class ZoneMap; 31class ZoneMap;
32 32
33class CityTime : public CityTimeBase 33class CityTime : public CityTimeBase
34{ 34{
35 Q_OBJECT 35 Q_OBJECT
36public: 36public:
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"); }
40public slots: 40public slots:
41 void beginNewTz(); 41 void beginNewTz();
42 void slotNewTz( const QString& strNewCountry, const QString& strNewCity ); 42 void slotNewTz( const QString& strNewCountry, const QString& strNewCity );
43 void changeClock( bool newClock ); 43 void changeClock( bool newClock );
44 44
45protected: 45protected:
46 void timerEvent( QTimerEvent* ); 46 void timerEvent( QTimerEvent* );
47 void mousePressEvent( QMouseEvent* event ); 47 void mousePressEvent( QMouseEvent* event );
48 48
49private: 49private:
50 void showTime( void ); // get and show the time for various places... 50 void showTime( void ); // get and show the time for various places...
51 void readInTimes( void ); // a method to get information from the config 51 void readInTimes( void ); // a method to get information from the config
52 QString strRealTz; // save the TZ var 52 QString strRealTz; // save the TZ var
53 QString nameRealTz; // and what it is called 53 QString nameRealTz; // and what it is called
54 QString strHome; // the home variable... 54 QString strHome; // the home variable...
55 bool bAdded; // a flag to indicate things have been added... 55 bool bAdded; // a flag to indicate things have been added...
56 bool bWhichClock; 56 bool bWhichClock;
57 int timerId; 57 int timerId;
58 58
59 59
60 QWidget* selWidget; 60 QWidget* selWidget;
61 // a spot to hold the time zone for each city 61 // a spot to hold the time zone for each city
62 QString strCityTz[CITIES]; 62 QString strCityTz[CITIES];
63 QList<QToolButton> listCities; 63 QList<QToolButton> listCities;
64 QList<QLabel> listTimes; 64 QList<QLabel> listTimes;
65 bool changed; 65 bool changed;
66}; 66};
67 67
68#endif 68#endif
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,32 +1,30 @@
1CONFIG += qt warn_on release 1CONFIG += qt warn_on release quick-app
2TEMPLATE = app
3DESTDIR = $(OPIEDIR)/bin
4#INTERFACES = citytimebase.ui
5HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h 2HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h
6SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp 3SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
7TARGET = citytime
8INCLUDEPATH += $(OPIEDIR)/include 4INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 5DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe 6LIBS += -lqpe
11 7
8 TARGET= citytime
9
12TRANSLATIONS = ../../../i18n/de/citytime.ts \ 10TRANSLATIONS = ../../../i18n/de/citytime.ts \
13 ../../../i18n/nl/citytime.ts \ 11 ../../../i18n/nl/citytime.ts \
14 ../../../i18n/xx/citytime.ts \ 12 ../../../i18n/xx/citytime.ts \
15 ../../../i18n/en/citytime.ts \ 13 ../../../i18n/en/citytime.ts \
16 ../../../i18n/es/citytime.ts \ 14 ../../../i18n/es/citytime.ts \
17 ../../../i18n/fr/citytime.ts \ 15 ../../../i18n/fr/citytime.ts \
18 ../../../i18n/hu/citytime.ts \ 16 ../../../i18n/hu/citytime.ts \
19 ../../../i18n/ja/citytime.ts \ 17 ../../../i18n/ja/citytime.ts \
20 ../../../i18n/ko/citytime.ts \ 18 ../../../i18n/ko/citytime.ts \
21 ../../../i18n/no/citytime.ts \ 19 ../../../i18n/no/citytime.ts \
22 ../../../i18n/pl/citytime.ts \ 20 ../../../i18n/pl/citytime.ts \
23 ../../../i18n/pt/citytime.ts \ 21 ../../../i18n/pt/citytime.ts \
24 ../../../i18n/pt_BR/citytime.ts \ 22 ../../../i18n/pt_BR/citytime.ts \
25 ../../../i18n/sl/citytime.ts \ 23 ../../../i18n/sl/citytime.ts \
26 ../../../i18n/zh_CN/citytime.ts \ 24 ../../../i18n/zh_CN/citytime.ts \
27 ../../../i18n/zh_TW/citytime.ts \ 25 ../../../i18n/zh_TW/citytime.ts \
28 ../../../i18n/da/citytime.ts 26 ../../../i18n/da/citytime.ts
29 27
30 28
31 29
32include ( $(OPIEDIR)/include.pro ) 30include ( $(OPIEDIR)/include.pro )
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
@@ -1,30 +1,25 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
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
24int main( int argc, char** argv ) 25OPIE_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,28 +1,26 @@
1TEMPLATE = app 1CONFIG += qt warn_on release quick-app
2CONFIG += qt warn_on release
3DESTDIR = $(OPIEDIR)/bin
4HEADERS = launchersettings.h \ 2HEADERS = launchersettings.h \
5 tabssettings.h \ 3 tabssettings.h \
6 taskbarsettings.h \ 4 taskbarsettings.h \
7 menusettings.h \ 5 menusettings.h \
8 inputmethodsettings.h \ 6 inputmethodsettings.h \
9 tabconfig.h \ 7 tabconfig.h \
10 tabdialog.h 8 tabdialog.h
11 9
12SOURCES = main.cpp \ 10SOURCES = main.cpp \
13 launchersettings.cpp \ 11 launchersettings.cpp \
14 tabssettings.cpp \ 12 tabssettings.cpp \
15 taskbarsettings.cpp \ 13 taskbarsettings.cpp \
16 menusettings.cpp \ 14 menusettings.cpp \
17 inputmethodsettings.cpp \ 15 inputmethodsettings.cpp \
18 tabdialog.cpp 16 tabdialog.cpp
19 17
20INCLUDEPATH += $(OPIEDIR)/include 18INCLUDEPATH += $(OPIEDIR)/include
21DEPENDPATH += $(OPIEDIR)/include 19DEPENDPATH += $(OPIEDIR)/include
22LIBS += -lqpe -lopie 20LIBS += -lqpe -lopie
23TARGET = launchersettings 21TARGET = launchersettings
24 22
25 23
26 24
27 25
28include ( $(OPIEDIR)/include.pro ) 26include ( $(OPIEDIR)/include.pro )
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
@@ -1,76 +1,77 @@
1 1
2/* 2/*
3               =. This file is part of the OPIE Project 3               =. This file is part of the OPIE Project
4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
5           .>+-= 5           .>+-=
6 _;:,     .>    :=|. This file is free software; you can 6 _;:,     .>    :=|. This file is free software; you can
7.> <`_,   >  .   <= redistribute it and/or modify it under 7.> <`_,   >  .   <= redistribute it and/or modify it under
8:`=1 )Y*s>-.--   : the terms of the GNU General Public 8:`=1 )Y*s>-.--   : the terms of the GNU General Public
9.="- .-=="i,     .._ License as published by the Free Software 9.="- .-=="i,     .._ License as published by the Free Software
10 - .   .-<_>     .<> Foundation; either version 2 of the License, 10 - .   .-<_>     .<> Foundation; either version 2 of the License,
11     ._= =}       : or (at your option) any later version. 11     ._= =}       : or (at your option) any later version.
12    .%`+i>       _;_. 12    .%`+i>       _;_.
13    .i_,=:_.      -<s. This file is distributed in the hope that 13    .i_,=:_.      -<s. This file is distributed in the hope that
14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
15    : ..    .:,     . . . without even the implied warranty of 15    : ..    .:,     . . . without even the implied warranty of
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
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;
22  -_. . .   )=.  = see the file COPYING. If not, write to the 22  -_. . .   )=.  = see the file COPYING. If not, write to the
23    --        :-=` Free Software Foundation, Inc., 23    --        :-=` Free Software Foundation, Inc.,
24 59 Temple Place - Suite 330, 24 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28 28
29#include <qlayout.h> 29#include <qlayout.h>
30#include <qapplication.h> 30#include <qapplication.h>
31 31
32#include <opie/otabwidget.h> 32#include <opie/otabwidget.h>
33 33
34#include "launchersettings.h" 34#include "launchersettings.h"
35#include "tabssettings.h" 35#include "tabssettings.h"
36#include "menusettings.h" 36#include "menusettings.h"
37#include "taskbarsettings.h" 37#include "taskbarsettings.h"
38#include "inputmethodsettings.h" 38#include "inputmethodsettings.h"
39 39
40LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) 40LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags)
41 : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp )
41{ 42{
42 setCaption ( tr( "Launcher Settings" )); 43 setCaption ( tr( "Launcher Settings" ));
43 44
44 QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); 45 QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
45 46
46 OTabWidget *tw = new OTabWidget ( this, "otab" ); 47 OTabWidget *tw = new OTabWidget ( this, "otab" );
47 lay-> addWidget ( tw ); 48 lay-> addWidget ( tw );
48 49
49 m_tabs = new TabsSettings ( tw ); 50 m_tabs = new TabsSettings ( tw );
50 m_taskbar = new TaskbarSettings ( tw ); 51 m_taskbar = new TaskbarSettings ( tw );
51 m_menu = new MenuSettings ( tw ); 52 m_menu = new MenuSettings ( tw );
52 m_imethods = new InputMethodSettings ( tw ); 53 m_imethods = new InputMethodSettings ( tw );
53 54
54 tw-> addTab ( m_taskbar, "wait", tr( "Taskbar" )); 55 tw-> addTab ( m_taskbar, "wait", tr( "Taskbar" ));
55 tw-> addTab ( m_menu, "go", tr( "O-Menu" )); 56 tw-> addTab ( m_menu, "go", tr( "O-Menu" ));
56 tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" )); 57 tw-> addTab ( m_tabs, "launchersettings/tabstab.png", tr( "Tabs" ));
57 tw-> addTab ( m_imethods, "launchersettings/inputmethod.png", tr( "InputMethods" )); 58 tw-> addTab ( m_imethods, "launchersettings/inputmethod.png", tr( "InputMethods" ));
58 59
59 tw-> setCurrentTab ( m_taskbar ); 60 tw-> setCurrentTab ( m_taskbar );
60} 61}
61 62
62void LauncherSettings::accept ( ) 63void LauncherSettings::accept ( )
63{ 64{
64 m_taskbar-> accept ( ); 65 m_taskbar-> accept ( );
65 m_menu-> accept ( ); 66 m_menu-> accept ( );
66 m_tabs-> accept ( ); 67 m_tabs-> accept ( );
67 m_imethods-> accept ( ); 68 m_imethods-> accept ( );
68 69
69 QDialog::accept ( ); 70 QDialog::accept ( );
70} 71}
71 72
72void LauncherSettings::done ( int r ) 73void LauncherSettings::done ( int r )
73{ 74{
74 QDialog::done ( r ); 75 QDialog::done ( r );
75 close ( ); 76 close ( );
76} 77}
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
@@ -1,54 +1,55 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
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;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27
28#ifndef __LAUNCHER_SETTINGS_H__ 28#ifndef __LAUNCHER_SETTINGS_H__
29#define __LAUNCHER_SETTINGS_H__ 29#define __LAUNCHER_SETTINGS_H__
30 30
31#include <qdialog.h> 31#include <qdialog.h>
32 32
33class TabsSettings; 33class TabsSettings;
34class TaskbarSettings; 34class TaskbarSettings;
35class MenuSettings; 35class MenuSettings;
36class InputMethodSettings; 36class InputMethodSettings;
37 37
38class LauncherSettings : public QDialog { 38class LauncherSettings : public QDialog {
39 Q_OBJECT 39 Q_OBJECT
40 40
41public: 41public:
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 ( );
45 virtual void done ( int r ); 46 virtual void done ( int r );
46 47
47private: 48private:
48 TabsSettings *m_tabs; 49 TabsSettings *m_tabs;
49 TaskbarSettings *m_taskbar; 50 TaskbarSettings *m_taskbar;
50 MenuSettings *m_menu; 51 MenuSettings *m_menu;
51 InputMethodSettings* m_imethods; 52 InputMethodSettings* m_imethods;
52}; 53};
53 54
54#endif 55#endif
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
@@ -1,43 +1,35 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
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;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27
28#include "launchersettings.h" 28#include "launchersettings.h"
29 29
30#include <qpe/qpeapplication.h> 30#include <qpe/qpeapplication.h>
31#include <opie/oapplicationfactory.h>
31 32
33OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> )
32 34
33int 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
@@ -1,163 +1,175 @@
1/* 1/*
2                This file is part of the OPIE Project 2                This file is part of the OPIE Project
3 =. Copyright (c) 2002 Trolltech AS <info@trolltech.com> 3 =. Copyright (c) 2002 Trolltech AS <info@trolltech.com>
4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
5           .>+-= 5           .>+-=
6 _;:,     .>    :=|. This file is free software; you can 6 _;:,     .>    :=|. This file is free software; you can
7.> <`_,   >  .   <= redistribute it and/or modify it under 7.> <`_,   >  .   <= redistribute it and/or modify it under
8:`=1 )Y*s>-.--   : the terms of the GNU General Public 8:`=1 )Y*s>-.--   : the terms of the GNU General Public
9.="- .-=="i,     .._ License as published by the Free Software 9.="- .-=="i,     .._ License as published by the Free Software
10 - .   .-<_>     .<> Foundation; either version 2 of the License, 10 - .   .-<_>     .<> Foundation; either version 2 of the License,
11     ._= =}       : or (at your option) any later version. 11     ._= =}       : or (at your option) any later version.
12    .%`+i>       _;_. 12    .%`+i>       _;_.
13    .i_,=:_.      -<s. This file is distributed in the hope that 13    .i_,=:_.      -<s. This file is distributed in the hope that
14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
15    : ..    .:,     . . . without even the implied warranty of 15    : ..    .:,     . . . without even the implied warranty of
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
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;
22  -_. . .   )=.  = see the file COPYING. If not, write to the 22  -_. . .   )=.  = see the file COPYING. If not, write to the
23    --        :-=` Free Software Foundation, Inc., 23    --        :-=` Free Software Foundation, Inc.,
24 59 Temple Place - Suite 330, 24 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28 28
29#include "menusettings.h" 29#include "menusettings.h"
30 30
31#include <qpe/config.h> 31#include <qpe/config.h>
32#include <qpe/qlibrary.h> 32#include <qpe/qlibrary.h>
33#include <qpe/qpeapplication.h> 33#include <qpe/qpeapplication.h>
34#include <qpe/menuappletinterface.h> 34#include <qpe/menuappletinterface.h>
35#include <qpe/qcopenvelope_qws.h> 35#include <qpe/qcopenvelope_qws.h>
36 36
37#include <qdir.h> 37#include <qdir.h>
38#include <qlistview.h> 38#include <qlistview.h>
39#include <qcheckbox.h> 39#include <qcheckbox.h>
40#include <qheader.h> 40#include <qheader.h>
41#include <qlayout.h> 41#include <qlayout.h>
42#include <qlabel.h> 42#include <qlabel.h>
43#include <qwhatsthis.h> 43#include <qwhatsthis.h>
44 44
45#include <stdlib.h> 45#include <stdlib.h>
46 46
47 47
48MenuSettings::MenuSettings ( QWidget *parent, const char *name ) 48MenuSettings::MenuSettings ( QWidget *parent, const char *name )
49 : QWidget ( parent, name ) 49 : QWidget ( parent, name )
50{ 50{
51 m_applets_changed = false; 51 m_applets_changed = false;
52 52
53 QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); 53 QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
54 54
55 QLabel *l = new QLabel ( tr( "Load applets in O-Menu:" ), this ); 55 QLabel *l = new QLabel ( tr( "Load applets in O-Menu:" ), this );
56 lay-> addWidget ( l ); 56 lay-> addWidget ( l );
57 57
58 m_list = new QListView ( this ); 58 m_list = new QListView ( this );
59 m_list-> addColumn ( "foobar" ); 59 m_list-> addColumn ( "foobar" );
60 m_list-> header ( )-> hide ( ); 60 m_list-> header ( )-> hide ( );
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." ));
69 72
70 connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( ))); 73 connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
71 74
72 init ( ); 75 init ( );
73} 76}
74 77
75void MenuSettings::init ( ) 78void MenuSettings::init ( )
76{ 79{
77 Config cfg ( "StartMenu" ); 80 Config cfg ( "StartMenu" );
78 cfg. setGroup ( "Applets" ); 81 cfg. setGroup ( "Applets" );
79 QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' ); 82 QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
80 83
81 QString path = QPEApplication::qpeDir ( ) + "/plugins/applets"; 84 QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
82#ifdef Q_OS_MACX 85#ifdef Q_OS_MACX
83 QStringList list = QDir ( path, "lib*.dylib" ). entryList ( ); 86 QStringList list = QDir ( path, "lib*.dylib" ). entryList ( );
84#else 87#else
85 QStringList list = QDir ( path, "lib*.so" ). entryList ( ); 88 QStringList list = QDir ( path, "lib*.so" ). entryList ( );
86#endif /* Q_OS_MACX */ 89#endif /* Q_OS_MACX */
87 90
88 for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) { 91 for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
89 QString name; 92 QString name;
90 QPixmap icon; 93 QPixmap icon;
91 MenuAppletInterface *iface = 0; 94 MenuAppletInterface *iface = 0;
92 95
93 QLibrary *lib = new QLibrary ( path + "/" + *it ); 96 QLibrary *lib = new QLibrary ( path + "/" + *it );
94 lib-> queryInterface ( IID_MenuApplet, (QUnknownInterface**) &iface ); 97 lib-> queryInterface ( IID_MenuApplet, (QUnknownInterface**) &iface );
95 if ( iface ) { 98 if ( iface ) {
96 QString lang = getenv( "LANG" ); 99 QString lang = getenv( "LANG" );
97 QTranslator *trans = new QTranslator ( qApp ); 100 QTranslator *trans = new QTranslator ( qApp );
98 QString type = (*it). left ((*it). find (".")); 101 QString type = (*it). left ((*it). find ("."));
99 QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm"; 102 QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm";
100 if ( trans-> load ( tfn )) 103 if ( trans-> load ( tfn ))
101 qApp-> installTranslator ( trans ); 104 qApp-> installTranslator ( trans );
102 else 105 else
103 delete trans; 106 delete trans;
104 name = iface-> name ( ); 107 name = iface-> name ( );
105 icon = iface-> icon ( ). pixmap ( QIconSet::Small, QIconSet::Normal ); 108 icon = iface-> icon ( ). pixmap ( QIconSet::Small, QIconSet::Normal );
106 iface-> release ( ); 109 iface-> release ( );
107 lib-> unload ( ); 110 lib-> unload ( );
108 111
109 QCheckListItem *item; 112 QCheckListItem *item;
110 item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox ); 113 item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox );
111 if ( !icon. isNull ( )) 114 if ( !icon. isNull ( ))
112 item-> setPixmap ( 0, icon ); 115 item-> setPixmap ( 0, icon );
113 item-> setOn ( exclude. find ( *it ) == exclude. end ( )); 116 item-> setOn ( exclude. find ( *it ) == exclude. end ( ));
114 m_applets [*it] = item; 117 m_applets [*it] = item;
115 } else { 118 } else {
116 delete lib; 119 delete lib;
117 } 120 }
118 } 121 }
119 122
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
124void MenuSettings::appletChanged() 128void MenuSettings::appletChanged()
125{ 129{
126 m_applets_changed = true; 130 m_applets_changed = true;
127} 131}
128 132
129void MenuSettings::accept ( ) 133void MenuSettings::accept ( )
130{ 134{
131 bool apps_changed = false; 135 bool apps_changed = false;
132 136
133 Config cfg ( "StartMenu" ); 137 Config cfg ( "StartMenu" );
134 cfg. setGroup ( "Applets" ); 138 cfg. setGroup ( "Applets" );
135 if ( m_applets_changed ) { 139 if ( m_applets_changed ) {
136 QStringList exclude; 140 QStringList exclude;
137 QMap <QString, QCheckListItem *>::Iterator it; 141 QMap <QString, QCheckListItem *>::Iterator it;
138 for ( it = m_applets. begin ( ); it != m_applets. end ( ); ++it ) { 142 for ( it = m_applets. begin ( ); it != m_applets. end ( ); ++it ) {
139 if ( !(*it)-> isOn ( )) 143 if ( !(*it)-> isOn ( ))
140 exclude << it. key ( ); 144 exclude << it. key ( );
141 } 145 }
142 cfg. writeEntry ( "ExcludeApplets", exclude, ',' ); 146 cfg. writeEntry ( "ExcludeApplets", exclude, ',' );
143 } 147 }
144 cfg. writeEntry ( "SafeMode", false ); 148 cfg. writeEntry ( "SafeMode", false );
145 149
146 cfg. setGroup ( "Menu" ); 150 cfg. setGroup ( "Menu" );
147 151
148 if ( m_menutabs-> isChecked ( ) != cfg. readBoolEntry ( "LauncherTabs", true )) { 152 if ( m_menutabs-> isChecked ( ) != cfg. readBoolEntry ( "LauncherTabs", true )) {
149 apps_changed = true; 153 apps_changed = true;
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
155 if ( m_applets_changed ) { 164 if ( m_applets_changed ) {
156 QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" ); 165 QCopEnvelope ( "QPE/TaskBar", "reloadApplets()" );
157 m_applets_changed = false; 166 m_applets_changed = false;
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}
163 175
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
@@ -1,60 +1,60 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
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;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27
28#ifndef __MENU_SETTINGS_H__ 28#ifndef __MENU_SETTINGS_H__
29#define __MENU_SETTINGS_H__ 29#define __MENU_SETTINGS_H__
30 30
31#include <qwidget.h> 31#include <qwidget.h>
32#include <qmap.h> 32#include <qmap.h>
33 33
34class QListView; 34class QListView;
35class QCheckListItem; 35class QCheckListItem;
36class QCheckBox; 36class QCheckBox;
37 37
38 38
39class MenuSettings : public QWidget { 39class MenuSettings : public QWidget {
40 Q_OBJECT 40 Q_OBJECT
41 41
42public: 42public:
43 MenuSettings ( QWidget *parent = 0, const char *name = 0 ); 43 MenuSettings ( QWidget *parent = 0, const char *name = 0 );
44 44
45 void accept ( ); 45 void accept ( );
46 46
47protected slots: 47protected slots:
48 void appletChanged ( ); 48 void appletChanged ( );
49 49
50protected: 50protected:
51 void init ( ); 51 void init ( );
52 52
53private: 53private:
54 QListView *m_list; 54 QListView *m_list;
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
60#endif 60#endif
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
@@ -1,318 +1,318 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
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;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27
28#include "tabssettings.h" 28#include "tabssettings.h"
29 29
30#include <qpe/qpeapplication.h> 30#include <qpe/qpeapplication.h>
31#include <qpe/resource.h> 31#include <qpe/resource.h>
32#include <qpe/applnk.h> 32#include <qpe/applnk.h>
33#include <qpe/mimetype.h> 33#include <qpe/mimetype.h>
34#include <qpe/qcopenvelope_qws.h> 34#include <qpe/qcopenvelope_qws.h>
35#include <qpe/config.h> 35#include <qpe/config.h>
36 36
37#include <qlistbox.h> 37#include <qlistbox.h>
38#include <qpushbutton.h> 38#include <qpushbutton.h>
39#include <qlayout.h> 39#include <qlayout.h>
40#include <qlabel.h> 40#include <qlabel.h>
41#include <qwhatsthis.h> 41#include <qwhatsthis.h>
42#include <qcheckbox.h> 42#include <qcheckbox.h>
43 43
44#include "tabdialog.h" 44#include "tabdialog.h"
45 45
46#include <stdlib.h> 46#include <stdlib.h>
47#include <qmessagebox.h> 47#include <qmessagebox.h>
48 48
49 49
50 #define GLOBALID ".global." 50 #define GLOBALID ".global."
51 51
52 52
53TabsSettings::TabsSettings ( QWidget *parent, const char *name ) 53TabsSettings::TabsSettings ( QWidget *parent, const char *name )
54 : QWidget ( parent, name ) 54 : QWidget ( parent, name )
55{ 55{
56 QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 ); 56 QGridLayout *lay = new QGridLayout ( this, 0, 0, 4, 4 );
57 57
58 QLabel *l = new QLabel ( tr( "Launcher Tabs:" ), this ); 58 QLabel *l = new QLabel ( tr( "Launcher Tabs:" ), this );
59 lay-> addMultiCellWidget ( l, 0, 0, 0, 1 ); 59 lay-> addMultiCellWidget ( l, 0, 0, 0, 1 );
60 60
61 m_list = new QListBox ( this ); 61 m_list = new QListBox ( this );
62 lay-> addMultiCellWidget ( m_list, 1, 4, 0, 0 ); 62 lay-> addMultiCellWidget ( m_list, 1, 4, 0, 0 );
63 63
64 QWhatsThis::add ( m_list, tr( "foobar" )); 64 QWhatsThis::add ( m_list, tr( "foobar" ));
65 65
66 QPushButton *p1, *p2, *p3; 66 QPushButton *p1, *p2, *p3;
67 p1 = new QPushButton ( tr( "New" ), this ); 67 p1 = new QPushButton ( tr( "New" ), this );
68 lay-> addWidget ( p1, 1, 1 ); 68 lay-> addWidget ( p1, 1, 1 );
69 connect ( p1, SIGNAL( clicked ( )), this, SLOT( newClicked ( ))); 69 connect ( p1, SIGNAL( clicked ( )), this, SLOT( newClicked ( )));
70 70
71 p2 = new QPushButton ( tr( "Edit" ), this ); 71 p2 = new QPushButton ( tr( "Edit" ), this );
72 lay-> addWidget ( p2, 2, 1 ); 72 lay-> addWidget ( p2, 2, 1 );
73 connect ( p2, SIGNAL( clicked ( )), this, SLOT( editClicked ( ))); 73 connect ( p2, SIGNAL( clicked ( )), this, SLOT( editClicked ( )));
74 74
75 p3 = new QPushButton ( tr( "Delete" ), this ); 75 p3 = new QPushButton ( tr( "Delete" ), this );
76 lay-> addWidget ( p3, 3, 1 ); 76 lay-> addWidget ( p3, 3, 1 );
77 connect ( p3, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( ))); 77 connect ( p3, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( )));
78 78
79 lay-> setRowStretch ( 4, 10 ); 79 lay-> setRowStretch ( 4, 10 );
80 80
81 m_bigbusy = new QCheckBox( tr( "Enable big busy indicator" ), this ); 81 m_bigbusy = new QCheckBox( tr( "Enable big busy indicator" ), this );
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 );
88 p3-> setEnabled ( false ); 88 p3-> setEnabled ( false );
89 89
90 init ( ); 90 init ( );
91 91
92 QWhatsThis::add ( m_list, tr( "Select the Launcher Tab you want to edit or delete." )); 92 QWhatsThis::add ( m_list, tr( "Select the Launcher Tab you want to edit or delete." ));
93 QWhatsThis::add ( p1, tr( "Adds a new Tab to the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." )); 93 QWhatsThis::add ( p1, tr( "Adds a new Tab to the Launcher." ) + QString ( "<center><br><i>not yet implemented</i><br>Please use the tabmanager</center>." ));
94 QWhatsThis::add ( p2, tr( "Opens a new dialog to customize the select Tab." )); 94 QWhatsThis::add ( p2, tr( "Opens a new dialog to customize the select Tab." ));
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
100void TabsSettings::init ( ) 100void TabsSettings::init ( )
101{ 101{
102 AppLnkSet rootFolder( MimeType::appsFolderName ( )); 102 AppLnkSet rootFolder( MimeType::appsFolderName ( ));
103 QStringList types = rootFolder. types ( ); 103 QStringList types = rootFolder. types ( );
104 104
105 m_list-> insertItem ( tr( "All Tabs" )); 105 m_list-> insertItem ( tr( "All Tabs" ));
106 m_ids << GLOBALID; 106 m_ids << GLOBALID;
107 107
108 for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) { 108 for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) {
109 m_list-> insertItem ( rootFolder. typePixmap ( *it ), rootFolder. typeName ( *it )); 109 m_list-> insertItem ( rootFolder. typePixmap ( *it ), rootFolder. typeName ( *it ));
110 m_ids << *it; 110 m_ids << *it;
111 } 111 }
112 QImage img ( Resource::loadImage ( "DocsIcon" )); 112 QImage img ( Resource::loadImage ( "DocsIcon" ));
113 QPixmap pix; 113 QPixmap pix;
114 pix = img. smoothScale ( AppLnk::smallIconSize ( ), AppLnk::smallIconSize ( )); 114 pix = img. smoothScale ( AppLnk::smallIconSize ( ), AppLnk::smallIconSize ( ));
115 m_list-> insertItem ( pix, tr( "Documents" )); 115 m_list-> insertItem ( pix, tr( "Documents" ));
116 m_ids += "Documents"; // No tr 116 m_ids += "Documents"; // No tr
117 117
118 Config cfg ( "Launcher" ); 118 Config cfg ( "Launcher" );
119 119
120 readTabSettings ( cfg ); 120 readTabSettings ( cfg );
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}
126 126
127 127
128void TabsSettings::readTabSettings ( Config &cfg ) 128void TabsSettings::readTabSettings ( Config &cfg )
129{ 129{
130 QString grp ( "Tab %1" ); // No tr 130 QString grp ( "Tab %1" ); // No tr
131 m_tabs. clear ( ); 131 m_tabs. clear ( );
132 132
133 TabConfig global_def; 133 TabConfig global_def;
134 global_def. m_view = TabConfig::Icon; 134 global_def. m_view = TabConfig::Icon;
135 global_def. m_bg_type = TabConfig::Ruled; 135 global_def. m_bg_type = TabConfig::Ruled;
136 global_def. m_bg_image = "launcher/opie-background"; 136 global_def. m_bg_image = "launcher/opie-background";
137 global_def. m_bg_color = colorGroup ( ). color ( QColorGroup::Base ). name ( ); 137 global_def. m_bg_color = colorGroup ( ). color ( QColorGroup::Base ). name ( );
138 global_def. m_text_color = colorGroup ( ). color ( QColorGroup::Text ). name ( ); 138 global_def. m_text_color = colorGroup ( ). color ( QColorGroup::Text ). name ( );
139 global_def. m_font_use = false; 139 global_def. m_font_use = false;
140 global_def. m_font_family = font ( ). family ( ); 140 global_def. m_font_family = font ( ). family ( );
141 global_def. m_font_size = font ( ). pointSize ( ); 141 global_def. m_font_size = font ( ). pointSize ( );
142 global_def. m_font_weight = 50; 142 global_def. m_font_weight = 50;
143 global_def. m_font_italic = false; 143 global_def. m_font_italic = false;
144 global_def. m_changed = false; 144 global_def. m_changed = false;
145 145
146 146
147 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { 147 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
148 TabConfig tc = ( it != m_ids. begin ( )) ? m_tabs [GLOBALID] : global_def; 148 TabConfig tc = ( it != m_ids. begin ( )) ? m_tabs [GLOBALID] : global_def;
149 149
150 cfg. setGroup ( grp. arg ( *it )); 150 cfg. setGroup ( grp. arg ( *it ));
151 151
152 QString view = cfg. readEntry ( "View" ); 152 QString view = cfg. readEntry ( "View" );
153 if ( view == "Icon" ) // No tr 153 if ( view == "Icon" ) // No tr
154 tc. m_view = TabConfig::Icon; 154 tc. m_view = TabConfig::Icon;
155 if ( view == "List" ) // No tr 155 if ( view == "List" ) // No tr
156 tc. m_view = TabConfig::List; 156 tc. m_view = TabConfig::List;
157 157
158 QString bgType = cfg. readEntry ( "BackgroundType" ); 158 QString bgType = cfg. readEntry ( "BackgroundType" );
159 if ( bgType == "Image" ) 159 if ( bgType == "Image" )
160 tc. m_bg_type = TabConfig::Image; 160 tc. m_bg_type = TabConfig::Image;
161 else if ( bgType == "SolidColor" ) 161 else if ( bgType == "SolidColor" )
162 tc. m_bg_type = TabConfig::SolidColor; 162 tc. m_bg_type = TabConfig::SolidColor;
163 else if ( bgType == "Image" ) // No tr 163 else if ( bgType == "Image" ) // No tr
164 tc. m_bg_type = TabConfig::Image; 164 tc. m_bg_type = TabConfig::Image;
165 165
166 tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image ); 166 tc. m_bg_image = cfg. readEntry ( "BackgroundImage", tc. m_bg_image );
167 tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color ); 167 tc. m_bg_color = cfg. readEntry ( "BackgroundColor", tc. m_bg_color );
168 tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color ); 168 tc. m_text_color = cfg. readEntry ( "TextColor", tc. m_text_color );
169 QStringList f = cfg. readListEntry ( "Font", ',' ); 169 QStringList f = cfg. readListEntry ( "Font", ',' );
170 if ( f. count ( ) == 4 ) { 170 if ( f. count ( ) == 4 ) {
171 tc. m_font_use = true; 171 tc. m_font_use = true;
172 tc. m_font_family = f [0]; 172 tc. m_font_family = f [0];
173 tc. m_font_size = f [1]. toInt ( ); 173 tc. m_font_size = f [1]. toInt ( );
174 tc. m_font_weight = f [2]. toInt ( ); 174 tc. m_font_weight = f [2]. toInt ( );
175 tc. m_font_italic = ( f [3]. toInt ( )); 175 tc. m_font_italic = ( f [3]. toInt ( ));
176 } 176 }
177 m_tabs [*it] = tc; 177 m_tabs [*it] = tc;
178 } 178 }
179 179
180 // if all tabs have the same config, then initialize the GLOBALID tab to these values 180 // if all tabs have the same config, then initialize the GLOBALID tab to these values
181 181
182 TabConfig *first = 0; 182 TabConfig *first = 0;
183 bool same = true; 183 bool same = true;
184 184
185 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { 185 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
186 if ( *it == GLOBALID ) 186 if ( *it == GLOBALID )
187 continue; 187 continue;
188 else if ( !first ) 188 else if ( !first )
189 first = &m_tabs [*it]; 189 first = &m_tabs [*it];
190 else 190 else
191 same &= ( *first == m_tabs [*it] ); 191 same &= ( *first == m_tabs [*it] );
192 } 192 }
193 if ( same ) { 193 if ( same ) {
194 m_tabs [GLOBALID] = *first; 194 m_tabs [GLOBALID] = *first;
195 m_tabs [GLOBALID]. m_changed = true; 195 m_tabs [GLOBALID]. m_changed = true;
196 } 196 }
197} 197}
198 198
199 199
200void TabsSettings::accept ( ) 200void TabsSettings::accept ( )
201{ 201{
202 Config cfg ( "Launcher" ); 202 Config cfg ( "Launcher" );
203 203
204 // Launcher Tab 204 // Launcher Tab
205 QString grp ( "Tab %1" ); // No tr 205 QString grp ( "Tab %1" ); // No tr
206 206
207 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { 207 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
208 TabConfig &tc = m_tabs [*it]; 208 TabConfig &tc = m_tabs [*it];
209 209
210 if ( !tc. m_changed ) 210 if ( !tc. m_changed )
211 continue; 211 continue;
212 212
213 cfg. setGroup ( grp. arg ( *it )); 213 cfg. setGroup ( grp. arg ( *it ));
214 switch ( tc. m_view ) { 214 switch ( tc. m_view ) {
215 case TabConfig::Icon: 215 case TabConfig::Icon:
216 cfg.writeEntry ( "View", "Icon" ); 216 cfg.writeEntry ( "View", "Icon" );
217 break; 217 break;
218 case TabConfig::List: 218 case TabConfig::List:
219 cfg.writeEntry ( "View", "List" ); 219 cfg.writeEntry ( "View", "List" );
220 break; 220 break;
221 } 221 }
222 222
223 QCopEnvelope e ( "QPE/Launcher", "setTabView(QString,int)" ); 223 QCopEnvelope e ( "QPE/Launcher", "setTabView(QString,int)" );
224 e << *it << tc. m_view; 224 e << *it << tc. m_view;
225 225
226 cfg. writeEntry ( "BackgroundImage", tc. m_bg_image ); 226 cfg. writeEntry ( "BackgroundImage", tc. m_bg_image );
227 cfg. writeEntry ( "BackgroundColor", tc. m_bg_color ); 227 cfg. writeEntry ( "BackgroundColor", tc. m_bg_color );
228 cfg. writeEntry ( "TextColor", tc. m_text_color ); 228 cfg. writeEntry ( "TextColor", tc. m_text_color );
229 229
230 if ( tc. m_font_use ) { 230 if ( tc. m_font_use ) {
231 QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" ); 231 QString f = tc. m_font_family + "," + QString::number ( tc. m_font_size ) + "," + QString::number ( tc. m_font_weight ) + "," + ( tc. m_font_italic ? "1" : "0" );
232 cfg. writeEntry ( "Font", f ); 232 cfg. writeEntry ( "Font", f );
233 } 233 }
234 else 234 else
235 cfg. removeEntry ( "Font" ); 235 cfg. removeEntry ( "Font" );
236 236
237 QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" ); 237 QCopEnvelope be ( "QPE/Launcher", "setTabBackground(QString,int,QString)" );
238 238
239 switch ( tc. m_bg_type ) { 239 switch ( tc. m_bg_type ) {
240 case TabConfig::Ruled: 240 case TabConfig::Ruled:
241 cfg.writeEntry( "BackgroundType", "Ruled" ); 241 cfg.writeEntry( "BackgroundType", "Ruled" );
242 be << *it << tc. m_bg_type << QString(""); 242 be << *it << tc. m_bg_type << QString("");
243 break; 243 break;
244 case TabConfig::SolidColor: 244 case TabConfig::SolidColor:
245 cfg.writeEntry( "BackgroundType", "SolidColor" ); 245 cfg.writeEntry( "BackgroundType", "SolidColor" );
246 be << *it << tc. m_bg_type << tc. m_bg_color; 246 be << *it << tc. m_bg_type << tc. m_bg_color;
247 break; 247 break;
248 case TabConfig::Image: 248 case TabConfig::Image:
249 cfg.writeEntry( "BackgroundType", "Image" ); 249 cfg.writeEntry( "BackgroundType", "Image" );
250 be << *it << tc. m_bg_type << tc. m_bg_image; 250 be << *it << tc. m_bg_type << tc. m_bg_image;
251 break; 251 break;
252 } 252 }
253 253
254 QCopEnvelope te( "QPE/Launcher", "setTextColor(QString,QString)" ); 254 QCopEnvelope te( "QPE/Launcher", "setTextColor(QString,QString)" );
255 te << *it << tc. m_text_color; 255 te << *it << tc. m_text_color;
256 256
257 QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" ); 257 QCopEnvelope fe ( "QPE/Launcher", "setFont(QString,QString,int,int,int)" );
258 fe << *it; 258 fe << *it;
259 fe << ( tc. m_font_use ? tc. m_font_family : QString::null ); 259 fe << ( tc. m_font_use ? tc. m_font_family : QString::null );
260 fe << tc. m_font_size; 260 fe << tc. m_font_size;
261 fe << tc. m_font_weight; 261 fe << tc. m_font_weight;
262 fe << ( tc. m_font_italic ? 1 : 0 ); 262 fe << ( tc. m_font_italic ? 1 : 0 );
263 263
264 tc. m_changed = false; 264 tc. m_changed = false;
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
270 cfg. writeEntry ( "BigBusy", m_bigbusy->isChecked( ) ); 270 cfg. writeEntry ( "BigBusy", m_bigbusy->isChecked( ) );
271 271
272 { 272 {
273 QCopEnvelope e ( "QPE/Launcher", "setBusyIndicatorType(QString)" ); 273 QCopEnvelope e ( "QPE/Launcher", "setBusyIndicatorType(QString)" );
274 e << busytype; 274 e << busytype;
275 } 275 }
276} 276}
277 277
278void TabsSettings::newClicked ( ) 278void TabsSettings::newClicked ( )
279{ 279{
280 QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" )); 280 QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" ));
281} 281}
282 282
283void TabsSettings::deleteClicked ( ) 283void TabsSettings::deleteClicked ( )
284{ 284{
285 int ind = m_list-> currentItem ( ); 285 int ind = m_list-> currentItem ( );
286 286
287 if ( ind < 0 ) 287 if ( ind < 0 )
288 return; 288 return;
289 289
290 QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" )); 290 QMessageBox::information ( this, tr( "Error" ), tr( "Not implemented yet" ));
291} 291}
292 292
293void TabsSettings::editClicked ( ) 293void TabsSettings::editClicked ( )
294{ 294{
295 int ind = m_list-> currentItem ( ); 295 int ind = m_list-> currentItem ( );
296 296
297 if ( ind < 0 ) 297 if ( ind < 0 )
298 return; 298 return;
299 299
300 TabConfig tc = m_tabs [m_ids [ind]]; 300 TabConfig tc = m_tabs [m_ids [ind]];
301 301
302 TabDialog *d = new TabDialog ( m_list-> pixmap ( ind ), m_list-> text ( ind ), tc, this, "TabDialog", true ); 302 TabDialog *d = new TabDialog ( m_list-> pixmap ( ind ), m_list-> text ( ind ), tc, this, "TabDialog", true );
303 303
304 d-> showMaximized ( ); 304 d-> showMaximized ( );
305 if ( d-> exec ( ) == QDialog::Accepted ) { 305 if ( d-> exec ( ) == QDialog::Accepted ) {
306 tc. m_changed = true; 306 tc. m_changed = true;
307 m_tabs [m_ids [ind]] = tc; 307 m_tabs [m_ids [ind]] = tc;
308 308
309 if ( m_ids [ind] == GLOBALID ) { 309 if ( m_ids [ind] == GLOBALID ) {
310 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) { 310 for ( QStringList::Iterator it = m_ids. begin ( ); it != m_ids. end ( ); ++it ) {
311 if ( *it != GLOBALID ) 311 if ( *it != GLOBALID )
312 m_tabs [*it] = tc; 312 m_tabs [*it] = tc;
313 } 313 }
314 } 314 }
315 } 315 }
316 316
317 delete d; 317 delete d;
318} 318}
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
@@ -1,68 +1,68 @@
1/* 1/*
2               =. This file is part of the OPIE Project 2               =. This file is part of the OPIE Project
3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 3             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
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;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27#ifndef __TABS_SETTINGS_H__ 27#ifndef __TABS_SETTINGS_H__
28#define __TABS_SETTINGS_H__ 28#define __TABS_SETTINGS_H__
29 29
30#include <qwidget.h> 30#include <qwidget.h>
31#include <qmap.h> 31#include <qmap.h>
32 32
33#include "tabconfig.h" 33#include "tabconfig.h"
34 34
35class QListBox; 35class QListBox;
36class QCheckBox; 36class QCheckBox;
37class Config; 37class Config;
38 38
39 39
40class TabsSettings : public QWidget { 40class TabsSettings : public QWidget {
41 Q_OBJECT 41 Q_OBJECT
42 42
43public: 43public:
44 TabsSettings ( QWidget *parent = 0, const char *name = 0 ); 44 TabsSettings ( QWidget *parent = 0, const char *name = 0 );
45 45
46 void accept ( ); 46 void accept ( );
47 47
48protected slots: 48protected slots:
49 void newClicked ( ); 49 void newClicked ( );
50 void deleteClicked ( ); 50 void deleteClicked ( );
51 void editClicked ( ); 51 void editClicked ( );
52 52
53protected: 53protected:
54 void init ( ); 54 void init ( );
55 void readTabSettings ( Config & ); 55 void readTabSettings ( Config & );
56 56
57private: 57private:
58 QListBox *m_list; 58 QListBox *m_list;
59 //QString currentTab; 59 //QString currentTab;
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
65 65
66 66
67 67
68#endif 68#endif
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,33 +1,32 @@
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
6 INTERFACES= lightsettingsbase.ui sensorbase.ui 4 INTERFACES= lightsettingsbase.ui sensorbase.ui
7INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(OPIEDIR)/include 6 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe -lopie 7LIBS += -lqpe -lopie
8
10 TARGET = light-and-power 9 TARGET = light-and-power
11 10
12TRANSLATIONS = ../../../i18n/de/light-and-power.ts \ 11TRANSLATIONS = ../../../i18n/de/light-and-power.ts \
13 ../../../i18n/nl/light-and-power.ts \ 12 ../../../i18n/nl/light-and-power.ts \
14 ../../../i18n/xx/light-and-power.ts \ 13 ../../../i18n/xx/light-and-power.ts \
15 ../../../i18n/en/light-and-power.ts \ 14 ../../../i18n/en/light-and-power.ts \
16 ../../../i18n/es/light-and-power.ts \ 15 ../../../i18n/es/light-and-power.ts \
17 ../../../i18n/fr/light-and-power.ts \ 16 ../../../i18n/fr/light-and-power.ts \
18 ../../../i18n/hu/light-and-power.ts \ 17 ../../../i18n/hu/light-and-power.ts \
19 ../../../i18n/ja/light-and-power.ts \ 18 ../../../i18n/ja/light-and-power.ts \
20 ../../../i18n/ko/light-and-power.ts \ 19 ../../../i18n/ko/light-and-power.ts \
21 ../../../i18n/no/light-and-power.ts \ 20 ../../../i18n/no/light-and-power.ts \
22 ../../../i18n/pl/light-and-power.ts \ 21 ../../../i18n/pl/light-and-power.ts \
23 ../../../i18n/pt/light-and-power.ts \ 22 ../../../i18n/pt/light-and-power.ts \
24 ../../../i18n/pt_BR/light-and-power.ts \ 23 ../../../i18n/pt_BR/light-and-power.ts \
25 ../../../i18n/sl/light-and-power.ts \ 24 ../../../i18n/sl/light-and-power.ts \
26 ../../../i18n/zh_CN/light-and-power.ts \ 25 ../../../i18n/zh_CN/light-and-power.ts \
27 ../../../i18n/zh_TW/light-and-power.ts \ 26 ../../../i18n/zh_TW/light-and-power.ts \
28 ../../../i18n/it/light-and-power.ts \ 27 ../../../i18n/it/light-and-power.ts \
29 ../../../i18n/da/light-and-power.ts 28 ../../../i18n/da/light-and-power.ts
30 29
31 30
32 31
33include ( $(OPIEDIR)/include.pro ) 32include ( $(OPIEDIR)/include.pro )
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
@@ -1,70 +1,71 @@
1/* 1/*
2 This file is part of the OPIE Project 2 This file is part of the OPIE Project
3               =. Copyright (c) 2002 Maximilian Reiss <harlekin@handhelds.org> 3               =. Copyright (c) 2002 Maximilian Reiss <harlekin@handhelds.org>
4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> 4             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
5           .>+-= 5           .>+-=
6 _;:,     .>    :=|. This file is free software; you can 6 _;:,     .>    :=|. This file is free software; you can
7.> <`_,   >  .   <= redistribute it and/or modify it under 7.> <`_,   >  .   <= redistribute it and/or modify it under
8:`=1 )Y*s>-.--   : the terms of the GNU General Public 8:`=1 )Y*s>-.--   : the terms of the GNU General Public
9.="- .-=="i,     .._ License as published by the Free Software 9.="- .-=="i,     .._ License as published by the Free Software
10 - .   .-<_>     .<> Foundation; either version 2 of the License, 10 - .   .-<_>     .<> Foundation; either version 2 of the License,
11     ._= =}       : or (at your option) any later version. 11     ._= =}       : or (at your option) any later version.
12    .%`+i>       _;_. 12    .%`+i>       _;_.
13    .i_,=:_.      -<s. This file is distributed in the hope that 13    .i_,=:_.      -<s. This file is distributed in the hope that
14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 14     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
15    : ..    .:,     . . . without even the implied warranty of 15    : ..    .:,     . . . without even the implied warranty of
16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 16    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
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;
22  -_. . .   )=.  = see the file COPYING. If not, write to the 22  -_. . .   )=.  = see the file COPYING. If not, write to the
23    --        :-=` Free Software Foundation, Inc., 23    --        :-=` Free Software Foundation, Inc.,
24 59 Temple Place - Suite 330, 24 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28#ifndef __LIGHT_H__ 28#ifndef __LIGHT_H__
29#define __LIGHT_H__ 29#define __LIGHT_H__
30 30
31 31
32#include <qstringlist.h> 32#include <qstringlist.h>
33#include <qlistbox.h> 33#include <qlistbox.h>
34#include "lightsettingsbase.h" 34#include "lightsettingsbase.h"
35 35
36class QTimer; 36class QTimer;
37 37
38class LightSettings : public LightSettingsBase 38class LightSettings : public LightSettingsBase
39{ 39{
40 Q_OBJECT 40 Q_OBJECT
41 41
42public: 42public:
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
46protected: 47protected:
47 virtual void accept(); 48 virtual void accept();
48 virtual void done ( int r ); 49 virtual void done ( int r );
49 50
50protected slots: 51protected slots:
51 virtual void calibrateSensor ( ); 52 virtual void calibrateSensor ( );
52 virtual void calibrateSensorAC ( ); 53 virtual void calibrateSensorAC ( );
53 void setBacklight ( int ); 54 void setBacklight ( int );
54 void setContrast ( int ); 55 void setContrast ( int );
55 void setFrequency ( int ); 56 void setFrequency ( int );
56 void resetBacklight ( ); 57 void resetBacklight ( );
57 58
58private: 59private:
59 int m_bres; 60 int m_bres;
60 int m_cres; 61 int m_cres;
61 int m_oldcontrast; 62 int m_oldcontrast;
62 int m_oldfreq; 63 int m_oldfreq;
63 QTimer *m_resettimer; 64 QTimer *m_resettimer;
64 QStringList m_sensordata; 65 QStringList m_sensordata;
65 QStringList m_sensordata_ac; 66 QStringList m_sensordata_ac;
66}; 67};
67 68
68 69
69#endif 70#endif
70 71
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
@@ -1,1309 +1,1309 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>LightSettingsBase</class> 2<class>LightSettingsBase</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>LightSettingsBase</cstring> 7 <cstring>LightSettingsBase</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>343</width> 14 <width>343</width>
15 <height>532</height> 15 <height>532</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>sizePolicy</name> 19 <name>sizePolicy</name>
20 <sizepolicy> 20 <sizepolicy>
21 <hsizetype>7</hsizetype> 21 <hsizetype>7</hsizetype>
22 <vsizetype>5</vsizetype> 22 <vsizetype>5</vsizetype>
23 </sizepolicy> 23 </sizepolicy>
24 </property> 24 </property>
25 <property stdset="1"> 25 <property stdset="1">
26 <name>caption</name> 26 <name>caption</name>
27 <string>Light and Power Settings</string> 27 <string>Light and Power Settings</string>
28 </property> 28 </property>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>sizeGripEnabled</name> 30 <name>sizeGripEnabled</name>
31 <bool>false</bool> 31 <bool>false</bool>
32 </property> 32 </property>
33 <property> 33 <property>
34 <name>layoutMargin</name> 34 <name>layoutMargin</name>
35 </property> 35 </property>
36 <property> 36 <property>
37 <name>layoutSpacing</name> 37 <name>layoutSpacing</name>
38 </property> 38 </property>
39 <vbox> 39 <vbox>
40 <property stdset="1"> 40 <property stdset="1">
41 <name>margin</name> 41 <name>margin</name>
42 <number>3</number> 42 <number>3</number>
43 </property> 43 </property>
44 <property stdset="1"> 44 <property stdset="1">
45 <name>spacing</name> 45 <name>spacing</name>
46 <number>3</number> 46 <number>3</number>
47 </property> 47 </property>
48 <widget> 48 <widget>
49 <class>QTabWidget</class> 49 <class>QTabWidget</class>
50 <property stdset="1"> 50 <property stdset="1">
51 <name>name</name> 51 <name>name</name>
52 <cstring>tabs</cstring> 52 <cstring>tabs</cstring>
53 </property> 53 </property>
54 <property> 54 <property>
55 <name>layoutMargin</name> 55 <name>layoutMargin</name>
56 </property> 56 </property>
57 <property> 57 <property>
58 <name>layoutSpacing</name> 58 <name>layoutSpacing</name>
59 </property> 59 </property>
60 <widget> 60 <widget>
61 <class>QWidget</class> 61 <class>QWidget</class>
62 <property stdset="1"> 62 <property stdset="1">
63 <name>name</name> 63 <name>name</name>
64 <cstring>tab</cstring> 64 <cstring>tab</cstring>
65 </property> 65 </property>
66 <attribute> 66 <attribute>
67 <name>title</name> 67 <name>title</name>
68 <string>on Battery</string> 68 <string>on Battery</string>
69 </attribute> 69 </attribute>
70 <vbox> 70 <vbox>
71 <property stdset="1"> 71 <property stdset="1">
72 <name>margin</name> 72 <name>margin</name>
73 <number>5</number> 73 <number>5</number>
74 </property> 74 </property>
75 <property stdset="1"> 75 <property stdset="1">
76 <name>spacing</name> 76 <name>spacing</name>
77 <number>3</number> 77 <number>3</number>
78 </property> 78 </property>
79 <widget> 79 <widget>
80 <class>QGroupBox</class> 80 <class>QGroupBox</class>
81 <property stdset="1"> 81 <property stdset="1">
82 <name>name</name> 82 <name>name</name>
83 <cstring>Group1</cstring> 83 <cstring>Group1</cstring>
84 </property> 84 </property>
85 <property stdset="1"> 85 <property stdset="1">
86 <name>enabled</name> 86 <name>enabled</name>
87 <bool>true</bool> 87 <bool>true</bool>
88 </property> 88 </property>
89 <property stdset="1"> 89 <property stdset="1">
90 <name>title</name> 90 <name>title</name>
91 <string>General Settings</string> 91 <string>General Settings</string>
92 </property> 92 </property>
93 <property> 93 <property>
94 <name>layoutMargin</name> 94 <name>layoutMargin</name>
95 </property> 95 </property>
96 <property> 96 <property>
97 <name>layoutSpacing</name> 97 <name>layoutSpacing</name>
98 </property> 98 </property>
99 <grid> 99 <grid>
100 <property stdset="1"> 100 <property stdset="1">
101 <name>margin</name> 101 <name>margin</name>
102 <number>5</number> 102 <number>5</number>
103 </property> 103 </property>
104 <property stdset="1"> 104 <property stdset="1">
105 <name>spacing</name> 105 <name>spacing</name>
106 <number>3</number> 106 <number>3</number>
107 </property> 107 </property>
108 <widget row="1" column="1" > 108 <widget row="1" column="1" >
109 <class>QSpinBox</class> 109 <class>QSpinBox</class>
110 <property stdset="1"> 110 <property stdset="1">
111 <name>name</name> 111 <name>name</name>
112 <cstring>interval_lightoff</cstring> 112 <cstring>interval_lightoff</cstring>
113 </property> 113 </property>
114 <property stdset="1"> 114 <property stdset="1">
115 <name>suffix</name> 115 <name>suffix</name>
116 <string> sec</string> 116 <string> sec</string>
117 </property> 117 </property>
118 <property stdset="1"> 118 <property stdset="1">
119 <name>specialValueText</name> 119 <name>specialValueText</name>
120 <string>never</string> 120 <string>never</string>
121 </property> 121 </property>
122 <property stdset="1"> 122 <property stdset="1">
123 <name>buttonSymbols</name> 123 <name>buttonSymbols</name>
124 <enum>PlusMinus</enum> 124 <enum>PlusMinus</enum>
125 </property> 125 </property>
126 <property stdset="1"> 126 <property stdset="1">
127 <name>maxValue</name> 127 <name>maxValue</name>
128 <number>3600</number> 128 <number>3600</number>
129 </property> 129 </property>
130 <property stdset="1"> 130 <property stdset="1">
131 <name>minValue</name> 131 <name>minValue</name>
132 <number>0</number> 132 <number>0</number>
133 </property> 133 </property>
134 <property stdset="1"> 134 <property stdset="1">
135 <name>lineStep</name> 135 <name>lineStep</name>
136 <number>10</number> 136 <number>10</number>
137 </property> 137 </property>
138 </widget> 138 </widget>
139 <widget row="0" column="0" > 139 <widget row="0" column="0" >
140 <class>QLabel</class> 140 <class>QLabel</class>
141 <property stdset="1"> 141 <property stdset="1">
142 <name>name</name> 142 <name>name</name>
143 <cstring>TL1</cstring> 143 <cstring>TL1</cstring>
144 </property> 144 </property>
145 <property stdset="1"> 145 <property stdset="1">
146 <name>sizePolicy</name> 146 <name>sizePolicy</name>
147 <sizepolicy> 147 <sizepolicy>
148 <hsizetype>3</hsizetype> 148 <hsizetype>3</hsizetype>
149 <vsizetype>1</vsizetype> 149 <vsizetype>1</vsizetype>
150 </sizepolicy> 150 </sizepolicy>
151 </property> 151 </property>
152 <property stdset="1"> 152 <property stdset="1">
153 <name>text</name> 153 <name>text</name>
154 <string>Dim light after</string> 154 <string>Dim light after</string>
155 </property> 155 </property>
156 </widget> 156 </widget>
157 <widget row="0" column="1" > 157 <widget row="0" column="1" >
158 <class>QSpinBox</class> 158 <class>QSpinBox</class>
159 <property stdset="1"> 159 <property stdset="1">
160 <name>name</name> 160 <name>name</name>
161 <cstring>interval_dim</cstring> 161 <cstring>interval_dim</cstring>
162 </property> 162 </property>
163 <property stdset="1"> 163 <property stdset="1">
164 <name>suffix</name> 164 <name>suffix</name>
165 <string> sec</string> 165 <string> sec</string>
166 </property> 166 </property>
167 <property stdset="1"> 167 <property stdset="1">
168 <name>specialValueText</name> 168 <name>specialValueText</name>
169 <string>never</string> 169 <string>never</string>
170 </property> 170 </property>
171 <property stdset="1"> 171 <property stdset="1">
172 <name>buttonSymbols</name> 172 <name>buttonSymbols</name>
173 <enum>PlusMinus</enum> 173 <enum>PlusMinus</enum>
174 </property> 174 </property>
175 <property stdset="1"> 175 <property stdset="1">
176 <name>maxValue</name> 176 <name>maxValue</name>
177 <number>3600</number> 177 <number>3600</number>
178 </property> 178 </property>
179 <property stdset="1"> 179 <property stdset="1">
180 <name>minValue</name> 180 <name>minValue</name>
181 <number>0</number> 181 <number>0</number>
182 </property> 182 </property>
183 <property stdset="1"> 183 <property stdset="1">
184 <name>lineStep</name> 184 <name>lineStep</name>
185 <number>10</number> 185 <number>10</number>
186 </property> 186 </property>
187 </widget> 187 </widget>
188 <widget row="4" column="0" rowspan="1" colspan="2" > 188 <widget row="4" column="0" rowspan="1" colspan="2" >
189 <class>QCheckBox</class> 189 <class>QCheckBox</class>
190 <property stdset="1"> 190 <property stdset="1">
191 <name>name</name> 191 <name>name</name>
192 <cstring>LcdOffOnly</cstring> 192 <cstring>LcdOffOnly</cstring>
193 </property> 193 </property>
194 <property stdset="1"> 194 <property stdset="1">
195 <name>sizePolicy</name> 195 <name>sizePolicy</name>
196 <sizepolicy> 196 <sizepolicy>
197 <hsizetype>7</hsizetype> 197 <hsizetype>7</hsizetype>
198 <vsizetype>0</vsizetype> 198 <vsizetype>0</vsizetype>
199 </sizepolicy> 199 </sizepolicy>
200 </property> 200 </property>
201 <property stdset="1"> 201 <property stdset="1">
202 <name>text</name> 202 <name>text</name>
203 <string>Deactivate LCD only (does not suspend)</string> 203 <string>Deactivate LCD only (does not suspend)</string>
204 </property> 204 </property>
205 </widget> 205 </widget>
206 <widget row="2" column="0" > 206 <widget row="2" column="0" >
207 <class>QLabel</class> 207 <class>QLabel</class>
208 <property stdset="1"> 208 <property stdset="1">
209 <name>name</name> 209 <name>name</name>
210 <cstring>TL3</cstring> 210 <cstring>TL3</cstring>
211 </property> 211 </property>
212 <property stdset="1"> 212 <property stdset="1">
213 <name>sizePolicy</name> 213 <name>sizePolicy</name>
214 <sizepolicy> 214 <sizepolicy>
215 <hsizetype>3</hsizetype> 215 <hsizetype>3</hsizetype>
216 <vsizetype>1</vsizetype> 216 <vsizetype>1</vsizetype>
217 </sizepolicy> 217 </sizepolicy>
218 </property> 218 </property>
219 <property stdset="1"> 219 <property stdset="1">
220 <name>text</name> 220 <name>text</name>
221 <string>Suspend after</string> 221 <string>Suspend after</string>
222 </property> 222 </property>
223 </widget> 223 </widget>
224 <widget row="1" column="0" > 224 <widget row="1" column="0" >
225 <class>QLabel</class> 225 <class>QLabel</class>
226 <property stdset="1"> 226 <property stdset="1">
227 <name>name</name> 227 <name>name</name>
228 <cstring>TL2</cstring> 228 <cstring>TL2</cstring>
229 </property> 229 </property>
230 <property stdset="1"> 230 <property stdset="1">
231 <name>sizePolicy</name> 231 <name>sizePolicy</name>
232 <sizepolicy> 232 <sizepolicy>
233 <hsizetype>3</hsizetype> 233 <hsizetype>3</hsizetype>
234 <vsizetype>1</vsizetype> 234 <vsizetype>1</vsizetype>
235 </sizepolicy> 235 </sizepolicy>
236 </property> 236 </property>
237 <property stdset="1"> 237 <property stdset="1">
238 <name>text</name> 238 <name>text</name>
239 <string>Light off after</string> 239 <string>Light off after</string>
240 </property> 240 </property>
241 </widget> 241 </widget>
242 <widget row="3" column="0" > 242 <widget row="3" column="0" >
243 <class>QLabel</class> 243 <class>QLabel</class>
244 <property stdset="1"> 244 <property stdset="1">
245 <name>name</name> 245 <name>name</name>
246 <cstring>TL3_2</cstring> 246 <cstring>TL3_2</cstring>
247 </property> 247 </property>
248 <property stdset="1"> 248 <property stdset="1">
249 <name>sizePolicy</name> 249 <name>sizePolicy</name>
250 <sizepolicy> 250 <sizepolicy>
251 <hsizetype>3</hsizetype> 251 <hsizetype>3</hsizetype>
252 <vsizetype>1</vsizetype> 252 <vsizetype>1</vsizetype>
253 </sizepolicy> 253 </sizepolicy>
254 </property> 254 </property>
255 <property stdset="1"> 255 <property stdset="1">
256 <name>text</name> 256 <name>text</name>
257 <string>CPU Frequency</string> 257 <string>CPU Frequency</string>
258 </property> 258 </property>
259 </widget> 259 </widget>
260 <widget row="2" column="1" > 260 <widget row="2" column="1" >
261 <class>QSpinBox</class> 261 <class>QSpinBox</class>
262 <property stdset="1"> 262 <property stdset="1">
263 <name>name</name> 263 <name>name</name>
264 <cstring>interval_suspend</cstring> 264 <cstring>interval_suspend</cstring>
265 </property> 265 </property>
266 <property stdset="1"> 266 <property stdset="1">
267 <name>suffix</name> 267 <name>suffix</name>
268 <string> sec</string> 268 <string> sec</string>
269 </property> 269 </property>
270 <property stdset="1"> 270 <property stdset="1">
271 <name>specialValueText</name> 271 <name>specialValueText</name>
272 <string>never</string> 272 <string>never</string>
273 </property> 273 </property>
274 <property stdset="1"> 274 <property stdset="1">
275 <name>buttonSymbols</name> 275 <name>buttonSymbols</name>
276 <enum>PlusMinus</enum> 276 <enum>PlusMinus</enum>
277 </property> 277 </property>
278 <property stdset="1"> 278 <property stdset="1">
279 <name>maxValue</name> 279 <name>maxValue</name>
280 <number>3600</number> 280 <number>3600</number>
281 </property> 281 </property>
282 <property stdset="1"> 282 <property stdset="1">
283 <name>minValue</name> 283 <name>minValue</name>
284 <number>0</number> 284 <number>0</number>
285 </property> 285 </property>
286 <property stdset="1"> 286 <property stdset="1">
287 <name>lineStep</name> 287 <name>lineStep</name>
288 <number>10</number> 288 <number>10</number>
289 </property> 289 </property>
290 </widget> 290 </widget>
291 <widget row="3" column="1" > 291 <widget row="3" column="1" >
292 <class>QComboBox</class> 292 <class>QComboBox</class>
293 <property stdset="1"> 293 <property stdset="1">
294 <name>name</name> 294 <name>name</name>
295 <cstring>frequency</cstring> 295 <cstring>frequency</cstring>
296 </property> 296 </property>
297 </widget> 297 </widget>
298 </grid> 298 </grid>
299 </widget> 299 </widget>
300 <widget> 300 <widget>
301 <class>QGroupBox</class> 301 <class>QGroupBox</class>
302 <property stdset="1"> 302 <property stdset="1">
303 <name>name</name> 303 <name>name</name>
304 <cstring>GroupLight</cstring> 304 <cstring>GroupLight</cstring>
305 </property> 305 </property>
306 <property stdset="1"> 306 <property stdset="1">
307 <name>title</name> 307 <name>title</name>
308 <string>Backlight</string> 308 <string>Backlight</string>
309 </property> 309 </property>
310 <property> 310 <property>
311 <name>layoutMargin</name> 311 <name>layoutMargin</name>
312 </property> 312 </property>
313 <property> 313 <property>
314 <name>layoutSpacing</name> 314 <name>layoutSpacing</name>
315 </property> 315 </property>
316 <vbox> 316 <vbox>
317 <property stdset="1"> 317 <property stdset="1">
318 <name>margin</name> 318 <name>margin</name>
319 <number>5</number> 319 <number>5</number>
320 </property> 320 </property>
321 <property stdset="1"> 321 <property stdset="1">
322 <name>spacing</name> 322 <name>spacing</name>
323 <number>3</number> 323 <number>3</number>
324 </property> 324 </property>
325 <widget> 325 <widget>
326 <class>QSlider</class> 326 <class>QSlider</class>
327 <property stdset="1"> 327 <property stdset="1">
328 <name>name</name> 328 <name>name</name>
329 <cstring>brightness</cstring> 329 <cstring>brightness</cstring>
330 </property> 330 </property>
331 <property stdset="1"> 331 <property stdset="1">
332 <name>maxValue</name> 332 <name>maxValue</name>
333 <number>255</number> 333 <number>255</number>
334 </property> 334 </property>
335 <property stdset="1"> 335 <property stdset="1">
336 <name>orientation</name> 336 <name>orientation</name>
337 <enum>Horizontal</enum> 337 <enum>Horizontal</enum>
338 </property> 338 </property>
339 <property stdset="1"> 339 <property stdset="1">
340 <name>tickmarks</name> 340 <name>tickmarks</name>
341 <enum>Right</enum> 341 <enum>Right</enum>
342 </property> 342 </property>
343 <property> 343 <property>
344 <name>whatsThis</name> 344 <name>whatsThis</name>
345 <string>set a fix value for backlight</string> 345 <string>set a fix value for backlight</string>
346 </property> 346 </property>
347 </widget> 347 </widget>
348 <widget> 348 <widget>
349 <class>QSlider</class> 349 <class>QSlider</class>
350 <property stdset="1"> 350 <property stdset="1">
351 <name>name</name> 351 <name>name</name>
352 <cstring>contrast</cstring> 352 <cstring>contrast</cstring>
353 </property> 353 </property>
354 <property stdset="1"> 354 <property stdset="1">
355 <name>maxValue</name> 355 <name>maxValue</name>
356 <number>255</number> 356 <number>255</number>
357 </property> 357 </property>
358 <property stdset="1"> 358 <property stdset="1">
359 <name>orientation</name> 359 <name>orientation</name>
360 <enum>Horizontal</enum> 360 <enum>Horizontal</enum>
361 </property> 361 </property>
362 <property stdset="1"> 362 <property stdset="1">
363 <name>tickmarks</name> 363 <name>tickmarks</name>
364 <enum>Right</enum> 364 <enum>Right</enum>
365 </property> 365 </property>
366 <property> 366 <property>
367 <name>whatsThis</name> 367 <name>whatsThis</name>
368 <string>set a fix value for contrast</string> 368 <string>set a fix value for contrast</string>
369 </property> 369 </property>
370 </widget> 370 </widget>
371 <widget> 371 <widget>
372 <class>QLayoutWidget</class> 372 <class>QLayoutWidget</class>
373 <property stdset="1"> 373 <property stdset="1">
374 <name>name</name> 374 <name>name</name>
375 <cstring>Layout10</cstring> 375 <cstring>Layout10</cstring>
376 </property> 376 </property>
377 <property> 377 <property>
378 <name>layoutSpacing</name> 378 <name>layoutSpacing</name>
379 </property> 379 </property>
380 <hbox> 380 <hbox>
381 <property stdset="1"> 381 <property stdset="1">
382 <name>margin</name> 382 <name>margin</name>
383 <number>0</number> 383 <number>0</number>
384 </property> 384 </property>
385 <property stdset="1"> 385 <property stdset="1">
386 <name>spacing</name> 386 <name>spacing</name>
387 <number>3</number> 387 <number>3</number>
388 </property> 388 </property>
389 <widget> 389 <widget>
390 <class>QLabel</class> 390 <class>QLabel</class>
391 <property stdset="1"> 391 <property stdset="1">
392 <name>name</name> 392 <name>name</name>
393 <cstring>PixmapLabel2</cstring> 393 <cstring>PixmapLabel2</cstring>
394 </property> 394 </property>
395 <property stdset="1"> 395 <property stdset="1">
396 <name>pixmap</name> 396 <name>pixmap</name>
397 <pixmap>image0</pixmap> 397 <pixmap>image0</pixmap>
398 </property> 398 </property>
399 <property stdset="1"> 399 <property stdset="1">
400 <name>scaledContents</name> 400 <name>scaledContents</name>
401 <bool>false</bool> 401 <bool>false</bool>
402 </property> 402 </property>
403 </widget> 403 </widget>
404 <widget> 404 <widget>
405 <class>QLabel</class> 405 <class>QLabel</class>
406 <property stdset="1"> 406 <property stdset="1">
407 <name>name</name> 407 <name>name</name>
408 <cstring>TL4</cstring> 408 <cstring>TL4</cstring>
409 </property> 409 </property>
410 <property stdset="1"> 410 <property stdset="1">
411 <name>text</name> 411 <name>text</name>
412 <string>Off</string> 412 <string>Off</string>
413 </property> 413 </property>
414 </widget> 414 </widget>
415 <spacer> 415 <spacer>
416 <property> 416 <property>
417 <name>name</name> 417 <name>name</name>
418 <cstring>Spacer2</cstring> 418 <cstring>Spacer2</cstring>
419 </property> 419 </property>
420 <property stdset="1"> 420 <property stdset="1">
421 <name>orientation</name> 421 <name>orientation</name>
422 <enum>Horizontal</enum> 422 <enum>Horizontal</enum>
423 </property> 423 </property>
424 <property stdset="1"> 424 <property stdset="1">
425 <name>sizeType</name> 425 <name>sizeType</name>
426 <enum>Expanding</enum> 426 <enum>Expanding</enum>
427 </property> 427 </property>
428 <property> 428 <property>
429 <name>sizeHint</name> 429 <name>sizeHint</name>
430 <size> 430 <size>
431 <width>20</width> 431 <width>20</width>
432 <height>20</height> 432 <height>20</height>
433 </size> 433 </size>
434 </property> 434 </property>
435 </spacer> 435 </spacer>
436 <widget> 436 <widget>
437 <class>QLabel</class> 437 <class>QLabel</class>
438 <property stdset="1"> 438 <property stdset="1">
439 <name>name</name> 439 <name>name</name>
440 <cstring>TL5</cstring> 440 <cstring>TL5</cstring>
441 </property> 441 </property>
442 <property stdset="1"> 442 <property stdset="1">
443 <name>text</name> 443 <name>text</name>
444 <string>Full</string> 444 <string>Full</string>
445 </property> 445 </property>
446 </widget> 446 </widget>
447 <widget> 447 <widget>
448 <class>QLabel</class> 448 <class>QLabel</class>
449 <property stdset="1"> 449 <property stdset="1">
450 <name>name</name> 450 <name>name</name>
451 <cstring>PixmapLabel1</cstring> 451 <cstring>PixmapLabel1</cstring>
452 </property> 452 </property>
453 <property stdset="1"> 453 <property stdset="1">
454 <name>pixmap</name> 454 <name>pixmap</name>
455 <pixmap>image1</pixmap> 455 <pixmap>image1</pixmap>
456 </property> 456 </property>
457 <property stdset="1"> 457 <property stdset="1">
458 <name>scaledContents</name> 458 <name>scaledContents</name>
459 <bool>false</bool> 459 <bool>false</bool>
460 </property> 460 </property>
461 </widget> 461 </widget>
462 </hbox> 462 </hbox>
463 </widget> 463 </widget>
464 <widget> 464 <widget>
465 <class>QLayoutWidget</class> 465 <class>QLayoutWidget</class>
466 <property stdset="1"> 466 <property stdset="1">
467 <name>name</name> 467 <name>name</name>
468 <cstring>Layout9</cstring> 468 <cstring>Layout9</cstring>
469 </property> 469 </property>
470 <property> 470 <property>
471 <name>layoutMargin</name> 471 <name>layoutMargin</name>
472 </property> 472 </property>
473 <property> 473 <property>
474 <name>layoutSpacing</name> 474 <name>layoutSpacing</name>
475 </property> 475 </property>
476 <hbox> 476 <hbox>
477 <property stdset="1"> 477 <property stdset="1">
478 <name>margin</name> 478 <name>margin</name>
479 <number>0</number> 479 <number>0</number>
480 </property> 480 </property>
481 <property stdset="1"> 481 <property stdset="1">
482 <name>spacing</name> 482 <name>spacing</name>
483 <number>3</number> 483 <number>3</number>
484 </property> 484 </property>
485 <widget> 485 <widget>
486 <class>QCheckBox</class> 486 <class>QCheckBox</class>
487 <property stdset="1"> 487 <property stdset="1">
488 <name>name</name> 488 <name>name</name>
489 <cstring>auto_brightness</cstring> 489 <cstring>auto_brightness</cstring>
490 </property> 490 </property>
491 <property stdset="1"> 491 <property stdset="1">
492 <name>text</name> 492 <name>text</name>
493 <string>Use Light Sensor</string> 493 <string>Use Light Sensor</string>
494 </property> 494 </property>
495 <property> 495 <property>
496 <name>whatsThis</name> 496 <name>whatsThis</name>
497 <string>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</string> 497 <string>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</string>
498 </property> 498 </property>
499 </widget> 499 </widget>
500 <widget> 500 <widget>
501 <class>QPushButton</class> 501 <class>QPushButton</class>
502 <property stdset="1"> 502 <property stdset="1">
503 <name>name</name> 503 <name>name</name>
504 <cstring>CalibrateLightSensor</cstring> 504 <cstring>CalibrateLightSensor</cstring>
505 </property> 505 </property>
506 <property stdset="1"> 506 <property stdset="1">
507 <name>text</name> 507 <name>text</name>
508 <string>Calibrate</string> 508 <string>Calibrate</string>
509 </property> 509 </property>
510 <property> 510 <property>
511 <name>whatsThis</name> 511 <name>whatsThis</name>
512 <string>Advanced settings for light sensor handling</string> 512 <string>Advanced settings for light sensor handling</string>
513 </property> 513 </property>
514 </widget> 514 </widget>
515 </hbox> 515 </hbox>
516 </widget> 516 </widget>
517 </vbox> 517 </vbox>
518 </widget> 518 </widget>
519 <spacer> 519 <spacer>
520 <property> 520 <property>
521 <name>name</name> 521 <name>name</name>
522 <cstring>Spacer4</cstring> 522 <cstring>Spacer4</cstring>
523 </property> 523 </property>
524 <property stdset="1"> 524 <property stdset="1">
525 <name>orientation</name> 525 <name>orientation</name>
526 <enum>Vertical</enum> 526 <enum>Vertical</enum>
527 </property> 527 </property>
528 <property stdset="1"> 528 <property stdset="1">
529 <name>sizeType</name> 529 <name>sizeType</name>
530 <enum>Expanding</enum> 530 <enum>Expanding</enum>
531 </property> 531 </property>
532 <property> 532 <property>
533 <name>sizeHint</name> 533 <name>sizeHint</name>
534 <size> 534 <size>
535 <width>20</width> 535 <width>20</width>
536 <height>20</height> 536 <height>20</height>
537 </size> 537 </size>
538 </property> 538 </property>
539 </spacer> 539 </spacer>
540 </vbox> 540 </vbox>
541 </widget> 541 </widget>
542 <widget> 542 <widget>
543 <class>QWidget</class> 543 <class>QWidget</class>
544 <property stdset="1"> 544 <property stdset="1">
545 <name>name</name> 545 <name>name</name>
546 <cstring>tab</cstring> 546 <cstring>tab</cstring>
547 </property> 547 </property>
548 <attribute> 548 <attribute>
549 <name>title</name> 549 <name>title</name>
550 <string>on AC</string> 550 <string>on AC</string>
551 </attribute> 551 </attribute>
552 <vbox> 552 <vbox>
553 <property stdset="1"> 553 <property stdset="1">
554 <name>margin</name> 554 <name>margin</name>
555 <number>-1</number> 555 <number>-1</number>
556 </property> 556 </property>
557 <property stdset="1"> 557 <property stdset="1">
558 <name>spacing</name> 558 <name>spacing</name>
559 <number>-1</number> 559 <number>-1</number>
560 </property> 560 </property>
561 <widget> 561 <widget>
562 <class>QGroupBox</class> 562 <class>QGroupBox</class>
563 <property stdset="1"> 563 <property stdset="1">
564 <name>name</name> 564 <name>name</name>
565 <cstring>Group3</cstring> 565 <cstring>Group3</cstring>
566 </property> 566 </property>
567 <property stdset="1"> 567 <property stdset="1">
568 <name>enabled</name> 568 <name>enabled</name>
569 <bool>true</bool> 569 <bool>true</bool>
570 </property> 570 </property>
571 <property stdset="1"> 571 <property stdset="1">
572 <name>title</name> 572 <name>title</name>
573 <string>General Settings</string> 573 <string>General Settings</string>
574 </property> 574 </property>
575 <property> 575 <property>
576 <name>layoutMargin</name> 576 <name>layoutMargin</name>
577 </property> 577 </property>
578 <property> 578 <property>
579 <name>layoutSpacing</name> 579 <name>layoutSpacing</name>
580 </property> 580 </property>
581 <grid> 581 <grid>
582 <property stdset="1"> 582 <property stdset="1">
583 <name>margin</name> 583 <name>margin</name>
584 <number>5</number> 584 <number>5</number>
585 </property> 585 </property>
586 <property stdset="1"> 586 <property stdset="1">
587 <name>spacing</name> 587 <name>spacing</name>
588 <number>3</number> 588 <number>3</number>
589 </property> 589 </property>
590 <widget row="1" column="1" > 590 <widget row="1" column="1" >
591 <class>QSpinBox</class> 591 <class>QSpinBox</class>
592 <property stdset="1"> 592 <property stdset="1">
593 <name>name</name> 593 <name>name</name>
594 <cstring>interval_lightoff_ac</cstring> 594 <cstring>interval_lightoff_ac</cstring>
595 </property> 595 </property>
596 <property stdset="1"> 596 <property stdset="1">
597 <name>suffix</name> 597 <name>suffix</name>
598 <string> sec</string> 598 <string> sec</string>
599 </property> 599 </property>
600 <property stdset="1"> 600 <property stdset="1">
601 <name>specialValueText</name> 601 <name>specialValueText</name>
602 <string>never</string> 602 <string>never</string>
603 </property> 603 </property>
604 <property stdset="1"> 604 <property stdset="1">
605 <name>buttonSymbols</name> 605 <name>buttonSymbols</name>
606 <enum>PlusMinus</enum> 606 <enum>PlusMinus</enum>
607 </property> 607 </property>
608 <property stdset="1"> 608 <property stdset="1">
609 <name>maxValue</name> 609 <name>maxValue</name>
610 <number>3600</number> 610 <number>3600</number>
611 </property> 611 </property>
612 <property stdset="1"> 612 <property stdset="1">
613 <name>minValue</name> 613 <name>minValue</name>
614 <number>0</number> 614 <number>0</number>
615 </property> 615 </property>
616 <property stdset="1"> 616 <property stdset="1">
617 <name>lineStep</name> 617 <name>lineStep</name>
618 <number>10</number> 618 <number>10</number>
619 </property> 619 </property>
620 </widget> 620 </widget>
621 <widget row="0" column="0" > 621 <widget row="0" column="0" >
622 <class>QLabel</class> 622 <class>QLabel</class>
623 <property stdset="1"> 623 <property stdset="1">
624 <name>name</name> 624 <name>name</name>
625 <cstring>TextLabel1_3_2</cstring> 625 <cstring>TextLabel1_3_2</cstring>
626 </property> 626 </property>
627 <property stdset="1"> 627 <property stdset="1">
628 <name>sizePolicy</name> 628 <name>sizePolicy</name>
629 <sizepolicy> 629 <sizepolicy>
630 <hsizetype>3</hsizetype> 630 <hsizetype>3</hsizetype>
631 <vsizetype>1</vsizetype> 631 <vsizetype>1</vsizetype>
632 </sizepolicy> 632 </sizepolicy>
633 </property> 633 </property>
634 <property stdset="1"> 634 <property stdset="1">
635 <name>text</name> 635 <name>text</name>
636 <string>Dim light after</string> 636 <string>Dim light after</string>
637 </property> 637 </property>
638 </widget> 638 </widget>
639 <widget row="2" column="1" > 639 <widget row="2" column="1" >
640 <class>QSpinBox</class> 640 <class>QSpinBox</class>
641 <property stdset="1"> 641 <property stdset="1">
642 <name>name</name> 642 <name>name</name>
643 <cstring>interval_suspend_ac</cstring> 643 <cstring>interval_suspend_ac</cstring>
644 </property> 644 </property>
645 <property stdset="1"> 645 <property stdset="1">
646 <name>suffix</name> 646 <name>suffix</name>
647 <string> sec</string> 647 <string> sec</string>
648 </property> 648 </property>
649 <property stdset="1"> 649 <property stdset="1">
650 <name>specialValueText</name> 650 <name>specialValueText</name>
651 <string>never</string> 651 <string>never</string>
652 </property> 652 </property>
653 <property stdset="1"> 653 <property stdset="1">
654 <name>buttonSymbols</name> 654 <name>buttonSymbols</name>
655 <enum>PlusMinus</enum> 655 <enum>PlusMinus</enum>
656 </property> 656 </property>
657 <property stdset="1"> 657 <property stdset="1">
658 <name>maxValue</name> 658 <name>maxValue</name>
659 <number>3600</number> 659 <number>3600</number>
660 </property> 660 </property>
661 <property stdset="1"> 661 <property stdset="1">
662 <name>minValue</name> 662 <name>minValue</name>
663 <number>0</number> 663 <number>0</number>
664 </property> 664 </property>
665 <property stdset="1"> 665 <property stdset="1">
666 <name>lineStep</name> 666 <name>lineStep</name>
667 <number>10</number> 667 <number>10</number>
668 </property> 668 </property>
669 </widget> 669 </widget>
670 <widget row="0" column="1" > 670 <widget row="0" column="1" >
671 <class>QSpinBox</class> 671 <class>QSpinBox</class>
672 <property stdset="1"> 672 <property stdset="1">
673 <name>name</name> 673 <name>name</name>
674 <cstring>interval_dim_ac</cstring> 674 <cstring>interval_dim_ac</cstring>
675 </property> 675 </property>
676 <property stdset="1"> 676 <property stdset="1">
677 <name>suffix</name> 677 <name>suffix</name>
678 <string> sec</string> 678 <string> sec</string>
679 </property> 679 </property>
680 <property stdset="1"> 680 <property stdset="1">
681 <name>specialValueText</name> 681 <name>specialValueText</name>
682 <string>never</string> 682 <string>never</string>
683 </property> 683 </property>
684 <property stdset="1"> 684 <property stdset="1">
685 <name>buttonSymbols</name> 685 <name>buttonSymbols</name>
686 <enum>PlusMinus</enum> 686 <enum>PlusMinus</enum>
687 </property> 687 </property>
688 <property stdset="1"> 688 <property stdset="1">
689 <name>maxValue</name> 689 <name>maxValue</name>
690 <number>3600</number> 690 <number>3600</number>
691 </property> 691 </property>
692 <property stdset="1"> 692 <property stdset="1">
693 <name>minValue</name> 693 <name>minValue</name>
694 <number>0</number> 694 <number>0</number>
695 </property> 695 </property>
696 <property stdset="1"> 696 <property stdset="1">
697 <name>lineStep</name> 697 <name>lineStep</name>
698 <number>10</number> 698 <number>10</number>
699 </property> 699 </property>
700 </widget> 700 </widget>
701 <widget row="1" column="0" > 701 <widget row="1" column="0" >
702 <class>QLabel</class> 702 <class>QLabel</class>
703 <property stdset="1"> 703 <property stdset="1">
704 <name>name</name> 704 <name>name</name>
705 <cstring>TextLabel2_2_2</cstring> 705 <cstring>TextLabel2_2_2</cstring>
706 </property> 706 </property>
707 <property stdset="1"> 707 <property stdset="1">
708 <name>sizePolicy</name> 708 <name>sizePolicy</name>
709 <sizepolicy> 709 <sizepolicy>
710 <hsizetype>3</hsizetype> 710 <hsizetype>3</hsizetype>
711 <vsizetype>1</vsizetype> 711 <vsizetype>1</vsizetype>
712 </sizepolicy> 712 </sizepolicy>
713 </property> 713 </property>
714 <property stdset="1"> 714 <property stdset="1">
715 <name>text</name> 715 <name>text</name>
716 <string>Light off after</string> 716 <string>Light off after</string>
717 </property> 717 </property>
718 </widget> 718 </widget>
719 <widget row="2" column="0" > 719 <widget row="2" column="0" >
720 <class>QLabel</class> 720 <class>QLabel</class>
721 <property stdset="1"> 721 <property stdset="1">
722 <name>name</name> 722 <name>name</name>
723 <cstring>TextLabel1_2_2_3</cstring> 723 <cstring>TextLabel1_2_2_3</cstring>
724 </property> 724 </property>
725 <property stdset="1"> 725 <property stdset="1">
726 <name>sizePolicy</name> 726 <name>sizePolicy</name>
727 <sizepolicy> 727 <sizepolicy>
728 <hsizetype>3</hsizetype> 728 <hsizetype>3</hsizetype>
729 <vsizetype>1</vsizetype> 729 <vsizetype>1</vsizetype>
730 </sizepolicy> 730 </sizepolicy>
731 </property> 731 </property>
732 <property stdset="1"> 732 <property stdset="1">
733 <name>text</name> 733 <name>text</name>
734 <string>Suspend after</string> 734 <string>Suspend after</string>
735 </property> 735 </property>
736 </widget> 736 </widget>
737 <widget row="3" column="1" > 737 <widget row="3" column="1" >
738 <class>QComboBox</class> 738 <class>QComboBox</class>
739 <property stdset="1"> 739 <property stdset="1">
740 <name>name</name> 740 <name>name</name>
741 <cstring>frequency_ac</cstring> 741 <cstring>frequency_ac</cstring>
742 </property> 742 </property>
743 </widget> 743 </widget>
744 <widget row="4" column="0" > 744 <widget row="4" column="0" >
745 <class>QCheckBox</class> 745 <class>QCheckBox</class>
746 <property stdset="1"> 746 <property stdset="1">
747 <name>name</name> 747 <name>name</name>
748 <cstring>LcdOffOnly_ac</cstring> 748 <cstring>LcdOffOnly_ac</cstring>
749 </property> 749 </property>
750 <property stdset="1"> 750 <property stdset="1">
751 <name>sizePolicy</name> 751 <name>sizePolicy</name>
752 <sizepolicy> 752 <sizepolicy>
753 <hsizetype>7</hsizetype> 753 <hsizetype>7</hsizetype>
754 <vsizetype>0</vsizetype> 754 <vsizetype>0</vsizetype>
755 </sizepolicy> 755 </sizepolicy>
756 </property> 756 </property>
757 <property stdset="1"> 757 <property stdset="1">
758 <name>text</name> 758 <name>text</name>
759 <string>Deactivate LCD only (does not suspend)</string> 759 <string>Deactivate LCD only (does not suspend)</string>
760 </property> 760 </property>
761 </widget> 761 </widget>
762 <widget row="3" column="0" > 762 <widget row="3" column="0" >
763 <class>QLabel</class> 763 <class>QLabel</class>
764 <property stdset="1"> 764 <property stdset="1">
765 <name>name</name> 765 <name>name</name>
766 <cstring>TextLabel1_2_2_3_2</cstring> 766 <cstring>TextLabel1_2_2_3_2</cstring>
767 </property> 767 </property>
768 <property stdset="1"> 768 <property stdset="1">
769 <name>sizePolicy</name> 769 <name>sizePolicy</name>
770 <sizepolicy> 770 <sizepolicy>
771 <hsizetype>3</hsizetype> 771 <hsizetype>3</hsizetype>
772 <vsizetype>1</vsizetype> 772 <vsizetype>1</vsizetype>
773 </sizepolicy> 773 </sizepolicy>
774 </property> 774 </property>
775 <property stdset="1"> 775 <property stdset="1">
776 <name>text</name> 776 <name>text</name>
777 <string>CPU frequency</string> 777 <string>CPU frequency</string>
778 </property> 778 </property>
779 </widget> 779 </widget>
780 </grid> 780 </grid>
781 </widget> 781 </widget>
782 <widget> 782 <widget>
783 <class>QGroupBox</class> 783 <class>QGroupBox</class>
784 <property stdset="1"> 784 <property stdset="1">
785 <name>name</name> 785 <name>name</name>
786 <cstring>GroupLight_ac</cstring> 786 <cstring>GroupLight_ac</cstring>
787 </property> 787 </property>
788 <property stdset="1"> 788 <property stdset="1">
789 <name>title</name> 789 <name>title</name>
790 <string>Backlight</string> 790 <string>Backlight</string>
791 </property> 791 </property>
792 <property> 792 <property>
793 <name>layoutMargin</name> 793 <name>layoutMargin</name>
794 </property> 794 </property>
795 <property> 795 <property>
796 <name>layoutSpacing</name> 796 <name>layoutSpacing</name>
797 </property> 797 </property>
798 <vbox> 798 <vbox>
799 <property stdset="1"> 799 <property stdset="1">
800 <name>margin</name> 800 <name>margin</name>
801 <number>5</number> 801 <number>5</number>
802 </property> 802 </property>
803 <property stdset="1"> 803 <property stdset="1">
804 <name>spacing</name> 804 <name>spacing</name>
805 <number>3</number> 805 <number>3</number>
806 </property> 806 </property>
807 <widget> 807 <widget>
808 <class>QSlider</class> 808 <class>QSlider</class>
809 <property stdset="1"> 809 <property stdset="1">
810 <name>name</name> 810 <name>name</name>
811 <cstring>brightness_ac</cstring> 811 <cstring>brightness_ac</cstring>
812 </property> 812 </property>
813 <property stdset="1"> 813 <property stdset="1">
814 <name>maxValue</name> 814 <name>maxValue</name>
815 <number>255</number> 815 <number>255</number>
816 </property> 816 </property>
817 <property stdset="1"> 817 <property stdset="1">
818 <name>value</name> 818 <name>value</name>
819 <number>255</number> 819 <number>255</number>
820 </property> 820 </property>
821 <property stdset="1"> 821 <property stdset="1">
822 <name>orientation</name> 822 <name>orientation</name>
823 <enum>Horizontal</enum> 823 <enum>Horizontal</enum>
824 </property> 824 </property>
825 <property stdset="1"> 825 <property stdset="1">
826 <name>tickmarks</name> 826 <name>tickmarks</name>
827 <enum>Right</enum> 827 <enum>Right</enum>
828 </property> 828 </property>
829 <property> 829 <property>
830 <name>whatsThis</name> 830 <name>whatsThis</name>
831 <string>set a fix value for backlight</string> 831 <string>set a fix value for backlight</string>
832 </property> 832 </property>
833 </widget> 833 </widget>
834 <widget> 834 <widget>
835 <class>QSlider</class> 835 <class>QSlider</class>
836 <property stdset="1"> 836 <property stdset="1">
837 <name>name</name> 837 <name>name</name>
838 <cstring>contrast_ac</cstring> 838 <cstring>contrast_ac</cstring>
839 </property> 839 </property>
840 <property stdset="1"> 840 <property stdset="1">
841 <name>maxValue</name> 841 <name>maxValue</name>
842 <number>255</number> 842 <number>255</number>
843 </property> 843 </property>
844 <property stdset="1"> 844 <property stdset="1">
845 <name>value</name> 845 <name>value</name>
846 <number>255</number> 846 <number>255</number>
847 </property> 847 </property>
848 <property stdset="1"> 848 <property stdset="1">
849 <name>orientation</name> 849 <name>orientation</name>
850 <enum>Horizontal</enum> 850 <enum>Horizontal</enum>
851 </property> 851 </property>
852 <property stdset="1"> 852 <property stdset="1">
853 <name>tickmarks</name> 853 <name>tickmarks</name>
854 <enum>Right</enum> 854 <enum>Right</enum>
855 </property> 855 </property>
856 <property> 856 <property>
857 <name>whatsThis</name> 857 <name>whatsThis</name>
858 <string>set a fix value for contrast</string> 858 <string>set a fix value for contrast</string>
859 </property> 859 </property>
860 </widget> 860 </widget>
861 <widget> 861 <widget>
862 <class>QLayoutWidget</class> 862 <class>QLayoutWidget</class>
863 <property stdset="1"> 863 <property stdset="1">
864 <name>name</name> 864 <name>name</name>
865 <cstring>Layout20</cstring> 865 <cstring>Layout20</cstring>
866 </property> 866 </property>
867 <property> 867 <property>
868 <name>layoutSpacing</name> 868 <name>layoutSpacing</name>
869 </property> 869 </property>
870 <hbox> 870 <hbox>
871 <property stdset="1"> 871 <property stdset="1">
872 <name>margin</name> 872 <name>margin</name>
873 <number>0</number> 873 <number>0</number>
874 </property> 874 </property>
875 <property stdset="1"> 875 <property stdset="1">
876 <name>spacing</name> 876 <name>spacing</name>
877 <number>3</number> 877 <number>3</number>
878 </property> 878 </property>
879 <widget> 879 <widget>
880 <class>QLabel</class> 880 <class>QLabel</class>
881 <property stdset="1"> 881 <property stdset="1">
882 <name>name</name> 882 <name>name</name>
883 <cstring>PixmapLabel2_2_3</cstring> 883 <cstring>PixmapLabel2_2_3</cstring>
884 </property> 884 </property>
885 <property stdset="1"> 885 <property stdset="1">
886 <name>pixmap</name> 886 <name>pixmap</name>
887 <pixmap>image0</pixmap> 887 <pixmap>image0</pixmap>
888 </property> 888 </property>
889 <property stdset="1"> 889 <property stdset="1">
890 <name>scaledContents</name> 890 <name>scaledContents</name>
891 <bool>false</bool> 891 <bool>false</bool>
892 </property> 892 </property>
893 </widget> 893 </widget>
894 <widget> 894 <widget>
895 <class>QLabel</class> 895 <class>QLabel</class>
896 <property stdset="1"> 896 <property stdset="1">
897 <name>name</name> 897 <name>name</name>
898 <cstring>TextLabel6</cstring> 898 <cstring>TextLabel6</cstring>
899 </property> 899 </property>
900 <property stdset="1"> 900 <property stdset="1">
901 <name>text</name> 901 <name>text</name>
902 <string>Off</string> 902 <string>Off</string>
903 </property> 903 </property>
904 </widget> 904 </widget>
905 <spacer> 905 <spacer>
906 <property> 906 <property>
907 <name>name</name> 907 <name>name</name>
908 <cstring>Spacer3</cstring> 908 <cstring>Spacer3</cstring>
909 </property> 909 </property>
910 <property stdset="1"> 910 <property stdset="1">
911 <name>orientation</name> 911 <name>orientation</name>
912 <enum>Horizontal</enum> 912 <enum>Horizontal</enum>
913 </property> 913 </property>
914 <property stdset="1"> 914 <property stdset="1">
915 <name>sizeType</name> 915 <name>sizeType</name>
916 <enum>Expanding</enum> 916 <enum>Expanding</enum>
917 </property> 917 </property>
918 <property> 918 <property>
919 <name>sizeHint</name> 919 <name>sizeHint</name>
920 <size> 920 <size>
921 <width>20</width> 921 <width>20</width>
922 <height>20</height> 922 <height>20</height>
923 </size> 923 </size>
924 </property> 924 </property>
925 </spacer> 925 </spacer>
926 <widget> 926 <widget>
927 <class>QLabel</class> 927 <class>QLabel</class>
928 <property stdset="1"> 928 <property stdset="1">
929 <name>name</name> 929 <name>name</name>
930 <cstring>TextLabel7</cstring> 930 <cstring>TextLabel7</cstring>
931 </property> 931 </property>
932 <property stdset="1"> 932 <property stdset="1">
933 <name>text</name> 933 <name>text</name>
934 <string>Full</string> 934 <string>Full</string>
935 </property> 935 </property>
936 </widget> 936 </widget>
937 <widget> 937 <widget>
938 <class>QLabel</class> 938 <class>QLabel</class>
939 <property stdset="1"> 939 <property stdset="1">
940 <name>name</name> 940 <name>name</name>
941 <cstring>PixmapLabel1_2_3</cstring> 941 <cstring>PixmapLabel1_2_3</cstring>
942 </property> 942 </property>
943 <property stdset="1"> 943 <property stdset="1">
944 <name>pixmap</name> 944 <name>pixmap</name>
945 <pixmap>image1</pixmap> 945 <pixmap>image1</pixmap>
946 </property> 946 </property>
947 <property stdset="1"> 947 <property stdset="1">
948 <name>scaledContents</name> 948 <name>scaledContents</name>
949 <bool>false</bool> 949 <bool>false</bool>
950 </property> 950 </property>
951 </widget> 951 </widget>
952 </hbox> 952 </hbox>
953 </widget> 953 </widget>
954 <widget> 954 <widget>
955 <class>QLayoutWidget</class> 955 <class>QLayoutWidget</class>
956 <property stdset="1"> 956 <property stdset="1">
957 <name>name</name> 957 <name>name</name>
958 <cstring>Layout10</cstring> 958 <cstring>Layout10</cstring>
959 </property> 959 </property>
960 <property> 960 <property>
961 <name>layoutSpacing</name> 961 <name>layoutSpacing</name>
962 </property> 962 </property>
963 <hbox> 963 <hbox>
964 <property stdset="1"> 964 <property stdset="1">
965 <name>margin</name> 965 <name>margin</name>
966 <number>0</number> 966 <number>0</number>
967 </property> 967 </property>
968 <property stdset="1"> 968 <property stdset="1">
969 <name>spacing</name> 969 <name>spacing</name>
970 <number>3</number> 970 <number>3</number>
971 </property> 971 </property>
972 <widget> 972 <widget>
973 <class>QCheckBox</class> 973 <class>QCheckBox</class>
974 <property stdset="1"> 974 <property stdset="1">
975 <name>name</name> 975 <name>name</name>
976 <cstring>auto_brightness_ac</cstring> 976 <cstring>auto_brightness_ac</cstring>
977 </property> 977 </property>
978 <property stdset="1"> 978 <property stdset="1">
979 <name>text</name> 979 <name>text</name>
980 <string>Use Light Sensor</string> 980 <string>Use Light Sensor</string>
981 </property> 981 </property>
982 <property> 982 <property>
983 <name>whatsThis</name> 983 <name>whatsThis</name>
984 <string>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</string> 984 <string>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</string>
985 </property> 985 </property>
986 </widget> 986 </widget>
987 <widget> 987 <widget>
988 <class>QPushButton</class> 988 <class>QPushButton</class>
989 <property stdset="1"> 989 <property stdset="1">
990 <name>name</name> 990 <name>name</name>
991 <cstring>CalibrateLightSensor_ac</cstring> 991 <cstring>CalibrateLightSensor_ac</cstring>
992 </property> 992 </property>
993 <property stdset="1"> 993 <property stdset="1">
994 <name>text</name> 994 <name>text</name>
995 <string>Calibrate</string> 995 <string>Calibrate</string>
996 </property> 996 </property>
997 <property> 997 <property>
998 <name>whatsThis</name> 998 <name>whatsThis</name>
999 <string>Advanced settings for light sensor handling</string> 999 <string>Advanced settings for light sensor handling</string>
1000 </property> 1000 </property>
1001 </widget> 1001 </widget>
1002 </hbox> 1002 </hbox>
1003 </widget> 1003 </widget>
1004 </vbox> 1004 </vbox>
1005 </widget> 1005 </widget>
1006 <spacer> 1006 <spacer>
1007 <property> 1007 <property>
1008 <name>name</name> 1008 <name>name</name>
1009 <cstring>Spacer5</cstring> 1009 <cstring>Spacer5</cstring>
1010 </property> 1010 </property>
1011 <property stdset="1"> 1011 <property stdset="1">
1012 <name>orientation</name> 1012 <name>orientation</name>
1013 <enum>Vertical</enum> 1013 <enum>Vertical</enum>
1014 </property> 1014 </property>
1015 <property stdset="1"> 1015 <property stdset="1">
1016 <name>sizeType</name> 1016 <name>sizeType</name>
1017 <enum>Expanding</enum> 1017 <enum>Expanding</enum>
1018 </property> 1018 </property>
1019 <property> 1019 <property>
1020 <name>sizeHint</name> 1020 <name>sizeHint</name>
1021 <size> 1021 <size>
1022 <width>20</width> 1022 <width>20</width>
1023 <height>20</height> 1023 <height>20</height>
1024 </size> 1024 </size>
1025 </property> 1025 </property>
1026 </spacer> 1026 </spacer>
1027 </vbox> 1027 </vbox>
1028 </widget> 1028 </widget>
1029 <widget> 1029 <widget>
1030 <class>QWidget</class> 1030 <class>QWidget</class>
1031 <property stdset="1"> 1031 <property stdset="1">
1032 <name>name</name> 1032 <name>name</name>
1033 <cstring>tab</cstring> 1033 <cstring>tab</cstring>
1034 </property> 1034 </property>
1035 <attribute> 1035 <attribute>
1036 <name>title</name> 1036 <name>title</name>
1037 <string>Warnings</string> 1037 <string>Warnings</string>
1038 </attribute> 1038 </attribute>
1039 <vbox> 1039 <vbox>
1040 <property stdset="1"> 1040 <property stdset="1">
1041 <name>margin</name> 1041 <name>margin</name>
1042 <number>5</number> 1042 <number>5</number>
1043 </property> 1043 </property>
1044 <property stdset="1"> 1044 <property stdset="1">
1045 <name>spacing</name> 1045 <name>spacing</name>
1046 <number>3</number> 1046 <number>3</number>
1047 </property> 1047 </property>
1048 <widget> 1048 <widget>
1049 <class>QGroupBox</class> 1049 <class>QGroupBox</class>
1050 <property stdset="1"> 1050 <property stdset="1">
1051 <name>name</name> 1051 <name>name</name>
1052 <cstring>Group5</cstring> 1052 <cstring>Group5</cstring>
1053 </property> 1053 </property>
1054 <property stdset="1"> 1054 <property stdset="1">
1055 <name>title</name> 1055 <name>title</name>
1056 <string>Warnings</string> 1056 <string>Warnings</string>
1057 </property> 1057 </property>
1058 <property> 1058 <property>
1059 <name>layoutMargin</name> 1059 <name>layoutMargin</name>
1060 </property> 1060 </property>
1061 <property> 1061 <property>
1062 <name>layoutSpacing</name> 1062 <name>layoutSpacing</name>
1063 </property> 1063 </property>
1064 <grid> 1064 <grid>
1065 <property stdset="1"> 1065 <property stdset="1">
1066 <name>margin</name> 1066 <name>margin</name>
1067 <number>5</number> 1067 <number>5</number>
1068 </property> 1068 </property>
1069 <property stdset="1"> 1069 <property stdset="1">
1070 <name>spacing</name> 1070 <name>spacing</name>
1071 <number>3</number> 1071 <number>3</number>
1072 </property> 1072 </property>
1073 <widget row="0" column="0" > 1073 <widget row="0" column="0" >
1074 <class>QLabel</class> 1074 <class>QLabel</class>
1075 <property stdset="1"> 1075 <property stdset="1">
1076 <name>name</name> 1076 <name>name</name>
1077 <cstring>TextLabel1</cstring> 1077 <cstring>TextLabel1</cstring>
1078 </property> 1078 </property>
1079 <property stdset="1"> 1079 <property stdset="1">
1080 <name>sizePolicy</name> 1080 <name>sizePolicy</name>
1081 <sizepolicy> 1081 <sizepolicy>
1082 <hsizetype>3</hsizetype> 1082 <hsizetype>3</hsizetype>
1083 <vsizetype>5</vsizetype> 1083 <vsizetype>5</vsizetype>
1084 </sizepolicy> 1084 </sizepolicy>
1085 </property> 1085 </property>
1086 <property stdset="1"> 1086 <property stdset="1">
1087 <name>text</name> 1087 <name>text</name>
1088 <string>Low power warning interval</string> 1088 <string>Low power warning interval</string>
1089 </property> 1089 </property>
1090 <property stdset="1"> 1090 <property stdset="1">
1091 <name>alignment</name> 1091 <name>alignment</name>
1092 <set>WordBreak|AlignVCenter|AlignLeft</set> 1092 <set>WordBreak|AlignVCenter|AlignLeft</set>
1093 </property> 1093 </property>
1094 <property> 1094 <property>
1095 <name>wordwrap</name> 1095 <name>wordwrap</name>
1096 </property> 1096 </property>
1097 </widget> 1097 </widget>
1098 <widget row="1" column="1" > 1098 <widget row="1" column="1" >
1099 <class>QSpinBox</class> 1099 <class>QSpinBox</class>
1100 <property stdset="1"> 1100 <property stdset="1">
1101 <name>name</name> 1101 <name>name</name>
1102 <cstring>lowSpinBox</cstring> 1102 <cstring>lowSpinBox</cstring>
1103 </property> 1103 </property>
1104 <property stdset="1"> 1104 <property stdset="1">
1105 <name>suffix</name> 1105 <name>suffix</name>
1106 <string> %</string> 1106 <string> %</string>
1107 </property> 1107 </property>
1108 <property stdset="1"> 1108 <property stdset="1">
1109 <name>buttonSymbols</name> 1109 <name>buttonSymbols</name>
1110 <enum>PlusMinus</enum> 1110 <enum>PlusMinus</enum>
1111 </property> 1111 </property>
1112 <property stdset="1"> 1112 <property stdset="1">
1113 <name>maxValue</name> 1113 <name>maxValue</name>
1114 <number>80</number> 1114 <number>80</number>
1115 </property> 1115 </property>
1116 <property stdset="1"> 1116 <property stdset="1">
1117 <name>minValue</name> 1117 <name>minValue</name>
1118 <number>2</number> 1118 <number>2</number>
1119 </property> 1119 </property>
1120 <property> 1120 <property>
1121 <name>whatsThis</name> 1121 <name>whatsThis</name>
1122 <string>At what battery level should the low power warning pop up</string> 1122 <string>At what battery level should the low power warning pop up</string>
1123 </property> 1123 </property>
1124 </widget> 1124 </widget>
1125 <widget row="0" column="1" > 1125 <widget row="0" column="1" >
1126 <class>QSpinBox</class> 1126 <class>QSpinBox</class>
1127 <property stdset="1"> 1127 <property stdset="1">
1128 <name>name</name> 1128 <name>name</name>
1129 <cstring>warnintervalBox</cstring> 1129 <cstring>warnintervalBox</cstring>
1130 </property> 1130 </property>
1131 <property stdset="1"> 1131 <property stdset="1">
1132 <name>suffix</name> 1132 <name>suffix</name>
1133 <string> sec</string> 1133 <string> sec</string>
1134 </property> 1134 </property>
1135 <property stdset="1"> 1135 <property stdset="1">
1136 <name>specialValueText</name> 1136 <name>specialValueText</name>
1137 <string>never</string> 1137 <string>never</string>
1138 </property> 1138 </property>
1139 <property stdset="1"> 1139 <property stdset="1">
1140 <name>wrapping</name> 1140 <name>wrapping</name>
1141 <bool>true</bool> 1141 <bool>true</bool>
1142 </property> 1142 </property>
1143 <property stdset="1"> 1143 <property stdset="1">
1144 <name>buttonSymbols</name> 1144 <name>buttonSymbols</name>
1145 <enum>PlusMinus</enum> 1145 <enum>PlusMinus</enum>
1146 </property> 1146 </property>
1147 <property stdset="1"> 1147 <property stdset="1">
1148 <name>maxValue</name> 1148 <name>maxValue</name>
1149 <number>300</number> 1149 <number>300</number>
1150 </property> 1150 </property>
1151 <property stdset="1"> 1151 <property stdset="1">
1152 <name>minValue</name> 1152 <name>minValue</name>
1153 <number>0</number> 1153 <number>0</number>
1154 </property> 1154 </property>
1155 <property stdset="1"> 1155 <property stdset="1">
1156 <name>lineStep</name> 1156 <name>lineStep</name>
1157 <number>5</number> 1157 <number>5</number>
1158 </property> 1158 </property>
1159 <property stdset="1"> 1159 <property stdset="1">
1160 <name>value</name> 1160 <name>value</name>
1161 <number>5</number> 1161 <number>5</number>
1162 </property> 1162 </property>
1163 <property> 1163 <property>
1164 <name>whatsThis</name> 1164 <name>whatsThis</name>
1165 <string>how often should be checked for low power. This determines the rate popups occure in low power situations</string> 1165 <string>how often should be checked for low power. This determines the rate popups occure in low power situations</string>
1166 </property> 1166 </property>
1167 </widget> 1167 </widget>
1168 <widget row="2" column="1" > 1168 <widget row="2" column="1" >
1169 <class>QSpinBox</class> 1169 <class>QSpinBox</class>
1170 <property stdset="1"> 1170 <property stdset="1">
1171 <name>name</name> 1171 <name>name</name>
1172 <cstring>criticalSpinBox</cstring> 1172 <cstring>criticalSpinBox</cstring>
1173 </property> 1173 </property>
1174 <property stdset="1"> 1174 <property stdset="1">
1175 <name>prefix</name> 1175 <name>prefix</name>
1176 <string></string> 1176 <string></string>
1177 </property> 1177 </property>
1178 <property stdset="1"> 1178 <property stdset="1">
1179 <name>suffix</name> 1179 <name>suffix</name>
1180 <string> %</string> 1180 <string> %</string>
1181 </property> 1181 </property>
1182 <property stdset="1"> 1182 <property stdset="1">
1183 <name>buttonSymbols</name> 1183 <name>buttonSymbols</name>
1184 <enum>PlusMinus</enum> 1184 <enum>PlusMinus</enum>
1185 </property> 1185 </property>
1186 <property stdset="1"> 1186 <property stdset="1">
1187 <name>maxValue</name> 1187 <name>maxValue</name>
1188 <number>80</number> 1188 <number>80</number>
1189 </property> 1189 </property>
1190 <property stdset="1"> 1190 <property stdset="1">
1191 <name>minValue</name> 1191 <name>minValue</name>
1192 <number>2</number> 1192 <number>2</number>
1193 </property> 1193 </property>
1194 <property> 1194 <property>
1195 <name>whatsThis</name> 1195 <name>whatsThis</name>
1196 <string>At what battery level should the critical power warning pop up</string> 1196 <string>At what battery level should the critical power warning pop up</string>
1197 </property> 1197 </property>
1198 </widget> 1198 </widget>
1199 <widget row="1" column="0" > 1199 <widget row="1" column="0" >
1200 <class>QLabel</class> 1200 <class>QLabel</class>
1201 <property stdset="1"> 1201 <property stdset="1">
1202 <name>name</name> 1202 <name>name</name>
1203 <cstring>TextLabel2</cstring> 1203 <cstring>TextLabel2</cstring>
1204 </property> 1204 </property>
1205 <property stdset="1"> 1205 <property stdset="1">
1206 <name>sizePolicy</name> 1206 <name>sizePolicy</name>
1207 <sizepolicy> 1207 <sizepolicy>
1208 <hsizetype>1</hsizetype> 1208 <hsizetype>1</hsizetype>
1209 <vsizetype>5</vsizetype> 1209 <vsizetype>5</vsizetype>
1210 </sizepolicy> 1210 </sizepolicy>
1211 </property> 1211 </property>
1212 <property stdset="1"> 1212 <property stdset="1">
1213 <name>text</name> 1213 <name>text</name>
1214 <string>very low battery warning at</string> 1214 <string>very low battery warning at</string>
1215 </property> 1215 </property>
1216 </widget> 1216 </widget>
1217 <widget row="2" column="0" > 1217 <widget row="2" column="0" >
1218 <class>QLabel</class> 1218 <class>QLabel</class>
1219 <property stdset="1"> 1219 <property stdset="1">
1220 <name>name</name> 1220 <name>name</name>
1221 <cstring>TextLabel3</cstring> 1221 <cstring>TextLabel3</cstring>
1222 </property> 1222 </property>
1223 <property stdset="1"> 1223 <property stdset="1">
1224 <name>sizePolicy</name> 1224 <name>sizePolicy</name>
1225 <sizepolicy> 1225 <sizepolicy>
1226 <hsizetype>1</hsizetype> 1226 <hsizetype>1</hsizetype>
1227 <vsizetype>5</vsizetype> 1227 <vsizetype>5</vsizetype>
1228 </sizepolicy> 1228 </sizepolicy>
1229 </property> 1229 </property>
1230 <property stdset="1"> 1230 <property stdset="1">
1231 <name>text</name> 1231 <name>text</name>
1232 <string>critical power warning at</string> 1232 <string>critical power warning at</string>
1233 </property> 1233 </property>
1234 </widget> 1234 </widget>
1235 </grid> 1235 </grid>
1236 </widget> 1236 </widget>
1237 <spacer> 1237 <spacer>
1238 <property> 1238 <property>
1239 <name>name</name> 1239 <name>name</name>
1240 <cstring>Spacer1</cstring> 1240 <cstring>Spacer1</cstring>
1241 </property> 1241 </property>
1242 <property stdset="1"> 1242 <property stdset="1">
1243 <name>orientation</name> 1243 <name>orientation</name>
1244 <enum>Vertical</enum> 1244 <enum>Vertical</enum>
1245 </property> 1245 </property>
1246 <property stdset="1"> 1246 <property stdset="1">
1247 <name>sizeType</name> 1247 <name>sizeType</name>
1248 <enum>Expanding</enum> 1248 <enum>Expanding</enum>
1249 </property> 1249 </property>
1250 <property> 1250 <property>
1251 <name>sizeHint</name> 1251 <name>sizeHint</name>
1252 <size> 1252 <size>
1253 <width>20</width> 1253 <width>20</width>
1254 <height>20</height> 1254 <height>20</height>
1255 </size> 1255 </size>
1256 </property> 1256 </property>
1257 </spacer> 1257 </spacer>
1258 </vbox> 1258 </vbox>
1259 </widget> 1259 </widget>
1260 </widget> 1260 </widget>
1261 </vbox> 1261 </vbox>
1262</widget> 1262</widget>
1263<images> 1263<images>
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>
1273<connections> 1273<connections>
1274 <connection> 1274 <connection>
1275 <sender>CalibrateLightSensor</sender> 1275 <sender>CalibrateLightSensor</sender>
1276 <signal>clicked()</signal> 1276 <signal>clicked()</signal>
1277 <receiver>LightSettingsBase</receiver> 1277 <receiver>LightSettingsBase</receiver>
1278 <slot>calibrateSensor()</slot> 1278 <slot>calibrateSensor()</slot>
1279 </connection> 1279 </connection>
1280 <connection> 1280 <connection>
1281 <sender>CalibrateLightSensor_ac</sender> 1281 <sender>CalibrateLightSensor_ac</sender>
1282 <signal>clicked()</signal> 1282 <signal>clicked()</signal>
1283 <receiver>LightSettingsBase</receiver> 1283 <receiver>LightSettingsBase</receiver>
1284 <slot>calibrateSensorAC()</slot> 1284 <slot>calibrateSensorAC()</slot>
1285 </connection> 1285 </connection>
1286 <slot access="public">calibrateSensor()</slot> 1286 <slot access="public">calibrateSensor()</slot>
1287 <slot access="public">calibrateSensorAC()</slot> 1287 <slot access="public">calibrateSensorAC()</slot>
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>
1306 <tabstop>warnintervalBox</tabstop> 1306 <tabstop>warnintervalBox</tabstop>
1307 <tabstop>criticalSpinBox</tabstop> 1307 <tabstop>criticalSpinBox</tabstop>
1308</tabstops> 1308</tabstops>
1309</UI> 1309</UI>
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
@@ -1,38 +1,29 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "light.h" 21#include "light.h"
22 22
23#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
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
28int main(int argc, char** argv) 29OPIE_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
@@ -1,38 +1,32 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include <qpe/qpeapplication.h> 21#include <qpe/qpeapplication.h>
22#include <qpe/qcopenvelope_qws.h> 22#include <qpe/qcopenvelope_qws.h>
23#include <qpe/global.h> 23#include <qpe/global.h>
24 24
25#include "security.h" 25#include "security.h"
26 26
27#include <opie/oapplicationfactory.h>
27 28
28int main(int argc, char** argv) 29OPIE_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
@@ -1,325 +1,320 @@
1/********************************************************************** 1/**********************************************************************
2 ** Copyright (C) 2000 Trolltech AS. All rights reserved. 2 ** Copyright (C) 2000 Trolltech AS. All rights reserved.
3 ** 3 **
4 ** This file is part of Qtopia Environment. 4 ** This file is part of Qtopia Environment.
5 ** 5 **
6 ** This file may be distributed and/or modified under the terms of the 6 ** This file may be distributed and/or modified under the terms of the
7 ** GNU General Public License version 2 as published by the Free Software 7 ** GNU General Public License version 2 as published by the Free Software
8 ** Foundation and appearing in the file LICENSE.GPL included in the 8 ** Foundation and appearing in the file LICENSE.GPL included in the
9 ** packaging of this file. 9 ** packaging of this file.
10 ** 10 **
11 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13 ** 13 **
14 ** See http://www.trolltech.com/gpl/ for GPL licensing information. 14 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
15 ** 15 **
16 ** Contact info@trolltech.com if any conditions of this licensing are 16 ** Contact info@trolltech.com if any conditions of this licensing are
17 ** not clear to you. 17 ** not clear to you.
18 ** 18 **
19 **********************************************************************/ 19 **********************************************************************/
20#include "security.h" 20#include "security.h"
21 21
22#include <qpe/qpeapplication.h> 22#include <qpe/qpeapplication.h>
23#include <qpe/config.h> 23#include <qpe/config.h>
24#include <qpe/password.h> 24#include <qpe/password.h>
25#include <qpe/qpedialog.h> 25#include <qpe/qpedialog.h>
26#include <qpe/qcopenvelope_qws.h> 26#include <qpe/qcopenvelope_qws.h>
27 27
28#include <qcheckbox.h> 28#include <qcheckbox.h>
29#include <qpushbutton.h> 29#include <qpushbutton.h>
30#include <qcombobox.h> 30#include <qcombobox.h>
31#include <qmessagebox.h> 31#include <qmessagebox.h>
32#include <qfile.h> 32#include <qfile.h>
33#include <qlistview.h> 33#include <qlistview.h>
34#include <qtextstream.h> 34#include <qtextstream.h>
35 35
36 Security::Security( QWidget* parent, const char* name, WFlags fl ) 36 Security::Security( QWidget* parent, const char* name, WFlags fl )
37: SecurityBase( parent, name, TRUE, fl ) 37: SecurityBase( parent, name, TRUE, fl )
38{ 38{
39 valid=FALSE; 39 valid=FALSE;
40 Config cfg("Security"); 40 Config cfg("Security");
41 cfg.setGroup("Passcode"); 41 cfg.setGroup("Passcode");
42 passcode = cfg.readEntry("passcode"); 42 passcode = cfg.readEntry("passcode");
43 passcode_poweron->setChecked(cfg.readBoolEntry("passcode_poweron",FALSE)); 43 passcode_poweron->setChecked(cfg.readBoolEntry("passcode_poweron",FALSE));
44 cfg.setGroup("Sync"); 44 cfg.setGroup("Sync");
45 int auth_peer = cfg.readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24 45 int auth_peer = cfg.readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24
46 int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24); 46 int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24);
47 selectNet(auth_peer,auth_peer_bits); 47 selectNet(auth_peer,auth_peer_bits);
48 connect(syncnet, SIGNAL(textChanged(const QString&)), 48 connect(syncnet, SIGNAL(textChanged(const QString&)),
49 this, SLOT(setSyncNet(const QString&))); 49 this, SLOT(setSyncNet(const QString&)));
50 50
51 /* 51 /*
52 cfg.setGroup("Remote"); 52 cfg.setGroup("Remote");
53 if ( telnetAvailable() ) 53 if ( telnetAvailable() )
54 telnet->setChecked(cfg.readEntry("allow_telnet")); 54 telnet->setChecked(cfg.readEntry("allow_telnet"));
55 else 55 else
56 telnet->hide(); 56 telnet->hide();
57 57
58 if ( sshAvailable() ) 58 if ( sshAvailable() )
59 ssh->setChecked(cfg.readEntry("allow_ssh")); 59 ssh->setChecked(cfg.readEntry("allow_ssh"));
60 else 60 else
61 ssh->hide(); 61 ssh->hide();
62 */ 62 */
63 63
64 QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; 64 QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
65 Config loginCfg(configFile,Config::File); 65 Config loginCfg(configFile,Config::File);
66 66
67 loginCfg.setGroup("General"); 67 loginCfg.setGroup("General");
68 autoLoginName=loginCfg.readEntry("AutoLogin",""); 68 autoLoginName=loginCfg.readEntry("AutoLogin","");
69 69
70 if (autoLoginName.stripWhiteSpace().isEmpty()) { 70 if (autoLoginName.stripWhiteSpace().isEmpty()) {
71 autoLogin=false; 71 autoLogin=false;
72 } else { 72 } else {
73 autoLogin=true; 73 autoLogin=true;
74 } 74 }
75 75
76 cfg.setGroup("SyncMode"); 76 cfg.setGroup("SyncMode");
77 int mode = cfg.readNumEntry("Mode",2); // Default to Sharp 77 int mode = cfg.readNumEntry("Mode",2); // Default to Sharp
78 syncModeCombo->setCurrentItem( mode - 1 ); 78 syncModeCombo->setCurrentItem( mode - 1 );
79 79
80 connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool))); 80 connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool)));
81 connect(userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int))); 81 connect(userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int)));
82 connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode())); 82 connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode()));
83 connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode())); 83 connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode()));
84 84
85 loadUsers(); 85 loadUsers();
86 updateGUI(); 86 updateGUI();
87 87
88 dl = new QPEDialogListener(this); 88 dl = new QPEDialogListener(this);
89 showMaximized(); 89 showMaximized();
90} 90}
91 91
92Security::~Security() 92Security::~Security()
93{ 93{
94} 94}
95 95
96 96
97void Security::updateGUI() 97void Security::updateGUI()
98{ 98{
99 bool empty = passcode.isEmpty(); 99 bool empty = passcode.isEmpty();
100 100
101 changepasscode->setText( empty ? tr("Set passcode" ) 101 changepasscode->setText( empty ? tr("Set passcode" )
102 : tr("Change passcode" ) ); 102 : tr("Change passcode" ) );
103 passcode_poweron->setEnabled( !empty ); 103 passcode_poweron->setEnabled( !empty );
104 clearpasscode->setEnabled( !empty ); 104 clearpasscode->setEnabled( !empty );
105 105
106 autologinToggle->setChecked(autoLogin); 106 autologinToggle->setChecked(autoLogin);
107 userlist->setEnabled(autoLogin); 107 userlist->setEnabled(autoLogin);
108 108
109} 109}
110 110
111 111
112void Security::show() 112void Security::show()
113{ 113{
114 //valid=FALSE; 114 //valid=FALSE;
115 setEnabled(FALSE); 115 setEnabled(FALSE);
116 SecurityBase::show(); 116 SecurityBase::show();
117 if ( passcode.isEmpty() ) { 117 if ( passcode.isEmpty() ) {
118 // could insist... 118 // could insist...
119 //changePassCode(); 119 //changePassCode();
120 //if ( passcode.isEmpty() ) 120 //if ( passcode.isEmpty() )
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 {
126 QString pc = enterPassCode(tr("Enter passcode")); 125 QString pc = enterPassCode(tr("Enter passcode"));
127 if ( pc != passcode ) { 126 if ( pc != passcode ) {
128 QMessageBox::critical(this, tr("Passcode incorrect"), 127 QMessageBox::critical(this, tr("Passcode incorrect"),
129 tr("The passcode entered is incorrect.\nAccess denied")); 128 tr("The passcode entered is incorrect.\nAccess denied"));
130 reject(); 129 reject();
131 return; 130 return;
132 } 131 }
133 } 132 }
134 } 133 }
135 setEnabled(TRUE); 134 setEnabled(TRUE);
136 valid=TRUE; 135 valid=TRUE;
137} 136}
138 137
139void Security::accept() 138void Security::accept()
140{ 139{
141 applySecurity(); 140 applySecurity();
142 QDialog::accept(); 141 QDialog::accept();
143 QCopEnvelope env("QPE/System", "securityChanged()" ); 142 QCopEnvelope env("QPE/System", "securityChanged()" );
144} 143}
145 144
146void Security::done(int r) 145void Security::done(int r)
147{ 146{
148 QDialog::done(r); 147 QDialog::done(r);
149 close(); 148 close();
150} 149}
151 150
152void Security::selectNet(int auth_peer,int auth_peer_bits) 151void Security::selectNet(int auth_peer,int auth_peer_bits)
153{ 152{
154 QString sn; 153 QString sn;
155 if ( auth_peer_bits == 0 && auth_peer == 0 ) { 154 if ( auth_peer_bits == 0 && auth_peer == 0 ) {
156 sn = tr("Any"); 155 sn = tr("Any");
157 } else if ( auth_peer_bits == 32 && auth_peer == 0 ) { 156 } else if ( auth_peer_bits == 32 && auth_peer == 0 ) {
158 sn = tr("None"); 157 sn = tr("None");
159 } else { 158 } else {
160 sn = 159 sn =
161 QString::number((auth_peer>>24)&0xff) + "." 160 QString::number((auth_peer>>24)&0xff) + "."
162 + QString::number((auth_peer>>16)&0xff) + "." 161 + QString::number((auth_peer>>16)&0xff) + "."
163 + QString::number((auth_peer>>8)&0xff) + "." 162 + QString::number((auth_peer>>8)&0xff) + "."
164 + QString::number((auth_peer>>0)&0xff) + "/" 163 + QString::number((auth_peer>>0)&0xff) + "/"
165 + QString::number(auth_peer_bits); 164 + QString::number(auth_peer_bits);
166 } 165 }
167 for (int i=0; i<syncnet->count(); i++) { 166 for (int i=0; i<syncnet->count(); i++) {
168 if ( syncnet->text(i).left(sn.length()) == sn ) { 167 if ( syncnet->text(i).left(sn.length()) == sn ) {
169 syncnet->setCurrentItem(i); 168 syncnet->setCurrentItem(i);
170 return; 169 return;
171 } 170 }
172 } 171 }
173 qDebug("No match for \"%s\"",sn.latin1()); 172 qDebug("No match for \"%s\"",sn.latin1());
174} 173}
175 174
176void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits) 175void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits)
177{ 176{
178 auth_peer=0; 177 auth_peer=0;
179 if ( sn == tr("Any") ) { 178 if ( sn == tr("Any") ) {
180 auth_peer = 0; 179 auth_peer = 0;
181 auth_peer_bits = 0; 180 auth_peer_bits = 0;
182 } else if ( sn == tr("None") ) { 181 } else if ( sn == tr("None") ) {
183 auth_peer = 0; 182 auth_peer = 0;
184 auth_peer_bits = 32; 183 auth_peer_bits = 32;
185 } else { 184 } else {
186 int x=0; 185 int x=0;
187 for (int i=0; i<4; i++) { 186 for (int i=0; i<4; i++) {
188 int nx = sn.find(QChar(i==3 ? '/' : '.'),x); 187 int nx = sn.find(QChar(i==3 ? '/' : '.'),x);
189 auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt(); 188 auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt();
190 x = nx+1; 189 x = nx+1;
191 } 190 }
192 uint n = (uint)sn.find(' ',x)-x; 191 uint n = (uint)sn.find(' ',x)-x;
193 auth_peer_bits = sn.mid(x,n).toInt(); 192 auth_peer_bits = sn.mid(x,n).toInt();
194 } 193 }
195} 194}
196 195
197void Security::loadUsers ( void ) 196void Security::loadUsers ( void )
198{ 197{
199 QFile passwd("/etc/passwd"); 198 QFile passwd("/etc/passwd");
200 if ( passwd.open(IO_ReadOnly) ) { 199 if ( passwd.open(IO_ReadOnly) ) {
201 QTextStream t( &passwd ); 200 QTextStream t( &passwd );
202 QString s; 201 QString s;
203 QStringList account; 202 QStringList account;
204 while ( !t.eof() ) { 203 while ( !t.eof() ) {
205 account = QStringList::split(':',t.readLine()); 204 account = QStringList::split(':',t.readLine());
206 205
207 // Hide disabled accounts 206 // Hide disabled accounts
208 if (*account.at(1)!="*") { 207 if (*account.at(1)!="*") {
209 208
210 userlist->insertItem(*account.at(0)); 209 userlist->insertItem(*account.at(0));
211 // Highlight this item if it is set to autologinToggle 210 // Highlight this item if it is set to autologinToggle
212 if ( *account.at(0) == autoLoginName) 211 if ( *account.at(0) == autoLoginName)
213 userlist->setCurrentItem(userlist->count()-1); 212 userlist->setCurrentItem(userlist->count()-1);
214 } 213 }
215 } 214 }
216 passwd.close(); 215 passwd.close();
217 } 216 }
218 217
219} 218}
220 219
221void Security::toggleAutoLogin(bool val) 220void Security::toggleAutoLogin(bool val)
222{ 221{
223 autoLogin=val; 222 autoLogin=val;
224 userlist->setEnabled(val); 223 userlist->setEnabled(val);
225 if (!autoLogin) 224 if (!autoLogin)
226 autoLoginName=userlist->currentText(); 225 autoLoginName=userlist->currentText();
227} 226}
228 227
229 228
230 229
231 230
232void Security::setSyncNet(const QString& sn) 231void Security::setSyncNet(const QString& sn)
233{ 232{
234 int auth_peer,auth_peer_bits; 233 int auth_peer,auth_peer_bits;
235 parseNet(sn,auth_peer,auth_peer_bits); 234 parseNet(sn,auth_peer,auth_peer_bits);
236 selectNet(auth_peer,auth_peer_bits); 235 selectNet(auth_peer,auth_peer_bits);
237} 236}
238 237
239void Security::applySecurity() 238void 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");
245 cfg.writeEntry("passcode",passcode); 243 cfg.writeEntry("passcode",passcode);
246 cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked()); 244 cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
247 cfg.setGroup("Sync"); 245 cfg.setGroup("Sync");
248 int auth_peer=0; 246 int auth_peer=0;
249 int auth_peer_bits; 247 int auth_peer_bits;
250 QString sn = syncnet->currentText(); 248 QString sn = syncnet->currentText();
251 parseNet(sn,auth_peer,auth_peer_bits); 249 parseNet(sn,auth_peer,auth_peer_bits);
252 cfg.writeEntry("auth_peer",auth_peer); 250 cfg.writeEntry("auth_peer",auth_peer);
253 cfg.writeEntry("auth_peer_bits",auth_peer_bits); 251 cfg.writeEntry("auth_peer_bits",auth_peer_bits);
254 /* 252 /*
255 cfg.setGroup("Remote"); 253 cfg.setGroup("Remote");
256 if ( telnetAvailable() ) 254 if ( telnetAvailable() )
257 cfg.writeEntry("allow_telnet",telnet->isChecked()); 255 cfg.writeEntry("allow_telnet",telnet->isChecked());
258 if ( sshAvailable() ) 256 if ( sshAvailable() )
259 cfg.writeEntry("allow_ssh",ssh->isChecked()); 257 cfg.writeEntry("allow_ssh",ssh->isChecked());
260 // ### write ssh/telnet sys config files 258 // ### write ssh/telnet sys config files
261 */ 259 */
262 260
263 QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf"; 261 QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
264 Config loginCfg(configFile,Config::File); 262 Config loginCfg(configFile,Config::File);
265 loginCfg.setGroup("General"); 263 loginCfg.setGroup("General");
266 264
267 if (autoLogin) { 265 if (autoLogin) {
268 loginCfg.writeEntry("AutoLogin",autoLoginName); 266 loginCfg.writeEntry("AutoLogin",autoLoginName);
269 } else { 267 } else {
270 loginCfg.removeEntry("AutoLogin"); 268 loginCfg.removeEntry("AutoLogin");
271 } 269 }
272 270
273 cfg.setGroup("SyncMode");
274 cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 );
275
276 } 271 }
277} 272}
278 273
279void Security::changeLoginName( int idx ) 274void Security::changeLoginName( int idx )
280{ 275{
281 autoLoginName = userlist->text(idx);; 276 autoLoginName = userlist->text(idx);;
282 updateGUI(); 277 updateGUI();
283} 278}
284 279
285void Security::changePassCode() 280void Security::changePassCode()
286{ 281{
287 QString new1; 282 QString new1;
288 QString new2; 283 QString new2;
289 284
290 do { 285 do {
291 new1 = enterPassCode(tr("Enter new passcode")); 286 new1 = enterPassCode(tr("Enter new passcode"));
292 if ( new1.isNull() ) 287 if ( new1.isNull() )
293 return; 288 return;
294 new2 = enterPassCode(tr("Re-enter new passcode")); 289 new2 = enterPassCode(tr("Re-enter new passcode"));
295 if ( new2.isNull() ) 290 if ( new2.isNull() )
296 return; 291 return;
297 } while (new1 != new2); 292 } while (new1 != new2);
298 293
299 passcode = new1; 294 passcode = new1;
300 updateGUI(); 295 updateGUI();
301} 296}
302 297
303void Security::clearPassCode() 298void Security::clearPassCode()
304{ 299{
305 passcode = QString::null; 300 passcode = QString::null;
306 updateGUI(); 301 updateGUI();
307} 302}
308 303
309 304
310QString Security::enterPassCode(const QString& prompt) 305QString Security::enterPassCode(const QString& prompt)
311{ 306{
312 return Password::getPassword(prompt); 307 return Password::getPassword(prompt);
313} 308}
314 309
315bool Security::telnetAvailable() const 310bool Security::telnetAvailable() const
316{ 311{
317 // ### not implemented 312 // ### not implemented
318 return FALSE; 313 return FALSE;
319} 314}
320 315
321bool Security::sshAvailable() const 316bool Security::sshAvailable() const
322{ 317{
323 // ### not implemented 318 // ### not implemented
324 return FALSE; 319 return FALSE;
325} 320}
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
@@ -1,70 +1,71 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#ifndef SECURITY_H 20#ifndef SECURITY_H
21#define SECURITY_H 21#define SECURITY_H
22 22
23#include "securitybase.h" 23#include "securitybase.h"
24 24
25class QPEDialogListener; 25class QPEDialogListener;
26 26
27class Security : public SecurityBase 27class Security : public SecurityBase
28{ 28{
29 Q_OBJECT 29 Q_OBJECT
30 30
31public: 31public:
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();
34 35
35 void show(); 36 void show();
36 37
37protected: 38protected:
38 void accept(); 39 void accept();
39 void applySecurity(); 40 void applySecurity();
40 void done(int); 41 void done(int);
41 42
42private slots: 43private slots:
43 void changePassCode(); 44 void changePassCode();
44 void clearPassCode(); 45 void clearPassCode();
45 void setSyncNet(const QString&); 46 void setSyncNet(const QString&);
46 void changeLoginName(int); 47 void changeLoginName(int);
47 void toggleAutoLogin(bool); 48 void toggleAutoLogin(bool);
48 49
49 50
50private: 51private:
51 void loadUsers(void); 52 void loadUsers(void);
52 bool telnetAvailable() const; 53 bool telnetAvailable() const;
53 bool sshAvailable() const; 54 bool sshAvailable() const;
54 void updateGUI(); 55 void updateGUI();
55 56
56 static void parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits); 57 static void parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits);
57 void selectNet(int auth_peer,int auth_peer_bits); 58 void selectNet(int auth_peer,int auth_peer_bits);
58 59
59 QString enterPassCode(const QString&); 60 QString enterPassCode(const QString&);
60 QString passcode; 61 QString passcode;
61 bool valid; 62 bool valid;
62 bool autoLogin; 63 bool autoLogin;
63 QString autoLoginName; 64 QString autoLoginName;
64 65
65 QPEDialogListener *dl; 66 QPEDialogListener *dl;
66}; 67};
67 68
68 69
69#endif // SECURITY_H 70#endif // SECURITY_H
70 71
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,32 +1,30 @@
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
6 INTERFACES= securitybase.ui 4 INTERFACES= securitybase.ui
7INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(OPIEDIR)/include 6 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 7LIBS += -lqpe
10 TARGET = security 8 TARGET = security
11 9
12TRANSLATIONS = ../../../i18n/de/security.ts \ 10TRANSLATIONS = ../../../i18n/de/security.ts \
13 ../../../i18n/nl/security.ts \ 11 ../../../i18n/nl/security.ts \
14 ../../../i18n/xx/security.ts \ 12 ../../../i18n/xx/security.ts \
15 ../../../i18n/en/security.ts \ 13 ../../../i18n/en/security.ts \
16 ../../../i18n/es/security.ts \ 14 ../../../i18n/es/security.ts \
17 ../../../i18n/fr/security.ts \ 15 ../../../i18n/fr/security.ts \
18 ../../../i18n/hu/security.ts \ 16 ../../../i18n/hu/security.ts \
19 ../../../i18n/ja/security.ts \ 17 ../../../i18n/ja/security.ts \
20 ../../../i18n/ko/security.ts \ 18 ../../../i18n/ko/security.ts \
21 ../../../i18n/no/security.ts \ 19 ../../../i18n/no/security.ts \
22 ../../../i18n/pl/security.ts \ 20 ../../../i18n/pl/security.ts \
23 ../../../i18n/pt/security.ts \ 21 ../../../i18n/pt/security.ts \
24 ../../../i18n/pt_BR/security.ts \ 22 ../../../i18n/pt_BR/security.ts \
25 ../../../i18n/sl/security.ts \ 23 ../../../i18n/sl/security.ts \
26 ../../../i18n/zh_CN/security.ts \ 24 ../../../i18n/zh_CN/security.ts \
27 ../../../i18n/zh_TW/security.ts \ 25 ../../../i18n/zh_TW/security.ts \
28 ../../../i18n/da/security.ts 26 ../../../i18n/da/security.ts
29 27
30 28
31 29
32include ( $(OPIEDIR)/include.pro ) 30include ( $(OPIEDIR)/include.pro )
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
@@ -1,437 +1,437 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>SecurityBase</class> 2<class>SecurityBase</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>SecurityBase</cstring> 7 <cstring>SecurityBase</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
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>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Security Settings</string> 20 <string>Security Settings</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
27 </property> 27 </property>
28 <vbox> 28 <vbox>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
31 <number>0</number> 31 <number>0</number>
32 </property> 32 </property>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>0</number> 35 <number>0</number>
36 </property> 36 </property>
37 <widget> 37 <widget>
38 <class>QTabWidget</class> 38 <class>QTabWidget</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>TabWidget2</cstring> 41 <cstring>TabWidget2</cstring>
42 </property> 42 </property>
43 <property> 43 <property>
44 <name>layoutMargin</name> 44 <name>layoutMargin</name>
45 </property> 45 </property>
46 <widget> 46 <widget>
47 <class>QWidget</class> 47 <class>QWidget</class>
48 <property stdset="1"> 48 <property stdset="1">
49 <name>name</name> 49 <name>name</name>
50 <cstring>tab</cstring> 50 <cstring>tab</cstring>
51 </property> 51 </property>
52 <attribute> 52 <attribute>
53 <name>title</name> 53 <name>title</name>
54 <string>Passcode</string> 54 <string>Passcode</string>
55 </attribute> 55 </attribute>
56 <vbox> 56 <vbox>
57 <property stdset="1"> 57 <property stdset="1">
58 <name>margin</name> 58 <name>margin</name>
59 <number>6</number> 59 <number>6</number>
60 </property> 60 </property>
61 <property stdset="1"> 61 <property stdset="1">
62 <name>spacing</name> 62 <name>spacing</name>
63 <number>6</number> 63 <number>6</number>
64 </property> 64 </property>
65 <widget> 65 <widget>
66 <class>QGroupBox</class> 66 <class>QGroupBox</class>
67 <property stdset="1"> 67 <property stdset="1">
68 <name>name</name> 68 <name>name</name>
69 <cstring>GroupBox4</cstring> 69 <cstring>GroupBox4</cstring>
70 </property> 70 </property>
71 <property stdset="1"> 71 <property stdset="1">
72 <name>title</name> 72 <name>title</name>
73 <string>Passcode</string> 73 <string>Passcode</string>
74 </property> 74 </property>
75 <vbox> 75 <vbox>
76 <property stdset="1"> 76 <property stdset="1">
77 <name>margin</name> 77 <name>margin</name>
78 <number>11</number> 78 <number>11</number>
79 </property> 79 </property>
80 <property stdset="1"> 80 <property stdset="1">
81 <name>spacing</name> 81 <name>spacing</name>
82 <number>6</number> 82 <number>6</number>
83 </property> 83 </property>
84 <widget> 84 <widget>
85 <class>QLayoutWidget</class> 85 <class>QLayoutWidget</class>
86 <property stdset="1"> 86 <property stdset="1">
87 <name>name</name> 87 <name>name</name>
88 <cstring>Layout1</cstring> 88 <cstring>Layout1</cstring>
89 </property> 89 </property>
90 <property> 90 <property>
91 <name>layoutSpacing</name> 91 <name>layoutSpacing</name>
92 </property> 92 </property>
93 <hbox> 93 <hbox>
94 <property stdset="1"> 94 <property stdset="1">
95 <name>margin</name> 95 <name>margin</name>
96 <number>0</number> 96 <number>0</number>
97 </property> 97 </property>
98 <property stdset="1"> 98 <property stdset="1">
99 <name>spacing</name> 99 <name>spacing</name>
100 <number>-1</number> 100 <number>-1</number>
101 </property> 101 </property>
102 <widget> 102 <widget>
103 <class>QPushButton</class> 103 <class>QPushButton</class>
104 <property stdset="1"> 104 <property stdset="1">
105 <name>name</name> 105 <name>name</name>
106 <cstring>changepasscode</cstring> 106 <cstring>changepasscode</cstring>
107 </property> 107 </property>
108 <property stdset="1"> 108 <property stdset="1">
109 <name>text</name> 109 <name>text</name>
110 <string>Change passcode</string> 110 <string>Change passcode</string>
111 </property> 111 </property>
112 </widget> 112 </widget>
113 <widget> 113 <widget>
114 <class>QPushButton</class> 114 <class>QPushButton</class>
115 <property stdset="1"> 115 <property stdset="1">
116 <name>name</name> 116 <name>name</name>
117 <cstring>clearpasscode</cstring> 117 <cstring>clearpasscode</cstring>
118 </property> 118 </property>
119 <property stdset="1"> 119 <property stdset="1">
120 <name>text</name> 120 <name>text</name>
121 <string>Clear passcode</string> 121 <string>Clear passcode</string>
122 </property> 122 </property>
123 </widget> 123 </widget>
124 </hbox> 124 </hbox>
125 </widget> 125 </widget>
126 <widget> 126 <widget>
127 <class>QCheckBox</class> 127 <class>QCheckBox</class>
128 <property stdset="1"> 128 <property stdset="1">
129 <name>name</name> 129 <name>name</name>
130 <cstring>passcode_poweron</cstring> 130 <cstring>passcode_poweron</cstring>
131 </property> 131 </property>
132 <property stdset="1"> 132 <property stdset="1">
133 <name>text</name> 133 <name>text</name>
134 <string>Require pass code at power-on</string> 134 <string>Require pass code at power-on</string>
135 </property> 135 </property>
136 </widget> 136 </widget>
137 <widget> 137 <widget>
138 <class>QLabel</class> 138 <class>QLabel</class>
139 <property stdset="1"> 139 <property stdset="1">
140 <name>name</name> 140 <name>name</name>
141 <cstring>TextLabel1</cstring> 141 <cstring>TextLabel1</cstring>
142 </property> 142 </property>
143 <property stdset="1"> 143 <property stdset="1">
144 <name>sizePolicy</name> 144 <name>sizePolicy</name>
145 <sizepolicy> 145 <sizepolicy>
146 <hsizetype>5</hsizetype> 146 <hsizetype>5</hsizetype>
147 <vsizetype>7</vsizetype> 147 <vsizetype>7</vsizetype>
148 </sizepolicy> 148 </sizepolicy>
149 </property> 149 </property>
150 <property stdset="1"> 150 <property stdset="1">
151 <name>text</name> 151 <name>text</name>
152 <string>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</string> 152 <string>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</string>
153 </property> 153 </property>
154 <property stdset="1"> 154 <property stdset="1">
155 <name>textFormat</name> 155 <name>textFormat</name>
156 <enum>RichText</enum> 156 <enum>RichText</enum>
157 </property> 157 </property>
158 <property stdset="1"> 158 <property stdset="1">
159 <name>alignment</name> 159 <name>alignment</name>
160 <set>AlignTop|AlignLeft</set> 160 <set>AlignTop|AlignLeft</set>
161 </property> 161 </property>
162 <property> 162 <property>
163 <name>vAlign</name> 163 <name>vAlign</name>
164 </property> 164 </property>
165 </widget> 165 </widget>
166 </vbox> 166 </vbox>
167 </widget> 167 </widget>
168 <spacer> 168 <spacer>
169 <property> 169 <property>
170 <name>name</name> 170 <name>name</name>
171 <cstring>Spacer3</cstring> 171 <cstring>Spacer3</cstring>
172 </property> 172 </property>
173 <property stdset="1"> 173 <property stdset="1">
174 <name>orientation</name> 174 <name>orientation</name>
175 <enum>Vertical</enum> 175 <enum>Vertical</enum>
176 </property> 176 </property>
177 <property stdset="1"> 177 <property stdset="1">
178 <name>sizeType</name> 178 <name>sizeType</name>
179 <enum>Expanding</enum> 179 <enum>Expanding</enum>
180 </property> 180 </property>
181 <property> 181 <property>
182 <name>sizeHint</name> 182 <name>sizeHint</name>
183 <size> 183 <size>
184 <width>20</width> 184 <width>20</width>
185 <height>20</height> 185 <height>20</height>
186 </size> 186 </size>
187 </property> 187 </property>
188 </spacer> 188 </spacer>
189 </vbox> 189 </vbox>
190 </widget> 190 </widget>
191 <widget> 191 <widget>
192 <class>QWidget</class> 192 <class>QWidget</class>
193 <property stdset="1"> 193 <property stdset="1">
194 <name>name</name> 194 <name>name</name>
195 <cstring>tab</cstring> 195 <cstring>tab</cstring>
196 </property> 196 </property>
197 <attribute> 197 <attribute>
198 <name>title</name> 198 <name>title</name>
199 <string>Login</string> 199 <string>Login</string>
200 </attribute> 200 </attribute>
201 <vbox> 201 <vbox>
202 <property stdset="1"> 202 <property stdset="1">
203 <name>margin</name> 203 <name>margin</name>
204 <number>6</number> 204 <number>6</number>
205 </property> 205 </property>
206 <property stdset="1"> 206 <property stdset="1">
207 <name>spacing</name> 207 <name>spacing</name>
208 <number>6</number> 208 <number>6</number>
209 </property> 209 </property>
210 <widget> 210 <widget>
211 <class>QGroupBox</class> 211 <class>QGroupBox</class>
212 <property stdset="1"> 212 <property stdset="1">
213 <name>name</name> 213 <name>name</name>
214 <cstring>GroupBox3</cstring> 214 <cstring>GroupBox3</cstring>
215 </property> 215 </property>
216 <property stdset="1"> 216 <property stdset="1">
217 <name>title</name> 217 <name>title</name>
218 <string>Login</string> 218 <string>Login</string>
219 </property> 219 </property>
220 <vbox> 220 <vbox>
221 <property stdset="1"> 221 <property stdset="1">
222 <name>margin</name> 222 <name>margin</name>
223 <number>11</number> 223 <number>11</number>
224 </property> 224 </property>
225 <property stdset="1"> 225 <property stdset="1">
226 <name>spacing</name> 226 <name>spacing</name>
227 <number>6</number> 227 <number>6</number>
228 </property> 228 </property>
229 <widget> 229 <widget>
230 <class>QCheckBox</class> 230 <class>QCheckBox</class>
231 <property stdset="1"> 231 <property stdset="1">
232 <name>name</name> 232 <name>name</name>
233 <cstring>autologinToggle</cstring> 233 <cstring>autologinToggle</cstring>
234 </property> 234 </property>
235 <property stdset="1"> 235 <property stdset="1">
236 <name>text</name> 236 <name>text</name>
237 <string>Login Automatically</string> 237 <string>Login Automatically</string>
238 </property> 238 </property>
239 </widget> 239 </widget>
240 <widget> 240 <widget>
241 <class>QComboBox</class> 241 <class>QComboBox</class>
242 <property stdset="1"> 242 <property stdset="1">
243 <name>name</name> 243 <name>name</name>
244 <cstring>userlist</cstring> 244 <cstring>userlist</cstring>
245 </property> 245 </property>
246 </widget> 246 </widget>
247 </vbox> 247 </vbox>
248 </widget> 248 </widget>
249 <spacer> 249 <spacer>
250 <property> 250 <property>
251 <name>name</name> 251 <name>name</name>
252 <cstring>Spacer2</cstring> 252 <cstring>Spacer2</cstring>
253 </property> 253 </property>
254 <property stdset="1"> 254 <property stdset="1">
255 <name>orientation</name> 255 <name>orientation</name>
256 <enum>Vertical</enum> 256 <enum>Vertical</enum>
257 </property> 257 </property>
258 <property stdset="1"> 258 <property stdset="1">
259 <name>sizeType</name> 259 <name>sizeType</name>
260 <enum>Expanding</enum> 260 <enum>Expanding</enum>
261 </property> 261 </property>
262 <property> 262 <property>
263 <name>sizeHint</name> 263 <name>sizeHint</name>
264 <size> 264 <size>
265 <width>20</width> 265 <width>20</width>
266 <height>20</height> 266 <height>20</height>
267 </size> 267 </size>
268 </property> 268 </property>
269 </spacer> 269 </spacer>
270 </vbox> 270 </vbox>
271 </widget> 271 </widget>
272 <widget> 272 <widget>
273 <class>QWidget</class> 273 <class>QWidget</class>
274 <property stdset="1"> 274 <property stdset="1">
275 <name>name</name> 275 <name>name</name>
276 <cstring>tab</cstring> 276 <cstring>tab</cstring>
277 </property> 277 </property>
278 <attribute> 278 <attribute>
279 <name>title</name> 279 <name>title</name>
280 <string>Sync</string> 280 <string>Sync</string>
281 </attribute> 281 </attribute>
282 <vbox> 282 <vbox>
283 <property stdset="1"> 283 <property stdset="1">
284 <name>margin</name> 284 <name>margin</name>
285 <number>6</number> 285 <number>6</number>
286 </property> 286 </property>
287 <property stdset="1"> 287 <property stdset="1">
288 <name>spacing</name> 288 <name>spacing</name>
289 <number>6</number> 289 <number>6</number>
290 </property> 290 </property>
291 <widget> 291 <widget>
292 <class>QGroupBox</class> 292 <class>QGroupBox</class>
293 <property stdset="1"> 293 <property stdset="1">
294 <name>name</name> 294 <name>name</name>
295 <cstring>GroupBox2</cstring> 295 <cstring>GroupBox2</cstring>
296 </property> 296 </property>
297 <property stdset="1"> 297 <property stdset="1">
298 <name>title</name> 298 <name>title</name>
299 <string>Sync</string> 299 <string>Sync</string>
300 </property> 300 </property>
301 <vbox> 301 <vbox>
302 <property stdset="1"> 302 <property stdset="1">
303 <name>margin</name> 303 <name>margin</name>
304 <number>11</number> 304 <number>11</number>
305 </property> 305 </property>
306 <property stdset="1"> 306 <property stdset="1">
307 <name>spacing</name> 307 <name>spacing</name>
308 <number>6</number> 308 <number>6</number>
309 </property> 309 </property>
310 <widget> 310 <widget>
311 <class>QLabel</class> 311 <class>QLabel</class>
312 <property stdset="1"> 312 <property stdset="1">
313 <name>name</name> 313 <name>name</name>
314 <cstring>TextLabel1_2</cstring> 314 <cstring>TextLabel1_2</cstring>
315 </property> 315 </property>
316 <property stdset="1"> 316 <property stdset="1">
317 <name>text</name> 317 <name>text</name>
318 <string>Accept sync from network:</string> 318 <string>Accept sync from network:</string>
319 </property> 319 </property>
320 <property stdset="1"> 320 <property stdset="1">
321 <name>textFormat</name> 321 <name>textFormat</name>
322 <enum>RichText</enum> 322 <enum>RichText</enum>
323 </property> 323 </property>
324 </widget> 324 </widget>
325 <widget> 325 <widget>
326 <class>QComboBox</class> 326 <class>QComboBox</class>
327 <item> 327 <item>
328 <property> 328 <property>
329 <name>text</name> 329 <name>text</name>
330 <string>192.168.129.0/24 (default)</string> 330 <string>192.168.129.0/24 (default)</string>
331 </property> 331 </property>
332 </item> 332 </item>
333 <item> 333 <item>
334 <property> 334 <property>
335 <name>text</name> 335 <name>text</name>
336 <string>192.168.1.0/24</string> 336 <string>192.168.1.0/24</string>
337 </property> 337 </property>
338 </item> 338 </item>
339 <item> 339 <item>
340 <property> 340 <property>
341 <name>text</name> 341 <name>text</name>
342 <string>192.168.0.0/16</string> 342 <string>192.168.0.0/16</string>
343 </property> 343 </property>
344 </item> 344 </item>
345 <item> 345 <item>
346 <property> 346 <property>
347 <name>text</name> 347 <name>text</name>
348 <string>172.16.0.0/12</string> 348 <string>172.16.0.0/12</string>
349 </property> 349 </property>
350 </item> 350 </item>
351 <item> 351 <item>
352 <property> 352 <property>
353 <name>text</name> 353 <name>text</name>
354 <string>10.0.0.0/8</string> 354 <string>10.0.0.0/8</string>
355 </property> 355 </property>
356 </item> 356 </item>
357 <item> 357 <item>
358 <property> 358 <property>
359 <name>text</name> 359 <name>text</name>
360 <string>1.0.0.0/8</string> 360 <string>1.0.0.0/8</string>
361 </property> 361 </property>
362 </item> 362 </item>
363 <item> 363 <item>
364 <property> 364 <property>
365 <name>text</name> 365 <name>text</name>
366 <string>Any</string> 366 <string>Any</string>
367 </property> 367 </property>
368 </item> 368 </item>
369 <item> 369 <item>
370 <property> 370 <property>
371 <name>text</name> 371 <name>text</name>
372 <string>None</string> 372 <string>None</string>
373 </property> 373 </property>
374 </item> 374 </item>
375 <property stdset="1"> 375 <property stdset="1">
376 <name>name</name> 376 <name>name</name>
377 <cstring>syncnet</cstring> 377 <cstring>syncnet</cstring>
378 </property> 378 </property>
379 <property stdset="1"> 379 <property stdset="1">
380 <name>editable</name> 380 <name>editable</name>
381 <bool>true</bool> 381 <bool>true</bool>
382 </property> 382 </property>
383 </widget> 383 </widget>
384 <widget> 384 <widget>
385 <class>QComboBox</class> 385 <class>QComboBox</class>
386 <item> 386 <item>
387 <property> 387 <property>
388 <name>text</name> 388 <name>text</name>
389 <string>Qtopia 1.7</string> 389 <string>Qtopia 1.7</string>
390 </property> 390 </property>
391 </item> 391 </item>
392 <item> 392 <item>
393 <property> 393 <property>
394 <name>text</name> 394 <name>text</name>
395 <string>Opie 1.0</string> 395 <string>Opie 1.0</string>
396 </property> 396 </property>
397 </item> 397 </item>
398 <item> 398 <item>
399 <property> 399 <property>
400 <name>text</name> 400 <name>text</name>
401 <string>Both</string> 401 <string>Both</string>
402 </property> 402 </property>
403 </item> 403 </item>
404 <property stdset="1"> 404 <property stdset="1">
405 <name>name</name> 405 <name>name</name>
406 <cstring>syncModeCombo</cstring> 406 <cstring>syncModeCombo</cstring>
407 </property> 407 </property>
408 </widget> 408 </widget>
409 </vbox> 409 </vbox>
410 </widget> 410 </widget>
411 <spacer> 411 <spacer>
412 <property> 412 <property>
413 <name>name</name> 413 <name>name</name>
414 <cstring>Spacer1</cstring> 414 <cstring>Spacer1</cstring>
415 </property> 415 </property>
416 <property stdset="1"> 416 <property stdset="1">
417 <name>orientation</name> 417 <name>orientation</name>
418 <enum>Vertical</enum> 418 <enum>Vertical</enum>
419 </property> 419 </property>
420 <property stdset="1"> 420 <property stdset="1">
421 <name>sizeType</name> 421 <name>sizeType</name>
422 <enum>Expanding</enum> 422 <enum>Expanding</enum>
423 </property> 423 </property>
424 <property> 424 <property>
425 <name>sizeHint</name> 425 <name>sizeHint</name>
426 <size> 426 <size>
427 <width>20</width> 427 <width>20</width>
428 <height>20</height> 428 <height>20</height>
429 </size> 429 </size>
430 </property> 430 </property>
431 </spacer> 431 </spacer>
432 </vbox> 432 </vbox>
433 </widget> 433 </widget>
434 </widget> 434 </widget>
435 </vbox> 435 </vbox>
436</widget> 436</widget>
437</UI> 437</UI>