summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/addressbook/addressplugin.cpp5
-rw-r--r--core/pim/today/plugins/addressbook/addressplugin.h1
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginconfig.cpp2
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginconfig.h2
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.cpp11
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.h1
-rw-r--r--core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control2
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
@@ -67,3 +67,8 @@ void AddressBookPlugin::refresh()
67{ 67{
68 m_abWidget->refresh( NULL ); 68 m_abWidget->refresh( NULL );
69} 69}
70
71void 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
@@ -42,6 +42,7 @@ public:
42 QString appName() const; 42 QString appName() const;
43 bool excludeFromRefresh() const; 43 bool excludeFromRefresh() const;
44 void refresh(); 44 void refresh();
45 void reinitialize();
45 46
46 private: 47 private:
47 AddressBookPluginWidget* m_abWidget; 48 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
@@ -78,7 +78,6 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char*
78 SpinDaysClip->setMaxValue( 200 ); 78 SpinDaysClip->setMaxValue( 200 );
79 QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) ); 79 QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) );
80 80
81 // Headline color settings
82 QHBox *box5 = new QHBox( this ); 81 QHBox *box5 = new QHBox( this );
83 QLabel* colorLabel2 = new QLabel( box5, "" ); 82 QLabel* colorLabel2 = new QLabel( box5, "" );
84 colorLabel2->setText( tr( "Set Headline Color: " ) ); 83 colorLabel2->setText( tr( "Set Headline Color: " ) );
@@ -106,7 +105,6 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char*
106 105
107 106
108 layout->addWidget( b_group ); 107 layout->addWidget( b_group );
109 // layout->addWidget( box4 );
110 layout->addWidget( box1 ); 108 layout->addWidget( box1 );
111 // layout->addWidget( box2 ); 109 // layout->addWidget( box2 );
112 layout->addWidget( box3 ); 110 layout->addWidget( box3 );
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
@@ -27,7 +27,7 @@
27#include <opie/ocolorbutton.h> 27#include <opie/ocolorbutton.h>
28 28
29class AddressBookPluginConfig : public TodayConfigWidget { 29class AddressBookPluginConfig : public TodayConfigWidget {
30 30 Q_OBJECT
31 31
32public: 32public:
33 33
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
@@ -64,6 +64,10 @@ void AddressBookPluginWidget::refresh( const OContactAccess* )
64 getAddress(); 64 getAddress();
65} 65}
66 66
67void AddressBookPluginWidget::reinitialize() {
68 readConfig();
69 getAddress();
70}
67 71
68void AddressBookPluginWidget::readConfig() { 72void AddressBookPluginWidget::readConfig() {
69 Config cfg( "todayaddressplugin" ); 73 Config cfg( "todayaddressplugin" );
@@ -98,10 +102,7 @@ void AddressBookPluginWidget::getAddress() {
98 QString output; 102 QString output;
99 103
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..
106 output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" ); 107 output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" );
107 addressLabel->setText( output ); 108 addressLabel->setText( output );
@@ -115,10 +116,10 @@ void AddressBookPluginWidget::getAddress() {
115 qWarning("Searching from now (%s) until %s ! ", 116 qWarning("Searching from now (%s) until %s ! ",
116 QDate::currentDate().toString().latin1(), 117 QDate::currentDate().toString().latin1(),
117 lookAheadDate.toString().latin1() ); 118 lookAheadDate.toString().latin1() );
119
118 OContact querybirthdays; 120 OContact querybirthdays;
119 querybirthdays.setBirthday( lookAheadDate ); 121 querybirthdays.setBirthday( lookAheadDate );
120 122
121
122 m_list = m_contactdb->queryByExample( querybirthdays, 123 m_list = m_contactdb->queryByExample( querybirthdays,
123 OContactAccess::DateDiff ); 124 OContactAccess::DateDiff );
124 if ( m_list.count() > 0 ){ 125 if ( m_list.count() > 0 ){
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
@@ -35,6 +35,7 @@ public:
35 AddressBookPluginWidget( QWidget *parent, const char *name ); 35 AddressBookPluginWidget( QWidget *parent, const char *name );
36 ~AddressBookPluginWidget(); 36 ~AddressBookPluginWidget();
37 37
38 void reinitialize();
38public slots: 39public slots:
39 void refresh( const OContactAccess* db ); 40 void refresh( const OContactAccess* db );
40 41
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
@@ -4,6 +4,6 @@ Priority: optional
4Section: opie/applications 4Section: opie/applications
5Maintainer: Stefan Eilers <eilers.stefan@epost.de> 5Maintainer: Stefan Eilers <eilers.stefan@epost.de>
6Architecture: arm 6Architecture: arm
7Version: $QPE_VERSION-$SUB_VERSION
8Depends: libqte2, opie-today 7Depends: libqte2, opie-today
9Description: Addressbook plugin for today shows Birthdays and Anniversaries 8Description: Addressbook plugin for today shows Birthdays and Anniversaries
9Version: $QPE_VERSION$EXTRAVERSION