1 files changed, 6 insertions, 3 deletions
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 4f0f0b2..2b59085 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -88,60 +88,63 @@ class RecurMonthly : public RecurBase
    void setByPos( int count, int weekday );
    
    bool byDay();
    bool byPos();
    
    int day();
    int count();
    int weekday();
    
  private:
    QRadioButton *mByDayRadio;
    QComboBox *mByDayCombo;
    QRadioButton *mByPosRadio;
    QComboBox *mByPosCountCombo;
    QComboBox *mByPosWeekdayCombo;
 };
 class RecurYearly : public RecurBase
 {
  public:
    RecurYearly( QWidget *parent = 0, const char *name = 0 );
    
-    void setByDay();
+    void setByDay( int doy );
-    void setByMonth( int month );
+    void setByMonth( int month, int day );
    
    bool byMonth();
    bool byDay();
    int month();
+    int day();
    
  private:
+    int mDay;
    QRadioButton *mByMonthRadio;
    QComboBox *mByMonthCombo;
-    
+    QLabel* mByDayLabel;
+    QLabel* mDayOfLabel;
    QRadioButton *mByDayRadio;
 };
 class RecurrenceChooser : public QWidget
 {
    Q_OBJECT
  public:
    RecurrenceChooser( QWidget *parent = 0, const char *name = 0 );
    
    enum { Daily, Weekly, Monthly, Yearly };
    
    void setType( int );
    int type();
    
  signals:
    void chosen( int );
  protected slots:
    void emitChoice();
    
  private:
    QComboBox *mTypeCombo;
    
    QRadioButton *mDailyButton;

diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h index 4f0f0b2..2b59085 100644 --- a/korganizer/koeditorrecurrence.h +++ b/korganizer/koeditorrecurrence.h
@@ -88,60 +88,63 @@ class RecurMonthly : public RecurBase
88	void setByPos( int count, int weekday );	88	void setByPos( int count, int weekday );
89		89
90	bool byDay();	90	bool byDay();
91	bool byPos();	91	bool byPos();
92		92
93	int day();	93	int day();
94		94
95	int count();	95	int count();
96	int weekday();	96	int weekday();
97		97
98	private:	98	private:
99	QRadioButton *mByDayRadio;	99	QRadioButton *mByDayRadio;
100	QComboBox *mByDayCombo;	100	QComboBox *mByDayCombo;
101		101
102	QRadioButton *mByPosRadio;	102	QRadioButton *mByPosRadio;
103	QComboBox *mByPosCountCombo;	103	QComboBox *mByPosCountCombo;
104	QComboBox *mByPosWeekdayCombo;	104	QComboBox *mByPosWeekdayCombo;
105	};	105	};
106		106
107	class RecurYearly : public RecurBase	107	class RecurYearly : public RecurBase
108	{	108	{
109	public:	109	public:
110	RecurYearly( QWidget parent = 0, const char name = 0 );	110	RecurYearly( QWidget parent = 0, const char name = 0 );
111		111
112	void setByDay();	112	void setByDay( int doy );
113	void setByMonth( int month );	113	void setByMonth( int month, int day );
114		114
115	bool byMonth();	115	bool byMonth();
116	bool byDay();	116	bool byDay();
117		117
118	int month();	118	int month();
		119	int day();
119		120
120	private:	121	private:
		122	int mDay;
121	QRadioButton *mByMonthRadio;	123	QRadioButton *mByMonthRadio;
122	QComboBox *mByMonthCombo;	124	QComboBox *mByMonthCombo;
123		125	QLabel* mByDayLabel;
		126	QLabel* mDayOfLabel;
124	QRadioButton *mByDayRadio;	127	QRadioButton *mByDayRadio;
125	};	128	};
126		129
127	class RecurrenceChooser : public QWidget	130	class RecurrenceChooser : public QWidget
128	{	131	{
129	Q_OBJECT	132	Q_OBJECT
130	public:	133	public:
131	RecurrenceChooser( QWidget parent = 0, const char name = 0 );	134	RecurrenceChooser( QWidget parent = 0, const char name = 0 );
132		135
133	enum { Daily, Weekly, Monthly, Yearly };	136	enum { Daily, Weekly, Monthly, Yearly };
134		137
135	void setType( int );	138	void setType( int );
136	int type();	139	int type();
137		140
138	signals:	141	signals:
139	void chosen( int );	142	void chosen( int );
140		143
141	protected slots:	144	protected slots:
142	void emitChoice();	145	void emitChoice();
143		146
144	private:	147	private:
145	QComboBox *mTypeCombo;	148	QComboBox *mTypeCombo;
146		149
147	QRadioButton *mDailyButton;	150	QRadioButton *mDailyButton;