summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/settings/light-and-power/light-and-power.pro2
-rw-r--r--core/settings/light-and-power/light.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 9d2452c..43395bf 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -1,26 +1,26 @@
TEMPLATE = app
CONFIG += qt warn_on release
DESTDIR = $(OPIEDIR)/bin
HEADERS = settings.h
SOURCES = light.cpp main.cpp
INTERFACES = lightsettingsbase.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopie
TARGET = light-and-power
TRANSLATIONS = ../../../i18n/de/light-and-power.ts \
../../../i18n/en/light-and-power.ts \
../../../i18n/es/light-and-power.ts \
../../../i18n/fr/light-and-power.ts \
../../../i18n/hu/light-and-power.ts \
../../../i18n/ja/light-and-power.ts \
../../../i18n/ko/light-and-power.ts \
../../../i18n/no/light-and-power.ts \
../../../i18n/pl/light-and-power.ts \
../../../i18n/pt/light-and-power.ts \
../../../i18n/pt_BR/light-and-power.ts \
../../../i18n/sl/light-and-power.ts \
../../../i18n/zh_CN/light-and-power.ts \
../../../i18n/zh_TW/light-and-power.ts \
../../../i18n/it/light-and-power.ts
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index e959603..fbea905 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -24,73 +24,74 @@
#include <qpe/config.h>
#include <qpe/applnk.h>
#include <qpe/qpeapplication.h>
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
#include <qpe/qcopenvelope_qws.h>
#endif
#include <qlabel.h>
#include <qcheckbox.h>
#include <qradiobutton.h>
#include <qtabwidget.h>
#include <qslider.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qdatastream.h>
#include <qmessagebox.h>
#include <qcombobox.h>
#include <qspinbox.h>
#include <qlistbox.h>
#include <qdir.h>
#if QT_VERSION >= 300
#include <qstylefactory.h>
#endif
-extern int qpe_sysBrightnessSteps();
+#include <opie/odevice.h>
+
LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
: LightSettingsBase( parent, name, TRUE, fl )
{
// Not supported
auto_brightness->hide();
Config config( "qpe" );
config.setGroup( "Screensaver" );
int interval;
interval = config.readNumEntry( "Interval_Dim", 20 );
interval_dim->setValue( interval );
interval = config.readNumEntry( "Interval_LightOff", 30 );
interval_lightoff->setValue( interval );
interval = config.readNumEntry( "Interval", 60 );
if ( interval > 3600 ) interval /= 1000; // compatibility (was millisecs)
interval_suspend->setValue( interval );
screensaver_dim->setChecked( config.readNumEntry("Dim",1) != 0 );
screensaver_lightoff->setChecked( config.readNumEntry("LightOff",1) != 0 );
LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );
- int maxbright = qpe_sysBrightnessSteps();
+ int maxbright = ODevice::inst ( )-> displayBrightnessResolution ( );
initbright = config.readNumEntry("Brightness",255);
brightness->setMaxValue( maxbright );
brightness->setTickInterval( QMAX(1,maxbright/16) );
brightness->setLineStep( QMAX(1,maxbright/16) );
brightness->setPageStep( QMAX(1,maxbright/16) );
brightness->setValue( (maxbright*255 - initbright*maxbright)/255 );
connect(brightness, SIGNAL(valueChanged(int)), this, SLOT(applyBrightness()));
}
LightSettings::~LightSettings()
{
}
static void set_fl(int bright)
{
QCopEnvelope e("QPE/System", "setBacklight(int)" );
e << bright;
}
void LightSettings::reject()
{
set_fl(initbright);