author | harlekin <harlekin> | 2002-09-17 09:36:43 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-17 09:36:43 (UTC) |
commit | 03abe825f26678c34142e14f93cabd8f097d5bea (patch) (side-by-side diff) | |
tree | 39ea534ae903bf7699237dc8d19c4f34d955c0bf /core/pim | |
parent | 537aee09b7df89a166debf5ffd14286cbb636898 (diff) | |
download | opie-03abe825f26678c34142e14f93cabd8f097d5bea.zip opie-03abe825f26678c34142e14f93cabd8f097d5bea.tar.gz opie-03abe825f26678c34142e14f93cabd8f097d5bea.tar.bz2 |
some changes
-rw-r--r-- | core/pim/today/configwidget.h | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.cpp | 8 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.h | 1 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginconfig.cpp | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginconfig.h | 6 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.h | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.h | 1 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 167 | ||||
-rw-r--r-- | core/pim/today/today.h | 10 | ||||
-rw-r--r-- | core/pim/today/todayconfig.cpp | 15 |
10 files changed, 105 insertions, 112 deletions
diff --git a/core/pim/today/configwidget.h b/core/pim/today/configwidget.h index f449db4..02ce37a 100644 --- a/core/pim/today/configwidget.h +++ b/core/pim/today/configwidget.h @@ -2,14 +2,14 @@ #ifndef CONFIG_WIDGET_H #define CONFIG_WIDGET_H - class ConfigWidget : public QWidget { + public: - ConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {}; + ConfigWidget( QWidget *parent, const char *name ) : QWidget( parent, name ) {} ; virtual ~ConfigWidget() {}; virtual void writeConfig() = 0; }; diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp index d2a73df..9800e61 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.cpp +++ b/core/pim/today/plugins/datebook/datebookplugin.cpp @@ -20,13 +20,8 @@ #include "datebookplugin.h" #include "datebookpluginwidget.h" #include "datebookpluginconfig.h" -#include "../../configwidget.h" - -#include <qpe/timestring.h> -#include <qpe/config.h> - DatebookPlugin::DatebookPlugin() { } @@ -69,5 +64,6 @@ int DatebookPlugin::maxHeight() const { return 100; } - +int main() { +} diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h index f2c4446..61dc9f3 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.h +++ b/core/pim/today/plugins/datebook/datebookplugin.h @@ -19,9 +19,8 @@ #include <qstring.h> #include <qwidget.h> -#include <qpe/datebookdb.h> #include <opie/oclickablelabel.h> #include "../../todayplugininterface.h" diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp index 7482f5e..51be40e 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp @@ -1,9 +1,8 @@ #include "datebookpluginconfig.h" - #include <qpe/config.h> #include <qlayout.h> #include <qtoolbutton.h> @@ -11,9 +10,9 @@ #include <qhbox.h> #include <qvbox.h> DatebookPluginConfig::DatebookPluginConfig( QWidget* parent, const char* name) - : ConfigWidget( parent, name ) { + : ConfigWidget( parent, name ) { QVBoxLayout * layout = new QVBoxLayout( this ); QHBox *box1 = new QHBox( this ); diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h index 33d3c4e..9505a2d 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.h +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h @@ -1,21 +1,21 @@ #ifndef DATEBOOK_PLUGIN_CONFIG_H #define DATEBOOK_PLUGIN_CONFIG_H -#include <qwidget.h> +//#include <qwidget.h> #include <qcheckbox.h> #include <qspinbox.h> #include "../../configwidget.h" class DatebookPluginConfig : public ConfigWidget { - Q_OBJECT + public: DatebookPluginConfig( QWidget *parent, const char *name ); - ~DatebookPluginConfig(); + ~DatebookPluginConfig(); void writeConfig(); private: /** diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h index 77889d6..7e5006f 100644 --- a/core/pim/today/plugins/todolist/todoplugin.h +++ b/core/pim/today/plugins/todolist/todoplugin.h @@ -23,13 +23,11 @@ #include <opie/tododb.h> #include <opie/oclickablelabel.h> #include "../../todayplugininterface.h" -#include "../../configwidget.h" class TodolistPlugin : public TodayPluginObject { - public: TodolistPlugin(); ~TodolistPlugin(); diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h index a46cc7c..6be4b1e 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.h +++ b/core/pim/today/plugins/todolist/todopluginconfig.h @@ -23,9 +23,8 @@ #include "../../configwidget.h" class TodolistPluginConfig : public ConfigWidget { - Q_OBJECT public: TodolistPluginConfig( QWidget *parent, const char *name ); diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 09540bd..d78b5b5 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -31,12 +31,23 @@ #include <qlabel.h> #include <qtimer.h> #include <qpixmap.h> #include <qlayout.h> +#include <qhbox.h> #include <qtabwidget.h> #include <qdialog.h> +struct TodayPlugin { + QLibrary *library; + TodayPluginInterface *iface; + TodayPluginObject *guiPart; + QHBox *guiBox; + QString name; + bool active; + int pos; +}; + static QValueList<TodayPlugin> pluginList; Today::Today( QWidget* parent, const char* name, WFlags fl ) : TodayBase( parent, name, fl ) { @@ -51,13 +62,14 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) ); #endif #endif - pluginLayout = 0l; + // pluginLayout = 0l; setOwnerField(); init(); - refresh(); + loadPlugins(); + draw(); showMaximized(); } /** @@ -123,8 +135,9 @@ void Today::loadPlugins() { for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) { (*tit).library->unload(); delete (*tit).library; } + pluginList.clear(); QString path = QPEApplication::qpeDir() + "/plugins/today"; QDir dir( path, "lib*.so" ); @@ -138,20 +151,41 @@ void Today::loadPlugins() { qDebug( "querying: %s", QString( path + "/" + *it ).latin1() ); if ( lib->queryInterface( IID_TodayPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) { qDebug( "loading: %s", QString( path + "/" + *it ).latin1() ); - qDebug( QString(*it).latin1() ); + qDebug( QString(*it) ); TodayPlugin plugin; plugin.library = lib; plugin.iface = iface; - plugin.name = QString(*it).latin1(); + plugin.name = QString(*it); if ( m_excludeApplets.grep( *it ).isEmpty() ) { plugin.active = true; } else { plugin.active = false; } plugin.guiPart = plugin.iface->guiPart(); + + plugin.guiBox = new QHBox( this ); + QPixmap plugPix; + plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( 18, 18 ), 0 ); + OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); + plugIcon->setPixmap( plugPix ); + QScrollView* sv = new QScrollView( plugin.guiBox ); + QWidget *plugWidget = plugin.guiPart->widget( sv->viewport() ); + sv->setMinimumHeight( plugin.guiPart->minHeight() ); + //sv->setMaximumHeight( plugin.guiPart->maxHeight() ); + sv->setResizePolicy( QScrollView::AutoOneFit ); + sv->setHScrollBarMode( QScrollView::AlwaysOff ); + sv->setFrameShape( QFrame::NoFrame ); + sv->addChild( plugWidget ); + + //plugin.guiBox->addWidget( plugIcon, 0, AlignTop ); + //plugin.guiBox->addWidget( sv, 0, AlignTop ); + plugin.guiBox->setStretchFactor( plugIcon, 1 ); + plugin.guiBox->setStretchFactor( sv, 9 ); + layout->addWidget( plugin.guiBox ); + pluginList.append( plugin ); count++; } else { qDebug( "could not recognize %s", QString( path + "/" + *it ).latin1() ); @@ -165,13 +199,8 @@ void Today::loadPlugins() { * Repaint method. Reread all fields. */ void Today::draw() { - if ( pluginLayout ) { - delete pluginLayout; - } - pluginLayout = new QVBoxLayout( layout ); - if ( pluginList.count() == 0 ) { QLabel *noPlugins = new QLabel( this ); noPlugins->setText( tr( "No plugins found" ) ); layout->addWidget( noPlugins ); @@ -183,31 +212,17 @@ void Today::draw() { for ( uint i = 0; i < pluginList.count(); i++ ) { plugin = pluginList[i]; if ( plugin.active ) { - QHBoxLayout* plugLayout = new QHBoxLayout( this ); - QPixmap plugPix; - plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( 18, 18 ), 0 ); - OClickableLabel* plugIcon = new OClickableLabel( this ); - plugIcon->setPixmap( plugPix ); - QScrollView* sv = new QScrollView( this ); - QWidget* plugWidget = plugin.guiPart->widget( sv->viewport() ); - // plugWidget->reparent( sv->viewport(), QPoint( 0, 0 ) ); - sv->setMinimumHeight( plugin.guiPart->minHeight() ); - //sv->setMaximumHeight( plugin.guiPart->maxHeight() ); - - sv->setResizePolicy( QScrollView::AutoOneFit ); - sv->setHScrollBarMode( QScrollView::AlwaysOff ); - sv->setFrameShape( QFrame::NoFrame ); - sv->addChild( plugWidget ); - - plugLayout->addWidget( plugIcon, 0, AlignTop ); - plugLayout->addWidget( sv, 0, AlignTop ); - plugLayout->setStretchFactor( plugIcon, 1 ); - plugLayout->setStretchFactor( sv, 9 ); - pluginLayout->addLayout( plugLayout ); - count++; - } + qDebug( plugin.name + " is ACTIVE " ); + // QHBoxLayout* plugLayout = new QHBoxLayout( this ); + plugin.guiBox->show(); + } else { + // plugin.guiWidget->hide(); + qDebug( plugin.name + " is INACTIVE" ); + plugin.guiBox->hide(); + } + count++; } if ( count == 0 ) { QLabel *noPluginsActive = new QLabel( this ); @@ -215,64 +230,62 @@ void Today::draw() { layout->addWidget( noPluginsActive ); } layout->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); - - - // how often refresh - later have qcop update calls in *db - // QTimer::singleShot( 20*1000, this, SLOT( draw() ) ); -} - - -void Today::refresh() { - loadPlugins(); - draw(); - qDebug( "redraw" ); -// QTimer::singleShot( 30*1000, this, SLOT( refresh() ) ); } /** * The method for the configuration dialog. */ void Today::startConfig() { - conf = new TodayConfig ( this, "", true ); - - uint count = 0; - TodayPlugin plugin; - - QList<ConfigWidget> configWidgetList; - for ( uint i = 0; i < pluginList.count(); i++ ) { - plugin = pluginList[i]; - - // load the config widgets in the tabs - if ( plugin.guiPart->configWidget( this ) != 0l ) { - ConfigWidget* widget = plugin.guiPart->configWidget( this ); - widget->reparent( conf , QPoint( 0,0 ) ); - configWidgetList.append( widget ); - conf->TabWidget3->insertTab( widget, plugin.guiPart->appName() ); - } - // set the order/activate tab - conf->pluginManagement( plugin.name, plugin.guiPart->pluginName(), + + TodayConfig conf( this, "dialog", true ); + + TodayPlugin plugin; + + QList<ConfigWidget> configWidgetList; + for ( uint i = 0; i < pluginList.count(); i++ ) { + plugin = pluginList[i]; + + // load the config widgets in the tabs + if ( plugin.guiPart->configWidget( this ) != 0l ) { + ConfigWidget* widget = plugin.guiPart->configWidget( this ); + configWidgetList.append( widget ); + conf.TabWidget3->insertTab( widget, plugin.guiPart->appName() ); + } + // set the order/activate tab + conf.pluginManagement( plugin.name, plugin.guiPart->pluginName(), Resource::loadPixmap( plugin.guiPart->pixmapNameWidget() ) ); - count++; - } + } - conf->showMaximized(); + conf.exec(); + if ( conf.exec() == QDialog::Accepted ) { + conf.writeConfig(); + ConfigWidget *confWidget; + for ( confWidget = configWidgetList.first(); confWidget != 0; + confWidget = configWidgetList.next() ) { + confWidget->writeConfig(); + } + init(); - if ( conf->exec() == QDialog::Accepted ) { - ConfigWidget *confWidget; - for ( confWidget=configWidgetList.first(); confWidget != 0; - confWidget = configWidgetList.next() ) { - confWidget->writeConfig(); - } - conf->writeConfig(); - init(); - loadPlugins(); - draw(); - } - delete conf; + TodayPlugin plugin; + for ( uint i = 0; i < pluginList.count(); i++ ) { + plugin = pluginList[i]; + + if ( m_excludeApplets.grep( plugin.name ).isEmpty() ) { + qDebug("CONFIG" + plugin.name + "ACTIVE"); + plugin.active = true; + } else { + qDebug("CONFIG" + plugin.name + "INACTIVE"); + + plugin.active = false; + } + } + + draw(); + } } void Today::startAddressbook() { diff --git a/core/pim/today/today.h b/core/pim/today/today.h index ca17020..0a9a705 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h @@ -21,8 +21,9 @@ #include <opie/tododb.h> #include <qdatetime.h> #include <qlist.h> +#include <qhbox.h> #include <qpe/qlibrary.h> #include <qpe/event.h> @@ -31,16 +32,8 @@ #include "todayplugininterface.h" class QVBoxLayout; -struct TodayPlugin { - QLibrary *library; - TodayPluginInterface *iface; - TodayPluginObject *guiPart; - QString name; - bool active; - int pos; -}; class Today : public TodayBase { Q_OBJECT @@ -54,9 +47,8 @@ class Today : public TodayBase { void startAddressbook(); void launchApp( QString appName ); void editCard(); void draw(); - void refresh(); private: void init(); void setOwnerField(); diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index 08e59c0..79c4d1f 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp @@ -29,16 +29,14 @@ #include <qhbox.h> #include <qvbox.h> #include <qtoolbutton.h> -// for getenv -#include <stdlib.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 ) { - setTextLabel( name ); + // setTextLabel( name ); setPixmap( Resource::loadPixmap( icon ) ); setAutoRaise( TRUE ); setFocusPolicy( QWidget::NoFocus ); setToggleButton( t ); @@ -51,19 +49,17 @@ public: * 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 ) +TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { - if ( !name ) { - setName( "todayconfig" ); - } setCaption( tr( "Today config" ) ); QVBoxLayout *layout = new QVBoxLayout( this ); TabWidget3 = new QTabWidget( this, "TabWidget3" ); - TabWidget3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, TabWidget3->sizePolicy().hasHeightForWidth() ) ); + // TabWidget3->setFrameShape( QFrame::NoFrame ); + //TabWidget3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, TabWidget3->sizePolicy().hasHeightForWidth() ) ); TabWidget3->setAutoMask( FALSE ); TabWidget3->setTabShape( QTabWidget::Rounded ); layout->addWidget( TabWidget3 ); @@ -106,8 +102,9 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) ); readConfig(); + showMaximized(); } /** |