1 files changed, 16 insertions, 57 deletions

diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index a60f1d2..bfb5ec6 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -1,28 +1,28 @@
 /*
  * todayconfig.cpp
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002, 2003 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "todayconfig.h"
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qheader.h>
@@ -55,191 +55,150 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
     : QDialog( parent, name, modal, WStyle_ContextHelp ) {
 
     setCaption( tr( "Today Config" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     TabWidget3 = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
     layout->addWidget( TabWidget3 );
 
     tab_2 = new QWidget( TabWidget3, "tab_2" );
     QVBoxLayout *tab2Layout = new QVBoxLayout( tab_2, 4 ,4 );
     QLabel *l = new QLabel( tr( "Load which plugins in what order:" ), tab_2 );
     tab2Layout->addWidget( l );
     QHBox *hbox1 = new QHBox( tab_2 );
     m_appletListView = new QListView( hbox1 );
     m_appletListView->addColumn( "PluginList" );
     m_appletListView->header()->hide();
     m_appletListView->setSorting( -1 );
     QWhatsThis::add( m_appletListView, tr( "Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order" ) );
     QVBox *vbox1 = new QVBox( hbox1 );
     new ToolButton( vbox1, tr( "Move Up" ), "up",  this , SLOT( moveSelectedUp() ) );
     new ToolButton( vbox1, tr( "Move Down" ), "down", this , SLOT( moveSelectedDown() ) );
     tab2Layout->addWidget( hbox1 );
     TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) );
 
+    // Misc tab
     tab_3 = new QWidget( TabWidget3, "tab_3" );
     QVBoxLayout *tab3Layout = new QVBoxLayout( tab_3 );
-    tab3Layout->setMargin( 20 );
-    QHBox *hbox_auto = new QHBox( tab_3 );
-    TextLabel2 = new QLabel( hbox_auto, "AutoStart" );
-    TextLabel2->setText( tr( "autostart on \nresume?\n (Opie only)" ) );
-    QWhatsThis::add( TextLabel2 , tr( "Check this if today should be autostarted on resume." ) );
-    CheckBoxAuto = new QCheckBox( hbox_auto, "CheckBoxAuto" );
-    QWhatsThis::add( CheckBoxAuto, tr( "Check this if today should be autostarted on resume." ) );
-
-    QHBox *hbox_hide = new QHBox( tab_3 );
-    TextLabel4 = new QLabel( hbox_hide, "HideBanner" );
-    TextLabel4->setText( tr( "Tiny Banner" ) );
-    //QWhatsThis::add( TextLabel2 , tr( "Check this if today should be autostarted on resume." ) );
-    CheckBoxHide = new QCheckBox( hbox_hide, "CheckBoxHide" );
-    // QWhatsThis::add( CheckBoxAuto, tr( "Check this if today should be autostarted on resume." ) );
-
-    QHBox *hbox_inactive = new QHBox( tab_3 );
-    TimeLabel = new QLabel( hbox_inactive, "TimeLabel" );
-    TimeLabel->setText( tr( "minutes inactive" ) );
-    QWhatsThis::add( TimeLabel , tr( "How many minutes has the PDA been suspended before the autostart feature kicks in on resume" ) );
-    SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" );
-    SpinBoxTime->setMaxValue ( 1440 );
-    QWhatsThis::add( SpinBoxTime , tr( "How many minutes has the PDA been suspended before the autostart feature kicks in on resume" ) );
-    QHBox *hbox_iconSize = new QHBox( tab_3 );
-    QLabel *iconSizeLabel = new QLabel( hbox_iconSize, "iconSizeLabel" );
-    iconSizeLabel->setText( tr( "Icon size" ) );
-    QWhatsThis::add( iconSizeLabel, tr( "Set the icon size in pixel" ) );
-    SpinBoxIconSize = new QSpinBox( hbox_iconSize, "TimeSpinner" );
-    SpinBoxIconSize->setMaxValue( 32 );
-    QWhatsThis::add( SpinBoxIconSize, tr( "Set the icon size in pixel" ) );
-
-    QHBox *hbox_refresh = new QHBox( tab_3 );
-    QLabel *refreshLabel = new QLabel( hbox_refresh );
-    refreshLabel->setText( tr( "Refresh" ) );
-    QWhatsThis::add( refreshLabel, tr( "How often should Today refresh itself" ) );
-    SpinRefresh = new QSpinBox( hbox_refresh );
-    SpinRefresh->setMinValue( 0 );
-    SpinRefresh->setSuffix( tr( " sec" ) );
-    SpinRefresh->setMaxValue ( 7200 );
-    SpinRefresh->setSpecialValueText ( tr("never") );
-    QWhatsThis::add(  SpinRefresh, tr( "How often should Today refresh itself" ) );
-
-    tab3Layout->addWidget( hbox_auto );
-    tab3Layout->addWidget( hbox_hide );
-    tab3Layout->addWidget( hbox_inactive );
-    tab3Layout->addWidget( hbox_iconSize );
-    tab3Layout->addWidget( hbox_refresh );
+
+    m_guiMisc = new TodayConfigMiscBase( tab_3 );
+
+    tab3Layout->addWidget( m_guiMisc );
     TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) );
 
     m_applets_changed = false;
 
     connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) );
 
     readConfig();
     showMaximized();
 }
 
 
 /**
  * Autostart, uses the new (opie only) autostart method in the launcher code.
  * If registered against that today ist started on each resume.
  */
 void TodayConfig::setAutoStart() {
     Config cfg( "today" );
     cfg.setGroup( "Autostart" );
     if ( m_autoStart ) {
         QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" );
         e << QString( "add" );
         e << QString( "today" );
         e << QString( "%1" ).arg( m_autoStartTimer );
     } else {
         QCopEnvelope e( "QPE/System", "autoStart(QString,QString)" );
         e << QString( "remove" );
         e << QString( "today" );
     }
 }
 
 /**
  * Read the config part
  */
 void TodayConfig::readConfig() {
     Config cfg( "today" );
     cfg.setGroup( "Autostart" );
     m_autoStart = cfg.readNumEntry( "autostart", 1 );
-    CheckBoxAuto->setChecked( m_autoStart );
+    m_guiMisc->CheckBoxAuto->setChecked( m_autoStart );
     m_autoStartTimer = cfg.readNumEntry( "autostartdelay", 0 );
-    SpinBoxTime->setValue( m_autoStartTimer );
+    m_guiMisc->SpinBoxTime->setValue( m_autoStartTimer );
 
     cfg.setGroup( "General" );
     m_iconSize = cfg.readNumEntry( "IconSize", 18 );
-    SpinBoxIconSize->setValue( m_iconSize );
-    SpinRefresh->setValue( cfg.readNumEntry( "checkinterval", 15000 ) / 1000 );
-    CheckBoxHide->setChecked( cfg.readNumEntry( "HideBanner", 0 ) );
+    m_guiMisc->SpinBoxIconSize->setValue( m_iconSize );
+    m_guiMisc->SpinRefresh->setValue( cfg.readNumEntry( "checkinterval", 15000 ) / 1000 );
+    m_guiMisc->CheckBoxHide->setChecked( cfg.readNumEntry( "HideBanner", 0 ) );
 
 
     cfg.setGroup( "Plugins" );
     m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
 }
 
 /**
  * Write the config part
  */
 void TodayConfig::writeConfig() {
     Config cfg( "today" );
     cfg.setGroup( "Plugins" );
     if ( m_applets_changed ) {
         QStringList exclude;
         QStringList include;
         QStringList all_applets;
 
         QListViewItemIterator list_it( m_appletListView );
 
         // this makes sure the names get saved in the order selected
         for ( ; list_it.current(); ++list_it ) {
             QMap <QString, QCheckListItem *>::Iterator it;
             for ( it = m_applets.begin(); it != m_applets. end (); ++it ) {
                 if ( list_it.current() == (*it) && !(*it)-> isOn () ) {
                     exclude << it.key();
                 } else if ( list_it.current() == (*it) && (*it)-> isOn () ){
                     include << it.key();
                 }
                 if ( list_it.current() == (*it) ) {
                     all_applets << it.key();
                 }
             }
         }
         cfg.writeEntry( "ExcludeApplets", exclude, ',' );
         cfg.writeEntry( "IncludeApplets", include, ',' );
         cfg.writeEntry( "AllApplets",  all_applets, ',' );
     }
 
     cfg.setGroup( "Autostart" );
-    m_autoStart = CheckBoxAuto->isChecked();
+    m_autoStart = m_guiMisc->CheckBoxAuto->isChecked();
     cfg.writeEntry( "autostart",  m_autoStart );
-    m_autoStartTimer = SpinBoxTime->value();
+    m_autoStartTimer = m_guiMisc->SpinBoxTime->value();
     cfg.writeEntry( "autostartdelay", m_autoStartTimer );
-    m_iconSize = SpinBoxIconSize->value();
+    m_iconSize = m_guiMisc->SpinBoxIconSize->value();
 
     cfg.setGroup( "General" );
     cfg.writeEntry( "IconSize", m_iconSize );
-    cfg.writeEntry( "HideBanner",  CheckBoxHide->isChecked() );
-    cfg.writeEntry( "checkinterval", SpinRefresh->value()*1000 );
+    cfg.writeEntry( "HideBanner",  m_guiMisc->CheckBoxHide->isChecked() );
+    cfg.writeEntry( "checkinterval", m_guiMisc->SpinRefresh->value()*1000 );
 
     // set autostart settings
     setAutoStart();
 }
 
 
 void TodayConfig::moveSelectedUp() {
     QListViewItem *item = m_appletListView->selectedItem();
     if ( item && item->itemAbove() ) {
         item->itemAbove()->moveItem( item );
     }
 }
 
 
 void TodayConfig::moveSelectedDown() {
     QListViewItem *item = m_appletListView->selectedItem();
     if ( item && item->itemBelow() ) {
         item->moveItem( item->itemBelow() );
     }
 }
 
 
 /**
  * Set up the icons in the order/active tab