summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-09-20 21:05:08 (UTC)
committer harlekin <harlekin>2002-09-20 21:05:08 (UTC)
commit7027b4c29de455d457b7d62f52511216a8b76b9c (patch) (side-by-side diff)
treeacc5eaa9c0f92f5e88f3bb14dab77c09f9cb9d2c
parentd2d73b6391fbc7f743199f48387d13e887bbac1e (diff)
downloadopie-7027b4c29de455d457b7d62f52511216a8b76b9c.zip
opie-7027b4c29de455d457b7d62f52511216a8b76b9c.tar.gz
opie-7027b4c29de455d457b7d62f52511216a8b76b9c.tar.bz2
otabwidget now in config dialog
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
@@ -33,7 +33,7 @@
#include <qpixmap.h>
#include <qlayout.h>
#include <qhbox.h>
-#include <qtabwidget.h>
+#include <opie/otabwidget.h>
#include <qdialog.h>
@@ -260,7 +260,8 @@ void Today::startConfig() {
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(),
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
@@ -55,9 +55,7 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
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" );
@@ -73,7 +71,7 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
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 );
@@ -88,7 +86,7 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
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;
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
@@ -20,6 +20,7 @@
#include <qvariant.h>
#include <qdialog.h>
#include <qlistview.h>
+#include <opie/otabwidget.h>
class QCheckBox;
class QLabel;
@@ -34,7 +35,7 @@ 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 );