summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebook.cpp50
-rw-r--r--core/pim/datebook/datebookday.cpp7
-rw-r--r--core/pim/datebook/datebookdayallday.cpp2
-rw-r--r--core/pim/datebook/datebooksettings.cpp124
-rw-r--r--core/pim/datebook/datebooksettings.h18
-rw-r--r--core/pim/datebook/datebooksettingsbase.ui59
-rw-r--r--core/pim/datebook/datebooktypes.h7
-rw-r--r--core/pim/datebook/datebookweeklst.cpp5
8 files changed, 188 insertions, 84 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index a7f6691..8ae4f84 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -247,4 +247,5 @@ void DateBook::slotSettings()
frmSettings.comboDefaultView->setCurrentItem(defaultView-1);
frmSettings.comboWeekListView->setCurrentItem(weeklistviewconfig);
+ frmSettings.setPluginList(db_holiday->pluginManager(),db_holiday->pluginLoader());
bool found=false;
@@ -263,4 +264,7 @@ void DateBook::slotSettings()
if ( QPEApplication::execDialog( &frmSettings ) ) {
+ db_holiday->pluginManager()->save();
+ db_holiday->reloadPlugins();
+
aPreset = frmSettings.alarmPreset();
presetTime = frmSettings.presetTime();
@@ -1090,4 +1094,13 @@ DateBookHoliday::DateBookHoliday()
m_pluginLoader = new Opie::Core::OPluginLoader("holidays",false);
m_pluginLoader->setAutoDelete(true);
+ m_pluginManager = new Opie::Core::OPluginManager(m_pluginLoader);
+ m_pluginManager->load();
+
+ init();
+}
+
+void DateBookHoliday::reloadPlugins()
+{
+ deinit();
init();
}
@@ -1097,20 +1110,16 @@ DateBookHoliday::~DateBookHoliday()
deinit();
delete m_pluginLoader;
+ delete m_pluginManager;
}
void DateBookHoliday::deinit()
{
-/*
QValueList<HPlugin*>::Iterator it;
for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
HPlugin*_pl = *it;
- // destructs itself?
- _pl->_if->release();
- _pl->_lib->unload();
- delete _pl->_lib;
+ *it = 0;
delete _pl;
}
_pluginlist.clear();
-*/
}
@@ -1124,8 +1133,7 @@ void debugLst( const Opie::Core::OPluginItem::List& lst ) {
void DateBookHoliday::init()
{
-#if 0
deinit();
-#endif
- Opie::Core::OPluginItem::List lst = m_pluginLoader->allAvailable( false );
+
+ Opie::Core::OPluginItem::List lst = m_pluginLoader->filtered(true);
// debugLst( lst );
for( Opie::Core::OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ){
@@ -1142,28 +1150,4 @@ void DateBookHoliday::init()
}
}
-#if 0
- QString path = QPEApplication::qpeDir() + "plugins/datebook/holiday";
- QDir dir( path, "lib*.so" );
- QStringList list = dir.entryList();
- QStringList::Iterator it;
- for (it=list.begin();it!=list.end();++it) {
- Opie::Datebook::HolidayPluginIf*hif = 0;
- QLibrary*lib=new QLibrary(path+"/"+*it);
- if ((lib->queryInterface(IID_HOLIDAY_PLUGIN,(QUnknownInterface**)&hif) == QS_OK) && hif) {
- Opie::Datebook::HolidayPlugin*pl = hif->plugin();
- if (pl) {
- HPlugin*_pl=new HPlugin;
- _pl->_plugin = pl;
- odebug << "Found holiday " << pl->description()<<oendl;
- _pl->_lib = lib;
- _pl->_if = hif;
- _pluginlist.append(_pl);
- } else {
- }
- } else {
- delete lib;
- }
- }
-#endif
}
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index 00ddd05..26f0303 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -364,8 +364,9 @@ void DateBookDay::getEvents()
QStringList::Iterator sit;
QObject* object = 0;
+
+ /* this way we make sure that holiday dummy events are always
+ on top of the widgetlist. */
for (sit=hdays.begin();sit!=hdays.end();++sit) {
- object = m_allDays->addHoliday(*sit);
- if (!object) continue;
- /* not to do something with it */
+ m_allDays->addHoliday(*sit);
}
QValueList<EffectiveEvent> eventList = db->getEffectiveEventsNoHoliday( currDate, currDate );
diff --git a/core/pim/datebook/datebookdayallday.cpp b/core/pim/datebook/datebookdayallday.cpp
index 5b40246..27fce44 100644
--- a/core/pim/datebook/datebookdayallday.cpp
+++ b/core/pim/datebook/datebookdayallday.cpp
@@ -193,5 +193,5 @@ void DatebookAlldayDisp::mousePressEvent(QMouseEvent*e)
update();
QPopupMenu m;
- if (!m_holiday) {
+ if (ev.isValidUid()) {
m.insertItem( DateBookDayWidget::tr( "Edit" ), 1 );
m.insertItem( DateBookDayWidget::tr( "Duplicate" ), 4 );
diff --git a/core/pim/datebook/datebooksettings.cpp b/core/pim/datebook/datebooksettings.cpp
index cb4b73b..861e266 100644
--- a/core/pim/datebook/datebooksettings.cpp
+++ b/core/pim/datebook/datebooksettings.cpp
@@ -21,8 +21,13 @@
#include "datebooksettings.h"
+#include <opie2/opluginloader.h>
+#include <opie2/odebug.h>
+
#include <qpe/qpeapplication.h>
#include <qspinbox.h>
#include <qcheckbox.h>
+#include <qlistview.h>
+#include <qheader.h>
DateBookSettings::DateBookSettings( bool whichClock, QWidget *parent,
@@ -31,8 +36,12 @@ DateBookSettings::DateBookSettings( bool whichClock, QWidget *parent,
ampm( whichClock )
{
- init();
- QObject::connect( qApp, SIGNAL( clockChanged(bool) ), this, SLOT( slotChangeClock(bool) ) );
- QArray<int> categories;
- comboCategory->setCategories( categories, "Calendar", tr("Calendar") );
+ init();
+ QObject::connect( qApp, SIGNAL( clockChanged(bool) ), this, SLOT( slotChangeClock(bool) ) );
+ QArray<int> categories;
+ comboCategory->setCategories( categories, "Calendar", tr("Calendar") );
+ m_loader = 0;
+ m_manager = 0;
+ m_PluginListView->header()->hide();
+ m_PluginListView->setSorting(-1);
}
@@ -44,15 +53,15 @@ void DateBookSettings::setStartTime( int newStartViewTime )
{
if ( ampm ) {
- if ( newStartViewTime >= 12 ) {
- newStartViewTime %= 12;
- if ( newStartViewTime == 0 )
- newStartViewTime = 12;
- spinStart->setSuffix( tr(":00 PM") );
- }
- else if ( newStartViewTime == 0 ) {
- newStartViewTime = 12;
- spinStart->setSuffix( tr(":00 AM") );
- }
- oldtime = newStartViewTime;
+ if ( newStartViewTime >= 12 ) {
+ newStartViewTime %= 12;
+ if ( newStartViewTime == 0 )
+ newStartViewTime = 12;
+ spinStart->setSuffix( tr(":00 PM") );
+ }
+ else if ( newStartViewTime == 0 ) {
+ newStartViewTime = 12;
+ spinStart->setSuffix( tr(":00 AM") );
+ }
+ oldtime = newStartViewTime;
}
spinStart->setValue( newStartViewTime );
@@ -63,12 +72,39 @@ int DateBookSettings::startTime() const
int returnMe = spinStart->value();
if ( ampm ) {
- if ( returnMe != 12 && spinStart->suffix().contains(tr("PM"), FALSE) )
- returnMe += 12;
- else if (returnMe == 12 && spinStart->suffix().contains(tr("AM"), TRUE))
- returnMe = 0;
+ if ( returnMe != 12 && spinStart->suffix().contains(tr("PM"), FALSE) )
+ returnMe += 12;
+ else if (returnMe == 12 && spinStart->suffix().contains(tr("AM"), TRUE))
+ returnMe = 0;
}
return returnMe;
}
+void DateBookSettings::setPluginList(Opie::Core::OPluginManager*aManager,Opie::Core::OPluginLoader*aLoader)
+{
+ m_manager = aManager;
+ m_loader = aLoader;
+ if (!aManager||!aLoader) return;
+ Opie::Core::OPluginItem::List inLst = m_loader->allAvailable(true);
+ QCheckListItem *pitem = 0;
+
+ 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() );
+ }
+}
+
+void DateBookSettings::pluginItemClicked(QListViewItem *aItem)
+{
+ if (!aItem||!m_manager||!m_loader) return;
+ QCheckListItem*pitem = ((QCheckListItem*)aItem);
+
+ Opie::Core::OPluginItem::List lst = m_loader->allAvailable( true );
+ for ( Opie::Core::OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ) {
+ if ( QString::compare( (*it).name() , pitem->text(0) ) == 0 ) {
+ m_manager->setEnabled((*it),pitem->isOn());
+ break;
+ }
+ }
+}
void DateBookSettings::setAlarmPreset( bool bAlarm, int presetTime )
@@ -76,5 +112,5 @@ void DateBookSettings::setAlarmPreset( bool bAlarm, int presetTime )
chkAlarmPreset->setChecked( bAlarm );
if ( presetTime >=5 )
- spinPreset->setValue( presetTime );
+ spinPreset->setValue( presetTime );
}
@@ -93,12 +129,12 @@ void DateBookSettings::slot12Hour( int i )
{
if ( ampm ) {
- if ( spinStart->suffix().contains( tr("AM"), FALSE ) ) {
- if ( oldtime == 12 && i == 11 || oldtime == 11 && i == 12 )
- spinStart->setSuffix( tr(":00 PM") );
- } else {
- if ( oldtime == 12 && i == 11 || oldtime == 11 && i == 12 )
- spinStart->setSuffix( tr(":00 AM") );
- }
- oldtime = i;
+ if ( spinStart->suffix().contains( tr("AM"), FALSE ) ) {
+ if ( oldtime == 12 && i == 11 || oldtime == 11 && i == 12 )
+ spinStart->setSuffix( tr(":00 PM") );
+ } else {
+ if ( oldtime == 12 && i == 11 || oldtime == 11 && i == 12 )
+ spinStart->setSuffix( tr(":00 AM") );
+ }
+ oldtime = i;
}
}
@@ -107,13 +143,13 @@ void DateBookSettings::init()
{
if ( ampm ) {
- spinStart->setMinValue( 1 );
- spinStart->setMaxValue( 12 );
- spinStart->setValue( 12 );
- spinStart->setSuffix( tr(":00 AM") );
- oldtime = 12;
+ spinStart->setMinValue( 1 );
+ spinStart->setMaxValue( 12 );
+ spinStart->setValue( 12 );
+ spinStart->setSuffix( tr(":00 AM") );
+ oldtime = 12;
} else {
- spinStart->setMinValue( 0 );
- spinStart->setMaxValue( 23 );
- spinStart->setSuffix( tr(":00") );
+ spinStart->setMinValue( 0 );
+ spinStart->setMaxValue( 23 );
+ spinStart->setSuffix( tr(":00") );
}
}
@@ -124,9 +160,9 @@ void DateBookSettings::slotChangeClock( bool whichClock )
saveMe = spinStart->value();
if ( ampm && spinStart->suffix().contains( tr("AM"), FALSE ) ) {
- if ( saveMe == 12 )
- saveMe = 0;
+ if ( saveMe == 12 )
+ saveMe = 0;
} else if ( ampm && spinStart->suffix().contains( tr("PM"), FALSE ) ) {
- if ( saveMe != 12 )
- saveMe += 12;
+ if ( saveMe != 12 )
+ saveMe += 12;
}
ampm = whichClock;
@@ -137,19 +173,19 @@ void DateBookSettings::slotChangeClock( bool whichClock )
void DateBookSettings::setJumpToCurTime( bool bJump )
{
- chkJumpToCurTime->setChecked( bJump );
+ chkJumpToCurTime->setChecked( bJump );
}
bool DateBookSettings::jumpToCurTime() const
{
- return chkJumpToCurTime->isChecked();
+ return chkJumpToCurTime->isChecked();
}
void DateBookSettings::setRowStyle( int style )
{
- comboRowStyle->setCurrentItem( style );
+ comboRowStyle->setCurrentItem( style );
}
int DateBookSettings::rowStyle() const
{
- return comboRowStyle->currentItem();
+ return comboRowStyle->currentItem();
}
diff --git a/core/pim/datebook/datebooksettings.h b/core/pim/datebook/datebooksettings.h
index cf8a0ff..df7d32c 100644
--- a/core/pim/datebook/datebooksettings.h
+++ b/core/pim/datebook/datebooksettings.h
@@ -24,4 +24,15 @@
#include <qpe/categoryselect.h>
+namespace Opie {
+namespace Core {
+ class OPluginManager;
+ class OGenericPluginLoader;
+ class OPluginLoader;
+}
+namespace Ui {
+ class OPluginConfigWidget;
+}
+}
+
class DateBookSettings : public DateBookSettingsBase
{
@@ -44,12 +55,17 @@ public:
int rowStyle() const;
+ void setPluginList(Opie::Core::OPluginManager*,Opie::Core::OPluginLoader*);
private slots:
void slot12Hour( int );
void slotChangeClock( bool );
+protected slots:
+ virtual void pluginItemClicked(QListViewItem *);
-private:
+protected:
void init();
bool ampm;
int oldtime;
+ Opie::Core::OPluginManager*m_manager;
+ Opie::Core::OPluginLoader*m_loader;
};
#endif
diff --git a/core/pim/datebook/datebooksettingsbase.ui b/core/pim/datebook/datebooksettingsbase.ui
index e613db1..7b3e591 100644
--- a/core/pim/datebook/datebooksettingsbase.ui
+++ b/core/pim/datebook/datebooksettingsbase.ui
@@ -60,5 +60,11 @@
<property stdset="1">
<name>name</name>
- <cstring>TabWidget2</cstring>
+ <cstring>TabWidget</cstring>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
</property>
<widget>
@@ -669,4 +675,46 @@
</vbox>
</widget>
+ <widget>
+ <class>QWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>plugintab</cstring>
+ </property>
+ <attribute>
+ <name>title</name>
+ <string>Plugins</string>
+ </attribute>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>2</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>2</number>
+ </property>
+ <widget>
+ <class>QListView</class>
+ <column>
+ <property>
+ <name>text</name>
+ <string>Pluginlist</string>
+ </property>
+ <property>
+ <name>clickable</name>
+ <bool>true</bool>
+ </property>
+ <property>
+ <name>resizeable</name>
+ <bool>true</bool>
+ </property>
+ </column>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>m_PluginListView</cstring>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
</widget>
</vbox>
@@ -707,6 +755,13 @@
<slot>slot12Hour( int )</slot>
</connection>
- <slot access="public">slotChangeClock( bool )</slot>
+ <connection>
+ <sender>m_PluginListView</sender>
+ <signal>clicked(QListViewItem*)</signal>
+ <receiver>DateBookSettingsBase</receiver>
+ <slot>pluginItemClicked(QListViewItem *)</slot>
+ </connection>
+ <slot access="protected">pluginItemClicked(QListViewItem *)</slot>
<slot access="public">slot12Hour( int )</slot>
+ <slot access="public">slotChangeClock( bool )</slot>
</connections>
</UI>
diff --git a/core/pim/datebook/datebooktypes.h b/core/pim/datebook/datebooktypes.h
index f944e84..2966814 100644
--- a/core/pim/datebook/datebooktypes.h
+++ b/core/pim/datebook/datebooktypes.h
@@ -14,4 +14,5 @@ namespace Datebook {
namespace Core {
class OPluginLoader;
+ class OPluginManager;
}
}
@@ -36,4 +37,9 @@ public:
virtual QValueList<EffectiveEvent> getEffectiveEvents(const QDateTime &start);
+ void reloadPlugins();
+
+ Opie::Core::OPluginLoader*pluginLoader(){return m_pluginLoader;}
+ Opie::Core::OPluginManager*pluginManager(){return m_pluginManager;}
+
protected:
void init();
@@ -47,4 +53,5 @@ protected:
QValueList<HPlugin*>_pluginlist;
Opie::Core::OPluginLoader*m_pluginLoader;
+ Opie::Core::OPluginManager*m_pluginManager;
};
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index b0e78f1..3c871ea 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -216,5 +216,10 @@ void DateBookWeekLstEvent::beamMe()
void DateBookWeekLstEvent::mousePressEvent( QMouseEvent *e )
{
+ if (!event.event().isValidUid()) {
+ // this is just such a holiday event.
+ return;
+ }
popmenue = new QPopupMenu;
+
popmenue->insertItem( tr( "Edit" ), this, SLOT(editMe()));
popmenue->insertItem( tr( "Duplicate" ), this, SLOT(duplicateMe()));