author | drw <drw> | 2004-03-25 23:00:40 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-25 23:00:40 (UTC) |
commit | 03091cd727701bdb2aa6ac623cd606131546d686 (patch) (unidiff) | |
tree | 76b818f6893fd0030071427d5a1efb0273921195 /core/pim/today | |
parent | ad160e97db39536ac42acdd3f2f98d1e49ae1f75 (diff) | |
download | opie-03091cd727701bdb2aa6ac623cd606131546d686.zip opie-03091cd727701bdb2aa6ac623cd606131546d686.tar.gz opie-03091cd727701bdb2aa6ac623cd606131546d686.tar.bz2 |
libopie -> libopie2
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 | |||
@@ -4,18 +4,18 @@ CONFIG += qt plugin release | |||
4 | 4 | ||
5 | # Input | 5 | # Input |
6 | HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h \ | 6 | HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h \ |
7 | addresspluginwidget.h | 7 | addresspluginwidget.h |
8 | SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \ | 8 | SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \ |
9 | addresspluginwidget.cpp | 9 | addresspluginwidget.cpp |
10 | 10 | ||
11 | INCLUDEPATH += $(OPIEDIR)/include \ | 11 | INCLUDEPATH += $(OPIEDIR)/include \ |
12 | ../ ../library | 12 | ../ ../library |
13 | DEPENDPATH += $(OPIEDIR)/include \ | 13 | 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 |
19 | TARGET = todayaddressbookplugin | 19 | TARGET = todayaddressbookplugin |
20 | 20 | ||
21 | include ( $(OPIEDIR)/include.pro ) | 21 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -10,31 +10,31 @@ | |||
10 | /*************************************************************************** | 10 | /*************************************************************************** |
11 | * * | 11 | * * |
12 | * This program is free software; you can redistribute it and/or modify * | 12 | * This program is free software; you can redistribute it and/or modify * |
13 | * it under the terms of the GNU General Public License as published by * | 13 | * it under the terms of the GNU General Public License as published by * |
14 | * the Free Software Foundation; either version 2 of the License, or * | 14 | * the Free Software Foundation; either version 2 of the License, or * |
15 | * (at your option) any later version. * | 15 | * (at your option) any later version. * |
16 | * * | 16 | * * |
17 | ***************************************************************************/ | 17 | ***************************************************************************/ |
18 | 18 | ||
19 | #ifndef ADDRESSBOOK_PLUGIN_H | 19 | #ifndef ADDRESSBOOK_PLUGIN_H |
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 { |
31 | 31 | ||
32 | public: | 32 | public: |
33 | AddressBookPlugin(); | 33 | AddressBookPlugin(); |
34 | ~AddressBookPlugin(); | 34 | ~AddressBookPlugin(); |
35 | 35 | ||
36 | QString pluginName() const; | 36 | QString pluginName() const; |
37 | double versionNumber() const; | 37 | double versionNumber() const; |
38 | QString pixmapNameWidget() const; | 38 | QString pixmapNameWidget() const; |
39 | QWidget* widget(QWidget *); | 39 | QWidget* widget(QWidget *); |
40 | QString pixmapNameConfig() const; | 40 | QString pixmapNameConfig() const; |
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 | |||
@@ -77,43 +77,43 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
77 | SpinDaysClip->setMaxValue( 200 ); | 77 | SpinDaysClip->setMaxValue( 200 ); |
78 | QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) ); | 78 | QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) ); |
79 | 79 | ||
80 | // QHBox *box4 = new QHBox( this ); | 80 | // QHBox *box4 = new QHBox( this ); |
81 | 81 | ||
82 | // QLabel* colorLabel = new QLabel( box4, "" ); | 82 | // QLabel* colorLabel = new QLabel( box4, "" ); |
83 | // colorLabel->setText( tr( "To activate settings: Restart application !" ) ); | 83 | // colorLabel->setText( tr( "To activate settings: Restart application !" ) ); |
84 | 84 | ||
85 | 85 | ||
86 | QHBox *box5 = new QHBox( this ); | 86 | QHBox *box5 = new QHBox( this ); |
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 ); |
92 | 92 | ||
93 | // Entry color settings | 93 | // Entry color settings |
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 | ||
99 | // Urgent color settings | 99 | // Urgent color settings |
100 | QHBox *box7 = new QHBox( this ); | 100 | QHBox *box7 = new QHBox( this ); |
101 | QLabel* colorLabel5 = new QLabel( box7, "" ); | 101 | QLabel* colorLabel5 = new QLabel( box7, "" ); |
102 | colorLabel5->setText( tr( "Set Urgent\nColor if below " ) ); | 102 | colorLabel5->setText( tr( "Set Urgent\nColor if below " ) ); |
103 | SpinUrgentClip = new QSpinBox( box7, "SpinDays" ); | 103 | SpinUrgentClip = new QSpinBox( box7, "SpinDays" ); |
104 | SpinUrgentClip->setMaxValue( 200 ); | 104 | SpinUrgentClip->setMaxValue( 200 ); |
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 !" ) ); |
110 | 110 | ||
111 | 111 | ||
112 | //layout->addWidget( box4 ); | 112 | //layout->addWidget( box4 ); |
113 | layout->addWidget( box1 ); | 113 | layout->addWidget( box1 ); |
114 | //layout->addWidget( box2 ); | 114 | //layout->addWidget( box2 ); |
115 | layout->addWidget( box3 ); | 115 | layout->addWidget( box3 ); |
116 | layout->addWidget( box5 ); | 116 | layout->addWidget( box5 ); |
117 | layout->addWidget( box6 ); | 117 | layout->addWidget( box6 ); |
118 | layout->addWidget( box7 ); | 118 | layout->addWidget( box7 ); |
119 | 119 | ||
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 | |||
@@ -10,54 +10,54 @@ | |||
10 | /*************************************************************************** | 10 | /*************************************************************************** |
11 | * * | 11 | * * |
12 | * This program is free software; you can redistribute it and/or modify * | 12 | * This program is free software; you can redistribute it and/or modify * |
13 | * it under the terms of the GNU General Public License as published by * | 13 | * it under the terms of the GNU General Public License as published by * |
14 | * the Free Software Foundation; either version 2 of the License, or * | 14 | * the Free Software Foundation; either version 2 of the License, or * |
15 | * (at your option) any later version. * | 15 | * (at your option) any later version. * |
16 | * * | 16 | * * |
17 | ***************************************************************************/ | 17 | ***************************************************************************/ |
18 | 18 | ||
19 | #ifndef ADDRESSBOOK_PLUGIN_CONFIG_H | 19 | #ifndef ADDRESSBOOK_PLUGIN_CONFIG_H |
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 |
31 | 31 | ||
32 | public: | 32 | public: |
33 | 33 | ||
34 | AddressBookPluginConfig( QWidget *parent, const char *name ); | 34 | AddressBookPluginConfig( QWidget *parent, const char *name ); |
35 | ~AddressBookPluginConfig(); | 35 | ~AddressBookPluginConfig(); |
36 | 36 | ||
37 | private: | 37 | private: |
38 | /** | 38 | /** |
39 | * if changed then save | 39 | * if changed then save |
40 | */ | 40 | */ |
41 | bool changed(); | 41 | bool changed(); |
42 | void readConfig(); | 42 | void readConfig(); |
43 | void writeConfig(); | 43 | void writeConfig(); |
44 | 44 | ||
45 | QSpinBox* SpinBox2; | 45 | QSpinBox* SpinBox2; |
46 | QSpinBox* SpinBoxClip; | 46 | QSpinBox* SpinBoxClip; |
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; |
54 | 54 | ||
55 | // how many lines should be showed in the AddressBook section | 55 | // how many lines should be showed in the AddressBook section |
56 | int m_max_lines_task; | 56 | int m_max_lines_task; |
57 | // clip the lines after X chars | 57 | // clip the lines after X chars |
58 | int m_maxCharClip; | 58 | int m_maxCharClip; |
59 | // How many days look ahead | 59 | // How many days look ahead |
60 | int m_daysLookAhead; | 60 | int m_daysLookAhead; |
61 | // Days until urgent color is used | 61 | // Days until urgent color is used |
62 | int m_urgentDays; | 62 | int m_urgentDays; |
63 | // Entry Color | 63 | // Entry Color |
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 | |||
@@ -10,25 +10,25 @@ | |||
10 | /*************************************************************************** | 10 | /*************************************************************************** |
11 | * * | 11 | * * |
12 | * This program is free software; you can redistribute it and/or modify * | 12 | * This program is free software; you can redistribute it and/or modify * |
13 | * it under the terms of the GNU General Public License as published by * | 13 | * it under the terms of the GNU General Public License as published by * |
14 | * the Free Software Foundation; either version 2 of the License, or * | 14 | * the Free Software Foundation; either version 2 of the License, or * |
15 | * (at your option) any later version. * | 15 | * (at your option) any later version. * |
16 | * * | 16 | * * |
17 | ***************************************************************************/ | 17 | ***************************************************************************/ |
18 | 18 | ||
19 | #ifndef ADDRESSBOOK_PLUGIN_IMPL_H | 19 | #ifndef ADDRESSBOOK_PLUGIN_IMPL_H |
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; |
25 | 25 | ||
26 | class AddressBookPluginImpl : public TodayPluginInterface{ | 26 | class AddressBookPluginImpl : public TodayPluginInterface{ |
27 | 27 | ||
28 | public: | 28 | public: |
29 | AddressBookPluginImpl(); | 29 | AddressBookPluginImpl(); |
30 | virtual ~AddressBookPluginImpl(); | 30 | virtual ~AddressBookPluginImpl(); |
31 | 31 | ||
32 | QRESULT queryInterface( const QUuid &, QUnknownInterface** ); | 32 | QRESULT queryInterface( const QUuid &, QUnknownInterface** ); |
33 | Q_REFCOUNT | 33 | Q_REFCOUNT |
34 | 34 | ||
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 | |||
@@ -10,55 +10,55 @@ | |||
10 | /*************************************************************************** | 10 | /*************************************************************************** |
11 | * * | 11 | * * |
12 | * This program is free software; you can redistribute it and/or modify * | 12 | * This program is free software; you can redistribute it and/or modify * |
13 | * it under the terms of the GNU General Public License as published by * | 13 | * it under the terms of the GNU General Public License as published by * |
14 | * the Free Software Foundation; either version 2 of the License, or * | 14 | * the Free Software Foundation; either version 2 of the License, or * |
15 | * (at your option) any later version. * | 15 | * (at your option) any later version. * |
16 | * * | 16 | * * |
17 | ***************************************************************************/ | 17 | ***************************************************************************/ |
18 | 18 | ||
19 | #include "addresspluginwidget.h" | 19 | #include "addresspluginwidget.h" |
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 ) |
27 | : QWidget( parent, name ) { | 27 | : QWidget( parent, name ) { |
28 | 28 | ||
29 | addressLabel = 0l; | 29 | addressLabel = 0l; |
30 | m_contactdb = 0l; | 30 | m_contactdb = 0l; |
31 | layoutTodo = 0l; | 31 | layoutTodo = 0l; |
32 | 32 | ||
33 | // Hä ? Nonsense ! (se) | 33 | // Hä ? Nonsense ! (se) |
34 | if ( m_contactdb ) { | 34 | if ( m_contactdb ) { |
35 | delete m_contactdb; | 35 | delete m_contactdb; |
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 | ||
44 | readConfig(); | 44 | readConfig(); |
45 | getAddress(); | 45 | getAddress(); |
46 | } | 46 | } |
47 | 47 | ||
48 | AddressBookPluginWidget::~AddressBookPluginWidget() { | 48 | AddressBookPluginWidget::~AddressBookPluginWidget() { |
49 | delete m_contactdb; | 49 | delete m_contactdb; |
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 ! "); |
55 | m_contactdb->reload(); | 55 | m_contactdb->reload(); |
56 | getAddress(); | 56 | getAddress(); |
57 | } | 57 | } |
58 | 58 | ||
59 | void AddressBookPluginWidget::reinitialize() { | 59 | void AddressBookPluginWidget::reinitialize() { |
60 | readConfig(); | 60 | readConfig(); |
61 | getAddress(); | 61 | getAddress(); |
62 | } | 62 | } |
63 | 63 | ||
64 | void AddressBookPluginWidget::readConfig() { | 64 | void AddressBookPluginWidget::readConfig() { |
@@ -77,56 +77,56 @@ void AddressBookPluginWidget::readConfig() { | |||
77 | 77 | ||
78 | 78 | ||
79 | /** | 79 | /** |
80 | * Get the addresss | 80 | * Get the addresss |
81 | */ | 81 | */ |
82 | void AddressBookPluginWidget::getAddress() { | 82 | void AddressBookPluginWidget::getAddress() { |
83 | 83 | ||
84 | if ( ! layoutTodo ){ | 84 | if ( ! layoutTodo ){ |
85 | layoutTodo = new QVBoxLayout( this ); | 85 | layoutTodo = new QVBoxLayout( this ); |
86 | } | 86 | } |
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 ); |
92 | } | 92 | } |
93 | 93 | ||
94 | QString output; | 94 | QString output; |
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>" ); |
100 | addressLabel->setText( output ); | 100 | addressLabel->setText( output ); |
101 | return; | 101 | return; |
102 | } | 102 | } |
103 | 103 | ||
104 | // Define the query for birthdays and start search.. | 104 | // Define the query for birthdays and start search.. |
105 | QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead ); | 105 | QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead ); |
106 | int ammount = 0; | 106 | int ammount = 0; |
107 | if ( m_showBirthdays ){ | 107 | if ( m_showBirthdays ){ |
108 | qWarning("Searching from now (%s) until %s ! ", | 108 | qWarning("Searching from now (%s) until %s ! ", |
109 | QDate::currentDate().toString().latin1(), | 109 | QDate::currentDate().toString().latin1(), |
110 | lookAheadDate.toString().latin1() ); | 110 | lookAheadDate.toString().latin1() ); |
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 + ">" |
123 | + QObject::tr( "Next birthdays in <b> %1 </b> days:" ) | 123 | + QObject::tr( "Next birthdays in <b> %1 </b> days:" ) |
124 | .arg( m_daysLookAhead ) | 124 | .arg( m_daysLookAhead ) |
125 | + "</font> <br>"; | 125 | + "</font> <br>"; |
126 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { | 126 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { |
127 | if ( ammount++ < m_maxLinesTask ){ | 127 | if ( ammount++ < m_maxLinesTask ){ |
128 | // Now we want to calculate how many days | 128 | // Now we want to calculate how many days |
129 | //until birthday. We have to set | 129 | //until birthday. We have to set |
130 | // the correct year to calculate the day diff... | 130 | // the correct year to calculate the day diff... |
131 | QDate destdate = (*m_it).birthday(); | 131 | QDate destdate = (*m_it).birthday(); |
132 | destdate.setYMD( QDate::currentDate().year(), | 132 | destdate.setYMD( QDate::currentDate().year(), |
@@ -154,28 +154,28 @@ void AddressBookPluginWidget::getAddress() { | |||
154 | } | 154 | } |
155 | } | 155 | } |
156 | } else { | 156 | } else { |
157 | output = "<font color=" + m_headlineColor + ">" | 157 | output = "<font color=" + m_headlineColor + ">" |
158 | + QObject::tr( "No birthdays in <b> %1 </b> days!" ) | 158 | + QObject::tr( "No birthdays in <b> %1 </b> days!" ) |
159 | .arg( m_daysLookAhead ) | 159 | .arg( m_daysLookAhead ) |
160 | + "</font> <br>"; | 160 | + "</font> <br>"; |
161 | } | 161 | } |
162 | } | 162 | } |
163 | 163 | ||
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; |
172 | if ( m_list.count() > 0 ){ | 172 | if ( m_list.count() > 0 ){ |
173 | output += "<font color=" + m_headlineColor + ">" | 173 | output += "<font color=" + m_headlineColor + ">" |
174 | + QObject::tr( "Next anniversaries in <b> %1 </b> days:" ) | 174 | + QObject::tr( "Next anniversaries in <b> %1 </b> days:" ) |
175 | .arg( m_daysLookAhead ) | 175 | .arg( m_daysLookAhead ) |
176 | + "</font> <br>"; | 176 | + "</font> <br>"; |
177 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { | 177 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { |
178 | if ( ammount++ < m_maxLinesTask ){ | 178 | if ( ammount++ < m_maxLinesTask ){ |
179 | // Now we want to calculate how many days until anniversary. | 179 | // Now we want to calculate how many days until anniversary. |
180 | // We have to set the correct year to calculate the day diff... | 180 | // We have to set the correct year to calculate the day diff... |
181 | QDate destdate = (*m_it).anniversary(); | 181 | QDate destdate = (*m_it).anniversary(); |
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 | |||
@@ -10,54 +10,54 @@ | |||
10 | /*************************************************************************** | 10 | /*************************************************************************** |
11 | * * | 11 | * * |
12 | * This program is free software; you can redistribute it and/or modify * | 12 | * This program is free software; you can redistribute it and/or modify * |
13 | * it under the terms of the GNU General Public License as published by * | 13 | * it under the terms of the GNU General Public License as published by * |
14 | * the Free Software Foundation; either version 2 of the License, or * | 14 | * the Free Software Foundation; either version 2 of the License, or * |
15 | * (at your option) any later version. * | 15 | * (at your option) any later version. * |
16 | * * | 16 | * * |
17 | ***************************************************************************/ | 17 | ***************************************************************************/ |
18 | 18 | ||
19 | #ifndef ADDRESSBOOK_PLUGIN_WIDGET_H | 19 | #ifndef ADDRESSBOOK_PLUGIN_WIDGET_H |
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 { |
31 | 31 | ||
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | 33 | ||
34 | public: | 34 | public: |
35 | AddressBookPluginWidget( QWidget *parent, const char *name ); | 35 | AddressBookPluginWidget( QWidget *parent, const char *name ); |
36 | ~AddressBookPluginWidget(); | 36 | ~AddressBookPluginWidget(); |
37 | 37 | ||
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: |
43 | void startAddressBook(); | 43 | void startAddressBook(); |
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(); |
54 | void getAddress(); | 54 | void getAddress(); |
55 | int m_maxLinesTask; | 55 | int m_maxLinesTask; |
56 | int m_maxCharClip; | 56 | int m_maxCharClip; |
57 | int m_daysLookAhead; | 57 | int m_daysLookAhead; |
58 | int m_urgentDays; | 58 | int m_urgentDays; |
59 | QString m_entryColor; | 59 | QString m_entryColor; |
60 | QString m_headlineColor; | 60 | QString m_headlineColor; |
61 | QString m_urgentColor; | 61 | QString m_urgentColor; |
62 | bool m_showBirthdays; | 62 | bool m_showBirthdays; |
63 | bool m_showAnniversaries; | 63 | bool m_showAnniversaries; |
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 | |||
@@ -1,4 +1,4 @@ | |||
1 | config TODAY_ADDRESSBOOK | 1 | config TODAY_ADDRESSBOOK |
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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-today-addressbookplugin | 1 | Package: opie-today-addressbookplugin |
2 | Files: plugins/today/libtodayaddressbookplugin.so* | 2 | Files: plugins/today/libtodayaddressbookplugin.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/plugins | 4 | 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 |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |