- Completly reworked the backlight "preview":

every slider/control that relates to backlight levels, is now switching the
lcd to this level for 2 seconds - after that the backlight switches back to
the standard level (or light sensor control)

- Many bugfixes and usability improvements in light sensor calibration

8 files changed, 164 insertions, 142 deletions

diff --git a/core/settings/light-and-power/calibration.cpp b/core/settings/light-and-power/calibration.cpp
index 6a3360f..aed2bc8 100644
--- a/core/settings/light-and-power/calibration.cpp
+++ b/core/settings/light-and-power/calibration.cpp
@@ -28,14 +28,17 @@
 #include "calibration.h"
 
 #include <qpainter.h>
 #include <qpalette.h>
+#include <qpixmap.h>
 
-#define BRD 2
+#define BRD 3
 
 Calibration::Calibration ( QWidget *parent, const char *name, WFlags fl )
-	: QWidget ( parent, name, fl )
+	: QWidget ( parent, name, fl | WRepaintNoErase )
 {
+	setBackgroundMode ( NoBackground );
+	
 	m_scale = QSize ( 256, 256 );
 	m_steps = 5;
 	m_dragged = -1;
 	m_interval = 5;
@@ -120,22 +123,30 @@ void Calibration::checkPoints ( )
 {
 	int dx = m_scale. width ( );
 	int dy = m_scale. height ( );
 
+	if ( m_p [1]. x ( ) < 0 )
+		m_p [1]. setX ( 0 );
 	if ( m_p [1]. x ( ) >= dx )
 		m_p [1]. setX ( dx - 1 );
+	if ( m_p [0]. x ( ) < 0 )
+		m_p [0]. setX ( 0 );
 	if ( m_p [0]. x ( ) > m_p [1]. x ( ))
 		m_p [0]. setX ( m_p [1]. x ( ));
 
+	if ( m_p [1]. y ( ) < 0 )
+		m_p [1]. setY ( 0 );
 	if ( m_p [1]. y ( ) >= dy )
 		m_p [1]. setY ( dy - 1 );
+	if ( m_p [0]. y ( ) < 0 )
+		m_p [0]. setY ( 0 );
 	if ( m_p [0]. y ( ) > m_p [1]. y ( ))
 		m_p [0]. setY ( m_p [1]. y ( ));
 }
 
 
-#define SCALEX(x)   (BRD+x*(width()- 2*BRD)/m_scale.width())
-#define SCALEY(y)   (BRD+y*(height()-2*BRD)/m_scale.height())
+#define SCALEX(x)   (BRD+(x)*(width()- 2*BRD)/m_scale.width())
+#define SCALEY(y)   (BRD+(y)*(height()-2*BRD)/m_scale.height())
 
 
 static QRect around ( int x, int y )
 {
@@ -154,10 +165,10 @@ void Calibration::mousePressEvent ( QMouseEvent *e )
 	for ( int i = 0; i < 2; i++ ) {
 		x [i] = SCALEX( m_p [i]. x ( ));
 		y [i] = SCALEY( m_p [i]. y ( ));
 
-		if (( QABS( e-> x ( ) - x [i] ) <= BRD ) &&
-		    ( QABS( e-> y ( ) - y [i] ) <= BRD )) {
+		if (( QABS( e-> x ( ) - x [i] ) <= 2 * BRD ) &&
+		    ( QABS( e-> y ( ) - y [i] ) <= 2 * BRD )) {
 			m_dragged = i;
 			break;
 		}
 	}
@@ -168,9 +179,9 @@ void Calibration::mousePressEvent ( QMouseEvent *e )
 		if ( olddragged >= 0 )
 			r |= around ( x [olddragged], y [olddragged] );	
 		if ( m_dragged >= 0 ) 
 			r |= around ( x [m_dragged], y [m_dragged] );	
-		repaint ( r );
+		repaint ( r, false );
 	}	
 }
 
 void Calibration::mouseMoveEvent ( QMouseEvent *e )
@@ -183,12 +194,20 @@ void Calibration::mouseMoveEvent ( QMouseEvent *e )
 	n [m_dragged]. setX (( e-> x ( ) - BRD ) * m_scale. width ( ) / ( width ( ) - 2 * BRD ));
 	n [m_dragged]. setY (( e-> y ( ) - BRD ) * m_scale. height ( ) / ( height ( ) - 2 * BRD ));	
 	n [1 - m_dragged] = m_p [1 - m_dragged];
 	
-	if (( n [0]. x ( ) > n [1]. x ( )) || ( n [m_dragged]. x ( ) < 0 ) || ( n [m_dragged]. x ( ) >= m_scale. width ( )))
-		n [m_dragged]. setX ( m_p [m_dragged]. x ( ));
-	if (( n [0]. y ( ) > n [1]. y ( )) || ( n [m_dragged]. y ( ) < 0 ) || ( n [m_dragged]. y ( ) >= m_scale. height ( )))
-		n [m_dragged]. setY ( m_p [m_dragged]. y ( ));
+	if ( n [m_dragged]. x ( ) < 0 ) 
+		n [m_dragged]. setX ( 0 );
+	if ( n [m_dragged]. x ( ) >= m_scale. width ( ))
+		n [m_dragged]. setX ( m_scale. width ( ) - 1 );
+	if ( n [0]. x ( ) > n [1]. x ( ))
+		n [m_dragged]. setX ( n [1 - m_dragged]. x ( ));
+	if ( n [m_dragged]. y ( ) < 0 ) 
+		n [m_dragged]. setY ( 0 );
+	if ( n [m_dragged]. y ( ) >= m_scale. height ( ))
+		n [m_dragged]. setY ( m_scale. height ( ) - 1 );
+	if ( n [0]. y ( ) > n [1]. y ( ))
+		n [m_dragged]. setY ( n [1 - m_dragged]. y ( ));
 		
 	QRect r;	
 	int ox [2], oy [2], nx [2], ny [2];	
 	
@@ -205,20 +224,24 @@ void Calibration::mouseMoveEvent ( QMouseEvent *e )
 			
 			if ( i == 0 ) {
 				r |= QRect ( 0, ny [0], nx [0] - 0 + 1, 1 );
 				r |= QRect ( 0, oy [0], ox [0] - 0 + 1, 1 );
+			
+				emit startPointChanged ( startPoint ( ));
 			}
 			else if ( i == 1 ) {
 				r |= QRect ( nx [1], ny [1], width ( ) - nx [1], 1 ); 
 				r |= QRect ( ox [1], oy [1], width ( ) - ox [1], 1 ); 
+
+				emit endPointChanged ( endPoint ( ));
 			}
 		}
 	}
 	if ( r. isValid ( )) {
 		r |= QRect ( nx [0], ny [0], nx [1] - nx [0] + 1, ny [1] - ny [0] + 1 );
 		r |= QRect ( ox [0], oy [0], ox [1] - ox [0] + 1, oy [1] - oy [0] + 1 );
 		
-		repaint ( r );
+		repaint ( r, false );
 	}
 }
 
 void Calibration::mouseReleaseEvent ( QMouseEvent *e )
@@ -232,46 +255,92 @@ void Calibration::mouseReleaseEvent ( QMouseEvent *e )
 	int x = SCALEX( m_p [m_dragged]. x ( ));
 	int y = SCALEY( m_p [m_dragged]. y ( ));
 	m_dragged = -1;
 	
-	repaint ( around ( x, y ));
+	repaint ( around ( x, y ), false );
 }
 
-void Calibration::paintEvent ( QPaintEvent * )
+void Calibration::paintEvent ( QPaintEvent *pe )
 {
-	QPainter p ( this );
-	QColorGroup g = colorGroup ( );
-
+	QPixmap pix ( size ( ));
+	QPainter p ( &pix, this );
+	QRect cr = pe-> rect ( );
+	
 	int x0 = SCALEX( m_p [0]. x ( ));
 	int y0 = SCALEY( m_p [0]. y ( ));
 	int x1 = SCALEX( m_p [1]. x ( ));
 	int y1 = SCALEY( m_p [1]. y ( ));
 			
 	int dx = x1 - x0;
 	int dy = y1 - y0;
 	
+	// restrict steps to real x and y resolution
+	int st = QMIN( QMIN( m_steps, ( dx + 1 )), ( dy + 1 ));
+	
+	QString stepstr = tr( "%1 Steps" ). arg ( st );
+	QRect tr = p. boundingRect ( BRD, BRD, width ( ) - 2*BRD, height() - 2*BRD, AlignTop | AlignRight, stepstr );
+	tr. setLeft ( tr. left ( ) - 20 );
+	if ( p. hasClipping ( ))
+		p. setClipRegion ( p. clipRegion ( ) | QRegion ( tr ));
+	
+	QColorGroup g = colorGroup ( );
+
+	p. fillRect ( cr, g. base ( ));
+	p. fillRect ( tr, g. base ( ));
+
 	int ex = x0, ey = y0;
 	
+	p. setPen ( g. mid ( ));
+	
+	int gx0 = SCALEX( 0 );
+	int gy0 = SCALEY( 0 );
+	int gx1 = SCALEX( m_scale. width ( ) - 1 );
+	int gy1 = SCALEY( m_scale. height ( ) - 1 );
+
+	int xdiv = QMIN( 4, m_scale. width ( ));
+	int ydiv = QMIN( 4, m_scale. height ( ));
+	
+	xdiv = ( gx1 - gx0 + 1 ) / xdiv;
+	ydiv = ( gy1 - gy0 + 1 ) / ydiv;
+	
+	for ( int i = gx0 + xdiv; i <= ( gx1 - xdiv ); i += xdiv )
+		p. drawLine ( i, gy0, i, gy1 );
+	
+	for ( int i = gy0 + ydiv; i <= ( gy1 - ydiv ); i += ydiv )
+		p. drawLine ( gx0, i, gx1, i );
+	
 	p. setPen ( g. highlight ( ));
 	
 	p. drawLine ( BRD, ey, ex, ey );
 	
-	for ( int i = 1; i < m_steps; i++ ) {
-		int fx = x0 + dx * i / m_steps;
-		int fy = y0 + dy * i / ( m_steps - 1 );
+	for ( int i = 1; i < st; i++ ) {
+		int fx = x0 + dx * i / st;
+		int fy = y0 + dy * i / ( st - 1 );
 		
 		p. drawLine ( ex, ey, fx, ey );
 		p. drawLine ( fx, ey, fx, fy );
 				
 		ex = fx;
 		ey = fy;
 	}	
+	if ( st == 1 ) {
+		p. drawLine ( ex, ey, ex, y1 );
+		ey = y1;
+	}
 	
 	p. drawLine ( ex, ey, width ( ) - 1 - BRD, ey );
 	
+	
 	p. fillRect ( around ( x0, y0 ), m_dragged == 0 ? g. highlightedText ( ) : g. text ( ));
+	p. drawRect ( around ( x0, y0 ));
 	p. fillRect ( around ( x1, y1 ), m_dragged == 1 ? g. highlightedText ( ) : g. text ( ));
+	p. drawRect ( around ( x1, y1 ));
 	
 	p. setPen ( g. text ( ));
-	p. drawText ( QRect ( BRD, BRD, width ( ) - 2*BRD, height() - 2*BRD ), AlignTop | AlignRight, tr( "%1 Steps" ). arg ( m_steps ));
+	p. drawText ( tr, AlignTop | AlignRight, stepstr );
+	
+	p. end ( );
+	bitBlt ( this, cr. topLeft ( ), &pix, cr ); 
+	if ( !cr. contains ( tr ))
+		bitBlt ( this, tr. topLeft ( ), &pix, tr ); 		
 }
 
diff --git a/core/settings/light-and-power/calibration.h b/core/settings/light-and-power/calibration.h
index 2bff69a..ffa63b2 100644
--- a/core/settings/light-and-power/calibration.h
+++ b/core/settings/light-and-power/calibration.h
@@ -42,8 +42,12 @@ public:
 	int interval ( ) const;
 	QPoint startPoint ( ) const;
 	QPoint endPoint ( ) const;	
 
+signals:
+	void startPointChanged ( const QPoint & );
+	void endPointChanged ( const QPoint & );
+
 public slots:
 	void setScale ( const QSize &s );
 	void setLineSteps ( int step );
 	void setInterval ( int iv );
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index c89a26d..80c6631 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,8 +1,8 @@
 TEMPLATE	= app
-CONFIG		+= qt warn_on release
+CONFIG		+= qt warn_on debug
 DESTDIR		= $(OPIEDIR)/bin
-HEADERS		= settings.h sensor.h calibration.h
+HEADERS		= light.h sensor.h calibration.h
 SOURCES		= light.cpp main.cpp sensor.cpp calibration.cpp
 INTERFACES	= lightsettingsbase.ui sensorbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= ../$(OPIEDIR)/include
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index c0ba60b..21377b7 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -25,9 +25,9 @@
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include "settings.h"
+#include "light.h"
 
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/power.h>
@@ -37,8 +37,9 @@
 
 #include <qcheckbox.h>
 #include <qtabwidget.h>
 #include <qslider.h>
+#include <qtimer.h>
 #include <qspinbox.h>
 #include <qpushbutton.h>
 
 #include <opie/odevice.h>
@@ -47,9 +48,9 @@
 
 using namespace Opie;
 
 LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
-	: LightSettingsBase( parent, name, true, WStyle_ContextHelp )
+	: LightSettingsBase( parent, name, false, WStyle_ContextHelp )
 {
 	m_res = ODevice::inst ( )-> displayBrightnessResolution ( );
 
 	if ( !ODevice::inst ( )-> hasLightSensor ( )) {
@@ -62,16 +63,16 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
 	Config config ( "apm" );
 	config. setGroup ( "Battery" );
 
 	// battery spinboxes
-	interval_dim->      setValue ( config. readNumEntry ( "Dim", 20 ));
-	interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 30 ));
+	interval_dim->      setValue ( config. readNumEntry ( "Dim", 30 ));
+	interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 20 ));
 	interval_suspend->  setValue ( config. readNumEntry ( "Suspend", 60 ));
 
 	// battery check and slider
 	LcdOffOnly-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
 
-	int bright = config. readNumEntry ( "Brightness", 255 );
+	int bright = config. readNumEntry ( "Brightness", 127 );
 	brightness-> setMaxValue ( m_res - 1 );
 	brightness-> setTickInterval ( QMAX( 1, m_res / 16 ));
 	brightness-> setLineStep ( QMAX( 1, m_res / 16 ));
 	brightness-> setPageStep ( QMAX( 1, m_res / 16 ));
@@ -83,11 +84,11 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
 
 	config. setGroup ( "AC" );
 	
 	// ac spinboxes
-	interval_dim_ac_3->      setValue ( config. readNumEntry ( "Dim", 20 ));
-	interval_lightoff_ac_3-> setValue ( config. readNumEntry ( "LightOff", 30 ));
-	interval_suspend_ac_3->  setValue ( config. readNumEntry ( "Suspend", 60 ));
+	interval_dim_ac_3->      setValue ( config. readNumEntry ( "Dim", 60 ));
+	interval_lightoff_ac_3-> setValue ( config. readNumEntry ( "LightOff", 120 ));
+	interval_suspend_ac_3->  setValue ( config. readNumEntry ( "Suspend", 0 ));
 
 	// ac check and slider
 	LcdOffOnly_2_3-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
 
@@ -107,53 +108,61 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
 	warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 );
 	lowSpinBox->      setValue ( config. readNumEntry ( "powerverylow", 10 ) );
 	criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) );
 
+	m_resettimer = new QTimer ( this );
+	connect ( m_resettimer, SIGNAL( timeout ( )), this, SLOT( resetBacklight ( )));
+
 	if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) {
-		connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
 		tabs-> setCurrentPage ( 0 );		
 	}
 	else {
-		connect ( brightness_ac_3, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
 		tabs-> setCurrentPage ( 1 );
 	}
+	
+	connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
+	connect ( brightness_ac_3, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
 }
 
 LightSettings::~LightSettings ( ) 
 {
 }
 
-
 void LightSettings::calibrateSensor ( )
 {
 	Sensor *s = new Sensor ( m_sensordata, this );
+	connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int )));
 	s-> showMaximized ( );
 	s-> exec ( );
 	delete s;
 }
 
 void LightSettings::calibrateSensorAC ( )
 {
 	Sensor *s = new Sensor ( m_sensordata_ac, this );
+	connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int )));
 	s-> showMaximized ( );
 	s-> exec ( );
 	delete s;
 }
 
 void LightSettings::setBacklight ( int bright )
 {
-	bright = bright * 255 / ( m_res - 1 );
+	if ( bright >= 0 )
+		bright = bright * 255 / ( m_res - 1 );
+	
 	QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
 	e << bright;
+	
+	if ( bright != -1 ) {
+		m_resettimer-> stop ( );
+		m_resettimer-> start ( 2000, true );
+	}	
 }
 
-void LightSettings::reject ( )
+void LightSettings::resetBacklight ( )
 {
-	{
-		QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
-		e << -1;
-	}
-	QDialog::reject ( );
+	setBacklight ( -1 );
 }
 
 void LightSettings::accept ( )
 {
@@ -199,17 +208,15 @@ void LightSettings::accept ( )
 	{
 		QCopEnvelope e ( "QPE/System", "setScreenSaverInterval(int)" );
 		e << -1;
 	}
-	{
-		QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
-		e << -1;
-	}
-	
-	QDialog::accept ( );
+	LightSettingsBase::accept ( );
 }
 
 void LightSettings::done ( int r )
 {
-	QDialog::done ( r );
+	m_resettimer-> stop ( );
+	resetBacklight ( );
+	
+	LightSettingsBase::done ( r );
 	close ( );
 }
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui
index 04c6726..309b95d 100644
--- a/core/settings/light-and-power/lightsettingsbase.ui
+++ b/core/settings/light-and-power/lightsettingsbase.ui
@@ -10,9 +10,9 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>379</width>
+            <width>371</width>
             <height>532</height>
         </rect>
     </property>
     <property stdset="1">
@@ -1188,92 +1188,8 @@
     </image>
 </images>
 <connections>
     <connection>
-        <sender>auto_brightness</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>brightness</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness_ac_3</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>brightness_ac_3</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness_ac_3</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>TextLabel1_3_2</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>TextLabel1_3</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>interval_dim</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness_ac_3</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>interval_dim_ac_3</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>PixmapLabel2</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>TextLabel4</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>TextLabel5</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>PixmapLabel1</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness_ac_3</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>PixmapLabel2_2_3</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness_ac_3</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>TextLabel6</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness_ac_3</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>TextLabel7</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>auto_brightness_ac_3</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>PixmapLabel1_2_3</receiver>
-        <slot>setDisabled(bool)</slot>
-    </connection>
-    <connection>
         <sender>CalibrateLightSensor</sender>
         <signal>clicked()</signal>
         <receiver>LightSettingsBase</receiver>
         <slot>calibrateSensor()</slot>
diff --git a/core/settings/light-and-power/main.cpp b/core/settings/light-and-power/main.cpp
index 051fdec..ecacf69 100644
--- a/core/settings/light-and-power/main.cpp
+++ b/core/settings/light-and-power/main.cpp
@@ -17,9 +17,9 @@
 ** not clear to you.
 **
 **********************************************************************/
 
-#include "settings.h"
+#include "light.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
diff --git a/core/settings/light-and-power/sensor.cpp b/core/settings/light-and-power/sensor.cpp
index c1df04d..5ca54d4 100644
--- a/core/settings/light-and-power/sensor.cpp
+++ b/core/settings/light-and-power/sensor.cpp
@@ -29,8 +29,12 @@
 #include <qlayout.h>
 #include <qslider.h>
 #include <qspinbox.h>
 
+#include <opie/odevice.h>
+
+using namespace Opie;
+
 #include "calibration.h"
 #include "sensor.h"
 
 Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
@@ -51,35 +55,49 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
 		case 3: smin = params [2]. toInt ( );
 		case 2: steps = params [1]. toInt ( );
 		case 1: inter = params [0]. toInt ( ) / 1000;
 	}
+
+	int xscale = ODevice::inst ( )-> lightSensorResolution ( );
+	int yscale = ODevice::inst ( )-> displayBrightnessResolution ( );
 	
 	QVBoxLayout *lay = new QVBoxLayout ( frame );
 	lay-> setMargin ( 2 );
 	m_calib = new Calibration ( frame );
-	lay-> add ( m_calib );
+	lay-> add ( m_calib );	
 
-	m_calib-> setScale ( QSize ( 256, 256 ));
+	m_calib-> setScale ( QSize ( xscale, yscale ));
 	m_calib-> setLineSteps ( steps );
 	m_calib-> setInterval ( inter );
-	m_calib-> setStartPoint ( QPoint ( smin, lmax ));
-	m_calib-> setEndPoint ( QPoint ( smax, lmin ));
+	m_calib-> setStartPoint ( QPoint ( smin * xscale / 256, lmax * yscale / 256 ));
+	m_calib-> setEndPoint ( QPoint ( smax * xscale / 256, lmin * yscale / 256 ));
 	
 	interval-> setValue ( inter );
 	linesteps-> setValue ( steps );
 	
 	connect ( interval, SIGNAL( valueChanged ( int )), m_calib, SLOT( setInterval ( int )));
 	connect ( linesteps, SIGNAL( valueChanged ( int )), m_calib, SLOT( setLineSteps ( int )));
+	
+	connect ( m_calib, SIGNAL( startPointChanged ( const QPoint & )), this, SLOT( pointDrag ( const QPoint & )));
+	connect ( m_calib, SIGNAL( endPointChanged ( const QPoint & )), this, SLOT( pointDrag ( const QPoint & )));
 }                
 
 void Sensor::accept ( )
 {
+	int xscale = ODevice::inst ( )-> lightSensorResolution ( );
+	int yscale = ODevice::inst ( )-> displayBrightnessResolution ( );
+
 	m_params. clear ( );
 	m_params << QString::number ( m_calib-> interval ( ) * 1000 )
 	         << QString::number ( m_calib-> lineSteps ( ))
-	         << QString::number ( m_calib-> startPoint ( ). x ( ))
-	         << QString::number ( m_calib-> endPoint ( ). x ( ))
-	         << QString::number ( m_calib-> endPoint ( ). y ( ))
-	         << QString::number ( m_calib-> startPoint ( ). y ( ));
+	         << QString::number ( m_calib-> startPoint ( ). x ( ) * 256 / xscale )
+	         << QString::number ( m_calib-> endPoint ( ). x ( ) * 256 / xscale )
+	         << QString::number ( m_calib-> endPoint ( ). y ( ) * 256 / yscale )
+	         << QString::number ( m_calib-> startPoint ( ). y ( ) * 256 / yscale );
 
 	QDialog::accept ( );
 }
+
+void Sensor::pointDrag ( const QPoint &p )
+{
+	emit viewBacklight ( p. y ( ));
+}
diff --git a/core/settings/light-and-power/sensor.h b/core/settings/light-and-power/sensor.h
index 7a26d81..b484519 100644
--- a/core/settings/light-and-power/sensor.h
+++ b/core/settings/light-and-power/sensor.h
@@ -33,12 +33,20 @@
 class Calibration;
 class QStringList;
 
 class Sensor : public SensorBase {
+	Q_OBJECT
+
 public:
 	Sensor ( QStringList &params, QWidget *parent = 0, const char *name = 0 );
 	
 	virtual void accept ( );
+
+signals:
+	void viewBacklight ( int );
+
+private slots:
+	void pointDrag ( const QPoint & );
 	
 private:
 	QStringList &m_params;
 	Calibration *m_calib;