author | eilers <eilers> | 2003-08-01 12:44:27 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-08-01 12:44:27 (UTC) |
commit | 79e5e877ad1a42cf6486db94a2face8f8107ff8c (patch) (side-by-side diff) | |
tree | 36dbcce317bfca3ad8775d864fef511d2ab3a769 /core/pim/today/plugins/addressbook | |
parent | 6c715b67a8f0e32a4edca5be91332622834c8d91 (diff) | |
download | opie-79e5e877ad1a42cf6486db94a2face8f8107ff8c.zip opie-79e5e877ad1a42cf6486db94a2face8f8107ff8c.tar.gz opie-79e5e877ad1a42cf6486db94a2face8f8107ff8c.tar.bz2 |
Merging changes in BRANCH_1_0 into HEAD
Diffstat (limited to 'core/pim/today/plugins/addressbook') (more/less context) (ignore whitespace changes)
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 @@ -69 +69,6 @@ void AddressBookPlugin::refresh() } + +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 @@ -44,2 +44,3 @@ public: void refresh(); + void reinitialize(); 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 @@ -80,3 +80,2 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* - // Headline color settings QHBox *box5 = new QHBox( this ); @@ -108,3 +107,2 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* layout->addWidget( b_group ); - // layout->addWidget( box4 ); layout->addWidget( box1 ); 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 @@ -29,3 +29,3 @@ class AddressBookPluginConfig : public TodayConfigWidget { - + Q_OBJECT 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 @@ -66,2 +66,6 @@ void AddressBookPluginWidget::refresh( const OContactAccess* ) +void AddressBookPluginWidget::reinitialize() { + readConfig(); + getAddress(); +} @@ -100,6 +104,3 @@ 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.. @@ -117,2 +118,3 @@ void AddressBookPluginWidget::getAddress() { lookAheadDate.toString().latin1() ); + OContact querybirthdays; @@ -120,3 +122,2 @@ void AddressBookPluginWidget::getAddress() { - m_list = m_contactdb->queryByExample( querybirthdays, 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 @@ -37,2 +37,3 @@ public: + void reinitialize(); public 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 @@ -6,4 +6,4 @@ 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 |