summaryrefslogtreecommitdiff
Unidiff
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 @@
30#include <qpushbutton.h> 30#include <qpushbutton.h>
31#include <qlabel.h> 31#include <qlabel.h>
32#include <qtimer.h> 32#include <qtimer.h>
33#include <qpixmap.h> 33#include <qpixmap.h>
34#include <qlayout.h> 34#include <qlayout.h>
35#include <qhbox.h> 35#include <qhbox.h>
36#include <qtabwidget.h> 36#include <opie/otabwidget.h>
37#include <qdialog.h> 37#include <qdialog.h>
38 38
39 39
40struct TodayPlugin { 40struct TodayPlugin {
41 QLibrary *library; 41 QLibrary *library;
42 TodayPluginInterface *iface; 42 TodayPluginInterface *iface;
@@ -257,13 +257,14 @@ void Today::startConfig() {
257 plugin = pluginList[i]; 257 plugin = pluginList[i];
258 258
259 // load the config widgets in the tabs 259 // load the config widgets in the tabs
260 if ( plugin.guiPart->configWidget( this ) != 0l ) { 260 if ( plugin.guiPart->configWidget( this ) != 0l ) {
261 ConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3 ); 261 ConfigWidget* widget = plugin.guiPart->configWidget( conf.TabWidget3 );
262 configWidgetList.append( widget ); 262 configWidgetList.append( widget );
263 conf.TabWidget3->insertTab( widget, plugin.guiPart->appName() ); 263 conf.TabWidget3->addTab( widget, plugin.guiPart->pixmapNameConfig()
264 , plugin.guiPart->appName() );
264 } 265 }
265 // set the order/activate tab 266 // set the order/activate tab
266 conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(), 267 conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(),
267 Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) ); 268 Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) );
268 } 269 }
269 270
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:
52TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags fl ) 52TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags fl )
53 : QDialog( parent, name, modal, fl ) { 53 : QDialog( parent, name, modal, fl ) {
54 54
55 setCaption( tr( "Today config" ) ); 55 setCaption( tr( "Today config" ) );
56 56
57 QVBoxLayout *layout = new QVBoxLayout( this ); 57 QVBoxLayout *layout = new QVBoxLayout( this );
58 TabWidget3 = new QTabWidget( this, "TabWidget3" ); 58 TabWidget3 = new OTabWidget ( this, "tabwidget", OTabWidget::Global, OTabWidget::Bottom );
59 TabWidget3->setAutoMask( FALSE );
60 TabWidget3->setTabShape( QTabWidget::Rounded );
61 layout->addWidget( TabWidget3 ); 59 layout->addWidget( TabWidget3 );
62 60
63 tab_2 = new QWidget( TabWidget3, "tab_2" ); 61 tab_2 = new QWidget( TabWidget3, "tab_2" );
64 QVBoxLayout *tab2Layout = new QVBoxLayout( tab_2, 4 ,4 ); 62 QVBoxLayout *tab2Layout = new QVBoxLayout( tab_2, 4 ,4 );
65 QLabel *l = new QLabel( tr( "Load which plugins in what order:" ), tab_2 ); 63 QLabel *l = new QLabel( tr( "Load which plugins in what order:" ), tab_2 );
66 tab2Layout->addWidget( l ); 64 tab2Layout->addWidget( l );
@@ -70,13 +68,13 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
70 m_appletListView->header()->hide(); 68 m_appletListView->header()->hide();
71 m_appletListView->setSorting( -1 ); 69 m_appletListView->setSorting( -1 );
72 QVBox *vbox1 = new QVBox( hbox1 ); 70 QVBox *vbox1 = new QVBox( hbox1 );
73 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", this , SLOT( moveSelectedUp() ) ); 71 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", this , SLOT( moveSelectedUp() ) );
74 new ToolButton( vbox1, tr( "Move Down" ),"opieplayer/down", this , SLOT( moveSelectedDown() ) ); 72 new ToolButton( vbox1, tr( "Move Down" ),"opieplayer/down", this , SLOT( moveSelectedDown() ) );
75 tab2Layout->addWidget( hbox1 ); 73 tab2Layout->addWidget( hbox1 );
76 TabWidget3->insertTab( tab_2, tr( "active/order" ) ); 74 TabWidget3->addTab( tab_2, "pass", tr( "active/order" ) );
77 75
78 tab_3 = new QWidget( TabWidget3, "tab_3" ); 76 tab_3 = new QWidget( TabWidget3, "tab_3" );
79 QVBoxLayout *tab3Layout = new QVBoxLayout( tab_3 ); 77 QVBoxLayout *tab3Layout = new QVBoxLayout( tab_3 );
80 tab3Layout->setMargin( 20 ); 78 tab3Layout->setMargin( 20 );
81 QHBox *hbox_auto = new QHBox( tab_3 ); 79 QHBox *hbox_auto = new QHBox( tab_3 );
82 TextLabel2 = new QLabel( hbox_auto, "AutoStart" ); 80 TextLabel2 = new QLabel( hbox_auto, "AutoStart" );
@@ -85,13 +83,13 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
85 QHBox *hbox_inactive = new QHBox( tab_3 ); 83 QHBox *hbox_inactive = new QHBox( tab_3 );
86 TimeLabel = new QLabel( hbox_inactive , "TimeLabel" ); 84 TimeLabel = new QLabel( hbox_inactive , "TimeLabel" );
87 TimeLabel->setText( tr( "minutes inactive" ) ); 85 TimeLabel->setText( tr( "minutes inactive" ) );
88 SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" ); 86 SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" );
89 tab3Layout->addWidget( hbox_auto ); 87 tab3Layout->addWidget( hbox_auto );
90 tab3Layout->addWidget( hbox_inactive ); 88 tab3Layout->addWidget( hbox_inactive );
91 TabWidget3->insertTab( tab_3, tr( "Misc" ) ); 89 TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) );
92 90
93 m_applets_changed = false; 91 m_applets_changed = false;
94 92
95 connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) ); 93 connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) );
96 94
97 readConfig(); 95 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 @@
17#ifndef TODAYCONFIG_H 17#ifndef TODAYCONFIG_H
18#define TODAYCONFIG_H 18#define TODAYCONFIG_H
19 19
20#include <qvariant.h> 20#include <qvariant.h>
21#include <qdialog.h> 21#include <qdialog.h>
22#include <qlistview.h> 22#include <qlistview.h>
23#include <opie/otabwidget.h>
23 24
24class QCheckBox; 25class QCheckBox;
25class QLabel; 26class QLabel;
26class QSpinBox; 27class QSpinBox;
27class QTabWidget; 28class QTabWidget;
28 29
@@ -31,13 +32,13 @@ class TodayConfig : public QDialog {
31 Q_OBJECT 32 Q_OBJECT
32 33
33public: 34public:
34 TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); 35 TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
35 ~TodayConfig(); 36 ~TodayConfig();
36 37
37 QTabWidget* TabWidget3; 38 OTabWidget* TabWidget3;
38 39
39 void writeConfig(); 40 void writeConfig();
40 void pluginManagement( QString libName, QString name, QPixmap icon ); 41 void pluginManagement( QString libName, QString name, QPixmap icon );
41 42
42protected slots: 43protected slots:
43 void appletChanged(); 44 void appletChanged();