summaryrefslogtreecommitdiff
authorharlekin <harlekin>2004-06-04 16:08:25 (UTC)
committer harlekin <harlekin>2004-06-04 16:08:25 (UTC)
commite3982ce0959fe630709aeba25f4c6d93df150ff5 (patch) (side-by-side diff)
tree8ed3dce7a96645d25a00f1819f6aa0e37bc0abc2
parent9f12abfa6b60232592aa15feea25bee28908f525 (diff)
downloadopie-e3982ce0959fe630709aeba25f4c6d93df150ff5.zip
opie-e3982ce0959fe630709aeba25f4c6d93df150ff5.tar.gz
opie-e3982ce0959fe630709aeba25f4c6d93df150ff5.tar.bz2
default focus back on the brightness sliders, closes bug 1340
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp3
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui17
2 files changed, 17 insertions, 3 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 424a64c..1c61787 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -121,12 +121,13 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
int contr = m_oldcontrast = config. readNumEntry ( "Contrast", 127 );
brightness-> setTickInterval ( QMAX( 16, 256 / m_bres ));
brightness-> setLineStep ( QMAX( 1, 256 / m_bres ));
brightness-> setPageStep ( QMAX( 1, 256 / m_bres ));
brightness-> setValue ( bright );
+//
if (m_cres) {
contrast-> setTickInterval ( QMAX( 16, 256 / m_cres ));
contrast-> setLineStep ( QMAX( 1, 256 / m_cres ));
contrast-> setPageStep ( QMAX( 1, 256 / m_cres ));
contrast-> setValue ( contr );
}
@@ -177,15 +178,17 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
m_resettimer = new QTimer ( this );
connect ( m_resettimer, SIGNAL( timeout()), this, SLOT( resetBacklight()));
if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) {
tabs-> setCurrentPage ( 0 );
+ brightness->setFocus();
}
else {
tabs-> setCurrentPage ( 1 );
+ brightness_ac->setFocus();
}
connect ( brightness, SIGNAL( valueChanged(int)), this, SLOT( setBacklight(int)));
connect ( brightness_ac, SIGNAL( valueChanged(int)), this, SLOT( setBacklight(int)));
if (m_cres) {
connect ( contrast, SIGNAL( valueChanged(int)), this, SLOT( setContrast(int)));
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui
index 2af0331..1f1ff17 100644
--- a/core/settings/light-and-power/lightsettingsbase.ui
+++ b/core/settings/light-and-power/lightsettingsbase.ui
@@ -8,13 +8,13 @@
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>331</width>
+ <width>327</width>
<height>532</height>
</rect>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
@@ -1357,25 +1357,36 @@
</connection>
<slot access="public">calibrateSensor()</slot>
<slot access="public">calibrateSensorAC()</slot>
</connections>
<tabstops>
<tabstop>brightness</tabstop>
+ <tabstop>brightness_ac</tabstop>
+ <tabstop>tabs</tabstop>
+ <tabstop>LcdOffOnly</tabstop>
+ <tabstop>closeHingeAction</tabstop>
<tabstop>interval_dim</tabstop>
<tabstop>interval_lightoff</tabstop>
<tabstop>interval_suspend</tabstop>
- <tabstop>LcdOffOnly</tabstop>
<tabstop>auto_brightness</tabstop>
<tabstop>CalibrateLightSensor</tabstop>
<tabstop>brightness</tabstop>
- <tabstop>tabs</tabstop>
<tabstop>interval_lightoff</tabstop>
<tabstop>interval_suspend</tabstop>
<tabstop>interval_dim</tabstop>
<tabstop>LcdOffOnly_ac</tabstop>
<tabstop>auto_brightness</tabstop>
<tabstop>CalibrateLightSensor_ac</tabstop>
<tabstop>lowSpinBox</tabstop>
<tabstop>warnintervalBox</tabstop>
<tabstop>criticalSpinBox</tabstop>
+ <tabstop>frequency</tabstop>
+ <tabstop>contrast</tabstop>
+ <tabstop>interval_lightoff_ac</tabstop>
+ <tabstop>interval_suspend_ac</tabstop>
+ <tabstop>interval_dim_ac</tabstop>
+ <tabstop>frequency_ac</tabstop>
+ <tabstop>closeHingeAction_ac</tabstop>
+ <tabstop>contrast_ac</tabstop>
+ <tabstop>auto_brightness_ac</tabstop>
</tabstops>
</UI>