Diffstat (limited to 'core/pim/today/plugins/addressbook') (more/less context) (show whitespace changes)
9 files changed, 39 insertions, 39 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 | |||
@@ -14,5 +14,5 @@ DEPENDPATH += $(OPIEDIR)/include \ | |||
14 | ../ ../library | 14 | ../ ../library |
15 | 15 | ||
16 | LIBS+= -lqpe -lopie | 16 | LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 -lqtaux2 |
17 | 17 | ||
18 | DESTDIR = $(OPIEDIR)/plugins/today | 18 | 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 @@ | |||
20 | #define ADDRESSBOOK_PLUGIN_H | 20 | #define ADDRESSBOOK_PLUGIN_H |
21 | 21 | ||
22 | #include <qstring.h> | 22 | #include "addresspluginwidget.h" |
23 | #include <qwidget.h> | ||
24 | 23 | ||
25 | #include <opie/oclickablelabel.h> | 24 | #include <opie2/oclickablelabel.h> |
26 | #include <opie/todayplugininterface.h> | 25 | #include <opie2/todayplugininterface.h> |
27 | 26 | ||
28 | #include "addresspluginwidget.h" | 27 | #include <qstring.h> |
28 | #include <qwidget.h> | ||
29 | 29 | ||
30 | class AddressBookPlugin : public TodayPluginObject { | 30 | class AddressBookPlugin : public TodayPluginObject { |
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* | |||
87 | QLabel* colorLabel2 = new QLabel( box5, "" ); | 87 | QLabel* colorLabel2 = new QLabel( box5, "" ); |
88 | colorLabel2->setText( tr( "Set Headline Color: " ) ); | 88 | colorLabel2->setText( tr( "Set Headline Color: " ) ); |
89 | headlineColor = new OColorButton( box5, black , "headlineColor" ); | 89 | headlineColor = new Opie::OColorButton( box5, black , "headlineColor" ); |
90 | QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) ); | 90 | QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) ); |
91 | QHBox *box6 = new QHBox( this ); | 91 | QHBox *box6 = new QHBox( this ); |
@@ -94,5 +94,5 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
94 | QLabel* colorLabel3= new QLabel( box6, "" ); | 94 | QLabel* colorLabel3= new QLabel( box6, "" ); |
95 | colorLabel3->setText( tr( "Set Entry Color: " ) ); | 95 | colorLabel3->setText( tr( "Set Entry Color: " ) ); |
96 | entryColor = new OColorButton( box6, black , "entryColor" ); | 96 | entryColor = new Opie::OColorButton( box6, black , "entryColor" ); |
97 | QWhatsThis::add( entryColor , tr( "This color will be used for shown birthdays/anniversaries !" ) ); | 97 | QWhatsThis::add( entryColor , tr( "This color will be used for shown birthdays/anniversaries !" ) ); |
98 | 98 | ||
@@ -105,5 +105,5 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
105 | QLabel* colorLabel6 = new QLabel( box7, "" ); | 105 | QLabel* colorLabel6 = new QLabel( box7, "" ); |
106 | colorLabel6->setText( tr( " days: " ) ); | 106 | colorLabel6->setText( tr( " days: " ) ); |
107 | urgentColor = new OColorButton( box7, red , "urgentColor" ); | 107 | urgentColor = new Opie::OColorButton( box7, red , "urgentColor" ); |
108 | QWhatsThis::add( urgentColor , tr( "This urgent color will be used if we are close to the event !" ) ); | 108 | QWhatsThis::add( urgentColor , tr( "This urgent color will be used if we are close to the event !" ) ); |
109 | QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) ); | 109 | QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) ); |
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 @@ | |||
20 | #define ADDRESSBOOK_PLUGIN_CONFIG_H | 20 | #define ADDRESSBOOK_PLUGIN_CONFIG_H |
21 | 21 | ||
22 | #include <opie2/todayconfigwidget.h> | ||
23 | #include <opie2/ocolorbutton.h> | ||
24 | |||
22 | #include <qwidget.h> | 25 | #include <qwidget.h> |
23 | #include <qspinbox.h> | 26 | #include <qspinbox.h> |
24 | #include <qradiobutton.h> | 27 | #include <qradiobutton.h> |
25 | 28 | ||
26 | #include <opie/todayconfigwidget.h> | ||
27 | #include <opie/ocolorbutton.h> | ||
28 | |||
29 | class AddressBookPluginConfig : public TodayConfigWidget { | 29 | class AddressBookPluginConfig : public TodayConfigWidget { |
30 | Q_OBJECT | 30 | Q_OBJECT |
@@ -47,7 +47,7 @@ private: | |||
47 | QSpinBox* SpinDaysClip; | 47 | QSpinBox* SpinDaysClip; |
48 | QSpinBox* SpinUrgentClip; | 48 | QSpinBox* SpinUrgentClip; |
49 | OColorButton* entryColor; | 49 | Opie::OColorButton* entryColor; |
50 | OColorButton* headlineColor; | 50 | Opie::OColorButton* headlineColor; |
51 | OColorButton* urgentColor; | 51 | Opie::OColorButton* urgentColor; |
52 | QRadioButton* m_showBirthdayButton; | 52 | QRadioButton* m_showBirthdayButton; |
53 | QRadioButton* m_showAnniversaryButton; | 53 | 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 @@ | |||
20 | #define ADDRESSBOOK_PLUGIN_IMPL_H | 20 | #define ADDRESSBOOK_PLUGIN_IMPL_H |
21 | 21 | ||
22 | #include <opie/todayplugininterface.h> | 22 | #include <opie2/todayplugininterface.h> |
23 | 23 | ||
24 | class AddressBookPlugin; | 24 | 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 @@ | |||
20 | 20 | ||
21 | 21 | ||
22 | #include <qpe/config.h> | 22 | #include <opie2/opimcontact.h> |
23 | 23 | ||
24 | #include <opie/ocontact.h> | 24 | #include <qpe/config.h> |
25 | 25 | ||
26 | AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent, const char* name ) | 26 | AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent, const char* name ) |
@@ -36,8 +36,8 @@ AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent, const char* | |||
36 | } | 36 | } |
37 | 37 | ||
38 | m_contactdb = new OContactAccess("addressplugin"); | 38 | m_contactdb = new Opie::OPimContactAccess("addressplugin"); |
39 | 39 | ||
40 | connect( m_contactdb, SIGNAL( signalChanged(const OContactAccess*) ), | 40 | connect( m_contactdb, SIGNAL( signalChanged(const Opie::OPimContactAccess*) ), |
41 | this, SLOT( refresh(const OContactAccess*) ) ); | 41 | this, SLOT( refresh(const Opie::OPimContactAccess*) ) ); |
42 | 42 | ||
43 | 43 | ||
@@ -50,5 +50,5 @@ AddressBookPluginWidget::~AddressBookPluginWidget() { | |||
50 | } | 50 | } |
51 | 51 | ||
52 | void AddressBookPluginWidget::refresh( const OContactAccess* ) | 52 | void AddressBookPluginWidget::refresh( const Opie::OPimContactAccess* ) |
53 | { | 53 | { |
54 | qWarning(" AddressBookPluginWidget::Database was changed externally ! "); | 54 | qWarning(" AddressBookPluginWidget::Database was changed externally ! "); |
@@ -87,5 +87,5 @@ void AddressBookPluginWidget::getAddress() { | |||
87 | 87 | ||
88 | if ( ! addressLabel ) { | 88 | if ( ! addressLabel ) { |
89 | addressLabel = new OClickableLabel( this ); | 89 | addressLabel = new Opie::Ui::OClickableLabel( this ); |
90 | connect( addressLabel, SIGNAL( clicked() ), this, SLOT( startAddressBook() ) ); | 90 | connect( addressLabel, SIGNAL( clicked() ), this, SLOT( startAddressBook() ) ); |
91 | layoutTodo->addWidget( addressLabel ); | 91 | layoutTodo->addWidget( addressLabel ); |
@@ -95,5 +95,5 @@ void AddressBookPluginWidget::getAddress() { | |||
95 | 95 | ||
96 | // Check whether the database provide the search option.. | 96 | // Check whether the database provide the search option.. |
97 | if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ | 97 | if ( !m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDiff ) ){ |
98 | // Libopie seems to be old.. | 98 | // Libopie seems to be old.. |
99 | output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" ); | 99 | output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" ); |
@@ -111,12 +111,12 @@ void AddressBookPluginWidget::getAddress() { | |||
111 | } | 111 | } |
112 | 112 | ||
113 | if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ | 113 | if ( m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDiff ) ){ |
114 | 114 | ||
115 | 115 | ||
116 | OContact querybirthdays; | 116 | Opie::OPimContact querybirthdays; |
117 | querybirthdays.setBirthday( lookAheadDate ); | 117 | querybirthdays.setBirthday( lookAheadDate ); |
118 | 118 | ||
119 | m_list = m_contactdb->queryByExample( querybirthdays, | 119 | m_list = m_contactdb->queryByExample( querybirthdays, |
120 | OContactAccess::DateDiff ); | 120 | Opie::OPimContactAccess::DateDiff ); |
121 | if ( m_list.count() > 0 ){ | 121 | if ( m_list.count() > 0 ){ |
122 | output = "<font color=" + m_headlineColor + ">" | 122 | output = "<font color=" + m_headlineColor + ">" |
@@ -164,8 +164,8 @@ void AddressBookPluginWidget::getAddress() { | |||
164 | if ( m_showAnniversaries ){ | 164 | if ( m_showAnniversaries ){ |
165 | // Define the query for anniversaries and start search.. | 165 | // Define the query for anniversaries and start search.. |
166 | OContact queryanniversaries; | 166 | Opie::OPimContact queryanniversaries; |
167 | queryanniversaries.setAnniversary( lookAheadDate ); | 167 | queryanniversaries.setAnniversary( lookAheadDate ); |
168 | 168 | ||
169 | m_list = m_contactdb->queryByExample( queryanniversaries, OContactAccess::DateDiff ); | 169 | m_list = m_contactdb->queryByExample( queryanniversaries, Opie::OPimContactAccess::DateDiff ); |
170 | 170 | ||
171 | ammount = 0; | 171 | ammount = 0; |
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 @@ | |||
20 | #define ADDRESSBOOK_PLUGIN_WIDGET_H | 20 | #define ADDRESSBOOK_PLUGIN_WIDGET_H |
21 | 21 | ||
22 | #include <opie2/ocontactaccess.h> | ||
23 | #include <opie2/oclickablelabel.h> | ||
24 | |||
22 | #include <qstring.h> | 25 | #include <qstring.h> |
23 | #include <qwidget.h> | 26 | #include <qwidget.h> |
24 | #include <qlayout.h> | 27 | #include <qlayout.h> |
25 | 28 | ||
26 | #include <opie/ocontactaccess.h> | ||
27 | #include <opie/oclickablelabel.h> | ||
28 | |||
29 | 29 | ||
30 | class AddressBookPluginWidget : public QWidget { | 30 | class AddressBookPluginWidget : public QWidget { |
@@ -38,5 +38,5 @@ public: | |||
38 | void reinitialize(); | 38 | void reinitialize(); |
39 | public slots: | 39 | public slots: |
40 | void refresh( const OContactAccess* db ); | 40 | void refresh( const Opie::OPimContactAccess* db ); |
41 | 41 | ||
42 | protected slots: | 42 | protected slots: |
@@ -44,10 +44,10 @@ protected slots: | |||
44 | 44 | ||
45 | private: | 45 | private: |
46 | OClickableLabel* addressLabel; | 46 | Opie::Ui::OClickableLabel* addressLabel; |
47 | QVBoxLayout* layoutTodo; | 47 | QVBoxLayout* layoutTodo; |
48 | OContactAccess * m_contactdb; | 48 | Opie::OPimContactAccess * m_contactdb; |
49 | 49 | ||
50 | OContactAccess::List m_list; | 50 | Opie::OPimContactAccess::List m_list; |
51 | OContactAccess::List::Iterator m_it; | 51 | Opie::OPimContactAccess::List::Iterator m_it; |
52 | 52 | ||
53 | void readConfig(); | 53 | 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 @@ | |||
2 | boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)" | 2 | boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | 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 | |||
5 | Maintainer: Stefan Eilers <eilers.stefan@epost.de> | 5 | Maintainer: Stefan Eilers <eilers.stefan@epost.de> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: libqte2, opie-today | 7 | Depends: libqte2, opie-today, libopiecore2, libopieui2, libopiepim2, libopiedb2, libqtaux2 |
8 | Description: Addressbook plugin for Today | 8 | Description: Addressbook plugin for Today |
9 | Displays upcoming Birthdays and Anniversaries | 9 | Displays upcoming Birthdays and Anniversaries |