author | eilers <eilers> | 2003-08-01 12:44:27 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-08-01 12:44:27 (UTC) |
commit | 79e5e877ad1a42cf6486db94a2face8f8107ff8c (patch) (unidiff) | |
tree | 36dbcce317bfca3ad8775d864fef511d2ab3a769 /core/pim/today/plugins | |
parent | 6c715b67a8f0e32a4edca5be91332622834c8d91 (diff) | |
download | opie-79e5e877ad1a42cf6486db94a2face8f8107ff8c.zip opie-79e5e877ad1a42cf6486db94a2face8f8107ff8c.tar.gz opie-79e5e877ad1a42cf6486db94a2face8f8107ff8c.tar.bz2 |
Merging changes in BRANCH_1_0 into HEAD
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() | |||
69 | } | 69 | } |
70 | |||
71 | void AddressBookPlugin::reinitialize() | ||
72 | { | ||
73 | m_abWidget->reinitialize(); | ||
74 | } | ||
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: | |||
44 | void refresh(); | 44 | void refresh(); |
45 | void reinitialize(); | ||
45 | 46 | ||
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* | |||
80 | 80 | ||
81 | // Headline color settings | ||
82 | QHBox *box5 = new QHBox( this ); | 81 | QHBox *box5 = new QHBox( this ); |
@@ -108,3 +107,2 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
108 | layout->addWidget( b_group ); | 107 | layout->addWidget( b_group ); |
109 | // layout->addWidget( box4 ); | ||
110 | layout->addWidget( box1 ); | 108 | 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 @@ | |||
29 | class AddressBookPluginConfig : public TodayConfigWidget { | 29 | class AddressBookPluginConfig : public TodayConfigWidget { |
30 | 30 | Q_OBJECT | |
31 | 31 | ||
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* ) | |||
66 | 66 | ||
67 | void AddressBookPluginWidget::reinitialize() { | ||
68 | readConfig(); | ||
69 | getAddress(); | ||
70 | } | ||
67 | 71 | ||
@@ -100,6 +104,3 @@ void AddressBookPluginWidget::getAddress() { | |||
100 | // Check whether the database provide the search option.. | 104 | // Check whether the database provide the search option.. |
101 | // The following if-statement was replaced due to a bug in some | 105 | if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ |
102 | // implementations of libopie. The replacement should work everywhere..(eilers) | ||
103 | // if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ | ||
104 | if ( !( m_contactdb->querySettings() & OContactAccess::DateDiff ) ){ | ||
105 | // Libopie seems to be old.. | 106 | // Libopie seems to be old.. |
@@ -117,2 +118,3 @@ void AddressBookPluginWidget::getAddress() { | |||
117 | lookAheadDate.toString().latin1() ); | 118 | lookAheadDate.toString().latin1() ); |
119 | |||
118 | OContact querybirthdays; | 120 | OContact querybirthdays; |
@@ -120,3 +122,2 @@ void AddressBookPluginWidget::getAddress() { | |||
120 | 122 | ||
121 | |||
122 | m_list = m_contactdb->queryByExample( querybirthdays, | 123 | 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: | |||
37 | 37 | ||
38 | void reinitialize(); | ||
38 | public slots: | 39 | 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> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: libqte2, opie-today | 7 | Depends: libqte2, opie-today |
9 | Description: Addressbook plugin for today shows Birthdays and Anniversaries | 8 | Description: Addressbook plugin for today shows Birthdays and Anniversaries |
9 | Version: $QPE_VERSION$EXTRAVERSION | ||