14 files changed, 247 insertions, 22 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 8ae4f84..70dd7b5 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -263,6 +263,7 @@ void DateBook::slotSettings()
     frmSettings.comboCategory->setCategories(defaultCategories,"Calendar", tr("Calendar"));
 
     if ( QPEApplication::execDialog( &frmSettings ) ) {
+        frmSettings.savePlugins();
         db_holiday->pluginManager()->save();
         db_holiday->reloadPlugins();
 
diff --git a/core/pim/datebook/datebooksettings.cpp b/core/pim/datebook/datebooksettings.cpp
index 861e266..561dc38 100644
--- a/core/pim/datebook/datebooksettings.cpp
+++ b/core/pim/datebook/datebooksettings.cpp
@@ -22,6 +22,9 @@
 
 #include <opie2/opluginloader.h>
 #include <opie2/odebug.h>
+#include <opie2/oholidaypluginif.h>
+#include <opie2/oholidayplugin.h>
+#include <opie2/oholidayplugincfgwidget.h>
 
 #include <qpe/qpeapplication.h>
 
@@ -29,6 +32,8 @@
 #include <qcheckbox.h>
 #include <qlistview.h>
 #include <qheader.h>
+#include <qtabwidget.h>
+#include <qlayout.h>
 
 DateBookSettings::DateBookSettings( bool whichClock, QWidget *parent,
                                     const char *name, bool modal, WFlags fl )
@@ -90,6 +95,29 @@ void DateBookSettings::setPluginList(Opie::Core::OPluginManager*aManager,Opie::C
     for ( Opie::Core::OPluginItem::List::Iterator it = inLst.begin(); it != inLst.end(); ++it ) {
         pitem = new QCheckListItem(m_PluginListView,(*it).name(),QCheckListItem::CheckBox);
         pitem->setOn( (*it).isEnabled() );
+
+        Opie::Datebook::HolidayPluginIf*hif = m_loader->load<Opie::Datebook::HolidayPluginIf>(*it,IID_HOLIDAY_PLUGIN);
+        if (!hif) continue;
+        Opie::Datebook::HolidayPlugin*pl = hif->plugin();
+        if (!pl) continue;
+        Opie::Datebook::HolidayPluginConfigWidget*cfg = pl->configWidget();
+        if (!cfg) continue;
+        QWidget * dtab = new QWidget(TabWidget,pl->description());
+        QVBoxLayout*dlayout = new QVBoxLayout(dtab);
+        dlayout->setMargin(2);
+        dlayout->setSpacing(2);
+        cfg->reparent(dtab,0,QPoint(0,0));
+        dlayout->addWidget(cfg);
+        TabWidget->insertTab(dtab,pl->description());
+
+        m_cfgWidgets.append(cfg);
+    }
+}
+void DateBookSettings::savePlugins()
+{
+    QValueList<Opie::Datebook::HolidayPluginConfigWidget*>::Iterator it;
+    for (it=m_cfgWidgets.begin();it!=m_cfgWidgets.end();++it) {
+        (*it)->saveConfig();
     }
 }
 
diff --git a/core/pim/datebook/datebooksettings.h b/core/pim/datebook/datebooksettings.h
index df7d32c..912088f 100644
--- a/core/pim/datebook/datebooksettings.h
+++ b/core/pim/datebook/datebooksettings.h
@@ -22,6 +22,7 @@
 #define DATEBOOKSETTINGS_H
 #include "datebooksettingsbase.h"
 #include <qpe/categoryselect.h>
+#include <qvaluelist.h>
 
 namespace Opie {
 namespace Core {
@@ -32,6 +33,9 @@ namespace Core {
 namespace Ui {
     class OPluginConfigWidget;
 }
+namespace Datebook {
+    class HolidayPluginConfigWidget;
+}
 }
 
 class DateBookSettings : public DateBookSettingsBase
@@ -55,6 +59,7 @@ public:
     int rowStyle() const;
 
     void setPluginList(Opie::Core::OPluginManager*,Opie::Core::OPluginLoader*);
+    void savePlugins();
 private slots:
     void slot12Hour( int );
     void slotChangeClock( bool );
@@ -67,5 +72,6 @@ protected:
     int oldtime;
     Opie::Core::OPluginManager*m_manager;
     Opie::Core::OPluginLoader*m_loader;
+    QValueList<Opie::Datebook::HolidayPluginConfigWidget*> m_cfgWidgets;
 };
 #endif
diff --git a/core/pim/datebook/holiday/national/national-holidays.pro b/core/pim/datebook/holiday/national/national-holidays.pro
index 8b2b33e..3da9c3b 100644
--- a/core/pim/datebook/holiday/national/national-holidays.pro
+++ b/core/pim/datebook/holiday/national/national-holidays.pro
@@ -3,8 +3,8 @@ CONFIG -= moc
 CONFIG += qt plugin
 
 # Input
-HEADERS = nationalholiday.h nationalcfg.h
-SOURCES = nationalholiday.cpp nationalcfg.cpp
+HEADERS = nationalholiday.h nationalcfg.h nationalcfgwidget.h
+SOURCES = nationalholiday.cpp nationalcfg.cpp nationalcfgwidget.cpp
 INTERFACES=
 
 INCLUDEPATH     += $(OPIEDIR)/include \
diff --git a/core/pim/datebook/holiday/national/nationalcfg.cpp b/core/pim/datebook/holiday/national/nationalcfg.cpp
index a293251..52c453f 100644
--- a/core/pim/datebook/holiday/national/nationalcfg.cpp
+++ b/core/pim/datebook/holiday/national/nationalcfg.cpp
@@ -25,25 +25,20 @@ bool NHcfg::load(const QString&aPath)
     _path=aPath;

     stage = 0;

     _content.clear();

-    odebug << "Start loading file "<<_path<<oendl;

     QFile *f=new QFile(_path);

     if (!f) {

         oerr << "Could not open file" << oendl;

         return false;

     }

-    odebug << "Source" << oendl;

     QXmlInputSource is(*f);

-    odebug << "Reader" << oendl;

     QXmlSimpleReader reader;

-    odebug << "Handler" << oendl;

     reader.setContentHandler(this);

-    odebug << "Error handler" << oendl;

     reader.setErrorHandler(this);

 

     err = "";

-    odebug << "parse it" << oendl;

     bool ret = reader.parse(is);

-    odebug << "Errors: " << err << oendl;

+    if (err.length()>0)

+        odebug << "Errors: " << err << oendl;

     return ret;

 }

 

@@ -91,7 +86,6 @@ bool NHcfg::fatalError(const QXmlParseException& e)
 bool NHcfg::startElement(const QString&, const QString&,const QString& name, const QXmlAttributes& attr)

 {

     bool ret = false;

-    odebug << "startElement: " << name << oendl;

     if (name==_key_doc) {

         stage = 1;

         return true;

@@ -144,6 +138,5 @@ bool NHcfg::setName(const QXmlAttributes&attr)
         return false;

     }

     _contentname = attr.value(nindx);

-    odebug << "Contentname = " << _contentname<<oendl;

     return true;

 }

diff --git a/core/pim/datebook/holiday/national/nationalcfgwidget.cpp b/core/pim/datebook/holiday/national/nationalcfgwidget.cpp
new file mode 100644
index 0000000..6e3dd7d
--- a/dev/null
+++ b/core/pim/datebook/holiday/national/nationalcfgwidget.cpp
@@ -0,0 +1,99 @@
+#include "nationalcfgwidget.h"
+
+#include <opie2/odebug.h>
+
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+
+#include <qheader.h>
+#include <qlabel.h>
+#include <qlistview.h>
+#include <qpushbutton.h>
+#include <qlayout.h>
+#include <qvariant.h>
+#include <qtooltip.h>
+#include <qwhatsthis.h>
+#include <qheader.h>
+#include <qdir.h>
+
+/*
+ *  Constructs a NationalHolidayConfig which is a child of 'parent', with the
+ *  name 'name' and widget flags set to 'f'
+ */
+NationalHolidayConfigWidget::NationalHolidayConfigWidget( QWidget* parent,  const char* name, WFlags fl )
+    : Opie::Datebook::HolidayPluginConfigWidget( parent, name, fl )
+{
+    if ( !name )
+        setName( "NationalHolidayConfig" );
+    resize( 206, 210 );
+    setCaption( tr( "Select national config" ) );
+    NationalHolidayConfigLayout = new QVBoxLayout( this );
+    NationalHolidayConfigLayout->setSpacing( 2 );
+    NationalHolidayConfigLayout->setMargin( 2 );
+
+    m_headLabel = new QLabel( this, "m_headLabel" );
+    m_headLabel->setText( tr( "Select one or more configs to load" ) );
+    m_headLabel->setAlignment( int( QLabel::AlignCenter ) );
+    NationalHolidayConfigLayout->addWidget( m_headLabel );
+
+    m_Configlist = new QListView( this, "m_Configlist" );
+    m_Configlist->addColumn( tr( "configfiles" ) );
+    QWhatsThis::add(  m_Configlist, tr( "List of found xml-files which may load." ) );
+    NationalHolidayConfigLayout->addWidget( m_Configlist );
+
+    // signals and slots connections
+    connect( m_Configlist, SIGNAL( clicked(QListViewItem*) ), this, SLOT( listItemClicked(QListViewItem*) ) );
+    init();
+}
+
+void NationalHolidayConfigWidget::init()
+{
+    m_Configlist->header()->hide();
+    m_Configlist->setSorting(-1);
+
+    QString path = QPEApplication::qpeDir() + "etc/nationaldays";
+    QDir dir( path, "*.xml" );
+    QStringList list = dir.entryList();
+    QStringList::Iterator it;
+    Config cfg("nationaldays");
+    cfg.setGroup("entries");
+    files = cfg.readListEntry("files");
+    QCheckListItem *pitem = 0;
+
+    for (it=list.begin();it!=list.end();++it) {
+        pitem = new QCheckListItem(m_Configlist,(*it),QCheckListItem::CheckBox);
+        if (files.find((*it)) != files.end()) {
+            pitem->setOn(true);
+        } else {
+            pitem->setOn(false);
+        }
+    }
+}
+
+/*
+ *  Destroys the object and frees any allocated resources
+ */
+NationalHolidayConfigWidget::~NationalHolidayConfigWidget()
+{
+    // no need to delete child widgets, Qt does it all for us
+}
+
+void NationalHolidayConfigWidget::listItemClicked(QListViewItem*item)
+{
+    if (!item) return;
+    QCheckListItem*pitem = ((QCheckListItem*)item);
+    QStringList::Iterator it = files.find(pitem->text(0));
+    if (pitem->isOn()&&it==files.end()) {
+        files.append(pitem->text(0));
+    } else if (!pitem->isOn() && it!=files.end()) {
+        files.remove(it);
+    }
+}
+
+void NationalHolidayConfigWidget::saveConfig()
+{
+    Config cfg("nationaldays");
+    cfg.setGroup("entries");
+    cfg.writeEntry("files",files);
+}
+
diff --git a/core/pim/datebook/holiday/national/nationalcfgwidget.h b/core/pim/datebook/holiday/national/nationalcfgwidget.h
new file mode 100644
index 0000000..9f16aa4
--- a/dev/null
+++ b/core/pim/datebook/holiday/national/nationalcfgwidget.h
@@ -0,0 +1,39 @@
+#ifndef NATIONALHOLIDAYCONFIGWIDGET_H
+#define NATIONALHOLIDAYCONFIGWIDGET_H
+
+#include <opie2/oholidayplugincfgwidget.h>
+
+#include <qvariant.h>
+#include <qwidget.h>
+#include <qstringlist.h>
+
+class QVBoxLayout;
+class QHBoxLayout;
+class QGridLayout;
+class QLabel;
+class QListView;
+class QListViewItem;
+
+class NationalHolidayConfigWidget : public Opie::Datebook::HolidayPluginConfigWidget
+{
+    Q_OBJECT
+
+public:
+    NationalHolidayConfigWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    virtual ~NationalHolidayConfigWidget();
+
+    virtual void saveConfig();
+
+protected slots:
+    virtual void listItemClicked(QListViewItem*);
+
+protected:
+    void init();
+
+    QVBoxLayout* NationalHolidayConfigLayout;
+    QLabel* m_headLabel;
+    QListView* m_Configlist;
+    QStringList files;
+};
+
+#endif // NATIONALHOLIDAYCONFIG_H
diff --git a/core/pim/datebook/holiday/national/nationalholiday.cpp b/core/pim/datebook/holiday/national/nationalholiday.cpp
index 26cd913..52f3489 100644
--- a/core/pim/datebook/holiday/national/nationalholiday.cpp
+++ b/core/pim/datebook/holiday/national/nationalholiday.cpp
@@ -1,5 +1,6 @@
 #include "nationalholiday.h"
 #include "nationalcfg.h"
+#include "nationalcfgwidget.h"
 
 #include <opie2/odebug.h>
 
@@ -26,18 +27,19 @@ void NationalHoliday::init()
     Config cfg("nationaldays");
     cfg.setGroup("entries");
     files = cfg.readListEntry("files");
-    odebug << "Read " << files << oendl;
 }
 
 void NationalHoliday::load_days()
 {
     if (init_done) return;
+    Config cfg("nationaldays");
+    cfg.setGroup("entries");
     QStringList::ConstIterator it;
     NHcfg readit;
     for (it=files.begin();it!=files.end();++it) {
-        odebug << QPEApplication::qpeDir()+"/etc/nationaldays/"+(*it) << oendl;
-        if (!readit.load(QPEApplication::qpeDir()+"/etc/nationaldays/"+(*it)))
+        if (!readit.load(QPEApplication::qpeDir()+"/etc/nationaldays/"+(*it))) {
             continue;
+        }
         tholidaylist::ConstIterator it;
         for (it=readit.days().begin();it!=readit.days().end();++it) {
             _days[it.key()]+=(it.data());
@@ -120,4 +122,9 @@ QValueList<EffectiveEvent> NationalHoliday::events(const QDate&start,const QDate
     return ret;
 }
 
+Opie::Datebook::HolidayPluginConfigWidget*NationalHoliday::configWidget(QWidget *parent,  const char *name, QWidget::WFlags fl)
+{
+    return new NationalHolidayConfigWidget(parent,name,fl);
+}
+
 EXPORT_HOLIDAY_PLUGIN(NationalHoliday);
diff --git a/core/pim/datebook/holiday/national/nationalholiday.h b/core/pim/datebook/holiday/national/nationalholiday.h
index 6581263..afce3f4 100644
--- a/core/pim/datebook/holiday/national/nationalholiday.h
+++ b/core/pim/datebook/holiday/national/nationalholiday.h
@@ -5,6 +5,7 @@
 
 #include <opie2/oholidayplugin.h>
 #include <opie2/oholidaypluginif.h>
+#include <opie2/oholidayplugincfgwidget.h>
 
 #include <qmap.h>
 #include <qstringlist.h>
@@ -21,6 +22,7 @@ public:
     virtual QStringList entries(unsigned year, unsigned month, unsigned day);
     virtual QMap<QDate,QStringList> entries(const QDate&,const QDate&);
     virtual QValueList<EffectiveEvent> events(const QDate&,const QDate&);
+    virtual Opie::Datebook::HolidayPluginConfigWidget*configWidget(QWidget *parent=0,  const char *name = 0, QWidget::WFlags fl = 0);
 
 protected:
     void init();
diff --git a/libopie2/opiepim/ui/oholidayplugin.h b/libopie2/opiepim/ui/oholidayplugin.h
index 52db0eb..192a020 100644
--- a/libopie2/opiepim/ui/oholidayplugin.h
+++ b/libopie2/opiepim/ui/oholidayplugin.h
@@ -5,12 +5,15 @@
 #include <qstringlist.h>
 #include <qdatetime.h>
 #include <qmap.h>
+#include <qwidget.h>
 
 class EffectiveEvent;
 
 namespace Opie {
 namespace Datebook {
 
+class HolidayPluginConfigWidget;
+
 class HolidayPlugin
 {
 public:
@@ -21,8 +24,9 @@ public:
     virtual QStringList entries(unsigned year, unsigned month, unsigned day)=0;
     virtual QMap<QDate,QStringList> entries(const QDate&,const QDate&)=0;
     virtual QValueList<EffectiveEvent> events(const QDate&,const QDate&)=0;
-};
 
+    virtual HolidayPluginConfigWidget*configWidget(QWidget *parent=0,  const char *name = 0, QWidget::WFlags fl = 0 ){return 0;}
+};
 }
 }
 #endif
diff --git a/libopie2/opiepim/ui/oholidayplugincfgwidget.cpp b/libopie2/opiepim/ui/oholidayplugincfgwidget.cpp
new file mode 100644
index 0000000..43380bb
--- a/dev/null
+++ b/libopie2/opiepim/ui/oholidayplugincfgwidget.cpp
@@ -0,0 +1,14 @@
+#include "oholidayplugincfgwidget.h"
+
+namespace Opie {
+namespace Datebook {
+HolidayPluginConfigWidget::HolidayPluginConfigWidget( QWidget* parent, const char* name, WFlags fl )
+    : QWidget( parent, name, fl )
+{}
+
+HolidayPluginConfigWidget::~HolidayPluginConfigWidget()
+{}
+
+}
+}
+
diff --git a/libopie2/opiepim/ui/oholidayplugincfgwidget.h b/libopie2/opiepim/ui/oholidayplugincfgwidget.h
new file mode 100644
index 0000000..17af467
--- a/dev/null
+++ b/libopie2/opiepim/ui/oholidayplugincfgwidget.h
@@ -0,0 +1,30 @@
+#ifndef _HOLIDAY_PLUGIN_CFG_WIDGET
+#define _HOLIDAY_PLUGIN_CFG_WIDGET
+#include <qwidget.h>
+
+namespace Opie {
+namespace Datebook {
+class HolidayPluginConfigWidget:public QWidget
+{
+    Q_OBJECT
+public:
+    /**
+     * This will construct the widget. The widget gets deleted once the parent
+     * gets deleted as in any Qt application
+     *
+     * A Parent is required!
+     *
+     * @param parent The parent of the widget
+     * @param name The name of the object
+     */
+    HolidayPluginConfigWidget(QWidget *parent,  const char *name = 0, WFlags fl = 0 );
+    virtual ~HolidayPluginConfigWidget();
+
+    virtual void saveConfig()=0;
+};
+
+}
+}
+
+#endif
+
diff --git a/libopie2/opiepim/ui/oholidaypluginif.h b/libopie2/opiepim/ui/oholidaypluginif.h
index 825d3ad..618d371 100644
--- a/libopie2/opiepim/ui/oholidaypluginif.h
+++ b/libopie2/opiepim/ui/oholidaypluginif.h
@@ -4,8 +4,8 @@
 #include <qpe/qcom.h>
 
 #ifndef QT_NO_COMPONENT
-//017f90d4-34fc-4dc5-aed7-498c6da6571e
-#define IID_HOLIDAY_PLUGIN QUuid(0x017f90d4,0x34fc,0x4dc5,0xae,0xd7,0x49,0x8c,0x6d,0xa6,0x57,0x1e)
+//c0a5f73f-975e-4492-9285-af555284c4ab
+#define IID_HOLIDAY_PLUGIN        QUuid(0xc0a5f73f,0x975e,0x4492,0x92,0x85,0xaf,0x55,0x52,0x84,0xc4,0xab)
 #endif
 
 namespace Opie {
@@ -18,7 +18,7 @@ class HolidayPluginIf:public QUnknownInterface
 public:
    HolidayPluginIf():QUnknownInterface(){}
    virtual ~HolidayPluginIf(){}
-   
+
    virtual HolidayPlugin*plugin()=0;
 };
 
@@ -29,7 +29,6 @@ public:
     virtual ~HolidayPluginWrapper(){if (_plugin) delete _plugin;}
 
     QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface ) {
-        odebug << "HolidayPluginWrapper::queryInterface()" << oendl;
         *iface = 0;
         if (uuid == IID_HOLIDAY_PLUGIN || uuid == IID_QUnknown) {
             *iface = this;
@@ -55,7 +54,6 @@ protected:
     Q_EXPORT_INTERFACE() { \
     Q_CREATE_INSTANCE(  Opie::Datebook::HolidayPluginWrapper<Plugin> ) \
     }
-
 }
 }
 #endif
diff --git a/libopie2/opiepim/ui/ui.pro b/libopie2/opiepim/ui/ui.pro
index 53c7ae2..97c8d81 100644
--- a/libopie2/opiepim/ui/ui.pro
+++ b/libopie2/opiepim/ui/ui.pro
@@ -1,10 +1,14 @@
 HEADERS += ui/opimmainwindow.h         \
            ui/opimrecurrencewidget.h   \
            ui/todayconfigwidget.h      \
-           ui/todayplugininterface.h   
+           ui/todayplugininterface.h   \
+       ui/oholidayplugin.h \
+       ui/oholidayplugincfgwidget.h \
+       ui/oholidaypluginif.h
 
 SOURCES += ui/opimmainwindow.cpp       \
            ui/opimrecurrencewidget.cpp \
-           ui/todayconfigwidget.cpp
+           ui/todayconfigwidget.cpp        \
+           ui/oholidayplugincfgwidget.cpp
 
 INTERFACES += ui/opimrecurrencebase.ui