resolved merge conflict

4 files changed, 26 insertions, 17 deletions

diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
index b79c679..8863192 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
@@ -78,6 +78,12 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     SpinDaysClip->setMaxValue( 200 );
     QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) );
 
+//     QHBox *box4 = new QHBox( this );
+
+//     QLabel* colorLabel = new QLabel( box4, "" );
+//     colorLabel->setText( tr( "To activate settings: Restart application !" ) );
+
+
     QHBox *box5 = new QHBox( this );
     QLabel* colorLabel2 = new QLabel( box5, "" );
     colorLabel2->setText( tr( "Set Headline Color: " ) );
@@ -104,9 +110,9 @@ 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( box2 );
     layout->addWidget( box3 );
     layout->addWidget( box5 );
     layout->addWidget( box6 );
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index dad09db..d47bc0b 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -102,20 +102,24 @@ void AddressBookPluginWidget::getAddress() {
         QString output;
 
         // Check whether the database provide the search option..
-        if ( !m_contactdb->hasQuerySettings( 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(), 
+                qWarning("Searching from now (%s) until %s ! ",
+                         QDate::currentDate().toString().latin1(),
                          lookAheadDate.toString().latin1() );
+    }
+
+    if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
+
 
                 OContact querybirthdays;
                 querybirthdays.setBirthday( lookAheadDate );
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h
index bc412dd..2d303fc 100644
--- a/core/pim/today/plugins/datebook/datebookpluginconfig.h
+++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h
@@ -23,10 +23,13 @@
 
 #include <opie/todayconfigwidget.h>
 
-class DatebookPluginConfig : public TodayConfigWidget {
+#include "datebookpluginconfigbase.h"
+
+class DatebookPluginConfig : public TodayConfigWidget  {
 
     Q_OBJECT
 
+
 public:
     DatebookPluginConfig( QWidget *parent,  const char *name );
    ~DatebookPluginConfig();
@@ -39,13 +42,8 @@ private:
     bool changed();
     void readConfig();
 
-    QCheckBox* CheckBox2;
-    QCheckBox* CheckBox1;
-    QCheckBox* CheckBox3;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox2;
-
 
+    DatebookPluginConfigBase *m_gui;
     // how many lines should be showed in the datebook section
     int m_max_lines_meet;
     // If location is to be showed too, 1 to activate it.
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h
index e09251c..54d35cf 100644
--- a/core/pim/today/plugins/todolist/todopluginconfig.h
+++ b/core/pim/today/plugins/todolist/todopluginconfig.h
@@ -17,14 +17,15 @@
 #ifndef TODOLIST_PLUGIN_CONFIG_H
 #define TODOLIST_PLUGIN_CONFIG_H
 
-//#include <qwidget.h>
 #include <qspinbox.h>
 
 #include <opie/todayconfigwidget.h>
 
+#include "todopluginconfigbase.h"
+
 class TodolistPluginConfig : public TodayConfigWidget {
 
-Q_OBJECT
+    Q_OBJECT
 
 public:
 
@@ -38,9 +39,9 @@ private:
     bool changed();
     void readConfig();
     void writeConfig();
+    
+    TodoPluginConfigBase *m_gui;
 
-    QSpinBox* SpinBox2;
-    QSpinBox* SpinBoxClip;
 
     // how many lines should be showed in the todolist section
     int m_max_lines_task;