-rw-r--r-- | libopie/libopie.pro | 6 | ||||
-rw-r--r-- | libopie/orecurrancewidget.cpp | 20 | ||||
-rw-r--r-- | libopie/orecurrancewidget.h | 6 |
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 | |||
@@ -32,6 +32,9 @@ HEADERS = ofontmenu.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 \ |
@@ -63,6 +66,9 @@ SOURCES = ofontmenu.cc \ | |||
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 \ |
diff --git a/libopie/orecurrancewidget.cpp b/libopie/orecurrancewidget.cpp index 53cee65..0484ab9 100644 --- a/libopie/orecurrancewidget.cpp +++ b/libopie/orecurrancewidget.cpp | |||
@@ -54,6 +54,21 @@ ORecurranceWidget::ORecurranceWidget( bool 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 | |||
60 | ORecurranceWidget::~ORecurranceWidget() { | ||
61 | } | ||
62 | void ORecurranceWidget::setStartDate( const QDate& date ) { | ||
63 | qWarning("ORecurranceWidget::setStartDate"); | ||
64 | setRecurrence( recurrence(), date ); | ||
65 | } | ||
66 | void ORecurranceWidget::setRecurrence( const ORecur& rp ) { | ||
67 | setRecurrence( rp, start ); | ||
68 | } | ||
69 | void 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: |
@@ -108,10 +123,7 @@ ORecurranceWidget::ORecurranceWidget( bool startOnMonday, | |||
108 | } else | 123 | } else |
109 | cmdEnd->setText( TimeString::shortDate( end ) ); | 124 | cmdEnd->setText( TimeString::shortDate( end ) ); |
110 | } | 125 | } |
111 | ORecurranceWidget::~ORecurranceWidget() { | 126 | ORecur ORecurranceWidget::recurrence()const { |
112 | |||
113 | } | ||
114 | ORecur 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; |
diff --git a/libopie/orecurrancewidget.h b/libopie/orecurrancewidget.h index f2d7f87..4a8dd08 100644 --- a/libopie/orecurrancewidget.h +++ b/libopie/orecurrancewidget.h | |||
@@ -16,6 +16,7 @@ | |||
16 | #include "orecurrancebase.h" | 16 | #include "orecurrancebase.h" |
17 | #include <opie/orecur.h> | 17 | #include <opie/orecur.h> |
18 | 18 | ||
19 | // FIXME spelling!!!! -zecke | ||
19 | class ORecurranceWidget : public ORecurranceBase { | 20 | class ORecurranceWidget : public ORecurranceBase { |
20 | Q_OBJECT | 21 | Q_OBJECT |
21 | public: | 22 | public: |
@@ -28,13 +29,16 @@ public: | |||
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 | ||
34 | public slots: | 35 | public 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 | ||
39 | private slots: | 43 | private slots: |
40 | void setupRepeatLabel( const QString& ); | 44 | void setupRepeatLabel( const QString& ); |