otabwidget now in config dialog

3 files changed, 8 insertions, 8 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index d8b427d..901a61a 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -1,84 +1,84 @@
 /*
  * today.cpp
  *
  * copyright   : (c) 2002 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 "today.h"
 #include "configwidget.h"
 
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/contact.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qhbox.h>
-#include <qtabwidget.h>
+#include <opie/otabwidget.h>
 #include <qdialog.h>
 
 
 struct TodayPlugin {
     QLibrary *library;
     TodayPluginInterface *iface;
     TodayPluginObject *guiPart;
     QWidget *guiBox;
     QString name;
     bool active;
     int pos;
 };
 
 static QValueList<TodayPlugin> pluginList;
 
 Today::Today( QWidget* parent,  const char* name, WFlags fl )
     : TodayBase( parent, name, fl ) {
 
     QObject::connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) );
     QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this,  SLOT( editCard() ) );
 
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
     QCopChannel *todayChannel = new QCopChannel( "QPE/Today" , this );
     connect ( todayChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
               this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) );
 #endif
 #endif
 
     setOwnerField();
     refresh();
     showMaximized();
 }
 
 /**
  * Qcop receive method.
  */
 void Today::channelReceived( const QCString &msg, const QByteArray & data ) {
   QDataStream stream( data, IO_ReadOnly );
   if ( msg == "message(QString)" ) {
       QString message;
       stream >> message;
       setOwnerField( message );
   }
 }
 
 /**
  * Initialises the owner field with the default value, the username
@@ -215,97 +215,98 @@ void Today::draw() {
     if ( pluginList.count() == 0 ) {
         QLabel *noPlugins = new QLabel( this );
         noPlugins->setText( tr( "No plugins found" ) );
         layout->addWidget( noPlugins );
         return;
     }
 
     uint count = 0;
     TodayPlugin plugin;
     for ( uint i = 0; i < pluginList.count(); i++ ) {
 	plugin = pluginList[i];
 
     	if ( plugin.active ) {
             qDebug( plugin.name + " is ACTIVE " );
             plugin.guiBox->show();
         } else {
             qDebug( plugin.name + " is INACTIVE" );
             plugin.guiBox->hide();
         }
         count++;
     }
 
     if ( count == 0 ) {
         QLabel *noPluginsActive = new QLabel( this );
         noPluginsActive->setText( tr( "No plugins activated" ) );
         layout->addWidget( noPluginsActive );
     }
     layout->addStretch(0);
 }
 
 
 /**
  * The method for the configuration dialog.
  */
 void Today::startConfig() {
 
     TodayConfig conf( this, "dialog", true );
 
     TodayPlugin plugin;
     QList<ConfigWidget> configWidgetList;
 
     for ( int i = pluginList.count() - 1  ; i >= 0; i-- ) {
         plugin = pluginList[i];
 
         // load the config widgets in the tabs
         if ( plugin.guiPart->configWidget( this ) != 0l ) {
             ConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3  );
             configWidgetList.append( widget );
-            conf.TabWidget3->insertTab( widget, plugin.guiPart->appName() );
+            conf.TabWidget3->addTab( widget, plugin.guiPart->pixmapNameConfig()
+                                     , plugin.guiPart->appName() );
         }
         // set the order/activate tab
         conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(),
                               Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) );
     }
 
     if ( conf.exec() == QDialog::Accepted ) {
         conf.writeConfig();
         ConfigWidget *confWidget;
         for ( confWidget = configWidgetList.first(); confWidget != 0;
               confWidget = configWidgetList.next() ) {
             confWidget->writeConfig();
         }
         refresh();
     }
 }
 
 
 /**
  * Refresh for the view. Reload all applets
  *
  */
 void Today::refresh() {
     init();
 
     // set the date in top label
     QDate date = QDate::currentDate();
     QString time = ( tr( date.toString() ) );
 
     DateLabel->setText( QString( "<font color=#FFFFFF>" + time + "</font>" ) );
 
     if ( layout ) {
         delete layout;
     }
     layout = new QVBoxLayout( this );
     layout->addWidget( Frame );
     layout->addWidget( OwnerField );
 
     loadPlugins();
     draw();
 }
 
 void Today::startAddressbook() {
     QCopEnvelope e( "QPE/System", "execute(QString)" );
     e << QString( "addressbook" );
 }
 
 
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 532d126..04f595b 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -10,130 +10,128 @@
  *   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>
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qtoolbutton.h>
 
 class ToolButton : public QToolButton {
 
 public:
     ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
         : QToolButton( parent, name ) {
         setPixmap( Resource::loadPixmap( icon ) );
         setAutoRaise( TRUE );
         setFocusPolicy( QWidget::NoFocus );
         setToggleButton( t );
         connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
     }
 };
 
 
 /**
  * The class has currently quite some duplicate code.
  * By that way it would be real easy to have it as seperate app in settings tab
  *
  */
 TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl ) {
 
     setCaption( tr( "Today config" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
-    TabWidget3 = new QTabWidget( this, "TabWidget3" );
-    TabWidget3->setAutoMask( FALSE );
-    TabWidget3->setTabShape( QTabWidget::Rounded );
+    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 );
     QVBox *vbox1 = new QVBox( hbox1 );
     new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up",  this , SLOT( moveSelectedUp() ) );
     new ToolButton( vbox1, tr( "Move Down" ),"opieplayer/down", this , SLOT( moveSelectedDown() ) );
     tab2Layout->addWidget( hbox1 );
-    TabWidget3->insertTab( tab_2, tr( "active/order" ) );
+    TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) );
 
     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)" ) );
     CheckBoxAuto = new QCheckBox( hbox_auto, "CheckBoxAuto" );
     QHBox *hbox_inactive = new QHBox( tab_3 );
     TimeLabel = new QLabel( hbox_inactive  , "TimeLabel" );
     TimeLabel->setText( tr( "minutes inactive" ) );
     SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" );
     tab3Layout->addWidget( hbox_auto );
     tab3Layout->addWidget( hbox_inactive );
-    TabWidget3->insertTab( tab_3, tr( "Misc" ) );
+    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" );
     int autostart = cfg.readNumEntry( "autostart", 1 );
     if ( autostart ) {
         QCopEnvelope e( "QPE/System", "autoStart(QString,QString,QString)" );
         e << QString( "add" );
         e << QString( "today" );
         e << 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_autoStartTimer = cfg.readEntry( "autostartdelay", "0" );
     SpinBoxTime->setValue( m_autoStartTimer.toInt() );
 
     cfg.setGroup( "Plugins" );
     m_excludeApplets = cfg.readListEntry( "ExcludeApplets", ',' );
 }
 
 /**
  * Write the config part
  */
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index d5bdb4b..49cd10f 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -1,69 +1,70 @@
 /*
  * todayconfig.h
  *
  * copyright   : (c) 2002 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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef TODAYCONFIG_H
 #define TODAYCONFIG_H
 
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qlistview.h>
+#include <opie/otabwidget.h>
 
 class QCheckBox;
 class QLabel;
 class QSpinBox;
 class QTabWidget;
 
 class TodayConfig : public QDialog {
 
     Q_OBJECT
 
 public:
     TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~TodayConfig();
 
-    QTabWidget* TabWidget3;
+    OTabWidget* TabWidget3;
 
     void writeConfig();
     void pluginManagement( QString libName, QString name, QPixmap icon );
 
 protected slots:
     void appletChanged();
     void moveSelectedUp();
     void moveSelectedDown();
 
 private:
     void setAutoStart();
     void readConfig();
 
     QListView* m_appletListView;
     QMap<QString,QCheckListItem*> m_applets;
 
     int m_autoStart;
     QString m_autoStartTimer;
     QStringList m_excludeApplets;
     bool m_applets_changed;
 
     QLabel* TextLabel2;
     QCheckBox* CheckBoxAuto;
     QWidget* tab_2;
     QWidget* tab_3;
     QLabel* TextLabel1;
     QSpinBox* SpinBox7;
     QLabel* TimeLabel;
     QSpinBox* SpinBoxTime;
 };
 
 #endif