summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/libopie.pro6
-rw-r--r--libopie/orecurrancewidget.cpp20
-rw-r--r--libopie/orecurrancewidget.h6
3 files changed, 27 insertions, 5 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index b7537cc..2e76cb1 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -31,8 +31,11 @@ HEADERS = ofontmenu.h \
31 pim/opimxrefpartner.h \ 31 pim/opimxrefpartner.h \
32 pim/opimxref.h \ 32 pim/opimxref.h \
33 pim/opimxrefmanager.h \ 33 pim/opimxrefmanager.h \
34 pim/opimmaintainer.h \ 34 pim/opimmaintainer.h \
35 pim/opimnotify.h \
36 pim/opimnotifymanager.h \
37 pim/opimmainwindow.h \
35 orecurrancewidget.h \ 38 orecurrancewidget.h \
36 oticker.h 39 oticker.h
37# pim/otodoaccesssql.h \ 40# pim/otodoaccesssql.h \
38 41
@@ -62,8 +65,11 @@ SOURCES = ofontmenu.cc \
62 pim/opimxrefpartner.cpp \ 65 pim/opimxrefpartner.cpp \
63 pim/opimxref.cpp \ 66 pim/opimxref.cpp \
64 pim/opimxrefmanager.cpp \ 67 pim/opimxrefmanager.cpp \
65 pim/opimmaintainer.cpp \ 68 pim/opimmaintainer.cpp \
69 pim/opimnotify.cpp \
70 pim/opimnotifymanager.cpp \
71 pim/opimmainwindow.cpp \
66 orecurrancewidget.cpp \ 72 orecurrancewidget.cpp \
67 oticker.cpp 73 oticker.cpp
68# pim/otodoaccesssql.cpp \ 74# pim/otodoaccesssql.cpp \
69 75
diff --git a/libopie/orecurrancewidget.cpp b/libopie/orecurrancewidget.cpp
index 53cee65..0484ab9 100644
--- a/libopie/orecurrancewidget.cpp
+++ b/libopie/orecurrancewidget.cpp
@@ -53,8 +53,23 @@ ORecurranceWidget::ORecurranceWidget( bool startOnMonday,
53 startWeekOnMonday( startOnMonday ) 53 startWeekOnMonday( startOnMonday )
54{ 54{
55 // do some stuff with the repeat pattern 55 // do some stuff with the repeat pattern
56 init(); 56 init();
57 setRecurrence( rp );
58}
59
60ORecurranceWidget::~ORecurranceWidget() {
61}
62void ORecurranceWidget::setStartDate( const QDate& date ) {
63 qWarning("ORecurranceWidget::setStartDate");
64 setRecurrence( recurrence(), date );
65}
66void ORecurranceWidget::setRecurrence( const ORecur& rp ) {
67 setRecurrence( rp, start );
68}
69void ORecurranceWidget::setRecurrence( const ORecur& rp, const QDate& date ) {
70 start = date;
71 end = rp.endDate();
57 switch ( rp.type() ) { 72 switch ( rp.type() ) {
58 default: 73 default:
59 case ORecur::NoRepeat: 74 case ORecur::NoRepeat:
60 currInterval = None; 75 currInterval = None;
@@ -107,12 +122,9 @@ ORecurranceWidget::ORecurranceWidget( bool startOnMonday,
107 chkNoEnd->setChecked( TRUE ); 122 chkNoEnd->setChecked( TRUE );
108 } else 123 } else
109 cmdEnd->setText( TimeString::shortDate( end ) ); 124 cmdEnd->setText( TimeString::shortDate( end ) );
110} 125}
111ORecurranceWidget::~ORecurranceWidget() { 126ORecur ORecurranceWidget::recurrence()const {
112
113}
114ORecur ORecurranceWidget::recurrance()const {
115 QListIterator<QToolButton> it( listRTypeButtons ); 127 QListIterator<QToolButton> it( listRTypeButtons );
116 QListIterator<QToolButton> itExtra( listExtra ); 128 QListIterator<QToolButton> itExtra( listExtra );
117 ORecur rpTmp; 129 ORecur rpTmp;
118 int i; 130 int i;
diff --git a/libopie/orecurrancewidget.h b/libopie/orecurrancewidget.h
index f2d7f87..4a8dd08 100644
--- a/libopie/orecurrancewidget.h
+++ b/libopie/orecurrancewidget.h
@@ -15,8 +15,9 @@
15 15
16#include "orecurrancebase.h" 16#include "orecurrancebase.h"
17#include <opie/orecur.h> 17#include <opie/orecur.h>
18 18
19// FIXME spelling!!!! -zecke
19class ORecurranceWidget : public ORecurranceBase { 20class ORecurranceWidget : public ORecurranceBase {
20 Q_OBJECT 21 Q_OBJECT
21public: 22public:
22 ORecurranceWidget( bool startOnMonday, 23 ORecurranceWidget( bool startOnMonday,
@@ -27,15 +28,18 @@ public:
27 const ORecur& rp, const QDate& start, 28 const ORecur& rp, const QDate& start,
28 QWidget* parent = 0, const char* name =0, 29 QWidget* parent = 0, const char* name =0,
29 bool modal = TRUE, WFlags = 0 ); 30 bool modal = TRUE, WFlags = 0 );
30 ~ORecurranceWidget(); 31 ~ORecurranceWidget();
31 ORecur recurrance()const; 32 ORecur recurrence()const;
32 QDate endDate()const; 33 QDate endDate()const;
33 34
34public slots: 35public slots:
35 void slotSetRType( int ); 36 void slotSetRType( int );
36 void endDateChanged( int, int, int ); 37 void endDateChanged( int, int, int );
37 void slotNoEnd( bool unused ); 38 void slotNoEnd( bool unused );
39 void setStartDate( const QDate& );
40 void setRecurrence( const ORecur& recur, const QDate& start );
41 void setRecurrence( const ORecur& recur );
38 42
39private slots: 43private slots:
40 void setupRepeatLabel( const QString& ); 44 void setupRepeatLabel( const QString& );
41 void setupRepeatLabel( int ); 45 void setupRepeatLabel( int );