summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp5
-rw-r--r--core/pim/today/todayconfig.cpp8
-rw-r--r--core/pim/today/todayconfig.h3
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
@@ -30,13 +30,13 @@
#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;
@@ -257,13 +257,14 @@ void Today::startConfig() {
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() ) );
}
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
@@ -52,15 +52,13 @@ public:
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 );
@@ -70,13 +68,13 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
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" );
@@ -85,13 +83,13 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
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();
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
@@ -17,12 +17,13 @@
#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;
@@ -31,13 +32,13 @@ 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();