summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/calibration.cpp19
-rw-r--r--core/settings/light-and-power/light.cpp24
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui8
-rw-r--r--core/settings/light-and-power/sensor.cpp22
-rw-r--r--core/settings/light-and-power/sensorbase.ui10
5 files changed, 37 insertions, 46 deletions
diff --git a/core/settings/light-and-power/calibration.cpp b/core/settings/light-and-power/calibration.cpp
index 307de1f..6a3360f 100644
--- a/core/settings/light-and-power/calibration.cpp
+++ b/core/settings/light-and-power/calibration.cpp
@@ -1,278 +1,277 @@
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#include "calibration.h" 28#include "calibration.h"
29 29
30#include <qpainter.h> 30#include <qpainter.h>
31#include <qpalette.h> 31#include <qpalette.h>
32 32
33#define BRD 2 33#define BRD 2
34 34
35Calibration::Calibration ( QWidget *parent, const char *name, WFlags fl ) 35Calibration::Calibration ( QWidget *parent, const char *name, WFlags fl )
36 : QWidget ( parent, name, fl ) 36 : QWidget ( parent, name, fl )
37{ 37{
38 m_scale = QSize ( 256, 256 ); 38 m_scale = QSize ( 256, 256 );
39 m_steps = 5; 39 m_steps = 5;
40 m_dragged = -1; 40 m_dragged = -1;
41 m_interval = 5; 41 m_interval = 5;
42 42
43 m_p [0] = QPoint ( 0, 0 ); 43 m_p [0] = QPoint ( 0, 0 );
44 m_p [1] = QPoint ( 255, 255 ); 44 m_p [1] = QPoint ( 255, 255 );
45} 45}
46 46
47Calibration::~Calibration ( ) 47Calibration::~Calibration ( )
48{ 48{
49} 49}
50 50
51void Calibration::setScale ( const QSize &s ) 51void Calibration::setScale ( const QSize &s )
52{ 52{
53 if ( s. width ( ) < 1 || s. height ( ) < 1 ) 53 if ( s. width ( ) < 1 || s. height ( ) < 1 )
54 return; 54 return;
55 55
56 m_scale = s; 56 m_scale = s;
57 checkPoints ( ); 57 checkPoints ( );
58 58
59 update ( ); 59 update ( );
60} 60}
61 61
62QSize Calibration::scale ( ) const 62QSize Calibration::scale ( ) const
63{ 63{
64 return m_scale; 64 return m_scale;
65} 65}
66 66
67void Calibration::setLineSteps ( int steps ) 67void Calibration::setLineSteps ( int steps )
68{ 68{
69 if ( m_steps < 2 ) 69 if ( m_steps < 2 )
70 return; 70 return;
71 71
72 m_steps = steps; 72 m_steps = steps;
73 update ( ); 73 update ( );
74} 74}
75 75
76int Calibration::lineSteps ( ) const 76int Calibration::lineSteps ( ) const
77{ 77{
78 return m_steps; 78 return m_steps;
79} 79}
80 80
81void Calibration::setInterval ( int iv ) 81void Calibration::setInterval ( int iv )
82{ 82{
83 if ( iv < 1 ) 83 if ( iv < 1 )
84 return; 84 return;
85 85
86 m_interval = iv; 86 m_interval = iv;
87 //update ( ); 87 //update ( );
88} 88}
89 89
90int Calibration::interval ( ) const 90int Calibration::interval ( ) const
91{ 91{
92 return m_interval; 92 return m_interval;
93} 93}
94 94
95void Calibration::setStartPoint ( const QPoint &p ) 95void Calibration::setStartPoint ( const QPoint &p )
96{ 96{
97 m_p [0] = p; 97 m_p [0] = QPoint ( p. x ( ), m_scale. height ( ) - p. y ( ) - 1 );
98 checkPoints ( ); 98 checkPoints ( );
99 update ( ); 99 update ( );
100} 100}
101 101
102QPoint Calibration::startPoint ( ) const 102QPoint Calibration::startPoint ( ) const
103{ 103{
104 return m_p [0]; 104 return QPoint ( m_p [0]. x ( ), m_scale. height ( ) - m_p [0]. y ( ) - 1 );
105} 105}
106 106
107void Calibration::setEndPoint ( const QPoint &p ) 107void Calibration::setEndPoint ( const QPoint &p )
108{ 108{
109 m_p [1] = p; 109 m_p [1] = QPoint ( p. x ( ), m_scale. height ( ) - p. y ( ) - 1 );
110 checkPoints ( ); 110 checkPoints ( );
111 update ( ); 111 update ( );
112} 112}
113 113
114QPoint Calibration::endPoint ( ) const 114QPoint Calibration::endPoint ( ) const
115{ 115{
116 return m_p [1]; 116 return QPoint ( m_p [1]. x ( ), m_scale. height ( ) - m_p [1]. y ( ) - 1 );
117} 117}
118 118
119void Calibration::checkPoints ( ) 119void Calibration::checkPoints ( )
120{ 120{
121 int dx = m_scale. width ( ); 121 int dx = m_scale. width ( );
122 int dy = m_scale. height ( ); 122 int dy = m_scale. height ( );
123 123
124 if ( m_p [1]. x ( ) >= dx ) 124 if ( m_p [1]. x ( ) >= dx )
125 m_p [1]. setX ( dx - 1 ); 125 m_p [1]. setX ( dx - 1 );
126 if ( m_p [0]. x ( ) > m_p [1]. x ( )) 126 if ( m_p [0]. x ( ) > m_p [1]. x ( ))
127 m_p [0]. setX ( m_p [1]. x ( )); 127 m_p [0]. setX ( m_p [1]. x ( ));
128 128
129 if ( m_p [1]. y ( ) >= dy ) 129 if ( m_p [1]. y ( ) >= dy )
130 m_p [1]. setY ( dy - 1 ); 130 m_p [1]. setY ( dy - 1 );
131 if ( m_p [0]. y ( ) > m_p [1]. y ( )) 131 if ( m_p [0]. y ( ) > m_p [1]. y ( ))
132 m_p [0]. setY ( m_p [1]. y ( )); 132 m_p [0]. setY ( m_p [1]. y ( ));
133} 133}
134 134
135 135
136#define SCALEX(x) (BRD+x*(width()- 2*BRD)/m_scale.width()) 136#define SCALEX(x) (BRD+x*(width()- 2*BRD)/m_scale.width())
137#define SCALEY(y) (BRD+y*(height()-2*BRD)/m_scale.height()) 137#define SCALEY(y) (BRD+y*(height()-2*BRD)/m_scale.height())
138 138
139 139
140static QRect around ( int x, int y ) 140static QRect around ( int x, int y )
141{ 141{
142 return QRect ( x - BRD, y - BRD, 2 * BRD + 1, 2 * BRD + 1 ); 142 return QRect ( x - BRD, y - BRD, 2 * BRD + 1, 2 * BRD + 1 );
143} 143}
144 144
145void Calibration::mousePressEvent ( QMouseEvent *e ) 145void Calibration::mousePressEvent ( QMouseEvent *e )
146{ 146{
147 if ( e-> button ( ) != LeftButton ) 147 if ( e-> button ( ) != LeftButton )
148 return QWidget::mousePressEvent ( e ); 148 return QWidget::mousePressEvent ( e );
149 149
150 int olddragged = m_dragged; 150 int olddragged = m_dragged;
151 int x [2], y [2]; 151 int x [2], y [2];
152 152
153 m_dragged = -1; 153 m_dragged = -1;
154 for ( int i = 0; i < 2; i++ ) { 154 for ( int i = 0; i < 2; i++ ) {
155 x [i] = SCALEX( m_p [i]. x ( )); 155 x [i] = SCALEX( m_p [i]. x ( ));
156 y [i] = SCALEY( m_p [i]. y ( )); 156 y [i] = SCALEY( m_p [i]. y ( ));
157 157
158 if (( QABS( e-> x ( ) - x [i] ) <= BRD ) && 158 if (( QABS( e-> x ( ) - x [i] ) <= BRD ) &&
159 ( QABS( e-> y ( ) - y [i] ) <= BRD )) { 159 ( QABS( e-> y ( ) - y [i] ) <= BRD )) {
160 m_dragged = i; 160 m_dragged = i;
161 break; 161 break;
162 } 162 }
163 } 163 }
164 164
165 if ( m_dragged != olddragged ) { 165 if ( m_dragged != olddragged ) {
166 QRect r; 166 QRect r;
167 167
168 if ( olddragged >= 0 ) 168 if ( olddragged >= 0 )
169 r |= around ( x [olddragged], y [olddragged] ); 169 r |= around ( x [olddragged], y [olddragged] );
170 if ( m_dragged >= 0 ) 170 if ( m_dragged >= 0 )
171 r |= around ( x [m_dragged], y [m_dragged] ); 171 r |= around ( x [m_dragged], y [m_dragged] );
172 repaint ( r ); 172 repaint ( r );
173 } 173 }
174} 174}
175 175
176void Calibration::mouseMoveEvent ( QMouseEvent *e ) 176void Calibration::mouseMoveEvent ( QMouseEvent *e )
177{ 177{
178 if ( m_dragged < 0 ) 178 if ( m_dragged < 0 )
179 return; 179 return;
180 180
181 QPoint n [2]; 181 QPoint n [2];
182 182
183 n [m_dragged]. setX (( e-> x ( ) - BRD ) * m_scale. width ( ) / ( width ( ) - 2 * BRD )); 183 n [m_dragged]. setX (( e-> x ( ) - BRD ) * m_scale. width ( ) / ( width ( ) - 2 * BRD ));
184 n [m_dragged]. setY (( e-> y ( ) - BRD ) * m_scale. height ( ) / ( height ( ) - 2 * BRD )); 184 n [m_dragged]. setY (( e-> y ( ) - BRD ) * m_scale. height ( ) / ( height ( ) - 2 * BRD ));
185 n [1 - m_dragged] = m_p [1 - m_dragged]; 185 n [1 - m_dragged] = m_p [1 - m_dragged];
186 186
187 if (( n [0]. x ( ) > n [1]. x ( )) || ( n [m_dragged]. x ( ) < 0 ) || ( n [m_dragged]. x ( ) >= m_scale. width ( ))) 187 if (( n [0]. x ( ) > n [1]. x ( )) || ( n [m_dragged]. x ( ) < 0 ) || ( n [m_dragged]. x ( ) >= m_scale. width ( )))
188 n [m_dragged]. setX ( m_p [m_dragged]. x ( )); 188 n [m_dragged]. setX ( m_p [m_dragged]. x ( ));
189 if (( n [0]. y ( ) > n [1]. y ( )) || ( n [m_dragged]. y ( ) < 0 ) || ( n [m_dragged]. y ( ) >= m_scale. height ( ))) 189 if (( n [0]. y ( ) > n [1]. y ( )) || ( n [m_dragged]. y ( ) < 0 ) || ( n [m_dragged]. y ( ) >= m_scale. height ( )))
190 n [m_dragged]. setY ( m_p [m_dragged]. y ( )); 190 n [m_dragged]. setY ( m_p [m_dragged]. y ( ));
191 191
192 QRect r; 192 QRect r;
193 int ox [2], oy [2], nx [2], ny [2]; 193 int ox [2], oy [2], nx [2], ny [2];
194 194
195 for ( int i = 0; i < 2; i++ ) { 195 for ( int i = 0; i < 2; i++ ) {
196 nx [i] = SCALEX( n [i]. x ( )); 196 nx [i] = SCALEX( n [i]. x ( ));
197 ny [i] = SCALEY( n [i]. y ( )); 197 ny [i] = SCALEY( n [i]. y ( ));
198 ox [i] = SCALEX( m_p [i]. x ( )); 198 ox [i] = SCALEX( m_p [i]. x ( ));
199 oy [i] = SCALEY( m_p [i]. y ( )); 199 oy [i] = SCALEY( m_p [i]. y ( ));
200 200
201 if ( n [i] != m_p [i] ){ 201 if ( n [i] != m_p [i] ){
202 r |= around ( nx [i], ny [i] ); 202 r |= around ( nx [i], ny [i] );
203 r |= around ( ox [i], oy [i] ); 203 r |= around ( ox [i], oy [i] );
204 m_p [i] = n [i]; 204 m_p [i] = n [i];
205 205
206 if ( i == 0 ) { 206 if ( i == 0 ) {
207 r |= QRect ( 0, 0, nx [0] - 0 + 1, ny [0] - 0 + 1 ); 207 r |= QRect ( 0, ny [0], nx [0] - 0 + 1, 1 );
208 r |= QRect ( 0, 0, ox [0] - 0 + 1, oy [0] - 0 + 1 ); 208 r |= QRect ( 0, oy [0], ox [0] - 0 + 1, 1 );
209 } 209 }
210 else if ( i == 1 ) { 210 else if ( i == 1 ) {
211 r |= QRect ( nx [1], ny [1], width ( ) - nx [1], height ( ) - ny [1] ); 211 r |= QRect ( nx [1], ny [1], width ( ) - nx [1], 1 );
212 r |= QRect ( ox [1], oy [1], width ( ) - ox [1], height ( ) - oy [1] ); 212 r |= QRect ( ox [1], oy [1], width ( ) - ox [1], 1 );
213 } 213 }
214 } 214 }
215 } 215 }
216 if ( r. isValid ( )) { 216 if ( r. isValid ( )) {
217 r |= QRect ( nx [0], ny [0], nx [1] - nx [0] + 1, ny [1] - ny [0] + 1 ); 217 r |= QRect ( nx [0], ny [0], nx [1] - nx [0] + 1, ny [1] - ny [0] + 1 );
218 r |= QRect ( ox [0], oy [0], ox [1] - ox [0] + 1, oy [1] - oy [0] + 1 ); 218 r |= QRect ( ox [0], oy [0], ox [1] - ox [0] + 1, oy [1] - oy [0] + 1 );
219 219
220 repaint ( r ); 220 repaint ( r );
221 } 221 }
222} 222}
223 223
224void Calibration::mouseReleaseEvent ( QMouseEvent *e ) 224void Calibration::mouseReleaseEvent ( QMouseEvent *e )
225{ 225{
226 if ( e-> button ( ) != LeftButton ) 226 if ( e-> button ( ) != LeftButton )
227 return QWidget::mouseReleaseEvent ( e ); 227 return QWidget::mouseReleaseEvent ( e );
228 228
229 if ( m_dragged < 0 ) 229 if ( m_dragged < 0 )
230 return; 230 return;
231 231
232 int x = SCALEX( m_p [m_dragged]. x ( )); 232 int x = SCALEX( m_p [m_dragged]. x ( ));
233 int y = SCALEY( m_p [m_dragged]. y ( )); 233 int y = SCALEY( m_p [m_dragged]. y ( ));
234 m_dragged = -1; 234 m_dragged = -1;
235 235
236 repaint ( around ( x, y )); 236 repaint ( around ( x, y ));
237} 237}
238 238
239void Calibration::paintEvent ( QPaintEvent * ) 239void Calibration::paintEvent ( QPaintEvent * )
240{ 240{
241 QPainter p ( this ); 241 QPainter p ( this );
242 QColorGroup g = colorGroup ( ); 242 QColorGroup g = colorGroup ( );
243 243
244 int x0 = SCALEX( m_p [0]. x ( )); 244 int x0 = SCALEX( m_p [0]. x ( ));
245 int y0 = SCALEY( m_p [0]. y ( )); 245 int y0 = SCALEY( m_p [0]. y ( ));
246 int x1 = SCALEX( m_p [1]. x ( )); 246 int x1 = SCALEX( m_p [1]. x ( ));
247 int y1 = SCALEY( m_p [1]. y ( )); 247 int y1 = SCALEY( m_p [1]. y ( ));
248 248
249 int dx = x1 - x0; 249 int dx = x1 - x0;
250 int dy = y1 - y0; 250 int dy = y1 - y0;
251 251
252 int ex = x0, ey = y0; 252 int ex = x0, ey = y0;
253 253
254 p. setPen ( g. highlight ( )); 254 p. setPen ( g. highlight ( ));
255 255
256 p. drawLine ( BRD, BRD, ex, BRD ); 256 p. drawLine ( BRD, ey, ex, ey );
257 p. drawLine ( ex, BRD, ex, ey );
258 257
259 for ( int i = 1; i < m_steps; i++ ) { 258 for ( int i = 1; i < m_steps; i++ ) {
260 int fx = x0 + dx * i / m_steps; 259 int fx = x0 + dx * i / m_steps;
261 int fy = y0 + dy * i / ( m_steps - 1 ); 260 int fy = y0 + dy * i / ( m_steps - 1 );
262 261
263 p. drawLine ( ex, ey, fx, ey ); 262 p. drawLine ( ex, ey, fx, ey );
264 p. drawLine ( fx, ey, fx, fy ); 263 p. drawLine ( fx, ey, fx, fy );
265 264
266 ex = fx; 265 ex = fx;
267 ey = fy; 266 ey = fy;
268 } 267 }
269 268
270 p. drawLine ( ex, ey, width ( ) - 1 - BRD, ey ); 269 p. drawLine ( ex, ey, width ( ) - 1 - BRD, ey );
271 270
272 p. fillRect ( around ( x0, y0 ), m_dragged == 0 ? g. highlightedText ( ) : g. text ( )); 271 p. fillRect ( around ( x0, y0 ), m_dragged == 0 ? g. highlightedText ( ) : g. text ( ));
273 p. fillRect ( around ( x1, y1 ), m_dragged == 1 ? g. highlightedText ( ) : g. text ( )); 272 p. fillRect ( around ( x1, y1 ), m_dragged == 1 ? g. highlightedText ( ) : g. text ( ));
274 273
275 p. setPen ( g. text ( )); 274 p. setPen ( g. text ( ));
276 p. drawText ( QRect ( BRD, BRD, width ( ) - 2*BRD, height() - 2*BRD ), AlignTop | AlignRight, tr( "%1 Steps" ). arg ( m_steps )); 275 p. drawText ( QRect ( BRD, BRD, width ( ) - 2*BRD, height() - 2*BRD ), AlignTop | AlignRight, tr( "%1 Steps" ). arg ( m_steps ));
277} 276}
278 277
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 2ea0356..c0ba60b 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -1,226 +1,214 @@
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 28
29#include "settings.h" 29#include "settings.h"
30 30
31#include <qpe/global.h>
32#include <qpe/fontmanager.h>
33#include <qpe/config.h> 31#include <qpe/config.h>
34#include <qpe/applnk.h>
35#include <qpe/qpeapplication.h> 32#include <qpe/qpeapplication.h>
36#include <qpe/power.h> 33#include <qpe/power.h>
37#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 34#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
38#include <qpe/qcopenvelope_qws.h> 35#include <qpe/qcopenvelope_qws.h>
39#endif 36#endif
40 37
41#include <qlabel.h>
42#include <qcheckbox.h> 38#include <qcheckbox.h>
43#include <qradiobutton.h>
44#include <qtabwidget.h> 39#include <qtabwidget.h>
45#include <qslider.h> 40#include <qslider.h>
46#include <qfile.h>
47#include <qtextstream.h>
48#include <qdatastream.h>
49#include <qmessagebox.h>
50#include <qcombobox.h>
51#include <qgroupbox.h>
52#include <qspinbox.h> 41#include <qspinbox.h>
53#include <qpushbutton.h> 42#include <qpushbutton.h>
54#include <qlistbox.h>
55#include <qdir.h>
56#if QT_VERSION >= 300
57#include <qstylefactory.h>
58#endif
59 43
60#include <opie/odevice.h> 44#include <opie/odevice.h>
61 45
62#include "sensor.h" 46#include "sensor.h"
63 47
64using namespace Opie; 48using namespace Opie;
65 49
66LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) 50LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
67 : LightSettingsBase( parent, name, true, WStyle_ContextHelp ) 51 : LightSettingsBase( parent, name, true, WStyle_ContextHelp )
68{ 52{
69 m_res = ODevice::inst ( )-> displayBrightnessResolution ( ); 53 m_res = ODevice::inst ( )-> displayBrightnessResolution ( );
70 54
71 if ( !ODevice::inst ( )-> hasLightSensor ( )) { 55 if ( !ODevice::inst ( )-> hasLightSensor ( )) {
72 auto_brightness-> hide ( ); 56 auto_brightness-> hide ( );
73 CalibrateLightSensor-> hide ( ); 57 CalibrateLightSensor-> hide ( );
74 auto_brightness_ac_3-> hide ( ); 58 auto_brightness_ac_3-> hide ( );
75 CalibrateLightSensorAC-> hide ( ); 59 CalibrateLightSensorAC-> hide ( );
76 } 60 }
77 61
78 Config config ( "apm" ); 62 Config config ( "apm" );
79 config. setGroup ( "Battery" ); 63 config. setGroup ( "Battery" );
80 64
81 // battery spinboxes 65 // battery spinboxes
82 interval_dim-> setValue ( config. readNumEntry ( "Dim", 20 )); 66 interval_dim-> setValue ( config. readNumEntry ( "Dim", 20 ));
83 interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 30 )); 67 interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 30 ));
84 interval_suspend-> setValue ( config. readNumEntry ( "Suspend", 60 )); 68 interval_suspend-> setValue ( config. readNumEntry ( "Suspend", 60 ));
85 69
86 // battery check and slider 70 // battery check and slider
87 LcdOffOnly-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); 71 LcdOffOnly-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
88 72
89 int bright = config. readNumEntry ( "Brightness", 255 ); 73 int bright = config. readNumEntry ( "Brightness", 255 );
90 brightness-> setMaxValue ( m_res - 1 ); 74 brightness-> setMaxValue ( m_res - 1 );
91 brightness-> setTickInterval ( QMAX( 1, m_res / 16 )); 75 brightness-> setTickInterval ( QMAX( 1, m_res / 16 ));
92 brightness-> setLineStep ( QMAX( 1, m_res / 16 )); 76 brightness-> setLineStep ( QMAX( 1, m_res / 16 ));
93 brightness-> setPageStep ( QMAX( 1, m_res / 16 )); 77 brightness-> setPageStep ( QMAX( 1, m_res / 16 ));
94 brightness-> setValue (( bright * ( m_res - 1 ) + 127 ) / 255 ); 78 brightness-> setValue (( bright * ( m_res - 1 ) + 127 ) / 255 );
95 79
96 // light sensor 80 // light sensor
97 auto_brightness-> setChecked ( config. readBoolEntry ( "LightSensor", false )); 81 auto_brightness-> setChecked ( config. readBoolEntry ( "LightSensor", false ));
98 m_sensordata = config. readListEntry ( "LightSensorData", ';' ); 82 m_sensordata = config. readListEntry ( "LightSensorData", ';' );
99 83
100 config. setGroup ( "AC" ); 84 config. setGroup ( "AC" );
101 85
102 // ac spinboxes 86 // ac spinboxes
103 interval_dim_ac_3-> setValue ( config. readNumEntry ( "Dim", 20 )); 87 interval_dim_ac_3-> setValue ( config. readNumEntry ( "Dim", 20 ));
104 interval_lightoff_ac_3-> setValue ( config. readNumEntry ( "LightOff", 30 )); 88 interval_lightoff_ac_3-> setValue ( config. readNumEntry ( "LightOff", 30 ));
105 interval_suspend_ac_3-> setValue ( config. readNumEntry ( "Suspend", 60 )); 89 interval_suspend_ac_3-> setValue ( config. readNumEntry ( "Suspend", 60 ));
106 90
107 // ac check and slider 91 // ac check and slider
108 LcdOffOnly_2_3-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); 92 LcdOffOnly_2_3-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
109 93
110 bright = config. readNumEntry ( "Brightness", 255 ); 94 bright = config. readNumEntry ( "Brightness", 255 );
111 brightness_ac_3-> setMaxValue ( m_res - 1 ); 95 brightness_ac_3-> setMaxValue ( m_res - 1 );
112 brightness_ac_3-> setTickInterval ( QMAX( 1, m_res / 16 )); 96 brightness_ac_3-> setTickInterval ( QMAX( 1, m_res / 16 ));
113 brightness_ac_3-> setLineStep ( QMAX( 1, m_res / 16 )); 97 brightness_ac_3-> setLineStep ( QMAX( 1, m_res / 16 ));
114 brightness_ac_3-> setPageStep ( QMAX( 1, m_res / 16 )); 98 brightness_ac_3-> setPageStep ( QMAX( 1, m_res / 16 ));
115 brightness_ac_3-> setValue (( bright * ( m_res - 1 ) + 127 ) / 255 ); 99 brightness_ac_3-> setValue (( bright * ( m_res - 1 ) + 127 ) / 255 );
116 100
117 // light sensor 101 // light sensor
118 auto_brightness_ac_3-> setChecked ( config. readBoolEntry ( "LightSensor", false )); 102 auto_brightness_ac_3-> setChecked ( config. readBoolEntry ( "LightSensor", false ));
119 m_sensordata_ac = config. readListEntry ( "LightSensorData", ';' ); 103 m_sensordata_ac = config. readListEntry ( "LightSensorData", ';' );
120 104
121 // advanced settings 105 // advanced settings
122 config. setGroup ( "Warnings" ); 106 config. setGroup ( "Warnings" );
123 warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 ); 107 warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 );
124 lowSpinBox-> setValue ( config. readNumEntry ( "powerverylow", 10 ) ); 108 lowSpinBox-> setValue ( config. readNumEntry ( "powerverylow", 10 ) );
125 criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) ); 109 criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) );
126 110
127 if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) 111 if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) {
128 connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); 112 connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
129 else 113 tabs-> setCurrentPage ( 0 );
114 }
115 else {
130 connect ( brightness_ac_3, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); 116 connect ( brightness_ac_3, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
117 tabs-> setCurrentPage ( 1 );
118 }
131} 119}
132 120
133LightSettings::~LightSettings ( ) 121LightSettings::~LightSettings ( )
134{ 122{
135} 123}
136 124
137 125
138void LightSettings::calibrateSensor ( ) 126void LightSettings::calibrateSensor ( )
139{ 127{
140 Sensor *s = new Sensor ( m_sensordata, this ); 128 Sensor *s = new Sensor ( m_sensordata, this );
141 s-> showMaximized ( ); 129 s-> showMaximized ( );
142 s-> exec ( ); 130 s-> exec ( );
143 delete s; 131 delete s;
144} 132}
145 133
146void LightSettings::calibrateSensorAC ( ) 134void LightSettings::calibrateSensorAC ( )
147{ 135{
148 Sensor *s = new Sensor ( m_sensordata_ac, this ); 136 Sensor *s = new Sensor ( m_sensordata_ac, this );
149 s-> showMaximized ( ); 137 s-> showMaximized ( );
150 s-> exec ( ); 138 s-> exec ( );
151 delete s; 139 delete s;
152} 140}
153 141
154void LightSettings::setBacklight ( int bright ) 142void LightSettings::setBacklight ( int bright )
155{ 143{
156 bright = bright * 255 / ( m_res - 1 ); 144 bright = bright * 255 / ( m_res - 1 );
157 QCopEnvelope e ( "QPE/System", "setBacklight(int)" ); 145 QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
158 e << bright; 146 e << bright;
159} 147}
160 148
161void LightSettings::reject ( ) 149void LightSettings::reject ( )
162{ 150{
163 { 151 {
164 QCopEnvelope e ( "QPE/System", "setBacklight(int)" ); 152 QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
165 e << -1; 153 e << -1;
166 } 154 }
167 QDialog::reject ( ); 155 QDialog::reject ( );
168} 156}
169 157
170void LightSettings::accept ( ) 158void LightSettings::accept ( )
171{ 159{
172 Config config ( "apm" ); 160 Config config ( "apm" );
173 161
174 // bat 162 // bat
175 config. setGroup ( "Battery" ); 163 config. setGroup ( "Battery" );
176 config. writeEntry ( "LcdOffOnly", LcdOffOnly-> isChecked ( )); 164 config. writeEntry ( "LcdOffOnly", LcdOffOnly-> isChecked ( ));
177 config. writeEntry ( "Dim", interval_dim-> value ( )); 165 config. writeEntry ( "Dim", interval_dim-> value ( ));
178 config. writeEntry ( "LightOff", interval_lightoff-> value ( )); 166 config. writeEntry ( "LightOff", interval_lightoff-> value ( ));
179 config. writeEntry ( "Suspend", interval_suspend-> value ( )); 167 config. writeEntry ( "Suspend", interval_suspend-> value ( ));
180 config. writeEntry ( "Brightness", brightness-> value ( ) * 255 / ( m_res - 1 ) ); 168 config. writeEntry ( "Brightness", brightness-> value ( ) * 255 / ( m_res - 1 ) );
181 169
182 // ac 170 // ac
183 config. setGroup ( "AC" ); 171 config. setGroup ( "AC" );
184 config. writeEntry ( "LcdOffOnly", LcdOffOnly_2_3-> isChecked ( )); 172 config. writeEntry ( "LcdOffOnly", LcdOffOnly_2_3-> isChecked ( ));
185 config. writeEntry ( "Dim", interval_dim_ac_3-> value ( )); 173 config. writeEntry ( "Dim", interval_dim_ac_3-> value ( ));
186 config. writeEntry ( "LightOff", interval_lightoff_ac_3-> value ( )); 174 config. writeEntry ( "LightOff", interval_lightoff_ac_3-> value ( ));
187 config. writeEntry ( "Suspend", interval_suspend_ac_3-> value ( )); 175 config. writeEntry ( "Suspend", interval_suspend_ac_3-> value ( ));
188 config. writeEntry ( "Brightness", brightness_ac_3-> value ( ) * 255 / ( m_res - 1 )); 176 config. writeEntry ( "Brightness", brightness_ac_3-> value ( ) * 255 / ( m_res - 1 ));
189 177
190 // only make light sensor stuff appear if the unit has a sensor 178 // only make light sensor stuff appear if the unit has a sensor
191 if ( ODevice::inst ( )-> hasLightSensor ( )) { 179 if ( ODevice::inst ( )-> hasLightSensor ( )) {
192 config. setGroup ( "Battery" ); 180 config. setGroup ( "Battery" );
193 config. writeEntry ( "LightSensor", auto_brightness->isChecked() ); 181 config. writeEntry ( "LightSensor", auto_brightness->isChecked() );
194 config. writeEntry ( "LightSensorData", m_sensordata, ';' ); 182 config. writeEntry ( "LightSensorData", m_sensordata, ';' );
195 config. setGroup ( "AC" ); 183 config. setGroup ( "AC" );
196 config. writeEntry ( "LightSensor", auto_brightness_ac_3->isChecked() ); 184 config. writeEntry ( "LightSensor", auto_brightness_ac_3->isChecked() );
197 config. writeEntry ( "LightSensorData", m_sensordata_ac, ';' ); 185 config. writeEntry ( "LightSensorData", m_sensordata_ac, ';' );
198 } 186 }
199 187
200 // advanced 188 // advanced
201 config. setGroup ( "Warnings" ); 189 config. setGroup ( "Warnings" );
202 config. writeEntry ( "check_interval", warnintervalBox-> value ( ) * 1000 ); 190 config. writeEntry ( "check_interval", warnintervalBox-> value ( ) * 1000 );
203 config. writeEntry ( "power_verylow", lowSpinBox-> value ( )); 191 config. writeEntry ( "power_verylow", lowSpinBox-> value ( ));
204 config. writeEntry ( "power_critical", criticalSpinBox-> value ( )); 192 config. writeEntry ( "power_critical", criticalSpinBox-> value ( ));
205 config. write ( ); 193 config. write ( );
206 194
207 // notify the launcher 195 // notify the launcher
208 { 196 {
209 QCopEnvelope e ( "QPE/System", "reloadPowerWarnSettings()" ); 197 QCopEnvelope e ( "QPE/System", "reloadPowerWarnSettings()" );
210 } 198 }
211 { 199 {
212 QCopEnvelope e ( "QPE/System", "setScreenSaverInterval(int)" ); 200 QCopEnvelope e ( "QPE/System", "setScreenSaverInterval(int)" );
213 e << -1; 201 e << -1;
214 } 202 }
215 { 203 {
216 QCopEnvelope e ( "QPE/System", "setBacklight(int)" ); 204 QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
217 e << -1; 205 e << -1;
218 } 206 }
219 207
220 QDialog::accept ( ); 208 QDialog::accept ( );
221} 209}
222 210
223void LightSettings::done ( int r ) 211void LightSettings::done ( int r )
224{ 212{
225 QDialog::done ( r ); 213 QDialog::done ( r );
226 close ( ); 214 close ( );
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui
index 4df6024..04c6726 100644
--- a/core/settings/light-and-power/lightsettingsbase.ui
+++ b/core/settings/light-and-power/lightsettingsbase.ui
@@ -1,148 +1,148 @@
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>387</width> 14 <width>379</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>TabWidget3</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>GroupBox3</cstring> 83 <cstring>GroupBox3</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="1" column="0" > 139 <widget row="1" 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>TextLabel2_2</cstring> 143 <cstring>TextLabel2_2</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>
@@ -870,193 +870,193 @@
870 <cstring>PixmapLabel1_2_3</cstring> 870 <cstring>PixmapLabel1_2_3</cstring>
871 </property> 871 </property>
872 <property stdset="1"> 872 <property stdset="1">
873 <name>pixmap</name> 873 <name>pixmap</name>
874 <pixmap>image1</pixmap> 874 <pixmap>image1</pixmap>
875 </property> 875 </property>
876 <property stdset="1"> 876 <property stdset="1">
877 <name>scaledContents</name> 877 <name>scaledContents</name>
878 <bool>false</bool> 878 <bool>false</bool>
879 </property> 879 </property>
880 </widget> 880 </widget>
881 </hbox> 881 </hbox>
882 </widget> 882 </widget>
883 <widget> 883 <widget>
884 <class>QLayoutWidget</class> 884 <class>QLayoutWidget</class>
885 <property stdset="1"> 885 <property stdset="1">
886 <name>name</name> 886 <name>name</name>
887 <cstring>Layout10</cstring> 887 <cstring>Layout10</cstring>
888 </property> 888 </property>
889 <property> 889 <property>
890 <name>layoutSpacing</name> 890 <name>layoutSpacing</name>
891 </property> 891 </property>
892 <hbox> 892 <hbox>
893 <property stdset="1"> 893 <property stdset="1">
894 <name>margin</name> 894 <name>margin</name>
895 <number>0</number> 895 <number>0</number>
896 </property> 896 </property>
897 <property stdset="1"> 897 <property stdset="1">
898 <name>spacing</name> 898 <name>spacing</name>
899 <number>3</number> 899 <number>3</number>
900 </property> 900 </property>
901 <widget> 901 <widget>
902 <class>QCheckBox</class> 902 <class>QCheckBox</class>
903 <property stdset="1"> 903 <property stdset="1">
904 <name>name</name> 904 <name>name</name>
905 <cstring>auto_brightness_ac_3</cstring> 905 <cstring>auto_brightness_ac_3</cstring>
906 </property> 906 </property>
907 <property stdset="1"> 907 <property stdset="1">
908 <name>text</name> 908 <name>text</name>
909 <string>Use Light Sensor</string> 909 <string>Use Light Sensor</string>
910 </property> 910 </property>
911 <property> 911 <property>
912 <name>whatsThis</name> 912 <name>whatsThis</name>
913 <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> 913 <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>
914 </property> 914 </property>
915 </widget> 915 </widget>
916 <widget> 916 <widget>
917 <class>QPushButton</class> 917 <class>QPushButton</class>
918 <property stdset="1"> 918 <property stdset="1">
919 <name>name</name> 919 <name>name</name>
920 <cstring>CalibrateLightSensorAC</cstring> 920 <cstring>CalibrateLightSensorAC</cstring>
921 </property> 921 </property>
922 <property stdset="1"> 922 <property stdset="1">
923 <name>text</name> 923 <name>text</name>
924 <string>Calibrate</string> 924 <string>Calibrate</string>
925 </property> 925 </property>
926 <property> 926 <property>
927 <name>whatsThis</name> 927 <name>whatsThis</name>
928 <string>Advanced settings for light sensor handling</string> 928 <string>Advanced settings for light sensor handling</string>
929 </property> 929 </property>
930 </widget> 930 </widget>
931 </hbox> 931 </hbox>
932 </widget> 932 </widget>
933 </vbox> 933 </vbox>
934 </widget> 934 </widget>
935 <spacer> 935 <spacer>
936 <property> 936 <property>
937 <name>name</name> 937 <name>name</name>
938 <cstring>Spacer5</cstring> 938 <cstring>Spacer5</cstring>
939 </property> 939 </property>
940 <property stdset="1"> 940 <property stdset="1">
941 <name>orientation</name> 941 <name>orientation</name>
942 <enum>Vertical</enum> 942 <enum>Vertical</enum>
943 </property> 943 </property>
944 <property stdset="1"> 944 <property stdset="1">
945 <name>sizeType</name> 945 <name>sizeType</name>
946 <enum>Expanding</enum> 946 <enum>Expanding</enum>
947 </property> 947 </property>
948 <property> 948 <property>
949 <name>sizeHint</name> 949 <name>sizeHint</name>
950 <size> 950 <size>
951 <width>20</width> 951 <width>20</width>
952 <height>20</height> 952 <height>20</height>
953 </size> 953 </size>
954 </property> 954 </property>
955 </spacer> 955 </spacer>
956 </vbox> 956 </vbox>
957 </widget> 957 </widget>
958 <widget> 958 <widget>
959 <class>QWidget</class> 959 <class>QWidget</class>
960 <property stdset="1"> 960 <property stdset="1">
961 <name>name</name> 961 <name>name</name>
962 <cstring>tab</cstring> 962 <cstring>tab</cstring>
963 </property> 963 </property>
964 <attribute> 964 <attribute>
965 <name>title</name> 965 <name>title</name>
966 <string>Advanced Settings</string> 966 <string>Warnings</string>
967 </attribute> 967 </attribute>
968 <vbox> 968 <vbox>
969 <property stdset="1"> 969 <property stdset="1">
970 <name>margin</name> 970 <name>margin</name>
971 <number>5</number> 971 <number>5</number>
972 </property> 972 </property>
973 <property stdset="1"> 973 <property stdset="1">
974 <name>spacing</name> 974 <name>spacing</name>
975 <number>3</number> 975 <number>3</number>
976 </property> 976 </property>
977 <widget> 977 <widget>
978 <class>QGroupBox</class> 978 <class>QGroupBox</class>
979 <property stdset="1"> 979 <property stdset="1">
980 <name>name</name> 980 <name>name</name>
981 <cstring>GroupBox5</cstring> 981 <cstring>GroupBox5</cstring>
982 </property> 982 </property>
983 <property stdset="1"> 983 <property stdset="1">
984 <name>title</name> 984 <name>title</name>
985 <string>Warnings</string> 985 <string>Warnings</string>
986 </property> 986 </property>
987 <property> 987 <property>
988 <name>layoutMargin</name> 988 <name>layoutMargin</name>
989 </property> 989 </property>
990 <property> 990 <property>
991 <name>layoutSpacing</name> 991 <name>layoutSpacing</name>
992 </property> 992 </property>
993 <grid> 993 <grid>
994 <property stdset="1"> 994 <property stdset="1">
995 <name>margin</name> 995 <name>margin</name>
996 <number>5</number> 996 <number>5</number>
997 </property> 997 </property>
998 <property stdset="1"> 998 <property stdset="1">
999 <name>spacing</name> 999 <name>spacing</name>
1000 <number>3</number> 1000 <number>3</number>
1001 </property> 1001 </property>
1002 <widget row="0" column="0" > 1002 <widget row="0" column="0" >
1003 <class>QLabel</class> 1003 <class>QLabel</class>
1004 <property stdset="1"> 1004 <property stdset="1">
1005 <name>name</name> 1005 <name>name</name>
1006 <cstring>TextLabel1</cstring> 1006 <cstring>TextLabel1</cstring>
1007 </property> 1007 </property>
1008 <property stdset="1"> 1008 <property stdset="1">
1009 <name>sizePolicy</name> 1009 <name>sizePolicy</name>
1010 <sizepolicy> 1010 <sizepolicy>
1011 <hsizetype>3</hsizetype> 1011 <hsizetype>3</hsizetype>
1012 <vsizetype>5</vsizetype> 1012 <vsizetype>5</vsizetype>
1013 </sizepolicy> 1013 </sizepolicy>
1014 </property> 1014 </property>
1015 <property stdset="1"> 1015 <property stdset="1">
1016 <name>text</name> 1016 <name>text</name>
1017 <string>Low power warning interval</string> 1017 <string>Low power warning interval</string>
1018 </property> 1018 </property>
1019 <property stdset="1"> 1019 <property stdset="1">
1020 <name>alignment</name> 1020 <name>alignment</name>
1021 <set>WordBreak|AlignVCenter|AlignLeft</set> 1021 <set>WordBreak|AlignVCenter|AlignLeft</set>
1022 </property> 1022 </property>
1023 <property> 1023 <property>
1024 <name>wordwrap</name> 1024 <name>wordwrap</name>
1025 </property> 1025 </property>
1026 </widget> 1026 </widget>
1027 <widget row="1" column="1" > 1027 <widget row="1" column="1" >
1028 <class>QSpinBox</class> 1028 <class>QSpinBox</class>
1029 <property stdset="1"> 1029 <property stdset="1">
1030 <name>name</name> 1030 <name>name</name>
1031 <cstring>lowSpinBox</cstring> 1031 <cstring>lowSpinBox</cstring>
1032 </property> 1032 </property>
1033 <property stdset="1"> 1033 <property stdset="1">
1034 <name>suffix</name> 1034 <name>suffix</name>
1035 <string> %</string> 1035 <string> %</string>
1036 </property> 1036 </property>
1037 <property stdset="1"> 1037 <property stdset="1">
1038 <name>buttonSymbols</name> 1038 <name>buttonSymbols</name>
1039 <enum>PlusMinus</enum> 1039 <enum>PlusMinus</enum>
1040 </property> 1040 </property>
1041 <property stdset="1"> 1041 <property stdset="1">
1042 <name>maxValue</name> 1042 <name>maxValue</name>
1043 <number>80</number> 1043 <number>80</number>
1044 </property> 1044 </property>
1045 <property stdset="1"> 1045 <property stdset="1">
1046 <name>minValue</name> 1046 <name>minValue</name>
1047 <number>2</number> 1047 <number>2</number>
1048 </property> 1048 </property>
1049 <property> 1049 <property>
1050 <name>whatsThis</name> 1050 <name>whatsThis</name>
1051 <string>At what battery level should the low power warning pop up</string> 1051 <string>At what battery level should the low power warning pop up</string>
1052 </property> 1052 </property>
1053 </widget> 1053 </widget>
1054 <widget row="0" column="1" > 1054 <widget row="0" column="1" >
1055 <class>QSpinBox</class> 1055 <class>QSpinBox</class>
1056 <property stdset="1"> 1056 <property stdset="1">
1057 <name>name</name> 1057 <name>name</name>
1058 <cstring>warnintervalBox</cstring> 1058 <cstring>warnintervalBox</cstring>
1059 </property> 1059 </property>
1060 <property stdset="1"> 1060 <property stdset="1">
1061 <name>suffix</name> 1061 <name>suffix</name>
1062 <string> sec</string> 1062 <string> sec</string>
@@ -1202,109 +1202,109 @@
1202 </connection> 1202 </connection>
1203 <connection> 1203 <connection>
1204 <sender>auto_brightness_ac_3</sender> 1204 <sender>auto_brightness_ac_3</sender>
1205 <signal>toggled(bool)</signal> 1205 <signal>toggled(bool)</signal>
1206 <receiver>TextLabel1_3_2</receiver> 1206 <receiver>TextLabel1_3_2</receiver>
1207 <slot>setDisabled(bool)</slot> 1207 <slot>setDisabled(bool)</slot>
1208 </connection> 1208 </connection>
1209 <connection> 1209 <connection>
1210 <sender>auto_brightness</sender> 1210 <sender>auto_brightness</sender>
1211 <signal>toggled(bool)</signal> 1211 <signal>toggled(bool)</signal>
1212 <receiver>TextLabel1_3</receiver> 1212 <receiver>TextLabel1_3</receiver>
1213 <slot>setDisabled(bool)</slot> 1213 <slot>setDisabled(bool)</slot>
1214 </connection> 1214 </connection>
1215 <connection> 1215 <connection>
1216 <sender>auto_brightness</sender> 1216 <sender>auto_brightness</sender>
1217 <signal>toggled(bool)</signal> 1217 <signal>toggled(bool)</signal>
1218 <receiver>interval_dim</receiver> 1218 <receiver>interval_dim</receiver>
1219 <slot>setDisabled(bool)</slot> 1219 <slot>setDisabled(bool)</slot>
1220 </connection> 1220 </connection>
1221 <connection> 1221 <connection>
1222 <sender>auto_brightness_ac_3</sender> 1222 <sender>auto_brightness_ac_3</sender>
1223 <signal>toggled(bool)</signal> 1223 <signal>toggled(bool)</signal>
1224 <receiver>interval_dim_ac_3</receiver> 1224 <receiver>interval_dim_ac_3</receiver>
1225 <slot>setDisabled(bool)</slot> 1225 <slot>setDisabled(bool)</slot>
1226 </connection> 1226 </connection>
1227 <connection> 1227 <connection>
1228 <sender>auto_brightness</sender> 1228 <sender>auto_brightness</sender>
1229 <signal>toggled(bool)</signal> 1229 <signal>toggled(bool)</signal>
1230 <receiver>PixmapLabel2</receiver> 1230 <receiver>PixmapLabel2</receiver>
1231 <slot>setDisabled(bool)</slot> 1231 <slot>setDisabled(bool)</slot>
1232 </connection> 1232 </connection>
1233 <connection> 1233 <connection>
1234 <sender>auto_brightness</sender> 1234 <sender>auto_brightness</sender>
1235 <signal>toggled(bool)</signal> 1235 <signal>toggled(bool)</signal>
1236 <receiver>TextLabel4</receiver> 1236 <receiver>TextLabel4</receiver>
1237 <slot>setDisabled(bool)</slot> 1237 <slot>setDisabled(bool)</slot>
1238 </connection> 1238 </connection>
1239 <connection> 1239 <connection>
1240 <sender>auto_brightness</sender> 1240 <sender>auto_brightness</sender>
1241 <signal>toggled(bool)</signal> 1241 <signal>toggled(bool)</signal>
1242 <receiver>TextLabel5</receiver> 1242 <receiver>TextLabel5</receiver>
1243 <slot>setDisabled(bool)</slot> 1243 <slot>setDisabled(bool)</slot>
1244 </connection> 1244 </connection>
1245 <connection> 1245 <connection>
1246 <sender>auto_brightness</sender> 1246 <sender>auto_brightness</sender>
1247 <signal>toggled(bool)</signal> 1247 <signal>toggled(bool)</signal>
1248 <receiver>PixmapLabel1</receiver> 1248 <receiver>PixmapLabel1</receiver>
1249 <slot>setDisabled(bool)</slot> 1249 <slot>setDisabled(bool)</slot>
1250 </connection> 1250 </connection>
1251 <connection> 1251 <connection>
1252 <sender>auto_brightness_ac_3</sender> 1252 <sender>auto_brightness_ac_3</sender>
1253 <signal>toggled(bool)</signal> 1253 <signal>toggled(bool)</signal>
1254 <receiver>PixmapLabel2_2_3</receiver> 1254 <receiver>PixmapLabel2_2_3</receiver>
1255 <slot>setDisabled(bool)</slot> 1255 <slot>setDisabled(bool)</slot>
1256 </connection> 1256 </connection>
1257 <connection> 1257 <connection>
1258 <sender>auto_brightness_ac_3</sender> 1258 <sender>auto_brightness_ac_3</sender>
1259 <signal>toggled(bool)</signal> 1259 <signal>toggled(bool)</signal>
1260 <receiver>TextLabel6</receiver> 1260 <receiver>TextLabel6</receiver>
1261 <slot>setDisabled(bool)</slot> 1261 <slot>setDisabled(bool)</slot>
1262 </connection> 1262 </connection>
1263 <connection> 1263 <connection>
1264 <sender>auto_brightness_ac_3</sender> 1264 <sender>auto_brightness_ac_3</sender>
1265 <signal>toggled(bool)</signal> 1265 <signal>toggled(bool)</signal>
1266 <receiver>TextLabel7</receiver> 1266 <receiver>TextLabel7</receiver>
1267 <slot>setDisabled(bool)</slot> 1267 <slot>setDisabled(bool)</slot>
1268 </connection> 1268 </connection>
1269 <connection> 1269 <connection>
1270 <sender>auto_brightness_ac_3</sender> 1270 <sender>auto_brightness_ac_3</sender>
1271 <signal>toggled(bool)</signal> 1271 <signal>toggled(bool)</signal>
1272 <receiver>PixmapLabel1_2_3</receiver> 1272 <receiver>PixmapLabel1_2_3</receiver>
1273 <slot>setDisabled(bool)</slot> 1273 <slot>setDisabled(bool)</slot>
1274 </connection> 1274 </connection>
1275 <connection> 1275 <connection>
1276 <sender>CalibrateLightSensor</sender> 1276 <sender>CalibrateLightSensor</sender>
1277 <signal>clicked()</signal> 1277 <signal>clicked()</signal>
1278 <receiver>LightSettingsBase</receiver> 1278 <receiver>LightSettingsBase</receiver>
1279 <slot>calibrateSensor()</slot> 1279 <slot>calibrateSensor()</slot>
1280 </connection> 1280 </connection>
1281 <connection> 1281 <connection>
1282 <sender>CalibrateLightSensorAC</sender> 1282 <sender>CalibrateLightSensorAC</sender>
1283 <signal>clicked()</signal> 1283 <signal>clicked()</signal>
1284 <receiver>LightSettingsBase</receiver> 1284 <receiver>LightSettingsBase</receiver>
1285 <slot>calibrateSensorAC()</slot> 1285 <slot>calibrateSensorAC()</slot>
1286 </connection> 1286 </connection>
1287 <slot access="public">calibrateSensor()</slot> 1287 <slot access="public">calibrateSensor()</slot>
1288 <slot access="public">calibrateSensorAC()</slot> 1288 <slot access="public">calibrateSensorAC()</slot>
1289</connections> 1289</connections>
1290<tabstops> 1290<tabstops>
1291 <tabstop>interval_dim</tabstop> 1291 <tabstop>interval_dim</tabstop>
1292 <tabstop>interval_lightoff</tabstop> 1292 <tabstop>interval_lightoff</tabstop>
1293 <tabstop>interval_suspend</tabstop> 1293 <tabstop>interval_suspend</tabstop>
1294 <tabstop>LcdOffOnly</tabstop> 1294 <tabstop>LcdOffOnly</tabstop>
1295 <tabstop>brightness</tabstop> 1295 <tabstop>brightness</tabstop>
1296 <tabstop>auto_brightness</tabstop> 1296 <tabstop>auto_brightness</tabstop>
1297 <tabstop>CalibrateLightSensor</tabstop> 1297 <tabstop>CalibrateLightSensor</tabstop>
1298 <tabstop>TabWidget3</tabstop> 1298 <tabstop>tabs</tabstop>
1299 <tabstop>interval_lightoff_ac_3</tabstop> 1299 <tabstop>interval_lightoff_ac_3</tabstop>
1300 <tabstop>interval_suspend_ac_3</tabstop> 1300 <tabstop>interval_suspend_ac_3</tabstop>
1301 <tabstop>interval_dim_ac_3</tabstop> 1301 <tabstop>interval_dim_ac_3</tabstop>
1302 <tabstop>LcdOffOnly_2_3</tabstop> 1302 <tabstop>LcdOffOnly_2_3</tabstop>
1303 <tabstop>brightness_ac_3</tabstop> 1303 <tabstop>brightness_ac_3</tabstop>
1304 <tabstop>auto_brightness_ac_3</tabstop> 1304 <tabstop>auto_brightness_ac_3</tabstop>
1305 <tabstop>CalibrateLightSensorAC</tabstop> 1305 <tabstop>CalibrateLightSensorAC</tabstop>
1306 <tabstop>lowSpinBox</tabstop> 1306 <tabstop>lowSpinBox</tabstop>
1307 <tabstop>warnintervalBox</tabstop> 1307 <tabstop>warnintervalBox</tabstop>
1308 <tabstop>criticalSpinBox</tabstop> 1308 <tabstop>criticalSpinBox</tabstop>
1309</tabstops> 1309</tabstops>
1310</UI> 1310</UI>
diff --git a/core/settings/light-and-power/sensor.cpp b/core/settings/light-and-power/sensor.cpp
index ddd71d6..c1df04d 100644
--- a/core/settings/light-and-power/sensor.cpp
+++ b/core/settings/light-and-power/sensor.cpp
@@ -1,85 +1,85 @@
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#include <qframe.h> 28#include <qframe.h>
29#include <qlayout.h> 29#include <qlayout.h>
30#include <qslider.h> 30#include <qslider.h>
31#include <qspinbox.h> 31#include <qspinbox.h>
32 32
33#include "calibration.h" 33#include "calibration.h"
34#include "sensor.h" 34#include "sensor.h"
35 35
36Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name ) 36Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
37 : SensorBase ( parent, name, true, WStyle_ContextHelp ), m_params ( params ) 37 : SensorBase ( parent, name, true, WStyle_ContextHelp ), m_params ( params )
38{ 38{
39 int steps = 5; 39 int steps = 12;
40 int inter = 5; 40 int inter = 2;
41 41
42 int smin = 0; 42 int smin = 40;
43 int smax = 255; 43 int smax = 215;
44 int lmin = 0; 44 int lmin = 1;
45 int lmax = 255; 45 int lmax = 255;
46 46
47 switch ( params. count ( )) { 47 switch ( params. count ( )) {
48 case 6: lmax = params [5]. toInt ( ); 48 case 6: lmax = params [5]. toInt ( );
49 case 5: lmin = params [4]. toInt ( ); 49 case 5: lmin = params [4]. toInt ( );
50 case 4: smax = params [3]. toInt ( ); 50 case 4: smax = params [3]. toInt ( );
51 case 3: smin = params [2]. toInt ( ); 51 case 3: smin = params [2]. toInt ( );
52 case 2: steps = params [1]. toInt ( ); 52 case 2: steps = params [1]. toInt ( );
53 case 1: inter = params [0]. toInt ( ); 53 case 1: inter = params [0]. toInt ( ) / 1000;
54 } 54 }
55 55
56 QVBoxLayout *lay = new QVBoxLayout ( frame ); 56 QVBoxLayout *lay = new QVBoxLayout ( frame );
57 lay-> setMargin ( 2 ); 57 lay-> setMargin ( 2 );
58 m_calib = new Calibration ( frame ); 58 m_calib = new Calibration ( frame );
59 lay-> add ( m_calib ); 59 lay-> add ( m_calib );
60 60
61 m_calib-> setScale ( QSize ( 256, 256 )); 61 m_calib-> setScale ( QSize ( 256, 256 ));
62 m_calib-> setLineSteps ( steps ); 62 m_calib-> setLineSteps ( steps );
63 m_calib-> setInterval ( inter ); 63 m_calib-> setInterval ( inter );
64 m_calib-> setStartPoint ( QPoint ( smin, lmin )); 64 m_calib-> setStartPoint ( QPoint ( smin, lmax ));
65 m_calib-> setEndPoint ( QPoint ( smax, lmax )); 65 m_calib-> setEndPoint ( QPoint ( smax, lmin ));
66 66
67 interval-> setValue ( inter ); 67 interval-> setValue ( inter );
68 linesteps-> setValue ( steps ); 68 linesteps-> setValue ( steps );
69 69
70 connect ( interval, SIGNAL( valueChanged ( int )), m_calib, SLOT( setInterval ( int ))); 70 connect ( interval, SIGNAL( valueChanged ( int )), m_calib, SLOT( setInterval ( int )));
71 connect ( linesteps, SIGNAL( valueChanged ( int )), m_calib, SLOT( setLineSteps ( int ))); 71 connect ( linesteps, SIGNAL( valueChanged ( int )), m_calib, SLOT( setLineSteps ( int )));
72} 72}
73 73
74void Sensor::accept ( ) 74void Sensor::accept ( )
75{ 75{
76 m_params. clear ( ); 76 m_params. clear ( );
77 m_params << QString::number ( m_calib-> interval ( )) 77 m_params << QString::number ( m_calib-> interval ( ) * 1000 )
78 << QString::number ( m_calib-> lineSteps ( )) 78 << QString::number ( m_calib-> lineSteps ( ))
79 << QString::number ( m_calib-> startPoint ( ). x ( )) 79 << QString::number ( m_calib-> startPoint ( ). x ( ))
80 << QString::number ( m_calib-> endPoint ( ). x ( )) 80 << QString::number ( m_calib-> endPoint ( ). x ( ))
81 << QString::number ( m_calib-> startPoint ( ). y ( )) 81 << QString::number ( m_calib-> endPoint ( ). y ( ))
82 << QString::number ( m_calib-> endPoint ( ). y ( )); 82 << QString::number ( m_calib-> startPoint ( ). y ( ));
83 83
84 QDialog::accept ( ); 84 QDialog::accept ( );
85} 85}
diff --git a/core/settings/light-and-power/sensorbase.ui b/core/settings/light-and-power/sensorbase.ui
index 98fce88..64b9a27 100644
--- a/core/settings/light-and-power/sensorbase.ui
+++ b/core/settings/light-and-power/sensorbase.ui
@@ -1,110 +1,110 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>SensorBase</class> 2<class>SensorBase</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>SensorBase</cstring> 7 <cstring>SensorBase</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>293</width> 14 <width>289</width>
15 <height>443</height> 15 <height>443</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>Sensor Calibration</string> 20 <string>Sensor Calibration</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>3</number> 31 <number>3</number>
32 </property> 32 </property>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>3</number> 35 <number>3</number>
36 </property> 36 </property>
37 <widget> 37 <widget>
38 <class>QLayoutWidget</class> 38 <class>QLayoutWidget</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>Layout21</cstring> 41 <cstring>Layout21</cstring>
42 </property> 42 </property>
43 <property> 43 <property>
44 <name>layoutSpacing</name> 44 <name>layoutSpacing</name>
45 </property> 45 </property>
46 <grid> 46 <grid>
47 <property stdset="1"> 47 <property stdset="1">
48 <name>margin</name> 48 <name>margin</name>
49 <number>0</number> 49 <number>0</number>
50 </property> 50 </property>
51 <property stdset="1"> 51 <property stdset="1">
52 <name>spacing</name> 52 <name>spacing</name>
53 <number>2</number> 53 <number>2</number>
54 </property> 54 </property>
55 <widget row="0" column="0" > 55 <widget row="0" column="0" >
56 <class>QLayoutWidget</class> 56 <class>QLayoutWidget</class>
57 <property stdset="1"> 57 <property stdset="1">
58 <name>name</name> 58 <name>name</name>
59 <cstring>Layout20</cstring> 59 <cstring>Layout20</cstring>
60 </property> 60 </property>
61 <property> 61 <property>
62 <name>layoutSpacing</name> 62 <name>layoutSpacing</name>
63 </property> 63 </property>
64 <vbox> 64 <vbox>
65 <property stdset="1"> 65 <property stdset="1">
66 <name>margin</name> 66 <name>margin</name>
67 <number>0</number> 67 <number>0</number>
68 </property> 68 </property>
69 <property stdset="1"> 69 <property stdset="1">
70 <name>spacing</name> 70 <name>spacing</name>
71 <number>3</number> 71 <number>3</number>
72 </property> 72 </property>
73 <widget> 73 <widget>
74 <class>QLabel</class> 74 <class>QLabel</class>
75 <property stdset="1"> 75 <property stdset="1">
76 <name>name</name> 76 <name>name</name>
77 <cstring>PixmapLabel1</cstring> 77 <cstring>PixmapLabel1</cstring>
78 </property> 78 </property>
79 <property stdset="1"> 79 <property stdset="1">
80 <name>pixmap</name> 80 <name>pixmap</name>
81 <pixmap>image0</pixmap> 81 <pixmap>image0</pixmap>
82 </property> 82 </property>
83 <property stdset="1"> 83 <property stdset="1">
84 <name>scaledContents</name> 84 <name>scaledContents</name>
85 <bool>false</bool> 85 <bool>false</bool>
86 </property> 86 </property>
87 </widget> 87 </widget>
88 <widget> 88 <widget>
89 <class>QLabel</class> 89 <class>QLabel</class>
90 <property stdset="1"> 90 <property stdset="1">
91 <name>name</name> 91 <name>name</name>
92 <cstring>TextLabel5</cstring> 92 <cstring>TextLabel5</cstring>
93 </property> 93 </property>
94 <property stdset="1"> 94 <property stdset="1">
95 <name>text</name> 95 <name>text</name>
96 <string>Full</string> 96 <string>Full</string>
97 </property> 97 </property>
98 </widget> 98 </widget>
99 <spacer> 99 <spacer>
100 <property> 100 <property>
101 <name>name</name> 101 <name>name</name>
102 <cstring>Spacer2</cstring> 102 <cstring>Spacer2</cstring>
103 </property> 103 </property>
104 <property stdset="1"> 104 <property stdset="1">
105 <name>orientation</name> 105 <name>orientation</name>
106 <enum>Vertical</enum> 106 <enum>Vertical</enum>
107 </property> 107 </property>
108 <property stdset="1"> 108 <property stdset="1">
109 <name>sizeType</name> 109 <name>sizeType</name>
110 <enum>Expanding</enum> 110 <enum>Expanding</enum>
@@ -687,184 +687,188 @@
687 <red>0</red> 687 <red>0</red>
688 <green>0</green> 688 <green>0</green>
689 <blue>0</blue> 689 <blue>0</blue>
690 </color> 690 </color>
691 <color> 691 <color>
692 <red>255</red> 692 <red>255</red>
693 <green>255</green> 693 <green>255</green>
694 <blue>255</blue> 694 <blue>255</blue>
695 </color> 695 </color>
696 <color> 696 <color>
697 <red>0</red> 697 <red>0</red>
698 <green>0</green> 698 <green>0</green>
699 <blue>0</blue> 699 <blue>0</blue>
700 </color> 700 </color>
701 <color> 701 <color>
702 <red>255</red> 702 <red>255</red>
703 <green>255</green> 703 <green>255</green>
704 <blue>255</blue> 704 <blue>255</blue>
705 </color> 705 </color>
706 <color> 706 <color>
707 <red>255</red> 707 <red>255</red>
708 <green>255</green> 708 <green>255</green>
709 <blue>255</blue> 709 <blue>255</blue>
710 </color> 710 </color>
711 <color> 711 <color>
712 <red>0</red> 712 <red>0</red>
713 <green>0</green> 713 <green>0</green>
714 <blue>0</blue> 714 <blue>0</blue>
715 </color> 715 </color>
716 <color> 716 <color>
717 <red>10</red> 717 <red>10</red>
718 <green>95</green> 718 <green>95</green>
719 <blue>137</blue> 719 <blue>137</blue>
720 </color> 720 </color>
721 <color> 721 <color>
722 <red>255</red> 722 <red>255</red>
723 <green>255</green> 723 <green>255</green>
724 <blue>255</blue> 724 <blue>255</blue>
725 </color> 725 </color>
726 </inactive> 726 </inactive>
727 </palette> 727 </palette>
728 </property> 728 </property>
729 <property stdset="1"> 729 <property stdset="1">
730 <name>frameShape</name> 730 <name>frameShape</name>
731 <enum>Box</enum> 731 <enum>Box</enum>
732 </property> 732 </property>
733 <property stdset="1"> 733 <property stdset="1">
734 <name>frameShadow</name> 734 <name>frameShadow</name>
735 <enum>Plain</enum> 735 <enum>Plain</enum>
736 </property> 736 </property>
737 </widget> 737 </widget>
738 </hbox> 738 </hbox>
739 </widget> 739 </widget>
740 </grid> 740 </grid>
741 </widget> 741 </widget>
742 <widget> 742 <widget>
743 <class>QLayoutWidget</class> 743 <class>QLayoutWidget</class>
744 <property stdset="1"> 744 <property stdset="1">
745 <name>name</name> 745 <name>name</name>
746 <cstring>Layout22</cstring> 746 <cstring>Layout22</cstring>
747 </property> 747 </property>
748 <property> 748 <property>
749 <name>layoutSpacing</name> 749 <name>layoutSpacing</name>
750 </property> 750 </property>
751 <hbox> 751 <hbox>
752 <property stdset="1"> 752 <property stdset="1">
753 <name>margin</name> 753 <name>margin</name>
754 <number>0</number> 754 <number>0</number>
755 </property> 755 </property>
756 <property stdset="1"> 756 <property stdset="1">
757 <name>spacing</name> 757 <name>spacing</name>
758 <number>3</number> 758 <number>3</number>
759 </property> 759 </property>
760 <widget> 760 <widget>
761 <class>QLabel</class> 761 <class>QLabel</class>
762 <property stdset="1"> 762 <property stdset="1">
763 <name>name</name> 763 <name>name</name>
764 <cstring>TextLabel4</cstring> 764 <cstring>TextLabel4</cstring>
765 </property> 765 </property>
766 <property stdset="1"> 766 <property stdset="1">
767 <name>text</name> 767 <name>text</name>
768 <string>Steps</string> 768 <string>Steps</string>
769 </property> 769 </property>
770 </widget> 770 </widget>
771 <widget> 771 <widget>
772 <class>QSlider</class> 772 <class>QSlider</class>
773 <property stdset="1"> 773 <property stdset="1">
774 <name>name</name> 774 <name>name</name>
775 <cstring>linesteps</cstring> 775 <cstring>linesteps</cstring>
776 </property> 776 </property>
777 <property stdset="1"> 777 <property stdset="1">
778 <name>minValue</name> 778 <name>minValue</name>
779 <number>2</number> 779 <number>2</number>
780 </property> 780 </property>
781 <property stdset="1"> 781 <property stdset="1">
782 <name>maxValue</name> 782 <name>maxValue</name>
783 <number>127</number> 783 <number>63</number>
784 </property> 784 </property>
785 <property stdset="1"> 785 <property stdset="1">
786 <name>lineStep</name> 786 <name>lineStep</name>
787 <number>10</number> 787 <number>5</number>
788 </property>
789 <property stdset="1">
790 <name>pageStep</name>
791 <number>5</number>
788 </property> 792 </property>
789 <property stdset="1"> 793 <property stdset="1">
790 <name>orientation</name> 794 <name>orientation</name>
791 <enum>Horizontal</enum> 795 <enum>Horizontal</enum>
792 </property> 796 </property>
793 <property stdset="1"> 797 <property stdset="1">
794 <name>tickmarks</name> 798 <name>tickmarks</name>
795 <enum>Right</enum> 799 <enum>Right</enum>
796 </property> 800 </property>
797 </widget> 801 </widget>
798 </hbox> 802 </hbox>
799 </widget> 803 </widget>
800 <widget> 804 <widget>
801 <class>QLayoutWidget</class> 805 <class>QLayoutWidget</class>
802 <property stdset="1"> 806 <property stdset="1">
803 <name>name</name> 807 <name>name</name>
804 <cstring>Layout28</cstring> 808 <cstring>Layout28</cstring>
805 </property> 809 </property>
806 <property> 810 <property>
807 <name>layoutSpacing</name> 811 <name>layoutSpacing</name>
808 </property> 812 </property>
809 <hbox> 813 <hbox>
810 <property stdset="1"> 814 <property stdset="1">
811 <name>margin</name> 815 <name>margin</name>
812 <number>0</number> 816 <number>0</number>
813 </property> 817 </property>
814 <property stdset="1"> 818 <property stdset="1">
815 <name>spacing</name> 819 <name>spacing</name>
816 <number>3</number> 820 <number>3</number>
817 </property> 821 </property>
818 <widget> 822 <widget>
819 <class>QLabel</class> 823 <class>QLabel</class>
820 <property stdset="1"> 824 <property stdset="1">
821 <name>name</name> 825 <name>name</name>
822 <cstring>TextLabel6</cstring> 826 <cstring>TextLabel6</cstring>
823 </property> 827 </property>
824 <property stdset="1"> 828 <property stdset="1">
825 <name>text</name> 829 <name>text</name>
826 <string>Check interval</string> 830 <string>Check interval</string>
827 </property> 831 </property>
828 </widget> 832 </widget>
829 <widget> 833 <widget>
830 <class>QSpinBox</class> 834 <class>QSpinBox</class>
831 <property stdset="1"> 835 <property stdset="1">
832 <name>name</name> 836 <name>name</name>
833 <cstring>interval</cstring> 837 <cstring>interval</cstring>
834 </property> 838 </property>
835 <property stdset="1"> 839 <property stdset="1">
836 <name>suffix</name> 840 <name>suffix</name>
837 <string> sec</string> 841 <string> sec</string>
838 </property> 842 </property>
839 <property stdset="1"> 843 <property stdset="1">
840 <name>buttonSymbols</name> 844 <name>buttonSymbols</name>
841 <enum>PlusMinus</enum> 845 <enum>PlusMinus</enum>
842 </property> 846 </property>
843 <property stdset="1"> 847 <property stdset="1">
844 <name>maxValue</name> 848 <name>maxValue</name>
845 <number>10</number> 849 <number>10</number>
846 </property> 850 </property>
847 <property stdset="1"> 851 <property stdset="1">
848 <name>minValue</name> 852 <name>minValue</name>
849 <number>1</number> 853 <number>1</number>
850 </property> 854 </property>
851 <property stdset="1"> 855 <property stdset="1">
852 <name>lineStep</name> 856 <name>lineStep</name>
853 <number>1</number> 857 <number>1</number>
854 </property> 858 </property>
855 </widget> 859 </widget>
856 </hbox> 860 </hbox>
857 </widget> 861 </widget>
858 </vbox> 862 </vbox>
859</widget> 863</widget>
860<images> 864<images>
861 <image> 865 <image>
862 <name>image0</name> 866 <name>image0</name>
863 <data format="XPM.GZ" length="439">789c6d8ec10ac2300c86ef7b8ad0ff36a4730777111f41f1288887b4b3e8610a3a0f22bebb6dd3d54d0ca5cdffe54f9aaaa4dd764d6555dc7beecf96ec896f54b68fae7bee0fab57a1ea86fc5950ad6685d2646973bd1c43ce3ec73c46903648e79a5624443a27d20cd2b9382704747e124382f11a7c5e30b364b957b331866331b3800c38f70282121c7c628367c098c1e0eb03121ccd4b46fcb0f80b26bb4833987f76b6d6f274de5fe6a1a031d30969f55e161fe4715f7b</data> 867 <data format="XPM.GZ" length="439">789c6d8ec10ac2300c86ef7b8ad0ff36a4730777111f41f1288887b4b3e8610a3a0f22bebb6dd3d54d0ca5cdffe54f9aaaa4dd764d6555dc7beecf96ec896f54b68fae7bee0fab57a1ea86fc5950ad6685d2646973bd1c43ce3ec73c46903648e79a5624443a27d20cd2b9382704747e124382f11a7c5e30b364b957b331866331b3800c38f70282121c7c628367c098c1e0eb03121ccd4b46fcb0f80b26bb4833987f76b6d6f274de5fe6a1a031d30969f55e161fe4715f7b</data>
864 </image> 868 </image>
865 <image> 869 <image>
866 <name>image1</name> 870 <name>image1</name>
867 <data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b324b364b06719340dcb434b36488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c004336518f</data> 871 <data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b324b364b06719340dcb434b36488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c004336518f</data>
868 </image> 872 </image>
869</images> 873</images>
870</UI> 874</UI>