summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/addressbook/addressbook.pro10
-rw-r--r--core/pim/today/plugins/addressbook/addressplugin.h12
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginconfig.cpp10
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginconfig.h12
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginimpl.h2
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.cpp92
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.h16
-rw-r--r--core/pim/today/plugins/addressbook/config.in2
-rw-r--r--core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control2
9 files changed, 79 insertions, 79 deletions
diff --git a/core/pim/today/plugins/addressbook/addressbook.pro b/core/pim/today/plugins/addressbook/addressbook.pro
index cf0ff97..e65f31e 100644
--- a/core/pim/today/plugins/addressbook/addressbook.pro
+++ b/core/pim/today/plugins/addressbook/addressbook.pro
@@ -5,14 +5,14 @@ CONFIG += qt plugin release
# Input
HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h \
- addresspluginwidget.h
+ addresspluginwidget.h
SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \
- addresspluginwidget.cpp
+ addresspluginwidget.cpp
INCLUDEPATH += $(OPIEDIR)/include \
- ../ ../library
+ ../ ../library
DEPENDPATH += $(OPIEDIR)/include \
- ../ ../library
+ ../ ../library
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 -lqtaux2
DESTDIR = $(OPIEDIR)/plugins/today
diff --git a/core/pim/today/plugins/addressbook/addressplugin.h b/core/pim/today/plugins/addressbook/addressplugin.h
index 0b3b065..e664d5f 100644
--- a/core/pim/today/plugins/addressbook/addressplugin.h
+++ b/core/pim/today/plugins/addressbook/addressplugin.h
@@ -20,11 +20,11 @@
#define ADDRESSBOOK_PLUGIN_H
-#include <qstring.h>
-#include <qwidget.h>
+#include "addresspluginwidget.h"
-#include <opie/oclickablelabel.h>
-#include <opie/todayplugininterface.h>
+#include <opie2/oclickablelabel.h>
+#include <opie2/todayplugininterface.h>
-#include "addresspluginwidget.h"
+#include <qstring.h>
+#include <qwidget.h>
class AddressBookPlugin : public TodayPluginObject {
@@ -46,5 +46,5 @@ public:
private:
- AddressBookPluginWidget* m_abWidget;
+ AddressBookPluginWidget* m_abWidget;
};
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
index 8c55937..81bb8fd 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
@@ -87,5 +87,5 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char*
QLabel* colorLabel2 = new QLabel( box5, "" );
colorLabel2->setText( tr( "Set Headline Color: " ) );
- headlineColor = new OColorButton( box5, black , "headlineColor" );
+ headlineColor = new Opie::OColorButton( box5, black , "headlineColor" );
QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) );
QHBox *box6 = new QHBox( this );
@@ -94,5 +94,5 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char*
QLabel* colorLabel3= new QLabel( box6, "" );
colorLabel3->setText( tr( "Set Entry Color: " ) );
- entryColor = new OColorButton( box6, black , "entryColor" );
+ entryColor = new Opie::OColorButton( box6, black , "entryColor" );
QWhatsThis::add( entryColor , tr( "This color will be used for shown birthdays/anniversaries !" ) );
@@ -105,5 +105,5 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char*
QLabel* colorLabel6 = new QLabel( box7, "" );
colorLabel6->setText( tr( " days: " ) );
- urgentColor = new OColorButton( box7, red , "urgentColor" );
+ urgentColor = new Opie::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 !" ) );
@@ -143,5 +143,5 @@ void AddressBookPluginConfig::readConfig() {
m_showBirthdayButton->setChecked( cfg.readBoolEntry( "showBirthdays", true ) );
m_showAnniversaryButton->setChecked( cfg.readBoolEntry( "showAnniversaries", true ) );
-
+
}
@@ -158,5 +158,5 @@ void AddressBookPluginConfig::writeConfig() {
m_urgentDays = SpinUrgentClip->value();
if ( m_urgentDays > m_daysLookAhead )
- m_urgentDays = m_daysLookAhead;
+ m_urgentDays = m_daysLookAhead;
cfg.writeEntry( "urgentdays", m_urgentDays );
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.h b/core/pim/today/plugins/addressbook/addresspluginconfig.h
index 5626e5d..e065ca2 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.h
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.h
@@ -20,11 +20,11 @@
#define ADDRESSBOOK_PLUGIN_CONFIG_H
+#include <opie2/todayconfigwidget.h>
+#include <opie2/ocolorbutton.h>
+
#include <qwidget.h>
#include <qspinbox.h>
#include <qradiobutton.h>
-#include <opie/todayconfigwidget.h>
-#include <opie/ocolorbutton.h>
-
class AddressBookPluginConfig : public TodayConfigWidget {
Q_OBJECT
@@ -47,7 +47,7 @@ private:
QSpinBox* SpinDaysClip;
QSpinBox* SpinUrgentClip;
- OColorButton* entryColor;
- OColorButton* headlineColor;
- OColorButton* urgentColor;
+ Opie::OColorButton* entryColor;
+ Opie::OColorButton* headlineColor;
+ Opie::OColorButton* urgentColor;
QRadioButton* m_showBirthdayButton;
QRadioButton* m_showAnniversaryButton;
diff --git a/core/pim/today/plugins/addressbook/addresspluginimpl.h b/core/pim/today/plugins/addressbook/addresspluginimpl.h
index bf321da..9716787 100644
--- a/core/pim/today/plugins/addressbook/addresspluginimpl.h
+++ b/core/pim/today/plugins/addressbook/addresspluginimpl.h
@@ -20,5 +20,5 @@
#define ADDRESSBOOK_PLUGIN_IMPL_H
-#include <opie/todayplugininterface.h>
+#include <opie2/todayplugininterface.h>
class AddressBookPlugin;
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index b0d456d..ea387d6 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -20,7 +20,7 @@
-#include <qpe/config.h>
+#include <opie2/opimcontact.h>
-#include <opie/ocontact.h>
+#include <qpe/config.h>
AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent, const char* name )
@@ -36,8 +36,8 @@ AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent, const char*
}
- m_contactdb = new OContactAccess("addressplugin");
-
- connect( m_contactdb, SIGNAL( signalChanged(const OContactAccess*) ),
- this, SLOT( refresh(const OContactAccess*) ) );
+ m_contactdb = new Opie::OPimContactAccess("addressplugin");
+
+ connect( m_contactdb, SIGNAL( signalChanged(const Opie::OPimContactAccess*) ),
+ this, SLOT( refresh(const Opie::OPimContactAccess*) ) );
@@ -50,5 +50,5 @@ AddressBookPluginWidget::~AddressBookPluginWidget() {
}
-void AddressBookPluginWidget::refresh( const OContactAccess* )
+void AddressBookPluginWidget::refresh( const Opie::OPimContactAccess* )
{
qWarning(" AddressBookPluginWidget::Database was changed externally ! ");
@@ -87,13 +87,13 @@ void AddressBookPluginWidget::getAddress() {
if ( ! addressLabel ) {
- addressLabel = new OClickableLabel( this );
+ addressLabel = new Opie::Ui::OClickableLabel( this );
connect( addressLabel, SIGNAL( clicked() ), this, SLOT( startAddressBook() ) );
layoutTodo->addWidget( addressLabel );
}
-
+
QString output;
// Check whether the database provide the search option..
- if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
+ if ( !m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDiff ) ){
// Libopie seems to be old..
output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" );
@@ -111,12 +111,12 @@ void AddressBookPluginWidget::getAddress() {
}
- if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
+ if ( m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDiff ) ){
- OContact querybirthdays;
+ Opie::OPimContact querybirthdays;
querybirthdays.setBirthday( lookAheadDate );
-
- m_list = m_contactdb->queryByExample( querybirthdays,
- OContactAccess::DateDiff );
+
+ m_list = m_contactdb->queryByExample( querybirthdays,
+ Opie::OPimContactAccess::DateDiff );
if ( m_list.count() > 0 ){
output = "<font color=" + m_headlineColor + ">"
@@ -126,29 +126,29 @@ void AddressBookPluginWidget::getAddress() {
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
+ // 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.setYMD( QDate::currentDate().year(),
destdate.month(), destdate.day() );
if ( QDate::currentDate().daysTo(destdate) < 0 )
- destdate.setYMD( QDate::currentDate().year()+1,
+ 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))
+ .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))
+ .daysTo(destdate))
+ " Days) </b></font><br>";
}
@@ -161,12 +161,12 @@ void AddressBookPluginWidget::getAddress() {
}
}
-
+
if ( m_showAnniversaries ){
// Define the query for anniversaries and start search..
- OContact queryanniversaries;
+ Opie::OPimContact queryanniversaries;
queryanniversaries.setAnniversary( lookAheadDate );
-
- m_list = m_contactdb->queryByExample( queryanniversaries, OContactAccess::DateDiff );
-
+
+ m_list = m_contactdb->queryByExample( queryanniversaries, Opie::OPimContactAccess::DateDiff );
+
ammount = 0;
if ( m_list.count() > 0 ){
@@ -177,31 +177,31 @@ void AddressBookPluginWidget::getAddress() {
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 anniversary.
+ // 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.setYMD( QDate::currentDate().year(), destdate.month(),
destdate.day() );
if ( QDate::currentDate().daysTo(destdate) < 0 )
- destdate.setYMD( QDate::currentDate().year()+1,
+ 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 ) )
+ .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 ) )
+ .daysTo( destdate ) )
+ " Days) </b></font><br>";
}
}
} else {
- output += "<font color=" + m_headlineColor + ">"
+ output += "<font color=" + m_headlineColor + ">"
+ QObject::tr( "No anniversaries in <b> %1 </b> days!" )
.arg( m_daysLookAhead )
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.h b/core/pim/today/plugins/addressbook/addresspluginwidget.h
index b0e3811..b1c690d 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.h
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.h
@@ -20,11 +20,11 @@
#define ADDRESSBOOK_PLUGIN_WIDGET_H
+#include <opie2/ocontactaccess.h>
+#include <opie2/oclickablelabel.h>
+
#include <qstring.h>
#include <qwidget.h>
#include <qlayout.h>
-#include <opie/ocontactaccess.h>
-#include <opie/oclickablelabel.h>
-
class AddressBookPluginWidget : public QWidget {
@@ -38,5 +38,5 @@ public:
void reinitialize();
public slots:
- void refresh( const OContactAccess* db );
+ void refresh( const Opie::OPimContactAccess* db );
protected slots:
@@ -44,10 +44,10 @@ protected slots:
private:
- OClickableLabel* addressLabel;
+ Opie::Ui::OClickableLabel* addressLabel;
QVBoxLayout* layoutTodo;
- OContactAccess * m_contactdb;
+ Opie::OPimContactAccess * m_contactdb;
- OContactAccess::List m_list;
- OContactAccess::List::Iterator m_it;
+ Opie::OPimContactAccess::List m_list;
+ Opie::OPimContactAccess::List::Iterator m_it;
void readConfig();
diff --git a/core/pim/today/plugins/addressbook/config.in b/core/pim/today/plugins/addressbook/config.in
index aad6fc7..cf61a0e 100644
--- a/core/pim/today/plugins/addressbook/config.in
+++ b/core/pim/today/plugins/addressbook/config.in
@@ -2,3 +2,3 @@
boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX
diff --git a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
index d40691a..2fd1435 100644
--- a/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
+++ b/core/pim/today/plugins/addressbook/opie-today-addressbookplugin.control
@@ -5,5 +5,5 @@ Section: opie/plugins
Maintainer: Stefan Eilers <eilers.stefan@epost.de>
Architecture: arm
-Depends: libqte2, opie-today
+Depends: libqte2, opie-today, libopiecore2, libopieui2, libopiepim2, libopiedb2, libqtaux2
Description: Addressbook plugin for Today
Displays upcoming Birthdays and Anniversaries