summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp64
-rw-r--r--core/settings/light-and-power/light.h1
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui300
3 files changed, 236 insertions, 129 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 6115178..d6d09a1 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -17,5 +17,5 @@
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
..}^=.=       =       ; Public License for more details.
-++=   -.     .`     .:
+++=   -.     .`     .:
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
@@ -35,4 +35,5 @@
#endif
+#include <qlabel.h>
#include <qcheckbox.h>
#include <qtabwidget.h>
@@ -55,4 +56,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
m_cres = ODevice::inst ( )-> displayContrastResolution ( );
+ // check whether to show the light sensor stuff
+
if ( !ODevice::inst ( )-> hasLightSensor ( )) {
auto_brightness-> hide ( );
@@ -61,4 +64,7 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
CalibrateLightSensor_ac-> hide ( );
}
+
+ // check whether to show the contrast stuff
+
if (m_cres) {
GroupLight->setTitle(tr("Backlight && Contrast"));
@@ -69,4 +75,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
}
+ // check whether to show the cpu frequency stuff
+
QStrList freq = ODevice::inst()->allowedCpuFrequencies();
if ( freq.count() ) {
@@ -74,8 +82,19 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
frequency_ac->insertStrList( freq );
} else {
+ frequencyLabel->hide();
frequency->hide();
+ frequencyLabel_ac->hide();
frequency_ac->hide();
}
+ // check whether to show the hinge action stuff
+
+ if ( !ODevice::inst()->hasHingeSensor() ) {
+ closeHingeLabel->hide();
+ closeHingeAction->hide();
+ closeHingeLabel_ac->hide();
+ closeHingeAction_ac->hide();
+ }
+
Config config ( "apm" );
config. setGroup ( "Battery" );
@@ -92,5 +111,8 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
frequency->setCurrentItem( config.readNumEntry("Freq", 0) );
- int bright = config. readNumEntry ( "Brightness", 127 );
+ // hinge action
+ closeHingeAction->setCurrentItem( config.readNumEntry("CloseHingeAction", 0) );
+
+ int bright = config. readNumEntry ( "Brightness", 127 );
int contr = m_oldcontrast = config. readNumEntry ( "Contrast", 127 );
brightness-> setTickInterval ( QMAX( 16, 256 / m_bres ));
@@ -111,5 +133,5 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
config. setGroup ( "AC" );
-
+
// ac spinboxes
interval_dim_ac-> setValue ( config. readNumEntry ( "Dim", 60 ));
@@ -123,4 +145,7 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
frequency_ac->setCurrentItem( config.readNumEntry("Freq", 0) );
+ // hinge action
+ closeHingeAction_ac->setCurrentItem( config.readNumEntry("CloseHingeAction", 0) );
+
bright = config. readNumEntry ( "Brightness", 255 );
brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres ));
@@ -140,6 +165,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
auto_brightness_ac-> setChecked ( config. readBoolEntry ( "LightSensor", false ));
m_sensordata_ac = config. readListEntry ( "LightSensorData", ';' );
-
- // advanced settings
+
+ // warnings
config. setGroup ( "Warnings" );
warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 );
@@ -151,10 +176,10 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) {
- tabs-> setCurrentPage ( 0 );
+ tabs-> setCurrentPage ( 0 );
}
else {
tabs-> setCurrentPage ( 1 );
}
-
+
connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
@@ -163,8 +188,11 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int )));
}
- connect( frequency, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) );
+ connect( frequency, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) );
+ connect( frequency_ac, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) );
+ connect( closeHingeAction, SIGNAL( activated(int) ), this, SLOT( setCloseHingeAction(int) ) );
+ connect( closeHingeAction_ac, SIGNAL( activated(int) ), this, SLOT( setCloseHingeAction(int) ) );
}
-LightSettings::~LightSettings ( )
+LightSettings::~LightSettings ( )
{
}
@@ -192,9 +220,9 @@ void LightSettings::setBacklight ( int bright )
QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
e << bright;
-
+
if ( bright != -1 ) {
m_resettimer-> stop ( );
m_resettimer-> start ( 4000, true );
- }
+ }
}
@@ -202,5 +230,4 @@ void LightSettings::setContrast ( int contr )
{
if (contr == -1) contr = m_oldcontrast;
-
ODevice::inst ( )-> setDisplayContrast(contr);
}
@@ -208,5 +235,5 @@ void LightSettings::setContrast ( int contr )
void LightSettings::setFrequency ( int index )
{
-qWarning("LightSettings::setFrequency(%d)", index);
+ qWarning("LightSettings::setFrequency(%d)", index);
ODevice::inst ( )-> setCurrentCpuFrequency(index);
}
@@ -218,4 +245,9 @@ void LightSettings::resetBacklight ( )
}
+void LightSettings::setCloseHingeAction ( int index )
+{
+ qWarning("LightSettings::setCloseHingeStatus(%d)", index);
+}
+
void LightSettings::accept ( )
{
@@ -232,4 +264,5 @@ void LightSettings::accept ( )
config. writeEntry ( "Contrast", contrast-> value () );
config. writeEntry ( "Freq", frequency->currentItem() );
+ config. writeEntry ( "CloseHingeAction", closeHingeAction->currentItem() );
// ac
@@ -243,6 +276,7 @@ void LightSettings::accept ( )
config. writeEntry ( "Contrast", contrast_ac-> value () );
config. writeEntry ( "Freq", frequency_ac->currentItem() );
+ config. writeEntry ( "CloseHingeAction", closeHingeAction_ac->currentItem() );
- // only make light sensor stuff appear if the unit has a sensor
+ // only make light sensor stuff appear if the unit has a sensor
if ( ODevice::inst ( )-> hasLightSensor ( )) {
config. setGroup ( "Battery" );
@@ -276,5 +310,5 @@ void LightSettings::done ( int r )
m_resettimer-> stop ( );
resetBacklight ( );
-
+
LightSettingsBase::done ( r );
close ( );
diff --git a/core/settings/light-and-power/light.h b/core/settings/light-and-power/light.h
index 83d5520..2167817 100644
--- a/core/settings/light-and-power/light.h
+++ b/core/settings/light-and-power/light.h
@@ -55,4 +55,5 @@ protected slots:
void setContrast ( int );
void setFrequency ( int );
+ void setCloseHingeAction ( int );
void resetBacklight ( );
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui
index e4d5f0e..2af0331 100644
--- a/core/settings/light-and-power/lightsettingsbase.ui
+++ b/core/settings/light-and-power/lightsettingsbase.ui
@@ -12,5 +12,5 @@
<x>0</x>
<y>0</y>
- <width>343</width>
+ <width>331</width>
<height>532</height>
</rect>
@@ -106,40 +106,63 @@
<number>3</number>
</property>
- <widget row="1" column="1" >
- <class>QSpinBox</class>
+ <widget row="0" column="0" rowspan="1" colspan="2" >
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>interval_lightoff</cstring>
+ <cstring>TL1</cstring>
</property>
<property stdset="1">
- <name>suffix</name>
- <string> sec</string>
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
<property stdset="1">
- <name>specialValueText</name>
- <string>never</string>
+ <name>text</name>
+ <string>Dim light after</string>
</property>
+ </widget>
+ <widget row="2" column="0" rowspan="1" colspan="2" >
+ <class>QLabel</class>
<property stdset="1">
- <name>buttonSymbols</name>
- <enum>PlusMinus</enum>
+ <name>name</name>
+ <cstring>TL3</cstring>
</property>
<property stdset="1">
- <name>maxValue</name>
- <number>3600</number>
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
<property stdset="1">
- <name>minValue</name>
- <number>0</number>
+ <name>text</name>
+ <string>Suspend after</string>
</property>
+ </widget>
+ <widget row="4" column="0" rowspan="1" colspan="3" >
+ <class>QCheckBox</class>
<property stdset="1">
- <name>lineStep</name>
- <number>10</number>
+ <name>name</name>
+ <cstring>LcdOffOnly</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Deactivate LCD only (does not suspend)</string>
</property>
</widget>
- <widget row="0" column="0" >
+ <widget row="3" column="0" rowspan="1" colspan="2" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TL1</cstring>
+ <cstring>frequencyLabel</cstring>
</property>
<property stdset="1">
@@ -152,8 +175,19 @@
<property stdset="1">
<name>text</name>
- <string>Dim light after</string>
+ <string>CPU Frequency</string>
</property>
</widget>
- <widget row="0" column="1" >
+ <widget row="5" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>closeHingeLabel</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>On closing the hinge</string>
+ </property>
+ </widget>
+ <widget row="0" column="2" >
<class>QSpinBox</class>
<property stdset="1">
@@ -186,77 +220,36 @@
</property>
</widget>
- <widget row="4" column="0" rowspan="1" colspan="2" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>LcdOffOnly</cstring>
- </property>
- <property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- </sizepolicy>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Deactivate LCD only (does not suspend)</string>
- </property>
- </widget>
- <widget row="2" column="0" >
- <class>QLabel</class>
+ <widget row="1" column="2" >
+ <class>QSpinBox</class>
<property stdset="1">
<name>name</name>
- <cstring>TL3</cstring>
- </property>
- <property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>1</vsizetype>
- </sizepolicy>
+ <cstring>interval_lightoff</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Suspend after</string>
- </property>
- </widget>
- <widget row="1" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TL2</cstring>
+ <name>suffix</name>
+ <string> sec</string>
</property>
<property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>1</vsizetype>
- </sizepolicy>
+ <name>specialValueText</name>
+ <string>never</string>
</property>
<property stdset="1">
- <name>text</name>
- <string>Light off after</string>
+ <name>buttonSymbols</name>
+ <enum>PlusMinus</enum>
</property>
- </widget>
- <widget row="3" column="0" >
- <class>QLabel</class>
<property stdset="1">
- <name>name</name>
- <cstring>TL3_2</cstring>
+ <name>maxValue</name>
+ <number>3600</number>
</property>
<property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>1</vsizetype>
- </sizepolicy>
+ <name>minValue</name>
+ <number>0</number>
</property>
<property stdset="1">
- <name>text</name>
- <string>CPU Frequency</string>
+ <name>lineStep</name>
+ <number>10</number>
</property>
</widget>
- <widget row="2" column="1" >
+ <widget row="2" column="2" >
<class>QSpinBox</class>
<property stdset="1">
@@ -289,5 +282,5 @@
</property>
</widget>
- <widget row="3" column="1" >
+ <widget row="3" column="2" >
<class>QComboBox</class>
<property stdset="1">
@@ -296,4 +289,47 @@
</property>
</widget>
+ <widget row="5" column="1" rowspan="1" colspan="2" >
+ <class>QComboBox</class>
+ <item>
+ <property>
+ <name>text</name>
+ <string>ignore</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>display off</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>suspend</string>
+ </property>
+ </item>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>closeHingeAction</cstring>
+ </property>
+ </widget>
+ <widget row="1" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TL2</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Light off after</string>
+ </property>
+ </widget>
</grid>
</widget>
@@ -553,9 +589,9 @@
<property stdset="1">
<name>margin</name>
- <number>-1</number>
+ <number>5</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>-1</number>
+ <number>3</number>
</property>
<widget>
@@ -619,22 +655,4 @@
</property>
</widget>
- <widget row="0" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1_3_2</cstring>
- </property>
- <property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>1</vsizetype>
- </sizepolicy>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Dim light after</string>
- </property>
- </widget>
<widget row="2" column="1" >
<class>QSpinBox</class>
@@ -699,4 +717,29 @@
</property>
</widget>
+ <widget row="3" column="1" >
+ <class>QComboBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>frequency_ac</cstring>
+ </property>
+ </widget>
+ <widget row="3" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>frequencyLabel_ac</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>CPU Frequency</string>
+ </property>
+ </widget>
<widget row="1" column="0" >
<class>QLabel</class>
@@ -717,9 +760,9 @@
</property>
</widget>
- <widget row="2" column="0" >
+ <widget row="0" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_2_2_3</cstring>
+ <cstring>TextLabel1_3_2</cstring>
</property>
<property stdset="1">
@@ -732,15 +775,26 @@
<property stdset="1">
<name>text</name>
- <string>Suspend after</string>
+ <string>Dim light after</string>
</property>
</widget>
- <widget row="3" column="1" >
- <class>QComboBox</class>
+ <widget row="2" column="0" >
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>frequency_ac</cstring>
+ <cstring>TextLabel1_2_2_3</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Suspend after</string>
</property>
</widget>
- <widget row="4" column="0" >
+ <widget row="4" column="0" rowspan="1" colspan="2" >
<class>QCheckBox</class>
<property stdset="1">
@@ -760,20 +814,38 @@
</property>
</widget>
- <widget row="3" column="0" >
- <class>QLabel</class>
+ <widget row="5" column="1" >
+ <class>QComboBox</class>
+ <item>
+ <property>
+ <name>text</name>
+ <string>ignore</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>display off</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>suspend</string>
+ </property>
+ </item>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_2_2_3_2</cstring>
+ <cstring>closeHingeAction_ac</cstring>
</property>
+ </widget>
+ <widget row="5" column="0" >
+ <class>QLabel</class>
<property stdset="1">
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>1</vsizetype>
- </sizepolicy>
+ <name>name</name>
+ <cstring>closeHingeLabel_ac</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>CPU frequency</string>
+ <string>On closing the hinge</string>
</property>
</widget>