author | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
commit | 640d964cfdc7467f6cacb513087cd3acda2c04f0 (patch) (unidiff) | |
tree | 9a784686c1795f8b1f81eb344598f3b549d43467 /library/datebookmonth.h | |
parent | dfb9c76738bb68e235114c5ad43dbd26a59b98ab (diff) | |
download | opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.zip opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.gz opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.bz2 |
Backing out unintentional merge from TT branch.
-rw-r--r-- | library/datebookmonth.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/datebookmonth.h b/library/datebookmonth.h index 6cd1ac5..a7647ae 100644 --- a/library/datebookmonth.h +++ b/library/datebookmonth.h | |||
@@ -47,48 +47,49 @@ public: | |||
47 | DateBookMonthHeader( QWidget *parent = 0, const char *name = 0 ); | 47 | DateBookMonthHeader( QWidget *parent = 0, const char *name = 0 ); |
48 | ~DateBookMonthHeader(); | 48 | ~DateBookMonthHeader(); |
49 | void setDate( int year, int month ); | 49 | void setDate( int year, int month ); |
50 | 50 | ||
51 | signals: | 51 | signals: |
52 | void dateChanged( int year, int month ); | 52 | void dateChanged( int year, int month ); |
53 | 53 | ||
54 | protected slots: | 54 | protected slots: |
55 | void keyPressEvent(QKeyEvent *e ) { | 55 | void keyPressEvent(QKeyEvent *e ) { |
56 | e->ignore(); | 56 | e->ignore(); |
57 | } | 57 | } |
58 | 58 | ||
59 | private slots: | 59 | private slots: |
60 | void updateDate(); | 60 | void updateDate(); |
61 | void firstMonth(); | 61 | void firstMonth(); |
62 | void lastMonth(); | 62 | void lastMonth(); |
63 | void monthBack(); | 63 | void monthBack(); |
64 | void monthForward(); | 64 | void monthForward(); |
65 | 65 | ||
66 | private: | 66 | private: |
67 | QToolButton *begin, *back, *next, *end; | 67 | QToolButton *begin, *back, *next, *end; |
68 | QComboBox *month; | 68 | QComboBox *month; |
69 | QSpinBox *year; | 69 | QSpinBox *year; |
70 | DateBookMonthHeaderPrivate *d; | 70 | DateBookMonthHeaderPrivate *d; |
71 | int focus; | ||
71 | }; | 72 | }; |
72 | 73 | ||
73 | class DayItemMonthPrivate; | 74 | class DayItemMonthPrivate; |
74 | class DayItemMonth : public QTableItem | 75 | class DayItemMonth : public QTableItem |
75 | { | 76 | { |
76 | public: | 77 | public: |
77 | DayItemMonth( QTable *table, EditType et, const QString &t ); | 78 | DayItemMonth( QTable *table, EditType et, const QString &t ); |
78 | ~DayItemMonth(); | 79 | ~DayItemMonth(); |
79 | void paint( QPainter *p, const QColorGroup &cg, const QRect &cr, bool selected ); | 80 | void paint( QPainter *p, const QColorGroup &cg, const QRect &cr, bool selected ); |
80 | void setDay( int d ) { dy = d; } | 81 | void setDay( int d ) { dy = d; } |
81 | void setEvents( const QValueList<Event> &events ) { daysEvents = events; }; | 82 | void setEvents( const QValueList<Event> &events ) { daysEvents = events; }; |
82 | void setEvents( const QValueList<EffectiveEvent> &effEvents ); | 83 | void setEvents( const QValueList<EffectiveEvent> &effEvents ); |
83 | void clearEvents() { daysEvents.clear(); }; | 84 | void clearEvents() { daysEvents.clear(); }; |
84 | void clearEffEvents(); | 85 | void clearEffEvents(); |
85 | int day() const { return dy; } | 86 | int day() const { return dy; } |
86 | void setType( Calendar::Day::Type t ); | 87 | void setType( Calendar::Day::Type t ); |
87 | Calendar::Day::Type type() const { return typ; } | 88 | Calendar::Day::Type type() const { return typ; } |
88 | 89 | ||
89 | private: | 90 | private: |
90 | QBrush back; | 91 | QBrush back; |
91 | QColor forg; | 92 | QColor forg; |
92 | int dy; | 93 | int dy; |
93 | Calendar::Day::Type typ; | 94 | Calendar::Day::Type typ; |
94 | QValueList<Event> daysEvents; // not used anymore... | 95 | QValueList<Event> daysEvents; // not used anymore... |