Adding feature: Disabling/Enabling of Birthdays/Anniversaries is possible, now !

4 files changed, 102 insertions, 47 deletions

diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
index a234236..9c65e7d 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
@@ -27,2 +27,3 @@
 #include <qwhatsthis.h>
+#include <qvgroupbox.h>
 
@@ -35,7 +36,24 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
 
-    QHBox *box1 = new QHBox( this );
+#if 0
+    // Informational stuff
+    QHBox *box4 = new QHBox( this );
+    QLabel* colorLabel = new QLabel( box4, "" );
+    colorLabel->setText( tr( "To activate settings: Restart application !" ) );
+#endif
+
+    // Buttongroup to enable/disable shown stuff
+    QVGroupBox* b_group = new QVGroupBox( this, "name" );
+    b_group -> setTitle( tr("Enable/Disable Views") );
+    m_showBirthdayButton = new QRadioButton( b_group );
+    m_showBirthdayButton -> setText( tr( "Show &Birthdays" ) );
+    m_showAnniversaryButton = new QRadioButton( b_group );
+    m_showAnniversaryButton -> setText( tr( "Show &Anniveraries" ) );
+
+    QWhatsThis::add( m_showBirthdayButton , tr( "The next birthdays will just be shown, if enabled!" ) );
+    QWhatsThis::add( m_showAnniversaryButton , tr( "The next anniversaries will just be shown, if enabled !" ) );
 
+    // Max lines settings
+    QHBox *box1 = new QHBox( this );
     QLabel* TextLabel6 = new QLabel( box1, "TextLabel6" );
     TextLabel6->setText( tr( "Max Lines: " ) );
-
     SpinBox2 = new QSpinBox( box1, "SpinBox2" );
@@ -44,7 +62,7 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
 
+#if 0
+    // Clip settings (currently not used)
     QHBox *box2 = new QHBox( this );
-
     QLabel* clipLabel = new QLabel( box2, "" );
     clipLabel->setText( tr( "Clip line after X chars: " ) );
-
     SpinBoxClip = new QSpinBox( box2, "SpinClip" );
@@ -52,5 +70,6 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     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, "" );
@@ -61,9 +80,4 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
 
-    QHBox *box4 = new QHBox( this );
-
-    QLabel* colorLabel = new QLabel( box4, "" );
-    colorLabel->setText( tr( "To activate settings: Restart application !" ) );
-
+    // Headline color settings
     QHBox *box5 = new QHBox( this );
-
     QLabel* colorLabel2 = new QLabel( box5, "" );
@@ -72,5 +86,5 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) );
-
     QHBox *box6 = new QHBox( this );
 
+    // Entry color settings
     QLabel* colorLabel3= new QLabel( box6, "" );
@@ -80,4 +94,4 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
 
+    // Urgent color settings
     QHBox *box7 = new QHBox( this );
-
     QLabel* colorLabel5 = new QLabel( box7, "" );
@@ -93,5 +107,6 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
 
-    layout->addWidget( box4 );
+    layout->addWidget( b_group );
+    //    layout->addWidget( box4 );
     layout->addWidget( box1 );
-    layout->addWidget( box2 );
+    //    layout->addWidget( box2 );
     layout->addWidget( box3 );
@@ -110,4 +125,4 @@ void AddressBookPluginConfig::readConfig() {
     SpinBox2->setValue( m_max_lines_task );
-    m_maxCharClip =  cfg.readNumEntry( "maxcharclip", 38 );
-    SpinBoxClip->setValue( m_maxCharClip );
+//     m_maxCharClip =  cfg.readNumEntry( "maxcharclip", 38 );
+//     SpinBoxClip->setValue( m_maxCharClip );
     m_daysLookAhead = cfg.readNumEntry( "dayslookahead", 14 );
@@ -123,2 +138,6 @@ void AddressBookPluginConfig::readConfig() {
     urgentColor->setColor( QColor( m_urgentColor ) );
+
+    m_showBirthdayButton->setChecked( cfg.readBoolEntry( "showBirthdays", true ) );
+    m_showAnniversaryButton->setChecked( cfg.readBoolEntry( "showAnniversaries", true ) );
+				  
 }
@@ -131,4 +150,4 @@ void AddressBookPluginConfig::writeConfig() {
     cfg.writeEntry( "maxlinestask", m_max_lines_task );
-    m_maxCharClip = SpinBoxClip->value();
-    cfg.writeEntry( "maxcharclip",  m_maxCharClip );
+//     m_maxCharClip = SpinBoxClip->value();
+//     cfg.writeEntry( "maxcharclip",  m_maxCharClip );
     m_daysLookAhead = SpinDaysClip->value();
@@ -146,2 +165,6 @@ void AddressBookPluginConfig::writeConfig() {
     cfg.writeEntry( "urgentcolor", m_urgentColor );
+
+    cfg.writeEntry( "showBirthdays", m_showBirthdayButton->isChecked() );
+    cfg.writeEntry( "showAnniversaries", m_showAnniversaryButton->isChecked() );
+
     cfg.write();
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.h b/core/pim/today/plugins/addressbook/addresspluginconfig.h
index ea03368..5e07aa3 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.h
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.h
@@ -23,2 +23,3 @@
 #include <qspinbox.h>
+#include <qradiobutton.h>
 
@@ -50,2 +51,4 @@ private:
     OColorButton* urgentColor;
+    QRadioButton* m_showBirthdayButton;
+    QRadioButton* m_showAnniversaryButton;
 
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index 7d87fca..498de28 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -77,2 +77,4 @@ void AddressBookPluginWidget::readConfig() {
     m_urgentColor   = cfg.readEntry( "urgentcolor", Qt::red.name() );
+    m_showBirthdays = cfg.readBoolEntry( "showBirthdays", true );
+    m_showAnniversaries = cfg.readBoolEntry( "showAnniversaries", true );
 }
@@ -98,3 +100,11 @@ void AddressBookPluginWidget::getAddress() {
 	// Check whether the database provide the search option..
-	if ( ! m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
+	// 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 ) ){
+		// Libopie seems to be old..
+		output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" );
+		addressLabel->setText( output );
+		return;
+	}
 
@@ -102,3 +112,6 @@ void AddressBookPluginWidget::getAddress() {
 		QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead );
-		qWarning("Searching from now (%s) until %s ! ", QDate::currentDate().toString().latin1(), 
+	int ammount = 0;
+	if ( m_showBirthdays ){
+		qWarning("Searching from now (%s) until %s ! ", 
+			 QDate::currentDate().toString().latin1(), 
 			 lookAheadDate.toString().latin1() );
@@ -107,8 +120,9 @@ void AddressBookPluginWidget::getAddress() {
 
-		int ammount = 0;
 		
-		m_list = m_contactdb->queryByExample( querybirthdays, OContactAccess::DateDiff );
+		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 )
+				+ QObject::tr( "Next birthdays in <b> %1 </b> days:" )
+				.arg( m_daysLookAhead )
 				+ "</font> <br>";
@@ -116,8 +130,11 @@ void AddressBookPluginWidget::getAddress() {
 				if ( ammount++ < m_maxLinesTask ){
-					// Now we want to calculate how many days until birthday. We have to set 
+					// Now we want to calculate how many days 
+					//until birthday. We have to set 
 					// the correct year to calculate the day diff...
 					QDate destdate = (*m_it).birthday();
-					destdate.setYMD( QDate::currentDate().year(), destdate.month(), destdate.day() );
+					destdate.setYMD( QDate::currentDate().year(), 
+							 destdate.month(), destdate.day() );
 					if ( QDate::currentDate().daysTo(destdate) < 0 )
-						destdate.setYMD( QDate::currentDate().year()+1, destdate.month(), destdate.day() );
+						destdate.setYMD( QDate::currentDate().year()+1, 
+								 destdate.month(), destdate.day() );
 
@@ -125,5 +142,7 @@ void AddressBookPluginWidget::getAddress() {
 					if ( QDate::currentDate().daysTo(destdate) < m_urgentDays )
-						output += "<font color=" + m_urgentColor + "><b>-" + (*m_it).fullName() 
+						output += "<font color=" + m_urgentColor + "><b>-" 
+							+ (*m_it).fullName() 
 							+ " (" 
-							+ QString::number(QDate::currentDate().daysTo(destdate)) 
+							+ QString::number(QDate::currentDate()
+									  .daysTo(destdate)) 
 							+ " Days) </b></font><br>";
@@ -131,5 +150,7 @@ void AddressBookPluginWidget::getAddress() {
 					else
-						output += "<font color=" + m_entryColor + "><b>-" + (*m_it).fullName() 
+						output += "<font color=" + m_entryColor + "><b>-" 
+							+ (*m_it).fullName() 
 							+ " (" 
-							+ QString::number(QDate::currentDate().daysTo(destdate)) 
+							+ QString::number(QDate::currentDate()
+									  .daysTo(destdate)) 
 							+ " Days) </b></font><br>";
@@ -139,6 +160,9 @@ void AddressBookPluginWidget::getAddress() {
 			output = "<font color=" + m_headlineColor + ">"
-				+ QObject::tr( "No birthdays in <b> %1 </b> days!" ).arg( m_daysLookAhead )
+				+ QObject::tr( "No birthdays in <b> %1 </b> days!" )
+				.arg( m_daysLookAhead )
 				+ "</font> <br>";
 		}
+	}
 		
+	if ( m_showAnniversaries ){
 		// Define the query for anniversaries and start search..
@@ -152,3 +176,4 @@ void AddressBookPluginWidget::getAddress() {
 			output += "<font color=" + m_headlineColor + ">"
-				+ QObject::tr( "Next anniversaries in <b> %1 </b> days:" ).arg( m_daysLookAhead )
+				+ QObject::tr( "Next anniversaries in <b> %1 </b> days:" )
+				.arg( m_daysLookAhead )
 				+ "</font> <br>";
@@ -156,18 +181,24 @@ void AddressBookPluginWidget::getAddress() {
 				if ( ammount++ < m_maxLinesTask ){
-					// Now we want to calculate how many days until anniversary. We have to set 
-					// the correct year to calculate the day diff...
+					// Now we want to calculate how many days until anniversary. 
+					// We have to set the correct year to calculate the day diff...
 					QDate destdate = (*m_it).anniversary();
-					destdate.setYMD( QDate::currentDate().year(), destdate.month(), destdate.day() );
+					destdate.setYMD( QDate::currentDate().year(), destdate.month(), 
+							 destdate.day() );
 					if ( QDate::currentDate().daysTo(destdate) < 0 )
-						destdate.setYMD( QDate::currentDate().year()+1, destdate.month(), destdate.day() );
+						destdate.setYMD( QDate::currentDate().year()+1, 
+								 destdate.month(), destdate.day() );
 
 					if ( QDate::currentDate().daysTo(destdate) < m_urgentDays )
-						output += "<font color=" + m_urgentColor + "><b>-" + (*m_it).fullName() 
+						output += "<font color=" + m_urgentColor + "><b>-" 
+							+ (*m_it).fullName() 
 							+ " (" 
-							+ QString::number(QDate::currentDate().daysTo( destdate ) ) 
+							+ QString::number(QDate::currentDate()
+									  .daysTo( destdate ) ) 
 							+ " Days) </b></font><br>";
 					else
-						output += "<font color=" + m_entryColor + "><b>-" + (*m_it).fullName() 
+						output += "<font color=" + m_entryColor + "><b>-" 
+							+ (*m_it).fullName() 
 							+ " (" 
-							+ QString::number(QDate::currentDate().daysTo( destdate ) ) 
+							+ QString::number(QDate::currentDate()
+									  .daysTo( destdate ) ) 
 							+ " Days) </b></font><br>";
@@ -177,10 +208,6 @@ void AddressBookPluginWidget::getAddress() {
 			output += "<font color=" + m_headlineColor + ">" 
-				+ QObject::tr( "No anniversaries in <b> %1 </b> days!" ).arg( m_daysLookAhead )
+				+ QObject::tr( "No anniversaries in <b> %1 </b> days!" )
+				.arg( m_daysLookAhead )
 				+ "</font> <br>";
 		}
-
-
-	}else{
-		// Libopie seems to be old..
-		output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" );
 	}
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.h b/core/pim/today/plugins/addressbook/addresspluginwidget.h
index 63f2a2b..cf2ecce 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.h
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.h
@@ -60,2 +60,4 @@ private:
     QString m_urgentColor;
+    bool m_showBirthdays;
+    bool m_showAnniversaries;
 };