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
@@ -1,313 +1,316 @@
 /*
                              This file is part of the OPIE Project
                =.            Copyright (c)  2002 Maximilian Reiss <harlekin@handhelds.org>
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     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;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "light.h"
 #include "sensor.h"
 
 /* OPIE */
 #include <opie2/odevice.h>
 #include <opie2/odebug.h>
 
 #include <qpe/config.h>
 #include <qpe/power.h>
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 /* QT */
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qtabwidget.h>
 #include <qslider.h>
 #include <qspinbox.h>
 #include <qpushbutton.h>
 #include <qgroupbox.h>
 #include <qcombobox.h>
 
 
 
 using namespace Opie::Core;
 
 LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
     : LightSettingsBase( parent, name, false, WStyle_ContextHelp )
 {
     m_bres = ODevice::inst ( )-> displayBrightnessResolution ( );
     m_cres = ODevice::inst ( )-> displayContrastResolution ( );
 
     // check whether to show the light sensor stuff
 
     if ( !ODevice::inst ( )-> hasLightSensor ( )) {
         auto_brightness-> hide ( );
         CalibrateLightSensor-> hide ( );
         auto_brightness_ac-> hide ( );
         CalibrateLightSensor_ac-> hide ( );
     }
 
     // check whether to show the contrast stuff
 
     if (m_cres) {
         GroupLight->setTitle(tr("Backlight && Contrast"));
         GroupLight_ac->setTitle(GroupLight->title());
     } else {
         contrast->hide();
         contrast_ac->hide();
     }
 
     // check whether to show the cpu frequency stuff
 
     QStrList freq = ODevice::inst()->allowedCpuFrequencies();
     if ( freq.count() ) {
         frequency->insertStrList( freq );
         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" );
 
     // battery spinboxes
     interval_dim->      setValue ( config. readNumEntry ( "Dim", 20 ));
     interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 30 ));
     interval_suspend->  setValue ( config. readNumEntry ( "Suspend", 60 ));
 
     // battery check and slider
     LcdOffOnly->setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
 
     // CPU frequency
     frequency->setCurrentItem( config.readNumEntry("Freq", 0) );
 
     // 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 ));
     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 );
     }
 
     // light sensor
     auto_brightness-> setChecked ( config. readBoolEntry ( "LightSensor", false ));
     m_sensordata = config. readListEntry ( "LightSensorData", ';' );
 
     config. setGroup ( "AC" );
 
     // ac spinboxes
     interval_dim_ac->      setValue ( config. readNumEntry ( "Dim", 60 ));
     interval_lightoff_ac-> setValue ( config. readNumEntry ( "LightOff", 120 ));
     interval_suspend_ac->  setValue ( config. readNumEntry ( "Suspend", 0 ));
 
     // ac check and slider
     LcdOffOnly_ac-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
 
     // CPU frequency
     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 ));
     brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres ));
     brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres ));
     brightness_ac-> setValue ( bright );
 
     if (m_cres) {
         contr = config. readNumEntry ( "Contrast", 127);
         contrast_ac-> setTickInterval ( QMAX( 16, 256 / m_cres ));
         contrast_ac-> setLineStep ( QMAX( 1, 256 / m_cres ));
         contrast_ac-> setPageStep ( QMAX( 1, 256 / m_cres ));
         contrast_ac-> setValue ( contr );
     }
 
     // light sensor
     auto_brightness_ac-> setChecked ( config. readBoolEntry ( "LightSensor", false ));
     m_sensordata_ac = config. readListEntry ( "LightSensorData", ';' );
 
     // warnings
     config. setGroup ( "Warnings" );
     warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 );
     lowSpinBox->      setValue ( config. readNumEntry ( "powerverylow", 10 ) );
     criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) );
 
     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)));
         connect ( contrast_ac, SIGNAL( valueChanged(int)), this, SLOT( setContrast(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 ( )
 {
 }
 
 void LightSettings::calibrateSensor ( )
 {
     Sensor *s = new Sensor ( m_sensordata, this );
     connect ( s, SIGNAL( viewBacklight(int)), this, SLOT( setBacklight(int)));
     QPEApplication::execDialog( s );
     delete s;
 }
 
 void LightSettings::calibrateSensorAC ( )
 {
     Sensor *s = new Sensor ( m_sensordata_ac, this );
     connect ( s, SIGNAL( viewBacklight(int)), this, SLOT( setBacklight(int)));
     QPEApplication::execDialog ( s );
     delete s;
 }
 
 void LightSettings::setBacklight ( int bright )
 {
     QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
     e << bright;
 
     if ( bright != -1 ) {
         m_resettimer-> stop ( );
         m_resettimer-> start ( 4000, true );
     }
 }
 
 void LightSettings::setContrast ( int contr )
 {
     if (contr == -1) contr = m_oldcontrast;
     ODevice::inst ( )-> setDisplayContrast(contr);
 }
 
 void LightSettings::setFrequency ( int index )
 {
     owarn << "LightSettings::setFrequency(" << index << ")" << oendl;
     ODevice::inst ( )-> setCurrentCpuFrequency(index);
 }
 
 void LightSettings::resetBacklight ( )
 {
     setBacklight ( -1 );
     setContrast ( -1 );
 }
 
 void LightSettings::setCloseHingeAction ( int index )
 {
     owarn << "LightSettings::setCloseHingeStatus(" << index << ")" << oendl;
 }
 
 void LightSettings::accept ( )
 {
     Config config ( "apm" );
 
     // bat
     config. setGroup ( "Battery" );
     config. writeEntry ( "LcdOffOnly", LcdOffOnly-> isChecked ( ));
     config. writeEntry ( "Dim",        interval_dim-> value ( ));
     config. writeEntry ( "LightOff",   interval_lightoff-> value ( ));
     config. writeEntry ( "Suspend",    interval_suspend-> value ( ));
     config. writeEntry ( "Brightness", brightness-> value () );
     if (m_cres)
     config. writeEntry ( "Contrast",   contrast-> value () );
     config. writeEntry ( "Freq",       frequency->currentItem() );
     config. writeEntry ( "CloseHingeAction", closeHingeAction->currentItem() );
 
     // ac
     config. setGroup ( "AC" );
     config. writeEntry ( "LcdOffOnly", LcdOffOnly_ac-> isChecked ( ));
     config. writeEntry ( "Dim",        interval_dim_ac-> value ( ));
     config. writeEntry ( "LightOff",   interval_lightoff_ac-> value ( ));
     config. writeEntry ( "Suspend",    interval_suspend_ac-> value ( ));
     config. writeEntry ( "Brightness", brightness_ac-> value () );
     if (m_cres)
     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
     if ( ODevice::inst ( )-> hasLightSensor ( )) {
         config. setGroup ( "Battery" );
         config. writeEntry ( "LightSensor", auto_brightness->isChecked() );
         config. writeEntry ( "LightSensorData", m_sensordata, ';' );
         config. setGroup ( "AC" );
         config. writeEntry ( "LightSensor", auto_brightness_ac->isChecked() );
         config. writeEntry ( "LightSensorData", m_sensordata_ac, ';' );
     }
 
     // advanced
     config. setGroup ( "Warnings" );
     config. writeEntry ( "check_interval", warnintervalBox-> value ( ) * 1000 );
     config. writeEntry ( "power_verylow",  lowSpinBox-> value ( ));
     config. writeEntry ( "power_critical", criticalSpinBox-> value ( ));
     config. write ( );
 
     // notify the launcher
     {
         QCopEnvelope e ( "QPE/System", "reloadPowerWarnSettings()" );
     }
     {
         QCopEnvelope e ( "QPE/System", "setScreenSaverInterval(int)" );
         e << -1;
     }
     LightSettingsBase::accept ( );
 }
 
 void LightSettings::done ( int r )
 {
     m_resettimer-> stop ( );
     resetBacklight ( );
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
@@ -1,142 +1,142 @@
 <!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>331</width>
+            <width>327</width>
             <height>532</height>
         </rect>
     </property>
     <property stdset="1">
         <name>sizePolicy</name>
         <sizepolicy>
             <hsizetype>7</hsizetype>
             <vsizetype>5</vsizetype>
         </sizepolicy>
     </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>tabs</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>5</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</number>
                     </property>
                     <widget>
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>Group1</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>
                         <grid>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>5</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>3</number>
                             </property>
                             <widget row="0"  column="0"  rowspan="1"  colspan="2" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TL1</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="0"  rowspan="1"  colspan="2" >
                                 <class>QLabel</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>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Suspend after</string>
                                 </property>
@@ -1235,147 +1235,158 @@
                                 <property>
                                     <name>whatsThis</name>
                                     <string>how often should be checked for low power. This determines the rate popups occure in low power situations</string>
                                 </property>
                             </widget>
                             <widget row="2"  column="1" >
                                 <class>QSpinBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>criticalSpinBox</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>prefix</name>
                                     <string></string>
                                 </property>
                                 <property stdset="1">
                                     <name>suffix</name>
                                     <string> %</string>
                                 </property>
                                 <property stdset="1">
                                     <name>buttonSymbols</name>
                                     <enum>PlusMinus</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>maxValue</name>
                                     <number>80</number>
                                 </property>
                                 <property stdset="1">
                                     <name>minValue</name>
                                     <number>2</number>
                                 </property>
                                 <property>
                                     <name>whatsThis</name>
                                     <string>At what battery level should the critical power warning pop up</string>
                                 </property>
                             </widget>
                             <widget row="1"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel2</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
                                         <hsizetype>1</hsizetype>
                                         <vsizetype>5</vsizetype>
                                     </sizepolicy>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>very low battery warning at</string>
                                 </property>
                             </widget>
                             <widget row="2"  column="0" >
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TextLabel3</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>sizePolicy</name>
                                     <sizepolicy>
                                         <hsizetype>1</hsizetype>
                                         <vsizetype>5</vsizetype>
                                     </sizepolicy>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>critical power warning at</string>
                                 </property>
                             </widget>
                         </grid>
                     </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="1025">789c5dd2cd4ec2401846e13d57d1c08e18a58a20312e44f913419626c6c5cc500a42f92b60c178eff6bc2642fd0e8b79be0d43e945d17b1df4bce2452ede98cdc4796e6cd65e71b88da2fddbfbdd572eef57bcf4532e7b7efe2c973ff79cd75fcc03cefdf45ca859820368aa045f440d7c1287047b6240f0591c11ec425b22d881ce27d8122b0417a22138122dc17b51030f70582258107d821fe225c18d784d702b56092ec51b824eac11dc8b96e0a3e808c6a206b6c580e0270c4a0413d127b8162f09866299a011af095ab142b02e56093e8837049b628d6043d49f04e7a22518898ee04ed46f8013510303382a115c893ec1997845702a96098ec52ac1a168492fa4a660acfb3dfded2c0f37189deec2b16672b2fb98ce66d35934378be36eb94a671dc7f1e6b8dbee263bf39924c9feb83b84260cd3d73b5c1e77f7f587df399c7caf8b348f99fb357836cdec9d1bd374ead99d2e9d6477ad7692b43bd9dd53f7b9d7eb6777e72fddeee0df733999fcf76dee0748aaf77c</data>
     </image>
     <image>
         <name>image1</name>
         <data format="XPM.GZ" length="1885">789c75d4576fdb301000e077ff0ac17c0b8a8bad49a2e843f61ece4e8a3e481cde198eb3d1ff5eeaeecca675ecb3047cd68922ef282f2f4557c707d1d272e3715a4efb3ad2bd72122d99a7f1f8ede7af1f1f8d663b8ffcb75051dcfcd66876a6918e0eef6e6d0d31f010aaf2a1d1e3da6551077a88c60fdaa14d694b87eea36d692b1c5cf4d88edd45bbaa5525e8516d2f1f685bdb289de7065da28dae8aac36e0f8d69a38add067b55d6cb224470bb6cc52f4153a316582f9c2906d2a255ed7e8d4b882d65791fd7585d79fd199512dac071cb0758cf383db99539a3f8d97d95ca1e1059ddb386ba3713daeb04a61bda0629725adef1a2d6d92517d045b4a346ca295cd12ca3f65e7ec36bbc8b03f60d85a513d24dab74752fd36d0952ddad81f18b0353faf605b89fb037a649756b4fe0cad5dace8f9fb6863754c4ec92e96e4989d48ead7989df2facfd1d66539d5ef929de734bf55b473719bee5f0bc6fec17a30f577979d70bff6d8694ceb599939a1fc437696d2f8c7c1347e2798f28f8269bf3c05d37ed909a67e9fb073beff62e69cfa336517bcdf6f8269be8f6c59d07a5a334baad756308dbf3db3a2fa256c45ef37bcb34b45e3bd06d37cdf662e69fc8799e97d86fb609aff2498ea77174cf5cbd9155d17c0d69aeaa78269ff8e8269bf0e83a91e8e6d2c3dafcbb66c1b2ce9cfee6f8080122ad09f7ffb37070c58703ebad083fe57393080218cfc41e7f17c0edcc21ddcc3034cfcf911a6f004cf73392ff00a6ff0ee8f1558853558878db99c4dd8826d7fecc02eec61eccfe51cc0211cc13174e004a303a7733967700e179fe212aebe58d735dc408be306da0bea1343c2912eac6106b95ffbc49f8b85391294afdf4880108b7244292aa17d186117e638d1153dd1f7315894e3b38662e463fcf9b7ff73be8ae6efef8d3f188ce126</data>
     </image>
 </images>
 <connections>
     <connection>
         <sender>CalibrateLightSensor</sender>
         <signal>clicked()</signal>
         <receiver>LightSettingsBase</receiver>
         <slot>calibrateSensor()</slot>
     </connection>
     <connection>
         <sender>CalibrateLightSensor_ac</sender>
         <signal>clicked()</signal>
         <receiver>LightSettingsBase</receiver>
         <slot>calibrateSensorAC()</slot>
     </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>