default focus back on the brightness sliders, closes bug 1340

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
@@ -124,6 +124,7 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
     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 ));
@@ -180,9 +181,11 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
 
     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)));
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
@@ -11,7 +11,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>331</width>
+            <width>327</width>
             <height>532</height>
         </rect>
     </property>
@@ -1360,14 +1360,16 @@
 </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>
@@ -1377,5 +1379,14 @@
     <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>