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
@@ -58,12 +58,17 @@ QString AddressBookPlugin::appName() const {
     return  "addressbook";
 }
 
 
 bool AddressBookPlugin::excludeFromRefresh() const {
     return false;
 }
 
 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
@@ -33,18 +33,19 @@ public:
     AddressBookPlugin();
     ~AddressBookPlugin();
 
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
     TodayConfigWidget* configWidget(QWidget *);
     QString appName() const;
     bool excludeFromRefresh() const;
     void refresh();
+    void reinitialize();
 
  private:
     AddressBookPluginWidget* m_abWidget; 
 };
 
 #endif
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
@@ -69,25 +69,24 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     SpinBoxClip->setMaxValue( 200 );
     QWhatsThis::add( SpinBoxClip , tr( "After how many chars should be the info about the task be cut off" ) );
 #endif
 
     // Look ahead settings
     QHBox *box3 = new QHBox( this );
     QLabel* daysLabel = new QLabel( box3, "" );
     daysLabel->setText( tr( "Days look ahead: " ) );
     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" );
     QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) );
     QHBox *box6 = new QHBox( this );
 
     // Entry color settings
     QLabel* colorLabel3= new QLabel( box6, "" );
     colorLabel3->setText( tr( "Set Entry Color: " ) );
     entryColor = new OColorButton( box6, black , "entryColor" );
     QWhatsThis::add( entryColor , tr( "This color will be used for shown birthdays/anniversaries !" ) );
@@ -97,25 +96,24 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     QLabel* colorLabel5 = new QLabel( box7, "" );
     colorLabel5->setText( tr( "Set Urgent\nColor if below " ) );
     SpinUrgentClip = new QSpinBox( box7, "SpinDays" );
     SpinUrgentClip->setMaxValue( 200 );
     QLabel* colorLabel6 = new QLabel( box7, "" );
     colorLabel6->setText( tr( " days: " ) );
     urgentColor = new OColorButton( box7, red , "urgentColor" );
     QWhatsThis::add( urgentColor , tr( "This urgent color will be used if we are close to the event !" ) );
     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 );
     layout->addWidget( box6 );
     layout->addWidget( box7 );
 
     readConfig();
 
 }
 
 void AddressBookPluginConfig::readConfig() {
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
@@ -18,25 +18,25 @@
 
 #ifndef ADDRESSBOOK_PLUGIN_CONFIG_H
 #define ADDRESSBOOK_PLUGIN_CONFIG_H
 
 #include <qwidget.h>
 #include <qspinbox.h>
 #include <qradiobutton.h>
 
 #include <opie/todayconfigwidget.h>
 #include <opie/ocolorbutton.h>
 
 class AddressBookPluginConfig : public TodayConfigWidget {
-
+    Q_OBJECT
 
 public:
 
     AddressBookPluginConfig( QWidget *parent,  const char *name );
     ~AddressBookPluginConfig();
 
 private:
     /**
      * if changed then save
      */
     bool changed();
     void readConfig();
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
@@ -55,24 +55,28 @@ AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent,  const char*
 
 AddressBookPluginWidget::~AddressBookPluginWidget() {
     delete m_contactdb;
 }
 
 void AddressBookPluginWidget::refresh( const OContactAccess* )
 {
         qWarning(" AddressBookPluginWidget::Database was changed externally ! ");
         m_contactdb->reload();
         getAddress();
 }
 
+void AddressBookPluginWidget::reinitialize() {
+        readConfig();
+        getAddress();
+}
 
 void AddressBookPluginWidget::readConfig() {
     Config cfg( "todayaddressplugin" );
     cfg.setGroup( "config" );
     m_maxLinesTask  = cfg.readNumEntry( "maxlinestask", 5 );
     m_maxCharClip   = cfg.readNumEntry( "maxcharclip", 38 );
     m_daysLookAhead = cfg.readNumEntry( "dayslookahead", 14 );
     m_urgentDays    = cfg.readNumEntry( "urgentdays", 7 );
     m_entryColor    = cfg.readEntry("entrycolor", Qt::black.name() );
     m_headlineColor = cfg.readEntry( "headlinecolor", Qt::black.name() );
     m_urgentColor   = cfg.readEntry( "urgentcolor", Qt::red.name() );
     m_showBirthdays = cfg.readBoolEntry( "showBirthdays", true );
@@ -89,45 +93,42 @@ void AddressBookPluginWidget::getAddress() {
                 layoutTodo = new QVBoxLayout( this );
         }
 
         if ( ! addressLabel ) {
                 addressLabel = new OClickableLabel( this );
                 connect( addressLabel, SIGNAL( clicked() ), this, SLOT( startAddressBook() ) );
                 layoutTodo->addWidget( addressLabel );
         }
         
         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;
         }
         
         // Define the query for birthdays and start search..
         QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead );
         int ammount = 0;
         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 + ">"
                                 + QObject::tr( "Next birthdays in <b> %1 </b> days:" )
                                 .arg( m_daysLookAhead )
                                 + "</font> <br>";
                         for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
                                 if ( ammount++ < m_maxLinesTask ){
                                         // Now we want to calculate how many days 
                                         //until birthday. We have to set 
                                         // the correct year to calculate the day diff...
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
@@ -26,24 +26,25 @@
 #include <opie/ocontactaccess.h>
 #include <opie/oclickablelabel.h>
 
 
 class AddressBookPluginWidget : public QWidget {
 
     Q_OBJECT
 
 public:
     AddressBookPluginWidget( QWidget *parent,  const char *name );
     ~AddressBookPluginWidget();
 
+    void reinitialize();
 public slots:
     void refresh( const OContactAccess* db ); 
 
 protected slots:
     void  startAddressBook();
 
 private:
     OClickableLabel* addressLabel;
     QVBoxLayout* layoutTodo;
     OContactAccess * m_contactdb;
 
     OContactAccess::List m_list;
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
@@ -1,9 +1,9 @@
 Package: opie-today-addressbookplugin
 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