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 @@ -66,4 +66,9 @@ bool AddressBookPlugin::excludeFromRefresh() const { 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 @@ -41,8 +41,9 @@ public: TodayConfigWidget* configWidget(QWidget *); QString appName() const; bool excludeFromRefresh() const; void refresh(); + void reinitialize(); private: AddressBookPluginWidget* m_abWidget; }; 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 @@ -77,9 +77,8 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* SpinDaysClip = new QSpinBox( box3, "SpinDays" ); SpinDaysClip->setMaxValue( 200 ); QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) ); - // Headline color settings QHBox *box5 = new QHBox( this ); QLabel* colorLabel2 = new QLabel( box5, "" ); colorLabel2->setText( tr( "Set Headline Color: " ) ); headlineColor = new OColorButton( box5, black , "headlineColor" ); @@ -105,9 +104,8 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) ); layout->addWidget( b_group ); - // layout->addWidget( box4 ); layout->addWidget( box1 ); // layout->addWidget( box2 ); layout->addWidget( box3 ); layout->addWidget( box5 ); 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 @@ -26,9 +26,9 @@ #include <opie/todayconfigwidget.h> #include <opie/ocolorbutton.h> class AddressBookPluginConfig : public TodayConfigWidget { - + Q_OBJECT public: AddressBookPluginConfig( QWidget *parent, const char *name ); 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 @@ -63,8 +63,12 @@ void AddressBookPluginWidget::refresh( const OContactAccess* ) m_contactdb->reload(); getAddress(); } +void AddressBookPluginWidget::reinitialize() { + readConfig(); + getAddress(); +} void AddressBookPluginWidget::readConfig() { Config cfg( "todayaddressplugin" ); cfg.setGroup( "config" ); @@ -97,12 +101,9 @@ void AddressBookPluginWidget::getAddress() { QString output; // 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>" ); addressLabel->setText( output ); return; @@ -114,12 +115,12 @@ void AddressBookPluginWidget::getAddress() { if ( m_showBirthdays ){ qWarning("Searching from now (%s) until %s ! ", QDate::currentDate().toString().latin1(), lookAheadDate.toString().latin1() ); + OContact querybirthdays; querybirthdays.setBirthday( lookAheadDate ); - m_list = m_contactdb->queryByExample( querybirthdays, OContactAccess::DateDiff ); if ( m_list.count() > 0 ){ output = "<font color=" + m_headlineColor + ">" 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 @@ -34,8 +34,9 @@ class AddressBookPluginWidget : public QWidget { public: AddressBookPluginWidget( QWidget *parent, const char *name ); ~AddressBookPluginWidget(); + void reinitialize(); public slots: void refresh( const OContactAccess* db ); protected slots: 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 @@ -3,7 +3,7 @@ Files: plugins/today/libtodayaddressbookplugin.so* Priority: optional 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 |