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
@@ -20,33 +20,33 @@
 
 #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 )
@@ -247,33 +247,34 @@ void Today::draw() {
  * 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();
     }
 }
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
@@ -42,66 +42,64 @@ public:
         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" );
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
@@ -7,47 +7,48 @@
  */
 /***************************************************************************
  *                                                                         *
  *   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;