author | sandman <sandman> | 2002-10-28 23:46:23 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-28 23:46:23 (UTC) |
commit | 4251429b30aaf4175c74f714ee01d59368c950f4 (patch) (unidiff) | |
tree | 717fb8fd8f17780c86b4bca84acd490f3191d0bf /core/settings/light-and-power | |
parent | a775c3be38fc7fbd5d120e7e3c1dd3a80a250293 (diff) | |
download | opie-4251429b30aaf4175c74f714ee01d59368c950f4.zip opie-4251429b30aaf4175c74f714ee01d59368c950f4.tar.gz opie-4251429b30aaf4175c74f714ee01d59368c950f4.tar.bz2 |
- some minor UI fixes
- parameters for sensor light range were reversed
- added reasonable calibration default values (at least on my 3870)
- l&p now automatically shows the 'right' (Batt/AC) tab when started
Diffstat (limited to 'core/settings/light-and-power') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/light-and-power/calibration.cpp | 19 | ||||
-rw-r--r-- | core/settings/light-and-power/light.cpp | 24 | ||||
-rw-r--r-- | core/settings/light-and-power/lightsettingsbase.ui | 8 | ||||
-rw-r--r-- | core/settings/light-and-power/sensor.cpp | 22 | ||||
-rw-r--r-- | core/settings/light-and-power/sensorbase.ui | 10 |
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 | |||
@@ -91,32 +91,32 @@ int Calibration::interval ( ) const | |||
91 | { | 91 | { |
92 | return m_interval; | 92 | return m_interval; |
93 | } | 93 | } |
94 | 94 | ||
95 | void Calibration::setStartPoint ( const QPoint &p ) | 95 | void 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 | ||
102 | QPoint Calibration::startPoint ( ) const | 102 | QPoint 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 | ||
107 | void Calibration::setEndPoint ( const QPoint &p ) | 107 | void 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 | ||
114 | QPoint Calibration::endPoint ( ) const | 114 | QPoint 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 | ||
119 | void Calibration::checkPoints ( ) | 119 | void 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 ( ); |
@@ -201,18 +201,18 @@ void Calibration::mouseMoveEvent ( QMouseEvent *e ) | |||
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 ); |
@@ -250,14 +250,13 @@ void Calibration::paintEvent ( QPaintEvent * ) | |||
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 ); |
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 | |||
@@ -25,40 +25,24 @@ | |||
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 | ||
64 | using namespace Opie; | 48 | using namespace Opie; |
@@ -121,16 +105,20 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
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 | ||
133 | LightSettings::~LightSettings ( ) | 121 | LightSettings::~LightSettings ( ) |
134 | { | 122 | { |
135 | } | 123 | } |
136 | 124 | ||
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 | |||
@@ -8,13 +8,13 @@ | |||
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> |
@@ -46,13 +46,13 @@ | |||
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> |
@@ -960,13 +960,13 @@ | |||
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> |
@@ -1292,13 +1292,13 @@ | |||
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> |
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 | |||
@@ -33,53 +33,53 @@ | |||
33 | #include "calibration.h" | 33 | #include "calibration.h" |
34 | #include "sensor.h" | 34 | #include "sensor.h" |
35 | 35 | ||
36 | Sensor::Sensor ( QStringList ¶ms, QWidget *parent, const char *name ) | 36 | Sensor::Sensor ( QStringList ¶ms, 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 | ||
74 | void Sensor::accept ( ) | 74 | void 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 | |||
@@ -8,13 +8,13 @@ | |||
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> |
@@ -777,17 +777,21 @@ | |||
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"> |