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
@@ -96,3 +96,3 @@ 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 ( );
@@ -103,3 +103,3 @@ 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}
@@ -108,3 +108,3 @@ 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 ( );
@@ -115,3 +115,3 @@ 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}
@@ -206,8 +206,8 @@ void Calibration::mouseMoveEvent ( QMouseEvent *e )
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 }
@@ -255,4 +255,3 @@ void Calibration::paintEvent ( QPaintEvent * )
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
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
@@ -30,6 +30,3 @@
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>
@@ -40,20 +37,7 @@
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
@@ -126,6 +110,10 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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}
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
@@ -13,3 +13,3 @@
13 <y>0</y> 13 <y>0</y>
14 <width>387</width> 14 <width>379</width>
15 <height>532</height> 15 <height>532</height>
@@ -51,3 +51,3 @@
51 <name>name</name> 51 <name>name</name>
52 <cstring>TabWidget3</cstring> 52 <cstring>tabs</cstring>
53 </property> 53 </property>
@@ -965,3 +965,3 @@
965 <name>title</name> 965 <name>title</name>
966 <string>Advanced Settings</string> 966 <string>Warnings</string>
967 </attribute> 967 </attribute>
@@ -1297,3 +1297,3 @@
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>
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
@@ -38,8 +38,8 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
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;
@@ -52,3 +52,3 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
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 }
@@ -63,4 +63,4 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
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
@@ -76,3 +76,3 @@ void Sensor::accept ( )
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 ( ))
@@ -80,4 +80,4 @@ void Sensor::accept ( )
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
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
@@ -13,3 +13,3 @@
13 <y>0</y> 13 <y>0</y>
14 <width>293</width> 14 <width>289</width>
15 <height>443</height> 15 <height>443</height>
@@ -782,3 +782,3 @@
782 <name>maxValue</name> 782 <name>maxValue</name>
783 <number>127</number> 783 <number>63</number>
784 </property> 784 </property>
@@ -786,3 +786,7 @@
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>