7 files changed, 15 insertions, 9 deletions
diff --git a/core/pim/today/plugins/addressbook/addressplugin.cpp b/core/pim/today/plugins/addressbook/addressplugin.cpp index a70f8d8..5d5d34c 100644 --- a/core/pim/today/plugins/addressbook/addressplugin.cpp +++ b/core/pim/today/plugins/addressbook/addressplugin.cpp @@ -68,2 +68,7 @@ void AddressBookPlugin::refresh() m_abWidget->refresh( NULL ); } + +void AddressBookPlugin::reinitialize() +{ + m_abWidget->reinitialize(); +} diff --git a/core/pim/today/plugins/addressbook/addressplugin.h b/core/pim/today/plugins/addressbook/addressplugin.h index 04e4faf..0b3b065 100644 --- a/core/pim/today/plugins/addressbook/addressplugin.h +++ b/core/pim/today/plugins/addressbook/addressplugin.h @@ -43,4 +43,5 @@ public: bool excludeFromRefresh() const; void refresh(); + void reinitialize(); private: diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp index 9c65e7d..b79c679 100644 --- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp @@ -79,5 +79,4 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) ); - // Headline color settings QHBox *box5 = new QHBox( this ); QLabel* colorLabel2 = new QLabel( box5, "" ); @@ -107,5 +106,4 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* layout->addWidget( b_group ); - // layout->addWidget( box4 ); layout->addWidget( box1 ); // layout->addWidget( box2 ); diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.h b/core/pim/today/plugins/addressbook/addresspluginconfig.h index 5e07aa3..5626e5d 100644 --- a/core/pim/today/plugins/addressbook/addresspluginconfig.h +++ b/core/pim/today/plugins/addressbook/addresspluginconfig.h @@ -28,5 +28,5 @@ class AddressBookPluginConfig : public TodayConfigWidget { - + Q_OBJECT public: diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp index 498de28..dad09db 100644 --- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp @@ -65,4 +65,8 @@ void AddressBookPluginWidget::refresh( const OContactAccess* ) } +void AddressBookPluginWidget::reinitialize() { + readConfig(); + getAddress(); +} void AddressBookPluginWidget::readConfig() { @@ -99,8 +103,5 @@ void AddressBookPluginWidget::getAddress() { // Check whether the database provide the search option.. - // The following if-statement was replaced due to a bug in some - // implementations of libopie. The replacement should work everywhere..(eilers) - // if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ - if ( !( m_contactdb->querySettings() & OContactAccess::DateDiff ) ){ + if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ // Libopie seems to be old.. output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" ); @@ -116,8 +117,8 @@ void AddressBookPluginWidget::getAddress() { QDate::currentDate().toString().latin1(), lookAheadDate.toString().latin1() ); + OContact querybirthdays; querybirthdays.setBirthday( lookAheadDate ); - m_list = m_contactdb->queryByExample( querybirthdays, OContactAccess::DateDiff ); diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.h b/core/pim/today/plugins/addressbook/addresspluginwidget.h index cf2ecce..b0e3811 100644 --- a/core/pim/today/plugins/addressbook/addresspluginwidget.h +++ b/core/pim/today/plugins/addressbook/addresspluginwidget.h @@ -36,4 +36,5 @@ public: ~AddressBookPluginWidget(); + void reinitialize(); public slots: void refresh( const OContactAccess* db ); diff --git a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control index 9fe23b6..1876eb8 100644 --- a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control +++ b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control @@ -5,5 +5,5 @@ Section: opie/applications Maintainer: Stefan Eilers <eilers.stefan@epost.de> Architecture: arm -Version: $QPE_VERSION-$SUB_VERSION Depends: libqte2, opie-today Description: Addressbook plugin for today shows Birthdays and Anniversaries +Version: $QPE_VERSION$EXTRAVERSION |