-rw-r--r-- | core/pim/datebook/datebook.cpp | 24 | ||||
-rw-r--r-- | core/pim/datebook/datebookweekheaderimpl.cpp | 11 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 43 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.h | 1 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 10 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.h | 14 | ||||
-rw-r--r-- | core/pim/today/plugins/addressbook/addresspluginconfig.cpp | 10 | ||||
-rw-r--r-- | core/pim/today/plugins/addressbook/addresspluginwidget.cpp | 12 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginconfig.h | 12 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.h | 9 |
11 files changed, 88 insertions, 60 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 10a9b59..07d7164 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -193,4 +193,6 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
193 | qDebug("done t=%d", t.elapsed() ); | 193 | qDebug("done t=%d", t.elapsed() ); |
194 | 194 | ||
195 | connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); | ||
196 | connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) ); | ||
195 | /* | 197 | /* |
196 | * Here is a problem description: | 198 | * Here is a problem description: |
@@ -403,4 +405,6 @@ void DateBook::insertEvent( const Event &e ) | |||
403 | { | 405 | { |
404 | Event dupEvent=e; | 406 | Event dupEvent=e; |
407 | if(!dupEvent.isValidUid() ) // tkcRom seems to be different | ||
408 | dupEvent.assignUid(); | ||
405 | dupEvent.setLocation(defaultLocation); | 409 | dupEvent.setLocation(defaultLocation); |
406 | dupEvent.setCategories(defaultCategories); | 410 | dupEvent.setCategories(defaultCategories); |
@@ -444,13 +448,15 @@ void DateBook::duplicateEvent( const Event &e ) | |||
444 | continue; | 448 | continue; |
445 | } | 449 | } |
446 | /* | 450 | /* |
447 | * The problem: | 451 | * The problem: |
448 | * DateBookDB does remove repeating events not by uid but by the time | 452 | * DateBookDB does remove repeating events not by uid but by the time |
449 | * the recurrence was created | 453 | * the recurrence was created |
450 | * so we need to update that time as well | 454 | * so we need to update that time as well |
451 | */ | 455 | */ |
452 | Event::RepeatPattern rp = newEv.repeatPattern(); | 456 | Event::RepeatPattern rp = newEv.repeatPattern(); |
453 | rp.createTime = ::time( NULL ); | 457 | rp.createTime = ::time( NULL ); |
454 | newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern... | 458 | newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern... |
459 | if( newEv.uid() == e.uid() || !newEv.isValidUid() ) | ||
460 | newEv.assignUid(); | ||
455 | 461 | ||
456 | db->addEvent(newEv); | 462 | db->addEvent(newEv); |
diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp index 770410e..84b4f1b 100644 --- a/core/pim/datebook/datebookweekheaderimpl.cpp +++ b/core/pim/datebook/datebookweekheaderimpl.cpp | |||
@@ -99,10 +99,10 @@ void DateBookWeekHeader::setDate(const QDate &d) { | |||
99 | date=d; | 99 | date=d; |
100 | dayofweek=d.dayOfWeek(); | 100 | dayofweek=d.dayOfWeek(); |
101 | if(bStartOnMonday) | 101 | if(bStartOnMonday) |
102 | dayofweek--; | 102 | dayofweek--; |
103 | else if( dayofweek == 7 ) | 103 | else if( dayofweek == 7 ) |
104 | /* we already have the right day -7 would lead to the current week..*/ | 104 | // we already have the right day -7 would lead to the current week.. |
105 | dayofweek = 0; | 105 | dayofweek = 0; |
106 | 106 | ||
107 | date=date.addDays(-dayofweek); | 107 | date=date.addDays(-dayofweek); |
108 | calcWeek(date,week,year,bStartOnMonday); | 108 | calcWeek(date,week,year,bStartOnMonday); |
@@ -110,8 +110,9 @@ void DateBookWeekHeader::setDate(const QDate &d) { | |||
110 | QDate stop=start.addDays(6); | 110 | QDate stop=start.addDays(6); |
111 | labelDate->setText( QString::number(start.day()) + "." + | 111 | labelDate->setText( QString::number(start.day()) + "." + |
112 | start.monthName(start.month()) + "-" + | 112 | Calendar::nameOfMonth( start.month()) + "-" + |
113 | QString::number(stop.day()) + "." + | 113 | QString::number(stop.day()) + "." + |
114 | start.monthName(stop.month()) +" ("+ | 114 | Calendar::nameOfMonth( stop.month()) +" ("+ |
115 | tr("w")+":"+QString::number( week ) +")"); | 115 | tr("w")+":"+QString::number( week ) +")"); |
116 | date = d; // bugfix: 0001126 - date has to be the selected date, not monday! | ||
116 | emit dateChanged(date); | 117 | emit dateChanged(date); |
117 | } | 118 | } |
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index aad1f3a..24fb0ba 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp | |||
@@ -1,29 +1,14 @@ | |||
1 | #include "datebookweeklst.h" | 1 | #include "datebookweeklst.h" |
2 | 2 | ||
3 | #include "datebookweekheaderimpl.h" | ||
4 | 3 | ||
5 | #include "datebook.h" | 4 | #include "datebook.h" |
6 | 5 | ||
7 | #include <qpe/calendar.h> | ||
8 | #include <qpe/datebookdb.h> | ||
9 | #include <qpe/event.h> | ||
10 | #include <qpe/qpeapplication.h> | ||
11 | #include <qpe/timestring.h> | ||
12 | #include <qpe/datebookmonth.h> | 6 | #include <qpe/datebookmonth.h> |
13 | #include <qpe/config.h> | 7 | #include <qpe/config.h> |
14 | #include <qpe/resource.h> | 8 | #include <qpe/resource.h> |
9 | #include <qpe/calendar.h> | ||
15 | 10 | ||
16 | #include <qdatetime.h> | ||
17 | #include <qheader.h> | ||
18 | #include <qlabel.h> | ||
19 | #include <qlayout.h> | 11 | #include <qlayout.h> |
20 | #include <qpainter.h> | ||
21 | #include <qpopupmenu.h> | ||
22 | #include <qtimer.h> | ||
23 | #include <qstyle.h> | ||
24 | #include <qtoolbutton.h> | 12 | #include <qtoolbutton.h> |
25 | #include <qvbox.h> | ||
26 | #include <qsizepolicy.h> | ||
27 | #include <qabstractlayout.h> | ||
28 | #include <qtl.h> | 13 | #include <qtl.h> |
29 | 14 | ||
@@ -74,8 +59,9 @@ void DateBookWeekLstHeader::setDate(const QDate &d) { | |||
74 | QDate stop=start.addDays(6); | 59 | QDate stop=start.addDays(6); |
75 | labelDate->setText( QString::number(start.day()) + "." + | 60 | labelDate->setText( QString::number(start.day()) + "." + |
76 | start.monthName(start.month()) + "-" + | 61 | Calendar::nameOfMonth( start.month() ) + "-" + |
77 | QString::number(stop.day()) + "." + | 62 | QString::number(stop.day()) + "." + |
78 | start.monthName(stop.month()) +" ("+ | 63 | Calendar::nameOfMonth( stop.month()) +" ("+ |
79 | tr("w")+":"+QString::number( week ) +")"); | 64 | tr("w")+":"+QString::number( week ) +")"); |
65 | date = d; // bugfix: 0001126 - date has to be the selected date, not monday! | ||
80 | emit dateChanged(date); | 66 | emit dateChanged(date); |
81 | } | 67 | } |
@@ -126,6 +112,8 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */, | |||
126 | char day=wdays[d.dayOfWeek()-1]; | 112 | char day=wdays[d.dayOfWeek()-1]; |
127 | 113 | ||
114 | //dont use dayOfWeek() to save space ! | ||
128 | label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) ); | 115 | label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) ); |
129 | add->setText("+"); | 116 | |
117 | add->setText("+"); | ||
130 | 118 | ||
131 | if (d == QDate::currentDate()) { | 119 | if (d == QDate::currentDate()) { |
@@ -342,6 +330,21 @@ QDate DateBookWeekLst::date() { | |||
342 | } | 330 | } |
343 | 331 | ||
332 | // return the date at the beginning of the week... | ||
333 | // copied from DateBookWeek | ||
334 | QDate DateBookWeekLst::weekDate() const | ||
335 | { | ||
336 | QDate d=bdate; | ||
337 | |||
338 | // Calculate offset to first day of week. | ||
339 | int dayoffset=d.dayOfWeek(); | ||
340 | if(bStartOnMonday) dayoffset--; | ||
341 | else if( dayoffset == 7 ) | ||
342 | dayoffset = 0; | ||
343 | |||
344 | return d.addDays(-dayoffset); | ||
345 | } | ||
346 | |||
344 | void DateBookWeekLst::getEvents() { | 347 | void DateBookWeekLst::getEvents() { |
345 | QDate start = date(); | 348 | QDate start = weekDate(); //date(); |
346 | QDate stop = start.addDays(6); | 349 | QDate stop = start.addDays(6); |
347 | QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop); | 350 | QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop); |
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h index 0bfbcda..f683ce7 100644 --- a/core/pim/datebook/datebookweeklst.h +++ b/core/pim/datebook/datebookweeklst.h | |||
@@ -121,4 +121,5 @@ public: | |||
121 | int week() const { return _week; }; | 121 | int week() const { return _week; }; |
122 | QDate date(); | 122 | QDate date(); |
123 | QDate weekDate() const; | ||
123 | 124 | ||
124 | public slots: | 125 | public slots: |
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index be2bf25..5da7ae9 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp | |||
@@ -77,5 +77,5 @@ void DatebookSearch::insertItem( void *rec ) | |||
77 | ev->lastHitField() == Qtopia::EndDateTime ) | 77 | ev->lastHitField() == Qtopia::EndDateTime ) |
78 | ) return; | 78 | ) return; |
79 | (void)new EventItem( this, ev ); | 79 | new EventItem( this, ev ); |
80 | _resultCount++; | 80 | _resultCount++; |
81 | } | 81 | } |
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index aa52061..f768d81 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -83,9 +83,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
83 | buttonBox->hide(); | 83 | buttonBox->hide(); |
84 | 84 | ||
85 | searches.append( new AppLnkSearch( resultsList, tr("applications") ) ); | 85 | searches.append( new AppLnkSearch( resultsList, tr("Applications") ) ); |
86 | searches.append( new DocLnkSearch( resultsList, tr("documents") ) ); | 86 | searches.append( new DocLnkSearch( resultsList, tr("Documents") ) ); |
87 | searches.append( new TodoSearch( resultsList, tr("todo") ) ); | 87 | searches.append( new TodoSearch( resultsList, tr("Todo List") ) ); |
88 | searches.append( new DatebookSearch( resultsList, tr("datebook") ) ); | 88 | searches.append( new DatebookSearch( resultsList, tr("Calendar") ) ); |
89 | searches.append( new AdressSearch( resultsList, tr("adressbook") ) ); | 89 | searches.append( new AdressSearch( resultsList, tr("Contacts") ) ); |
90 | 90 | ||
91 | setCentralWidget( mainFrame ); | 91 | setCentralWidget( mainFrame ); |
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h index 1f5c4bb..75054f0 100644 --- a/core/pim/osearch/mainwindow.h +++ b/core/pim/osearch/mainwindow.h | |||
@@ -8,5 +8,5 @@ | |||
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | 9 | ||
10 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> | 10 | // (c) 2002-2003 Patrick S. Vogt <tille@handhelds.org> |
11 | 11 | ||
12 | #ifndef MAINWINDOW_H | 12 | #ifndef MAINWINDOW_H |
@@ -14,6 +14,11 @@ | |||
14 | 14 | ||
15 | #include <qmainwindow.h> | 15 | #include <qmainwindow.h> |
16 | #include <qdialog.h> | ||
17 | #include <qaction.h> | ||
16 | #include <qlist.h> | 18 | #include <qlist.h> |
19 | |||
17 | #include <qmap.h> | 20 | #include <qmap.h> |
21 | #include <qtimer.h> | ||
22 | #include <qpopupmenu.h> | ||
18 | 23 | ||
19 | class QAction; | 24 | class QAction; |
@@ -27,6 +32,9 @@ class OListViewItem; | |||
27 | class QListViewItem; | 32 | class QListViewItem; |
28 | class QPopupMenu; | 33 | class QPopupMenu; |
29 | class QSignalMapper; | ||
30 | class QTimer; | 34 | class QTimer; |
35 | |||
36 | class QSignalMapper; | ||
37 | class QButton; | ||
38 | |||
31 | class SearchGroup; | 39 | class SearchGroup; |
32 | 40 | ||
@@ -39,5 +47,5 @@ public: | |||
39 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); | 47 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); |
40 | ~MainWindow(); | 48 | ~MainWindow(); |
41 | 49 | static QString appName() { return QString::fromLatin1("osearch"); } | |
42 | 50 | ||
43 | public slots: | 51 | public slots: |
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 | |||
@@ -79,4 +79,10 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
79 | QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) ); | 79 | QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) ); |
80 | 80 | ||
81 | // QHBox *box4 = new QHBox( this ); | ||
82 | |||
83 | // QLabel* colorLabel = new QLabel( box4, "" ); | ||
84 | // colorLabel->setText( tr( "To activate settings: Restart application !" ) ); | ||
85 | |||
86 | |||
81 | QHBox *box5 = new QHBox( this ); | 87 | QHBox *box5 = new QHBox( this ); |
82 | QLabel* colorLabel2 = new QLabel( box5, "" ); | 88 | QLabel* colorLabel2 = new QLabel( box5, "" ); |
@@ -105,7 +111,7 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
105 | 111 | ||
106 | 112 | ||
107 | layout->addWidget( b_group ); | 113 | //layout->addWidget( box4 ); |
108 | layout->addWidget( box1 ); | 114 | layout->addWidget( box1 ); |
109 | // layout->addWidget( box2 ); | 115 | //layout->addWidget( box2 ); |
110 | layout->addWidget( box3 ); | 116 | layout->addWidget( box3 ); |
111 | layout->addWidget( box5 ); | 117 | layout->addWidget( box5 ); |
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 | |||
@@ -103,5 +103,5 @@ void AddressBookPluginWidget::getAddress() { | |||
103 | 103 | ||
104 | // Check whether the database provide the search option.. | 104 | // Check whether the database provide the search option.. |
105 | if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ | 105 | if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ |
106 | // Libopie seems to be old.. | 106 | // Libopie seems to be old.. |
107 | output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" ); | 107 | output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" ); |
@@ -109,12 +109,16 @@ void AddressBookPluginWidget::getAddress() { | |||
109 | return; | 109 | return; |
110 | } | 110 | } |
111 | 111 | ||
112 | // Define the query for birthdays and start search.. | 112 | // Define the query for birthdays and start search.. |
113 | QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead ); | 113 | QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead ); |
114 | int ammount = 0; | 114 | int ammount = 0; |
115 | if ( m_showBirthdays ){ | 115 | if ( m_showBirthdays ){ |
116 | qWarning("Searching from now (%s) until %s ! ", | 116 | qWarning("Searching from now (%s) until %s ! ", |
117 | QDate::currentDate().toString().latin1(), | 117 | QDate::currentDate().toString().latin1(), |
118 | lookAheadDate.toString().latin1() ); | 118 | lookAheadDate.toString().latin1() ); |
119 | } | ||
120 | |||
121 | if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ | ||
122 | |||
119 | 123 | ||
120 | OContact querybirthdays; | 124 | OContact querybirthdays; |
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 | |||
@@ -24,8 +24,11 @@ | |||
24 | #include <opie/todayconfigwidget.h> | 24 | #include <opie/todayconfigwidget.h> |
25 | 25 | ||
26 | class DatebookPluginConfig : public TodayConfigWidget { | 26 | #include "datebookpluginconfigbase.h" |
27 | |||
28 | class DatebookPluginConfig : public TodayConfigWidget { | ||
27 | 29 | ||
28 | Q_OBJECT | 30 | Q_OBJECT |
29 | 31 | ||
32 | |||
30 | public: | 33 | public: |
31 | DatebookPluginConfig( QWidget *parent, const char *name ); | 34 | DatebookPluginConfig( QWidget *parent, const char *name ); |
@@ -40,11 +43,6 @@ private: | |||
40 | void readConfig(); | 43 | void readConfig(); |
41 | 44 | ||
42 | QCheckBox* CheckBox2; | ||
43 | QCheckBox* CheckBox1; | ||
44 | QCheckBox* CheckBox3; | ||
45 | QSpinBox* SpinBox1; | ||
46 | QSpinBox* SpinBox2; | ||
47 | |||
48 | 45 | ||
46 | DatebookPluginConfigBase *m_gui; | ||
49 | // how many lines should be showed in the datebook section | 47 | // how many lines should be showed in the datebook section |
50 | int m_max_lines_meet; | 48 | int m_max_lines_meet; |
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 | |||
@@ -18,12 +18,13 @@ | |||
18 | #define TODOLIST_PLUGIN_CONFIG_H | 18 | #define TODOLIST_PLUGIN_CONFIG_H |
19 | 19 | ||
20 | //#include <qwidget.h> | ||
21 | #include <qspinbox.h> | 20 | #include <qspinbox.h> |
22 | 21 | ||
23 | #include <opie/todayconfigwidget.h> | 22 | #include <opie/todayconfigwidget.h> |
24 | 23 | ||
24 | #include "todopluginconfigbase.h" | ||
25 | |||
25 | class TodolistPluginConfig : public TodayConfigWidget { | 26 | class TodolistPluginConfig : public TodayConfigWidget { |
26 | 27 | ||
27 | Q_OBJECT | 28 | Q_OBJECT |
28 | 29 | ||
29 | public: | 30 | public: |
@@ -39,7 +40,7 @@ private: | |||
39 | void readConfig(); | 40 | void readConfig(); |
40 | void writeConfig(); | 41 | void writeConfig(); |
42 | |||
43 | TodoPluginConfigBase *m_gui; | ||
41 | 44 | ||
42 | QSpinBox* SpinBox2; | ||
43 | QSpinBox* SpinBoxClip; | ||
44 | 45 | ||
45 | // how many lines should be showed in the todolist section | 46 | // how many lines should be showed in the todolist section |