summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp7
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui55
2 files changed, 58 insertions, 4 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 0193a7b..04d2249 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -22,249 +22,250 @@
#include "settings.h"
#include <qpe/global.h>
#include <qpe/fontmanager.h>
#include <qpe/config.h>
#include <qpe/applnk.h>
#include <qpe/qpeapplication.h>
#include <qpe/power.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 <qgroupbox.h>
#include <qspinbox.h>
#include <qlistbox.h>
#include <qdir.h>
#if QT_VERSION >= 300
#include <qstylefactory.h>
#endif
#include <opie/odevice.h>
using namespace Opie;
LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
: LightSettingsBase( parent, name, TRUE, fl )
{
if ( ODevice::inst()->model() == Model_iPAQ_H31xx ||
ODevice::inst()->model() == Model_iPAQ_H36xx ||
ODevice::inst()->model() == Model_iPAQ_H37xx ||
ODevice::inst()->model() == Model_iPAQ_H38xx ) {
// Not supported yet - hide until implemented
IpaqGroupBox->setEnabled( false );
IpaqGroupBoxAC->setEnabled( false );
LightSensorGroupBox->setEnabled( false );
} else {
// if ipaq no need to show the sensor box
IpaqGroupBox->hide();
IpaqGroupBoxAC->hide();
LightSensorGroupBox->hide();
}
Config config( "qpe" );
config.setGroup( "Screensaver" );
int interval;
// battery spinboxes
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 );
// ac spinboxes
interval = config.readNumEntry( "Interval_DimAC", 20 );
interval_dim_ac_3->setValue( interval );
interval = config.readNumEntry( "Interval_LightOffAC", 30 );
interval_lightoff_ac_3->setValue( interval );
interval = config.readNumEntry( "IntervalAC", 60 );
if ( interval > 3600 ) {
interval /= 1000; // compatibility (was millisecs)
}
interval_suspend_ac_3->setValue( interval );
// battery check and slider
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 = 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 );
// ac check and slider
screensaver_dim_ac_3->setChecked( config.readNumEntry("DimAC",1) != 0 );
screensaver_lightoff_ac_3->setChecked( config.readNumEntry("LightOffAC",1) != 0 );
LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnlyAC",0) != 0 );
+ noApmAC->setChecked( config.readNumEntry("NoApmAC",0) != 0 );
int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( );
initbright_ac = config.readNumEntry("BrightnessAC",255);
brightness_ac_3->setMaxValue( maxbright_ac );
brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) );
brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) );
brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) );
brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 );
// ipaq sensor
- config.setGroup( "Ipaq_light_sensor" );
+ config.setGroup( "Ipaqlightsensor" );
auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 );
auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 );
LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) );
LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) );
connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ;
LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) );
// advanced settings
Config conf("apm");
conf.setGroup( "warnings" );
warnintervalBox->setValue( conf.readNumEntry("checkinterval", 10000)/1000 );
lowSpinBox->setValue( conf.readNumEntry("powerverylow", 10 ) );
criticalSpinBox->setValue( conf.readNumEntry("powercritical", 5 ) );
connect( brightness, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightness() ) );
connect( brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) );
}
LightSettings::~LightSettings()
{
}
void LightSettings::slotSliderTicks( int steps ) {
LightMinValueSlider->setTickInterval( steps );
}
static void set_fl(int bright)
{
qDebug ( QString( "Brightness" ).arg( bright ) );
QCopEnvelope e("QPE/System", "setBacklight(int)" );
e << bright;
}
void LightSettings::reject()
{
set_fl(initbright);
QDialog::reject();
}
void LightSettings::accept()
{
if ( qApp->focusWidget() )
qApp->focusWidget()->clearFocus();
applyBrightness();
// bat
int i_dim = (screensaver_dim->isChecked() ? interval_dim->value() : 0);
int i_lightoff = (screensaver_lightoff->isChecked() ? interval_lightoff->value() : 0);
int i_suspend = interval_suspend->value();
QCopEnvelope e("QPE/System", "setScreenSaverIntervals(int,int,int)" );
e << i_dim << i_lightoff << i_suspend;
// ac
int i_dim_ac = (screensaver_dim_ac_3->isChecked() ? interval_dim_ac_3->value() : 0);
int i_lightoff_ac = (screensaver_lightoff_ac_3->isChecked() ? interval_lightoff_ac_3->value() : 0);
int i_suspend_ac = interval_suspend_ac_3->value();
QCopEnvelope e_ac("QPE/System", "setScreenSaverIntervalsAC(int,int,int)" );
e << i_dim_ac << i_lightoff_ac << i_suspend_ac;
Config config( "qpe" );
config.setGroup( "Screensaver" );
// bat
config.writeEntry( "Dim", (int)screensaver_dim->isChecked() );
config.writeEntry( "LightOff", (int)screensaver_lightoff->isChecked() );
config.writeEntry( "LcdOffOnly", (int)LcdOffOnly->isChecked() );
config.writeEntry( "Interval_Dim", interval_dim->value() );
config.writeEntry( "Interval_LightOff", interval_lightoff->value() );
config.writeEntry( "Interval", interval_suspend->value() );
config.writeEntry( "Brightness",
( brightness->value() ) * 255 / brightness->maxValue() );
// ac
config.writeEntry( "DimAC", (int)screensaver_dim_ac_3->isChecked() );
config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() );
config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() );
+ config.writeEntry( "NoAPmAC", (int)noApmAC->isChecked() );
config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() );
config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() );
config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() );
config.writeEntry( "BrightnessAC",
( brightness_ac_3->value()) * 255 / brightness_ac_3->maxValue() );
// only make ipaq light sensor entries in config file if on an ipaq
if ( ODevice::inst()->model() == Model_iPAQ_H31xx ||
ODevice::inst()->model() == Model_iPAQ_H36xx ||
ODevice::inst()->model() == Model_iPAQ_H37xx ||
ODevice::inst()->model() == Model_iPAQ_H38xx ) {
// ipaq sensor
- config.setGroup( "Ipaq_light_sensor" );
+ config.setGroup( "Ipaqlightsensor" );
config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() );
config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() );
config.writeEntry( "Steps", LightStepSpin->value() );
config.writeEntry( "MinValue", LightMinValueSlider->value() );
config.writeEntry( "Shift", LightShiftSpin->value() );
}
config.write();
// advanced
Config conf("apm");
conf.setGroup( "Warnings" );
conf.writeEntry( "check_interval", warnintervalBox->value()*1000 );
conf.writeEntry( "power_verylow", lowSpinBox->value() );
conf.writeEntry( "power_critical", criticalSpinBox->value() );
QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()");
conf.write();
-
QDialog::accept();
}
void LightSettings::applyBrightness()
{
if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) {
int bright = ( brightness->value() ) * 255 / brightness->maxValue();
set_fl(bright);
}
}
void LightSettings::applyBrightnessAC()
{
// if ac is attached, set directly that sliders setting, else the "on battery" sliders setting
if ( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ) {
int bright = ( brightness_ac_3->value() ) * 255 / brightness_ac_3->maxValue();
set_fl(bright);
}
}
void LightSettings::done(int r)
{
QDialog::done(r);
close ( );
}
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui
index be096ac..2d0457f 100644
--- a/core/settings/light-and-power/lightsettingsbase.ui
+++ b/core/settings/light-and-power/lightsettingsbase.ui
@@ -1,110 +1,110 @@
<!DOCTYPE UI><UI>
<class>LightSettingsBase</class>
<widget>
<class>QDialog</class>
<property stdset="1">
<name>name</name>
<cstring>LightSettingsBase</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>415</width>
+ <width>411</width>
<height>532</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Light and Power Settings</string>
</property>
<property stdset="1">
<name>sizeGripEnabled</name>
<bool>false</bool>
</property>
<property>
<name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>3</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>3</number>
</property>
<widget>
<class>QTabWidget</class>
<property stdset="1">
<name>name</name>
<cstring>TabWidget3</cstring>
</property>
<property>
<name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
</property>
<widget>
<class>QWidget</class>
<property stdset="1">
<name>name</name>
<cstring>tab</cstring>
</property>
<attribute>
<name>title</name>
<string>on Battery</string>
</attribute>
<vbox>
<property stdset="1">
<name>margin</name>
<number>3</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>3</number>
</property>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>GroupBox3</cstring>
</property>
<property stdset="1">
<name>enabled</name>
<bool>true</bool>
</property>
<property stdset="1">
<name>title</name>
<string>General Settings</string>
</property>
<property>
<name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>3</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>3</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout8</cstring>
</property>
<grid>
<property stdset="1">
<name>margin</name>
<number>0</number>
@@ -600,192 +600,203 @@
<name>maxValue</name>
<number>3600</number>
</property>
<property stdset="1">
<name>minValue</name>
<number>10</number>
</property>
<property stdset="1">
<name>lineStep</name>
<number>15</number>
</property>
</widget>
<widget row="1" column="1" >
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>interval_lightoff_ac_3</cstring>
</property>
<property stdset="1">
<name>suffix</name>
<string> seconds</string>
</property>
<property stdset="1">
<name>buttonSymbols</name>
<enum>PlusMinus</enum>
</property>
<property stdset="1">
<name>maxValue</name>
<number>3600</number>
</property>
<property stdset="1">
<name>minValue</name>
<number>10</number>
</property>
<property stdset="1">
<name>lineStep</name>
<number>15</number>
</property>
</widget>
<widget row="1" column="0" >
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>screensaver_lightoff_ac_3</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
<name>text</name>
<string>Light off after</string>
</property>
<property stdset="1">
<name>checked</name>
<bool>true</bool>
</property>
</widget>
<widget row="0" column="0" >
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>screensaver_dim_ac_3</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
<name>text</name>
<string>Dim light after</string>
</property>
<property stdset="1">
<name>checked</name>
<bool>true</bool>
</property>
</widget>
</grid>
</widget>
<widget>
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
<cstring>LcdOffOnly_2_3</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Deactivate LCD only (does not suspend)</string>
</property>
</widget>
+ <widget>
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>noApmAC</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>No power saving features</string>
+ </property>
+ </widget>
</vbox>
</widget>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>GroupBox8</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Backlight</string>
</property>
<property>
<name>layoutMargin</name>
</property>
<property>
<name>layoutSpacing</name>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>3</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>3</number>
</property>
<widget>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>brightness_ac_3</cstring>
</property>
<property stdset="1">
<name>minValue</name>
<number>0</number>
</property>
<property stdset="1">
<name>maxValue</name>
<number>255</number>
</property>
<property stdset="1">
<name>lineStep</name>
<number>16</number>
</property>
<property stdset="1">
<name>pageStep</name>
<number>16</number>
</property>
<property stdset="1">
<name>value</name>
<number>255</number>
</property>
<property stdset="1">
<name>tracking</name>
<bool>true</bool>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Right</enum>
</property>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout20</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>PixmapLabel2_2_3</cstring>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image2</pixmap>
</property>
<property stdset="1">
<name>scaledContents</name>
<bool>false</bool>
</property>
</widget>
@@ -1249,107 +1260,149 @@ warning at</string>
</hbox>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout8</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel11</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Shift</string>
</property>
</widget>
<widget>
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
<cstring>LightShiftSpin</cstring>
</property>
<property stdset="1">
<name>maxValue</name>
<number>126</number>
</property>
</widget>
</hbox>
</widget>
</vbox>
</widget>
<spacer>
<property>
<name>name</name>
<cstring>Spacer1</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</vbox>
</widget>
</widget>
</vbox>
</widget>
<images>
<image>
<name>image0</name>
<data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b324b364b06719340dcb434b36488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c004336518f</data>
</image>
<image>
<name>image1</name>
<data format="XPM.GZ" length="439">789c6d8ec10ac2300c86ef7b8ad0ff36a4730777111f41f1288887b4b3e8610a3a0f22bebb6dd3d54d0ca5cdffe54f9aaaa4dd764d6555dc7beecf96ec896f54b68fae7bee0fab57a1ea86fc5950ad6685d2646973bd1c43ce3ec73c46903648e79a5624443a27d20cd2b9382704747e124382f11a7c5e30b364b957b331866331b3800c38f70282121c7c628367c098c1e0eb03121ccd4b46fcb0f80b26bb4833987f76b6d6f274de5fe6a1a031d30969f55e161fe4715f7b</data>
</image>
<image>
<name>image2</name>
<data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b344b314b04719340dcb434b31488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c0041d3518e</data>
</image>
</images>
<connections>
<connection>
<sender>screensaver_dim</sender>
<signal>toggled(bool)</signal>
<receiver>interval_dim</receiver>
<slot>setEnabled(bool)</slot>
</connection>
<connection>
<sender>screensaver_lightoff</sender>
<signal>toggled(bool)</signal>
<receiver>interval_lightoff</receiver>
<slot>setEnabled(bool)</slot>
</connection>
+ <connection>
+ <sender>noApmAC</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>screensaver_dim_ac_3</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>noApmAC</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>interval_dim_ac_3</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>noApmAC</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>screensaver_lightoff_ac_3</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>noApmAC</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>interval_lightoff_ac_3</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>noApmAC</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>interval_suspend_ac_3</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>noApmAC</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>LcdOffOnly_2_3</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>noApmAC</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>TextLabel1_2_2_3</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
</connections>
<tabstops>
<tabstop>auto_brightness</tabstop>
<tabstop>screensaver_dim</tabstop>
<tabstop>interval_dim</tabstop>
<tabstop>screensaver_lightoff</tabstop>
<tabstop>interval_lightoff</tabstop>
<tabstop>interval_suspend</tabstop>
<tabstop>brightness</tabstop>
</tabstops>
</UI>