summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light-and-power.pro4
-rw-r--r--core/settings/light-and-power/light.cpp5
-rw-r--r--core/settings/light-and-power/light.h2
-rw-r--r--core/settings/light-and-power/main.cpp2
-rw-r--r--core/settings/light-and-power/sensor.cpp31
-rw-r--r--core/settings/light-and-power/sensor.h2
6 files changed, 24 insertions, 22 deletions
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 928976a..bc8ba4b 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,11 +1,11 @@
1 CONFIG += qt warn_on release quick-app 1 CONFIG += qt warn_on debug quick-app
2 HEADERS = light.h sensor.h calibration.h 2 HEADERS = light.h sensor.h calibration.h
3 SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp 3 SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp
4 INTERFACES= lightsettingsbase.ui sensorbase.ui 4 INTERFACES= lightsettingsbase.ui sensorbase.ui
5INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
6 DEPENDPATH+= ../$(OPIEDIR)/include 6 DEPENDPATH+= ../$(OPIEDIR)/include
7LIBS += -lqpe -lopie 7LIBS += -lqpe -lopiecore2
8 8
9 TARGET = light-and-power 9 TARGET = light-and-power
10 10
11include ( $(OPIEDIR)/include.pro ) 11include ( $(OPIEDIR)/include.pro )
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index ce45836..09fb767 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -18,43 +18,44 @@
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 "light.h" 29#include "light.h"
30#include "sensor.h"
31
32#include <opie2/odevice.h>
30 33
31#include <qpe/config.h> 34#include <qpe/config.h>
32#include <qpe/power.h> 35#include <qpe/power.h>
33#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 36#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
34#include <qpe/qcopenvelope_qws.h> 37#include <qpe/qcopenvelope_qws.h>
35#endif 38#endif
36 39
37#include <qlabel.h> 40#include <qlabel.h>
38#include <qcheckbox.h> 41#include <qcheckbox.h>
39#include <qtabwidget.h> 42#include <qtabwidget.h>
40#include <qslider.h> 43#include <qslider.h>
41#include <qspinbox.h> 44#include <qspinbox.h>
42#include <qpushbutton.h> 45#include <qpushbutton.h>
43#include <qgroupbox.h> 46#include <qgroupbox.h>
44#include <qcombobox.h> 47#include <qcombobox.h>
45 48
46#include <opie/odevice.h>
47 49
48#include "sensor.h"
49 50
50using namespace Opie; 51using namespace Opie;
51 52
52LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) 53LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
53 : LightSettingsBase( parent, name, false, WStyle_ContextHelp ) 54 : LightSettingsBase( parent, name, false, WStyle_ContextHelp )
54{ 55{
55 m_bres = ODevice::inst ( )-> displayBrightnessResolution ( ); 56 m_bres = ODevice::inst ( )-> displayBrightnessResolution ( );
56 m_cres = ODevice::inst ( )-> displayContrastResolution ( ); 57 m_cres = ODevice::inst ( )-> displayContrastResolution ( );
57 58
58 // check whether to show the light sensor stuff 59 // check whether to show the light sensor stuff
59 60
60 if ( !ODevice::inst ( )-> hasLightSensor ( )) { 61 if ( !ODevice::inst ( )-> hasLightSensor ( )) {
diff --git a/core/settings/light-and-power/light.h b/core/settings/light-and-power/light.h
index 2167817..9077a09 100644
--- a/core/settings/light-and-power/light.h
+++ b/core/settings/light-and-power/light.h
@@ -19,28 +19,28 @@
19++=   -.     .`     .: 19++=   -.     .`     .:
20 :     =  ...= . :.=- You should have received a copy of the GNU 20 :     =  ...= . :.=- You should have received a copy of the GNU
21 -.   .:....=;==+<; General Public License along with this file; 21 -.   .:....=;==+<; General Public License along with this file;
22  -_. . .   )=.  = see the file COPYING. If not, write to the 22  -_. . .   )=.  = see the file COPYING. If not, write to the
23    --        :-=` Free Software Foundation, Inc., 23    --        :-=` Free Software Foundation, Inc.,
24 59 Temple Place - Suite 330, 24 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28#ifndef __LIGHT_H__ 28#ifndef __LIGHT_H__
29#define __LIGHT_H__ 29#define __LIGHT_H__
30 30
31#include "lightsettingsbase.h"
31 32
32#include <qstringlist.h> 33#include <qstringlist.h>
33#include <qlistbox.h> 34#include <qlistbox.h>
34#include "lightsettingsbase.h"
35 35
36class QTimer; 36class QTimer;
37 37
38class LightSettings : public LightSettingsBase 38class LightSettings : public LightSettingsBase
39{ 39{
40 Q_OBJECT 40 Q_OBJECT
41 41
42public: 42public:
43 LightSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 43 LightSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
44 ~LightSettings(); 44 ~LightSettings();
45 static QString appName() { return QString::fromLatin1("light-and-power"); } 45 static QString appName() { return QString::fromLatin1("light-and-power"); }
46 46
diff --git a/core/settings/light-and-power/main.cpp b/core/settings/light-and-power/main.cpp
index cb43ce0..7a47b0b 100644
--- a/core/settings/light-and-power/main.cpp
+++ b/core/settings/light-and-power/main.cpp
@@ -11,16 +11,16 @@
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "light.h" 21#include "light.h"
22 22
23#include <opie/oapplicationfactory.h> 23#include <opie2/oapplicationfactory.h>
24 24
25 25
26OPIE_EXPORT_APP( OApplicationFactory<LightSettings> ) 26OPIE_EXPORT_APP( OApplicationFactory<LightSettings> )
diff --git a/core/settings/light-and-power/sensor.cpp b/core/settings/light-and-power/sensor.cpp
index 013e655..53c3aed 100644
--- a/core/settings/light-and-power/sensor.cpp
+++ b/core/settings/light-and-power/sensor.cpp
@@ -7,87 +7,88 @@
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
29#include "calibration.h"
30#include "sensor.h"
31
32#include <opie2/odevice.h>
33
28#include <qlayout.h> 34#include <qlayout.h>
29#include <qslider.h> 35#include <qslider.h>
30#include <qspinbox.h> 36#include <qspinbox.h>
31 37
32#include <opie/odevice.h>
33
34using namespace Opie; 38using namespace Opie;
35 39
36#include "calibration.h"
37#include "sensor.h"
38
39Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name ) 40Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
40 : SensorBase ( parent, name, true, WStyle_ContextHelp ), m_params ( params ) 41 : SensorBase ( parent, name, true, WStyle_ContextHelp ), m_params ( params )
41{ 42{
42 int steps = 12; 43 int steps = 12;
43 int inter = 2; 44 int inter = 2;
44 45
45 int smin = 40; 46 int smin = 40;
46 int smax = 215; 47 int smax = 215;
47 int lmin = 1; 48 int lmin = 1;
48 int lmax = 255; 49 int lmax = 255;
49 50
50 switch ( params. count ( )) { 51 switch ( params. count ( )) {
51 case 6: lmax = params [5]. toInt ( ); 52 case 6: lmax = params [5]. toInt ( );
52 case 5: lmin = params [4]. toInt ( ); 53 case 5: lmin = params [4]. toInt ( );
53 case 4: smax = params [3]. toInt ( ); 54 case 4: smax = params [3]. toInt ( );
54 case 3: smin = params [2]. toInt ( ); 55 case 3: smin = params [2]. toInt ( );
55 case 2: steps = params [1]. toInt ( ); 56 case 2: steps = params [1]. toInt ( );
56 case 1: inter = params [0]. toInt ( ) / 1000; 57 case 1: inter = params [0]. toInt ( ) / 1000;
57 } 58 }
58 59
59 int xscale = ODevice::inst ( )-> lightSensorResolution ( ); 60 int xscale = ODevice::inst ( )-> lightSensorResolution ( );
60 int yscale = ODevice::inst ( )-> displayBrightnessResolution ( ); 61 int yscale = ODevice::inst ( )-> displayBrightnessResolution ( );
61 62
62 QVBoxLayout *lay = new QVBoxLayout ( frame ); 63 QVBoxLayout *lay = new QVBoxLayout ( frame );
63 lay-> setMargin ( 2 ); 64 lay-> setMargin ( 2 );
64 m_calib = new Calibration ( frame ); 65 m_calib = new Calibration ( frame );
65 lay-> add ( m_calib ); 66 lay-> add ( m_calib );
66 67
67 m_calib-> setScale ( QSize ( xscale, yscale )); 68 m_calib-> setScale ( QSize ( xscale, yscale ));
68 m_calib-> setLineSteps ( steps ); 69 m_calib-> setLineSteps ( steps );
69 m_calib-> setInterval ( inter ); 70 m_calib-> setInterval ( inter );
70 m_calib-> setStartPoint ( QPoint ( smin * xscale / 256, lmax * yscale / 256 )); 71 m_calib-> setStartPoint ( QPoint ( smin * xscale / 256, lmax * yscale / 256 ));
71 m_calib-> setEndPoint ( QPoint ( smax * xscale / 256, lmin * yscale / 256 )); 72 m_calib-> setEndPoint ( QPoint ( smax * xscale / 256, lmin * yscale / 256 ));
72 73
73 interval-> setValue ( inter ); 74 interval-> setValue ( inter );
74 linesteps-> setValue ( steps ); 75 linesteps-> setValue ( steps );
75 76
76 connect ( interval, SIGNAL( valueChanged(int)), m_calib, SLOT( setInterval(int))); 77 connect ( interval, SIGNAL( valueChanged(int)), m_calib, SLOT( setInterval(int)));
77 connect ( linesteps, SIGNAL( valueChanged(int)), m_calib, SLOT( setLineSteps(int))); 78 connect ( linesteps, SIGNAL( valueChanged(int)), m_calib, SLOT( setLineSteps(int)));
78 79
79 connect ( m_calib, SIGNAL( startPointChanged(const QPoint&)), this, SLOT( pointDrag(const QPoint&))); 80 connect ( m_calib, SIGNAL( startPointChanged(const QPoint&)), this, SLOT( pointDrag(const QPoint&)));
80 connect ( m_calib, SIGNAL( endPointChanged(const QPoint&)), this, SLOT( pointDrag(const QPoint&))); 81 connect ( m_calib, SIGNAL( endPointChanged(const QPoint&)), this, SLOT( pointDrag(const QPoint&)));
81} 82}
82 83
83void Sensor::accept ( ) 84void Sensor::accept ( )
84{ 85{
85 int xscale = ODevice::inst ( )-> lightSensorResolution ( ); 86 int xscale = ODevice::inst ( )-> lightSensorResolution ( );
86 int yscale = ODevice::inst ( )-> displayBrightnessResolution ( ); 87 int yscale = ODevice::inst ( )-> displayBrightnessResolution ( );
87 88
88 m_params. clear ( ); 89 m_params. clear ( );
89 m_params << QString::number ( m_calib-> interval ( ) * 1000 ) 90 m_params << QString::number ( m_calib-> interval ( ) * 1000 )
90 << QString::number ( m_calib-> lineSteps ( )) 91 << QString::number ( m_calib-> lineSteps ( ))
91 << QString::number ( m_calib-> startPoint ( ). x ( ) * 256 / xscale ) 92 << QString::number ( m_calib-> startPoint ( ). x ( ) * 256 / xscale )
92 << QString::number ( m_calib-> endPoint ( ). x ( ) * 256 / xscale ) 93 << QString::number ( m_calib-> endPoint ( ). x ( ) * 256 / xscale )
93 << QString::number ( m_calib-> endPoint ( ). y ( ) * 256 / yscale ) 94 << QString::number ( m_calib-> endPoint ( ). y ( ) * 256 / yscale )
diff --git a/core/settings/light-and-power/sensor.h b/core/settings/light-and-power/sensor.h
index b484519..092ac6c 100644
--- a/core/settings/light-and-power/sensor.h
+++ b/core/settings/light-and-power/sensor.h
@@ -43,13 +43,13 @@ public:
43 43
44signals: 44signals:
45 void viewBacklight ( int ); 45 void viewBacklight ( int );
46 46
47private slots: 47private slots:
48 void pointDrag ( const QPoint & ); 48 void pointDrag ( const QPoint & );
49 49
50private: 50private:
51 QStringList &m_params; 51 QStringList &m_params;
52 Calibration *m_calib; 52 Calibration *m_calib;
53}; 53};
54 54
55#endif \ No newline at end of file 55#endif