author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /korganizer/koeditorrecurrence.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
Diffstat (limited to 'korganizer/koeditorrecurrence.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koeditorrecurrence.cpp | 94 |
1 files changed, 51 insertions, 43 deletions
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index e0380c4..e0ae3a0 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp | |||
@@ -9,43 +9,51 @@ | |||
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qtooltip.h> | 24 | #include <qtooltip.h> |
25 | #include <qfiledialog.h> | 25 | #include <q3filedialog.h> |
26 | #include <qlayout.h> | 26 | #include <qlayout.h> |
27 | #include <qvbox.h> | 27 | #include <q3vbox.h> |
28 | #include <qbuttongroup.h> | 28 | #include <q3buttongroup.h> |
29 | #include <qvgroupbox.h> | 29 | #include <q3vgroupbox.h> |
30 | #include <qwidgetstack.h> | 30 | #include <q3widgetstack.h> |
31 | #include <qdatetime.h> | 31 | #include <qdatetime.h> |
32 | #include <qlistbox.h> | 32 | #include <q3listbox.h> |
33 | #include <qspinbox.h> | 33 | #include <qspinbox.h> |
34 | #include <qcheckbox.h> | 34 | #include <qcheckbox.h> |
35 | #include <qapplication.h> | 35 | #include <qapplication.h> |
36 | #include <QDesktopWidget> | ||
37 | //Added by qt3to4: | ||
38 | #include <Q3HBoxLayout> | ||
39 | #include <QLabel> | ||
40 | #include <Q3GridLayout> | ||
41 | #include <Q3PtrList> | ||
42 | #include <Q3Frame> | ||
43 | #include <Q3VBoxLayout> | ||
36 | 44 | ||
37 | #include <kdialog.h> | 45 | #include <kdialog.h> |
38 | #include <kglobal.h> | 46 | #include <kglobal.h> |
39 | #include <klocale.h> | 47 | #include <klocale.h> |
40 | #include <kiconloader.h> | 48 | #include <kiconloader.h> |
41 | #include <kdebug.h> | 49 | #include <kdebug.h> |
42 | #include <knumvalidator.h> | 50 | #include <knumvalidator.h> |
43 | 51 | ||
44 | #include <libkcal/event.h> | 52 | #include <libkcal/event.h> |
45 | #include <libkcal/todo.h> | 53 | #include <libkcal/todo.h> |
46 | 54 | ||
47 | #include <libkdepim/kdateedit.h> | 55 | #include <libkdepim/kdateedit.h> |
48 | 56 | ||
49 | #include "koprefs.h" | 57 | #include "koprefs.h" |
50 | 58 | ||
51 | #include "koeditorrecurrence.h" | 59 | #include "koeditorrecurrence.h" |
@@ -68,69 +76,69 @@ void RecurBase::setFrequency( int f ) | |||
68 | { | 76 | { |
69 | if ( f < 1 ) f = 1; | 77 | if ( f < 1 ) f = 1; |
70 | 78 | ||
71 | mFrequencyEdit->setValue( f ); | 79 | mFrequencyEdit->setValue( f ); |
72 | } | 80 | } |
73 | 81 | ||
74 | int RecurBase::frequency() | 82 | int RecurBase::frequency() |
75 | { | 83 | { |
76 | return mFrequencyEdit->value(); | 84 | return mFrequencyEdit->value(); |
77 | } | 85 | } |
78 | 86 | ||
79 | /////////////////////////// RecurDaily /////////////////////////////// | 87 | /////////////////////////// RecurDaily /////////////////////////////// |
80 | 88 | ||
81 | RecurDaily::RecurDaily( QWidget *parent, const char *name ) : | 89 | RecurDaily::RecurDaily( QWidget *parent, const char *name ) : |
82 | RecurBase( parent, name ) | 90 | RecurBase( parent, name ) |
83 | { | 91 | { |
84 | QBoxLayout *topLayout = new QHBoxLayout( this ); | 92 | Q3BoxLayout *topLayout = new Q3HBoxLayout( this ); |
85 | topLayout->setSpacing( KDialog::spacingHint() ); | 93 | topLayout->setSpacing( KDialog::spacingHint() ); |
86 | topLayout->setMargin( KDialog::marginHintSmall() ); | 94 | topLayout->setMargin( KDialog::marginHintSmall() ); |
87 | 95 | ||
88 | QLabel *preLabel = new QLabel( i18n("Recur every"), this ); | 96 | QLabel *preLabel = new QLabel( i18n("Recur every"), this ); |
89 | topLayout->addWidget( preLabel ); | 97 | topLayout->addWidget( preLabel ); |
90 | 98 | ||
91 | topLayout->addWidget( frequencyEdit() ); | 99 | topLayout->addWidget( frequencyEdit() ); |
92 | 100 | ||
93 | QLabel *postLabel = new QLabel( i18n("day(s)"), this ); | 101 | QLabel *postLabel = new QLabel( i18n("day(s)"), this ); |
94 | topLayout->addWidget( postLabel ); | 102 | topLayout->addWidget( postLabel ); |
95 | } | 103 | } |
96 | 104 | ||
97 | 105 | ||
98 | /////////////////////////// RecurWeekly /////////////////////////////// | 106 | /////////////////////////// RecurWeekly /////////////////////////////// |
99 | 107 | ||
100 | RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) : | 108 | RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) : |
101 | RecurBase( parent, name ) | 109 | RecurBase( parent, name ) |
102 | { | 110 | { |
103 | QBoxLayout *topLayout = new QVBoxLayout( this ); | 111 | Q3BoxLayout *topLayout = new Q3VBoxLayout( this ); |
104 | topLayout->setSpacing( KDialog::spacingHint() ); | 112 | topLayout->setSpacing( KDialog::spacingHint() ); |
105 | topLayout->setMargin( KDialog::marginHintSmall() ); | 113 | topLayout->setMargin( KDialog::marginHintSmall() ); |
106 | 114 | ||
107 | //topLayout->addStretch( 1 ); | 115 | //topLayout->addStretch( 1 ); |
108 | 116 | ||
109 | QBoxLayout *weeksLayout = new QHBoxLayout( topLayout ); | 117 | Q3BoxLayout *weeksLayout = new Q3HBoxLayout( topLayout ); |
110 | 118 | ||
111 | QLabel *preLabel = new QLabel( i18n("Recur every"), this ); | 119 | QLabel *preLabel = new QLabel( i18n("Recur every"), this ); |
112 | weeksLayout->addWidget( preLabel ); | 120 | weeksLayout->addWidget( preLabel ); |
113 | 121 | ||
114 | weeksLayout->addWidget( frequencyEdit() ); | 122 | weeksLayout->addWidget( frequencyEdit() ); |
115 | 123 | ||
116 | QLabel *postLabel = new QLabel( i18n("week(s) on:"), this ); | 124 | QLabel *postLabel = new QLabel( i18n("week(s) on:"), this ); |
117 | weeksLayout->addWidget( postLabel ); | 125 | weeksLayout->addWidget( postLabel ); |
118 | 126 | ||
119 | QHBox *dayBox = new QHBox( this ); | 127 | Q3HBox *dayBox = new Q3HBox( this ); |
120 | topLayout->addWidget( dayBox, 1, AlignVCenter ); | 128 | topLayout->addWidget( dayBox, 1, Qt::AlignVCenter ); |
121 | // TODO: Respect start of week setting | 129 | // TODO: Respect start of week setting |
122 | for ( int i = 0; i < 7; ++i ) { | 130 | for ( int i = 0; i < 7; ++i ) { |
123 | QString weekDayName = KGlobal::locale()->weekDayName( i + 1, true ); | 131 | QString weekDayName = KGlobal::locale()->weekDayName( i + 1, true ); |
124 | int left = 1; | 132 | int left = 1; |
125 | if ( QApplication::desktop()->width() > 480 ) { | 133 | if ( QApplication::desktop()->width() > 480 ) { |
126 | ++left; | 134 | ++left; |
127 | if ( QApplication::desktop()->width() > 640 ) | 135 | if ( QApplication::desktop()->width() > 640 ) |
128 | ++left; | 136 | ++left; |
129 | } | 137 | } |
130 | mDayBoxes[ i ] = new QCheckBox( weekDayName.left( left ), dayBox ); | 138 | mDayBoxes[ i ] = new QCheckBox( weekDayName.left( left ), dayBox ); |
131 | } | 139 | } |
132 | 140 | ||
133 | topLayout->addStretch( ); | 141 | topLayout->addStretch( ); |
134 | } | 142 | } |
135 | 143 | ||
136 | void RecurWeekly::setDays( const QBitArray &days ) | 144 | void RecurWeekly::setDays( const QBitArray &days ) |
@@ -143,66 +151,66 @@ void RecurWeekly::setDays( const QBitArray &days ) | |||
143 | QBitArray RecurWeekly::days() | 151 | QBitArray RecurWeekly::days() |
144 | { | 152 | { |
145 | QBitArray days( 7 ); | 153 | QBitArray days( 7 ); |
146 | 154 | ||
147 | for ( int i = 0; i < 7; ++i ) { | 155 | for ( int i = 0; i < 7; ++i ) { |
148 | days.setBit( i, mDayBoxes[ i ]->isChecked() ); | 156 | days.setBit( i, mDayBoxes[ i ]->isChecked() ); |
149 | } | 157 | } |
150 | 158 | ||
151 | return days; | 159 | return days; |
152 | } | 160 | } |
153 | 161 | ||
154 | /////////////////////////// RecurMonthly /////////////////////////////// | 162 | /////////////////////////// RecurMonthly /////////////////////////////// |
155 | 163 | ||
156 | RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) : | 164 | RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) : |
157 | RecurBase( parent, name ) | 165 | RecurBase( parent, name ) |
158 | { | 166 | { |
159 | QBoxLayout *topLayout = new QVBoxLayout( this ); | 167 | Q3BoxLayout *topLayout = new Q3VBoxLayout( this ); |
160 | topLayout->setSpacing( KDialog::spacingHint() ); | 168 | topLayout->setSpacing( KDialog::spacingHint() ); |
161 | topLayout->setMargin( KDialog::marginHintSmall() ); | 169 | topLayout->setMargin( KDialog::marginHintSmall() ); |
162 | 170 | ||
163 | 171 | ||
164 | QBoxLayout *freqLayout = new QHBoxLayout( topLayout ); | 172 | Q3BoxLayout *freqLayout = new Q3HBoxLayout( topLayout ); |
165 | 173 | ||
166 | QLabel *preLabel = new QLabel( i18n("every"), this ); | 174 | QLabel *preLabel = new QLabel( i18n("every"), this ); |
167 | freqLayout->addWidget( preLabel ); | 175 | freqLayout->addWidget( preLabel ); |
168 | 176 | ||
169 | freqLayout->addWidget( frequencyEdit() ); | 177 | freqLayout->addWidget( frequencyEdit() ); |
170 | 178 | ||
171 | QLabel *postLabel = new QLabel( i18n("month(s)"), this ); | 179 | QLabel *postLabel = new QLabel( i18n("month(s)"), this ); |
172 | freqLayout->addWidget( postLabel ); | 180 | freqLayout->addWidget( postLabel ); |
173 | 181 | ||
174 | 182 | ||
175 | QButtonGroup *buttonGroup = new QButtonGroup( this ); | 183 | Q3ButtonGroup *buttonGroup = new Q3ButtonGroup( this ); |
176 | buttonGroup->setFrameStyle( QFrame::NoFrame ); | 184 | buttonGroup->setFrameStyle( Q3Frame::NoFrame ); |
177 | topLayout->addWidget( buttonGroup, 1, AlignVCenter ); | 185 | topLayout->addWidget( buttonGroup, 1, Qt::AlignVCenter ); |
178 | 186 | ||
179 | QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 3, 2 ); | 187 | Q3GridLayout *buttonLayout = new Q3GridLayout( buttonGroup, 3, 2 ); |
180 | buttonLayout->setSpacing( KDialog::spacingHint() ); | 188 | buttonLayout->setSpacing( KDialog::spacingHint() ); |
181 | buttonLayout->setMargin( KDialog::marginHintSmall() ); | 189 | buttonLayout->setMargin( KDialog::marginHintSmall() ); |
182 | 190 | ||
183 | 191 | ||
184 | QString recurOnText; | 192 | QString recurOnText; |
185 | if ( QApplication::desktop()->width() > 320 ) { | 193 | if ( QApplication::desktop()->width() > 320 ) { |
186 | recurOnText = i18n("Recur on the"); | 194 | recurOnText = i18n("Recur on the"); |
187 | } | 195 | } |
188 | 196 | ||
189 | mByDayRadio = new QRadioButton( recurOnText, buttonGroup ); | 197 | mByDayRadio = new QRadioButton( recurOnText, buttonGroup ); |
190 | buttonLayout->addWidget( mByDayRadio, 0, 0 ); | 198 | buttonLayout->addWidget( mByDayRadio, 0, 0 ); |
191 | 199 | ||
192 | mByDayCombo = new QComboBox( buttonGroup ); | 200 | mByDayCombo = new Q3ComboBox( buttonGroup ); |
193 | mByDayCombo->setSizeLimit( 7 ); | 201 | mByDayCombo->setSizeLimit( 7 ); |
194 | mByDayCombo->insertItem( i18n("1st") ); | 202 | mByDayCombo->insertItem( i18n("1st") ); |
195 | mByDayCombo->insertItem( i18n("2nd") ); | 203 | mByDayCombo->insertItem( i18n("2nd") ); |
196 | mByDayCombo->insertItem( i18n("3rd") ); | 204 | mByDayCombo->insertItem( i18n("3rd") ); |
197 | mByDayCombo->insertItem( i18n("4th") ); | 205 | mByDayCombo->insertItem( i18n("4th") ); |
198 | mByDayCombo->insertItem( i18n("5th") ); | 206 | mByDayCombo->insertItem( i18n("5th") ); |
199 | mByDayCombo->insertItem( i18n("6th") ); | 207 | mByDayCombo->insertItem( i18n("6th") ); |
200 | mByDayCombo->insertItem( i18n("7th") ); | 208 | mByDayCombo->insertItem( i18n("7th") ); |
201 | mByDayCombo->insertItem( i18n("8th") ); | 209 | mByDayCombo->insertItem( i18n("8th") ); |
202 | mByDayCombo->insertItem( i18n("9th") ); | 210 | mByDayCombo->insertItem( i18n("9th") ); |
203 | mByDayCombo->insertItem( i18n("10th") ); | 211 | mByDayCombo->insertItem( i18n("10th") ); |
204 | mByDayCombo->insertItem( i18n("11th") ); | 212 | mByDayCombo->insertItem( i18n("11th") ); |
205 | mByDayCombo->insertItem( i18n("12th") ); | 213 | mByDayCombo->insertItem( i18n("12th") ); |
206 | mByDayCombo->insertItem( i18n("13th") ); | 214 | mByDayCombo->insertItem( i18n("13th") ); |
207 | mByDayCombo->insertItem( i18n("14th") ); | 215 | mByDayCombo->insertItem( i18n("14th") ); |
208 | mByDayCombo->insertItem( i18n("15th") ); | 216 | mByDayCombo->insertItem( i18n("15th") ); |
@@ -280,60 +288,60 @@ int RecurMonthly::day() | |||
280 | 288 | ||
281 | int RecurMonthly::count() | 289 | int RecurMonthly::count() |
282 | { | 290 | { |
283 | return mByPosCountCombo->currentItem() + 1; | 291 | return mByPosCountCombo->currentItem() + 1; |
284 | } | 292 | } |
285 | 293 | ||
286 | int RecurMonthly::weekday() | 294 | int RecurMonthly::weekday() |
287 | { | 295 | { |
288 | return mByPosWeekdayCombo->currentItem(); | 296 | return mByPosWeekdayCombo->currentItem(); |
289 | } | 297 | } |
290 | 298 | ||
291 | /////////////////////////// RecurYearly /////////////////////////////// | 299 | /////////////////////////// RecurYearly /////////////////////////////// |
292 | 300 | ||
293 | RecurYearly::RecurYearly( QWidget *parent, const char *name ) : | 301 | RecurYearly::RecurYearly( QWidget *parent, const char *name ) : |
294 | RecurBase( parent, name ) | 302 | RecurBase( parent, name ) |
295 | { | 303 | { |
296 | QBoxLayout *topLayout = new QVBoxLayout( this ); | 304 | Q3BoxLayout *topLayout = new Q3VBoxLayout( this ); |
297 | topLayout->setSpacing( KDialog::spacingHint() ); | 305 | topLayout->setSpacing( KDialog::spacingHint() ); |
298 | topLayout->setMargin( KDialog::marginHintSmall() ); | 306 | topLayout->setMargin( KDialog::marginHintSmall() ); |
299 | 307 | ||
300 | 308 | ||
301 | QBoxLayout *freqLayout = new QHBoxLayout( topLayout ); | 309 | Q3BoxLayout *freqLayout = new Q3HBoxLayout( topLayout ); |
302 | 310 | ||
303 | QLabel *preLabel = new QLabel( i18n("every"), this ); | 311 | QLabel *preLabel = new QLabel( i18n("every"), this ); |
304 | freqLayout->addWidget( preLabel ); | 312 | freqLayout->addWidget( preLabel ); |
305 | 313 | ||
306 | freqLayout->addWidget( frequencyEdit() ); | 314 | freqLayout->addWidget( frequencyEdit() ); |
307 | 315 | ||
308 | QLabel *postLabel = new QLabel( i18n("year(s)"), this ); | 316 | QLabel *postLabel = new QLabel( i18n("year(s)"), this ); |
309 | freqLayout->addWidget( postLabel ); | 317 | freqLayout->addWidget( postLabel ); |
310 | 318 | ||
311 | 319 | ||
312 | QButtonGroup *buttonGroup = new QButtonGroup( this ); | 320 | Q3ButtonGroup *buttonGroup = new Q3ButtonGroup( this ); |
313 | buttonGroup->setFrameStyle( QFrame::NoFrame ); | 321 | buttonGroup->setFrameStyle( Q3Frame::NoFrame ); |
314 | topLayout->addWidget( buttonGroup, 1, AlignVCenter ); | 322 | topLayout->addWidget( buttonGroup, 1, Qt::AlignVCenter ); |
315 | 323 | ||
316 | QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 2, 3 ); | 324 | Q3GridLayout *buttonLayout = new Q3GridLayout( buttonGroup, 2, 3 ); |
317 | 325 | ||
318 | mByMonthRadio = new QRadioButton( i18n("On day "), buttonGroup); | 326 | mByMonthRadio = new QRadioButton( i18n("On day "), buttonGroup); |
319 | buttonLayout->addWidget( mByMonthRadio, 0, 0 , Qt::AlignRight); | 327 | buttonLayout->addWidget( mByMonthRadio, 0, 0 , Qt::AlignRight); |
320 | mByDayLabel = new QLabel( i18n("%1 of ").arg(1), buttonGroup ); | 328 | mByDayLabel = new QLabel( i18n("%1 of ").arg(1), buttonGroup ); |
321 | 329 | ||
322 | buttonLayout->addWidget( mByDayLabel, 0, 1 ); | 330 | buttonLayout->addWidget( mByDayLabel, 0, 1 ); |
323 | mByMonthCombo = new QComboBox( buttonGroup ); | 331 | mByMonthCombo = new Q3ComboBox( buttonGroup ); |
324 | mByMonthCombo->insertItem( i18n("January") ); | 332 | mByMonthCombo->insertItem( i18n("January") ); |
325 | mByMonthCombo->insertItem( i18n("February") ); | 333 | mByMonthCombo->insertItem( i18n("February") ); |
326 | mByMonthCombo->insertItem( i18n("March") ); | 334 | mByMonthCombo->insertItem( i18n("March") ); |
327 | mByMonthCombo->insertItem( i18n("April") ); | 335 | mByMonthCombo->insertItem( i18n("April") ); |
328 | mByMonthCombo->insertItem( i18n("May") ); | 336 | mByMonthCombo->insertItem( i18n("May") ); |
329 | mByMonthCombo->insertItem( i18n("June") ); | 337 | mByMonthCombo->insertItem( i18n("June") ); |
330 | mByMonthCombo->insertItem( i18n("July") ); | 338 | mByMonthCombo->insertItem( i18n("July") ); |
331 | mByMonthCombo->insertItem( i18n("August") ); | 339 | mByMonthCombo->insertItem( i18n("August") ); |
332 | mByMonthCombo->insertItem( i18n("September") ); | 340 | mByMonthCombo->insertItem( i18n("September") ); |
333 | mByMonthCombo->insertItem( i18n("October") ); | 341 | mByMonthCombo->insertItem( i18n("October") ); |
334 | mByMonthCombo->insertItem( i18n("November") ); | 342 | mByMonthCombo->insertItem( i18n("November") ); |
335 | mByMonthCombo->insertItem( i18n("December") ); | 343 | mByMonthCombo->insertItem( i18n("December") ); |
336 | buttonLayout->addWidget( mByMonthCombo, 0, 2,Qt::AlignLeft ); | 344 | buttonLayout->addWidget( mByMonthCombo, 0, 2,Qt::AlignLeft ); |
337 | if ( QApplication::desktop()->width() <= 640 ) { | 345 | if ( QApplication::desktop()->width() <= 640 ) { |
338 | mByMonthCombo->setSizeLimit( 6 ); | 346 | mByMonthCombo->setSizeLimit( 6 ); |
339 | } | 347 | } |
@@ -370,53 +378,53 @@ bool RecurYearly::byDay() | |||
370 | } | 378 | } |
371 | 379 | ||
372 | int RecurYearly::month() | 380 | int RecurYearly::month() |
373 | { | 381 | { |
374 | return mByMonthCombo->currentItem() + 1; | 382 | return mByMonthCombo->currentItem() + 1; |
375 | } | 383 | } |
376 | int RecurYearly::day() | 384 | int RecurYearly::day() |
377 | { | 385 | { |
378 | return mDay;//mByDayCombo->currentItem() + 1; | 386 | return mDay;//mByDayCombo->currentItem() + 1; |
379 | } | 387 | } |
380 | 388 | ||
381 | //////////////////////////// ExceptionsWidget ////////////////////////// | 389 | //////////////////////////// ExceptionsWidget ////////////////////////// |
382 | 390 | ||
383 | ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) : | 391 | ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) : |
384 | QWidget( parent, name ) | 392 | QWidget( parent, name ) |
385 | { | 393 | { |
386 | QBoxLayout *topLayout = new QVBoxLayout( this ); | 394 | Q3BoxLayout *topLayout = new Q3VBoxLayout( this ); |
387 | 395 | ||
388 | QGroupBox *groupBox = new QGroupBox( 1, Horizontal, i18n("Exceptions"), | 396 | Q3GroupBox *groupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Exceptions"), |
389 | this ); | 397 | this ); |
390 | topLayout->addWidget( groupBox ); | 398 | topLayout->addWidget( groupBox ); |
391 | 399 | ||
392 | QWidget *box = new QWidget( groupBox ); | 400 | QWidget *box = new QWidget( groupBox ); |
393 | 401 | ||
394 | QGridLayout *boxLayout = new QGridLayout( box ); | 402 | Q3GridLayout *boxLayout = new Q3GridLayout( box ); |
395 | 403 | ||
396 | mExceptionDateEdit = new KDateEdit( box ); | 404 | mExceptionDateEdit = new KDateEdit( box ); |
397 | boxLayout->addWidget( mExceptionDateEdit, 0, 0 ); | 405 | boxLayout->addWidget( mExceptionDateEdit, 0, 0 ); |
398 | 406 | ||
399 | QPushButton *addExceptionButton = new QPushButton( i18n("Add"), box ); | 407 | QPushButton *addExceptionButton = new QPushButton( i18n("Add"), box ); |
400 | boxLayout->addWidget( addExceptionButton, 1, 0 ); | 408 | boxLayout->addWidget( addExceptionButton, 1, 0 ); |
401 | QPushButton *changeExceptionButton = new QPushButton( i18n("Change"), box ); | 409 | QPushButton *changeExceptionButton = new QPushButton( i18n("Change"), box ); |
402 | boxLayout->addWidget( changeExceptionButton, 2, 0 ); | 410 | boxLayout->addWidget( changeExceptionButton, 2, 0 ); |
403 | QPushButton *deleteExceptionButton = new QPushButton( i18n("Delete"), box ); | 411 | QPushButton *deleteExceptionButton = new QPushButton( i18n("Delete"), box ); |
404 | boxLayout->addWidget( deleteExceptionButton, 3, 0 ); | 412 | boxLayout->addWidget( deleteExceptionButton, 3, 0 ); |
405 | 413 | ||
406 | mExceptionList = new QListBox( box ); | 414 | mExceptionList = new Q3ListBox( box ); |
407 | boxLayout->addMultiCellWidget( mExceptionList, 0, 3, 1, 1 ); | 415 | boxLayout->addMultiCellWidget( mExceptionList, 0, 3, 1, 1 ); |
408 | 416 | ||
409 | boxLayout->setRowStretch( 4, 1 ); | 417 | boxLayout->setRowStretch( 4, 1 ); |
410 | boxLayout->setColStretch( 1, 3 ); | 418 | boxLayout->setColStretch( 1, 3 ); |
411 | 419 | ||
412 | connect( addExceptionButton, SIGNAL( clicked() ), | 420 | connect( addExceptionButton, SIGNAL( clicked() ), |
413 | SLOT( addException() ) ); | 421 | SLOT( addException() ) ); |
414 | connect( changeExceptionButton, SIGNAL( clicked() ), | 422 | connect( changeExceptionButton, SIGNAL( clicked() ), |
415 | SLOT( changeException() ) ); | 423 | SLOT( changeException() ) ); |
416 | connect( deleteExceptionButton, SIGNAL( clicked() ), | 424 | connect( deleteExceptionButton, SIGNAL( clicked() ), |
417 | SLOT( deleteException() ) ); | 425 | SLOT( deleteException() ) ); |
418 | if ( QApplication::desktop()->width() < 480 ) { | 426 | if ( QApplication::desktop()->width() < 480 ) { |
419 | setMinimumWidth( 220 ); | 427 | setMinimumWidth( 220 ); |
420 | } else { | 428 | } else { |
421 | setMinimumWidth( 440 ); | 429 | setMinimumWidth( 440 ); |
422 | mExceptionDateEdit->setMinimumWidth( 200 ); | 430 | mExceptionDateEdit->setMinimumWidth( 200 ); |
@@ -493,66 +501,66 @@ void ExceptionsDialog::setDefaults( const QDateTime &from ) | |||
493 | void ExceptionsDialog::setDates( const DateList &dates ) | 501 | void ExceptionsDialog::setDates( const DateList &dates ) |
494 | { | 502 | { |
495 | mExceptions->setDates( dates ); | 503 | mExceptions->setDates( dates ); |
496 | } | 504 | } |
497 | 505 | ||
498 | DateList ExceptionsDialog::dates() | 506 | DateList ExceptionsDialog::dates() |
499 | { | 507 | { |
500 | return mExceptions->dates(); | 508 | return mExceptions->dates(); |
501 | } | 509 | } |
502 | 510 | ||
503 | ///////////////////////// RecurrenceRangeWidget /////////////////////////// | 511 | ///////////////////////// RecurrenceRangeWidget /////////////////////////// |
504 | 512 | ||
505 | RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, | 513 | RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, |
506 | const char *name ) | 514 | const char *name ) |
507 | : QWidget( parent, name ) | 515 | : QWidget( parent, name ) |
508 | { | 516 | { |
509 | QBoxLayout *topLayout = new QVBoxLayout( this ); | 517 | Q3BoxLayout *topLayout = new Q3VBoxLayout( this ); |
510 | 518 | ||
511 | mRangeGroupBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Range"), | 519 | mRangeGroupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Recurrence Range"), |
512 | this ); | 520 | this ); |
513 | topLayout->addWidget( mRangeGroupBox ); | 521 | topLayout->addWidget( mRangeGroupBox ); |
514 | 522 | ||
515 | QWidget *rangeBox = new QWidget( mRangeGroupBox ); | 523 | QWidget *rangeBox = new QWidget( mRangeGroupBox ); |
516 | QVBoxLayout *rangeLayout = new QVBoxLayout( rangeBox ); | 524 | Q3VBoxLayout *rangeLayout = new Q3VBoxLayout( rangeBox ); |
517 | rangeLayout->setSpacing( KDialog::spacingHint() ); | 525 | rangeLayout->setSpacing( KDialog::spacingHint() ); |
518 | rangeLayout->setMargin( KDialog::marginHintSmall() ); | 526 | rangeLayout->setMargin( KDialog::marginHintSmall() ); |
519 | 527 | ||
520 | mStartDateLabel = new QLabel( i18n("Begin on:"), rangeBox ); | 528 | mStartDateLabel = new QLabel( i18n("Begin on:"), rangeBox ); |
521 | rangeLayout->addWidget( mStartDateLabel ); | 529 | rangeLayout->addWidget( mStartDateLabel ); |
522 | 530 | ||
523 | mRangeButtonGroup = new QButtonGroup; | 531 | mRangeButtonGroup = new Q3ButtonGroup; |
524 | 532 | ||
525 | mNoEndDateButton = new QRadioButton( i18n("No ending date"), rangeBox ); | 533 | mNoEndDateButton = new QRadioButton( i18n("No ending date"), rangeBox ); |
526 | mRangeButtonGroup->insert( mNoEndDateButton ); | 534 | mRangeButtonGroup->insert( mNoEndDateButton ); |
527 | rangeLayout->addWidget( mNoEndDateButton ); | 535 | rangeLayout->addWidget( mNoEndDateButton ); |
528 | 536 | ||
529 | QBoxLayout *durationLayout = new QHBoxLayout( rangeLayout ); | 537 | Q3BoxLayout *durationLayout = new Q3HBoxLayout( rangeLayout ); |
530 | durationLayout->setSpacing( KDialog::spacingHint() ); | 538 | durationLayout->setSpacing( KDialog::spacingHint() ); |
531 | 539 | ||
532 | mEndDurationButton = new QRadioButton( i18n("End after"), rangeBox ); | 540 | mEndDurationButton = new QRadioButton( i18n("End after"), rangeBox ); |
533 | mRangeButtonGroup->insert( mEndDurationButton ); | 541 | mRangeButtonGroup->insert( mEndDurationButton ); |
534 | durationLayout->addWidget( mEndDurationButton ); | 542 | durationLayout->addWidget( mEndDurationButton ); |
535 | 543 | ||
536 | mEndDurationEdit = new QSpinBox( 1, 9999, 1, rangeBox ); | 544 | mEndDurationEdit = new QSpinBox( 1, 9999, 1, rangeBox ); |
537 | durationLayout->addWidget( mEndDurationEdit ); | 545 | durationLayout->addWidget( mEndDurationEdit ); |
538 | 546 | ||
539 | QLabel *endDurationLabel = new QLabel( i18n("occurrence(s)"), rangeBox ); | 547 | QLabel *endDurationLabel = new QLabel( i18n("occurrence(s)"), rangeBox ); |
540 | durationLayout ->addWidget( endDurationLabel ); | 548 | durationLayout ->addWidget( endDurationLabel ); |
541 | 549 | ||
542 | QBoxLayout *endDateLayout = new QHBoxLayout( rangeLayout ); | 550 | Q3BoxLayout *endDateLayout = new Q3HBoxLayout( rangeLayout ); |
543 | endDateLayout->setSpacing( KDialog::spacingHint() ); | 551 | endDateLayout->setSpacing( KDialog::spacingHint() ); |
544 | 552 | ||
545 | mEndDateButton = new QRadioButton( i18n("End by:"), rangeBox ); | 553 | mEndDateButton = new QRadioButton( i18n("End by:"), rangeBox ); |
546 | mRangeButtonGroup->insert( mEndDateButton ); | 554 | mRangeButtonGroup->insert( mEndDateButton ); |
547 | endDateLayout->addWidget( mEndDateButton ); | 555 | endDateLayout->addWidget( mEndDateButton ); |
548 | 556 | ||
549 | mEndDateEdit = new KDateEdit( rangeBox ); | 557 | mEndDateEdit = new KDateEdit( rangeBox ); |
550 | endDateLayout->addWidget( mEndDateEdit ); | 558 | endDateLayout->addWidget( mEndDateEdit ); |
551 | 559 | ||
552 | //endDateLayout->addStretch( 1 ); | 560 | //endDateLayout->addStretch( 1 ); |
553 | 561 | ||
554 | connect( mNoEndDateButton, SIGNAL( toggled( bool ) ), | 562 | connect( mNoEndDateButton, SIGNAL( toggled( bool ) ), |
555 | SLOT( showCurrentRange() ) ); | 563 | SLOT( showCurrentRange() ) ); |
556 | connect( mEndDurationButton, SIGNAL( toggled( bool ) ), | 564 | connect( mEndDurationButton, SIGNAL( toggled( bool ) ), |
557 | SLOT( showCurrentRange() ) ); | 565 | SLOT( showCurrentRange() ) ); |
558 | connect( mEndDateButton, SIGNAL( toggled( bool ) ), | 566 | connect( mEndDateButton, SIGNAL( toggled( bool ) ), |
@@ -653,33 +661,33 @@ void RecurrenceRangeDialog::setEndDate( const QDate &date ) | |||
653 | QDate RecurrenceRangeDialog::endDate() | 661 | QDate RecurrenceRangeDialog::endDate() |
654 | { | 662 | { |
655 | return mRecurrenceRangeWidget->endDate(); | 663 | return mRecurrenceRangeWidget->endDate(); |
656 | } | 664 | } |
657 | 665 | ||
658 | void RecurrenceRangeDialog::setDateTimes( const QDateTime &start, | 666 | void RecurrenceRangeDialog::setDateTimes( const QDateTime &start, |
659 | const QDateTime &end ) | 667 | const QDateTime &end ) |
660 | { | 668 | { |
661 | mRecurrenceRangeWidget->setDateTimes( start, end ); | 669 | mRecurrenceRangeWidget->setDateTimes( start, end ); |
662 | } | 670 | } |
663 | 671 | ||
664 | //////////////////////////// RecurrenceChooser //////////////////////// | 672 | //////////////////////////// RecurrenceChooser //////////////////////// |
665 | 673 | ||
666 | RecurrenceChooser::RecurrenceChooser( QWidget *parent, const char *name ) : | 674 | RecurrenceChooser::RecurrenceChooser( QWidget *parent, const char *name ) : |
667 | QWidget( parent, name ) | 675 | QWidget( parent, name ) |
668 | { | 676 | { |
669 | QBoxLayout *topLayout = new QVBoxLayout( this ); | 677 | Q3BoxLayout *topLayout = new Q3VBoxLayout( this ); |
670 | 678 | ||
671 | mTypeCombo = new QComboBox( this ); | 679 | mTypeCombo = new QComboBox( this ); |
672 | mTypeCombo->insertItem( i18n("Daily") ); | 680 | mTypeCombo->insertItem( i18n("Daily") ); |
673 | mTypeCombo->insertItem( i18n("Weekly") ); | 681 | mTypeCombo->insertItem( i18n("Weekly") ); |
674 | mTypeCombo->insertItem( i18n("Monthly") ); | 682 | mTypeCombo->insertItem( i18n("Monthly") ); |
675 | mTypeCombo->insertItem( i18n("Yearly") ); | 683 | mTypeCombo->insertItem( i18n("Yearly") ); |
676 | 684 | ||
677 | topLayout->addWidget( mTypeCombo ); | 685 | topLayout->addWidget( mTypeCombo ); |
678 | 686 | ||
679 | connect( mTypeCombo, SIGNAL( activated( int ) ), SLOT( emitChoice() ) ); | 687 | connect( mTypeCombo, SIGNAL( activated( int ) ), SLOT( emitChoice() ) ); |
680 | 688 | ||
681 | } | 689 | } |
682 | 690 | ||
683 | int RecurrenceChooser::type() | 691 | int RecurrenceChooser::type() |
684 | { | 692 | { |
685 | if ( mTypeCombo ) { | 693 | if ( mTypeCombo ) { |
@@ -712,67 +720,67 @@ void RecurrenceChooser::setType( int type ) | |||
712 | mYearlyButton->setChecked( true ); | 720 | mYearlyButton->setChecked( true ); |
713 | break; | 721 | break; |
714 | } | 722 | } |
715 | } | 723 | } |
716 | } | 724 | } |
717 | 725 | ||
718 | void RecurrenceChooser::emitChoice() | 726 | void RecurrenceChooser::emitChoice() |
719 | { | 727 | { |
720 | emit chosen ( type() ); | 728 | emit chosen ( type() ); |
721 | } | 729 | } |
722 | 730 | ||
723 | /////////////////////////////// Main Widget ///////////////////////////// | 731 | /////////////////////////////// Main Widget ///////////////////////////// |
724 | 732 | ||
725 | KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) : | 733 | KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) : |
726 | QWidget( parent, name ) | 734 | QWidget( parent, name ) |
727 | { | 735 | { |
728 | QGridLayout *topLayout = new QGridLayout( this, 2,2 ); | 736 | Q3GridLayout *topLayout = new Q3GridLayout( this, 2,2 ); |
729 | topLayout->setSpacing( KDialog::spacingHint() ); | 737 | topLayout->setSpacing( KDialog::spacingHint() ); |
730 | topLayout->setMargin( KDialog::marginHintSmall() ); | 738 | topLayout->setMargin( KDialog::marginHintSmall() ); |
731 | 739 | ||
732 | mEnabledCheck = new QCheckBox( i18n("Enable Recurrence"), this ); | 740 | mEnabledCheck = new QCheckBox( i18n("Enable Recurrence"), this ); |
733 | connect( mEnabledCheck, SIGNAL( toggled( bool ) ), | 741 | connect( mEnabledCheck, SIGNAL( toggled( bool ) ), |
734 | SLOT( setEnabled( bool ) ) ); | 742 | SLOT( setEnabled( bool ) ) ); |
735 | topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 ); | 743 | topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 ); |
736 | 744 | ||
737 | 745 | ||
738 | mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Time"), | 746 | mTimeGroupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Time"), |
739 | this ); | 747 | this ); |
740 | topLayout->addMultiCellWidget( mTimeGroupBox, 1, 1 , 0 , 1 ); | 748 | topLayout->addMultiCellWidget( mTimeGroupBox, 1, 1 , 0 , 1 ); |
741 | 749 | ||
742 | if ( QApplication::desktop()->width() <= 640 ) { | 750 | if ( QApplication::desktop()->width() <= 640 ) { |
743 | mTimeGroupBox->hide(); | 751 | mTimeGroupBox->hide(); |
744 | } | 752 | } |
745 | 753 | ||
746 | // QFrame *timeFrame = new QFrame( mTimeGroupBox ); | 754 | // QFrame *timeFrame = new QFrame( mTimeGroupBox ); |
747 | // QBoxLayout *layoutTimeFrame = new QHBoxLayout( timeFrame ); | 755 | // QBoxLayout *layoutTimeFrame = new QHBoxLayout( timeFrame ); |
748 | // layoutTimeFrame->setSpacing( KDialog::spacingHint() ); | 756 | // layoutTimeFrame->setSpacing( KDialog::spacingHint() ); |
749 | 757 | ||
750 | mDateTimeLabel = new QLabel( mTimeGroupBox ); | 758 | mDateTimeLabel = new QLabel( mTimeGroupBox ); |
751 | // mDateTimeLabel = new QLabel( timeFrame ); | 759 | // mDateTimeLabel = new QLabel( timeFrame ); |
752 | // layoutTimeFrame->addWidget( mDateTimeLabel ); | 760 | // layoutTimeFrame->addWidget( mDateTimeLabel ); |
753 | //mTimeGroupBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ) ); | 761 | //mTimeGroupBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ) ); |
754 | //mDateTimeLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum) ); | 762 | //mDateTimeLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum) ); |
755 | mRuleBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Rule"), this ); | 763 | mRuleBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Recurrence Rule"), this ); |
756 | topLayout->addMultiCellWidget( mRuleBox, 2, 2, 0, 1 ); | 764 | topLayout->addMultiCellWidget( mRuleBox, 2, 2, 0, 1 ); |
757 | mRecurrenceChooser = new RecurrenceChooser( mRuleBox ); | 765 | mRecurrenceChooser = new RecurrenceChooser( mRuleBox ); |
758 | connect( mRecurrenceChooser, SIGNAL( chosen( int ) ), | 766 | connect( mRecurrenceChooser, SIGNAL( chosen( int ) ), |
759 | SLOT( showCurrentRule( int ) ) ); | 767 | SLOT( showCurrentRule( int ) ) ); |
760 | 768 | ||
761 | 769 | ||
762 | mRuleStack = new QWidgetStack( mRuleBox ); | 770 | mRuleStack = new Q3WidgetStack( mRuleBox ); |
763 | 771 | ||
764 | mDaily = new RecurDaily( mRuleStack ); | 772 | mDaily = new RecurDaily( mRuleStack ); |
765 | mRuleStack->addWidget( mDaily, 0 ); | 773 | mRuleStack->addWidget( mDaily, 0 ); |
766 | 774 | ||
767 | mWeekly = new RecurWeekly( mRuleStack ); | 775 | mWeekly = new RecurWeekly( mRuleStack ); |
768 | mRuleStack->addWidget( mWeekly, 0 ); | 776 | mRuleStack->addWidget( mWeekly, 0 ); |
769 | 777 | ||
770 | mMonthly = new RecurMonthly( mRuleStack ); | 778 | mMonthly = new RecurMonthly( mRuleStack ); |
771 | mRuleStack->addWidget( mMonthly, 0 ); | 779 | mRuleStack->addWidget( mMonthly, 0 ); |
772 | 780 | ||
773 | mYearly = new RecurYearly( mRuleStack ); | 781 | mYearly = new RecurYearly( mRuleStack ); |
774 | mRuleStack->addWidget( mYearly, 0 ); | 782 | mRuleStack->addWidget( mYearly, 0 ); |
775 | 783 | ||
776 | showCurrentRule( mRecurrenceChooser->type() ); | 784 | showCurrentRule( mRecurrenceChooser->type() ); |
777 | mRecurrenceRangeWidget = 0; | 785 | mRecurrenceRangeWidget = 0; |
778 | mRecurrenceRangeDialog = new RecurrenceRangeDialog( this ); | 786 | mRecurrenceRangeDialog = new RecurrenceRangeDialog( this ); |
@@ -883,34 +891,34 @@ void KOEditorRecurrence::setDefaults( QDateTime from, QDateTime to ) | |||
883 | mMonthly->setFrequency( 1 ); | 891 | mMonthly->setFrequency( 1 ); |
884 | mYearly->setFrequency( 1 ); | 892 | mYearly->setFrequency( 1 ); |
885 | setDefaultsDates( from, to ); | 893 | setDefaultsDates( from, to ); |
886 | } | 894 | } |
887 | 895 | ||
888 | void KOEditorRecurrence::readEvent(Incidence *event) | 896 | void KOEditorRecurrence::readEvent(Incidence *event) |
889 | { | 897 | { |
890 | 898 | ||
891 | QDateTime dtEnd; | 899 | QDateTime dtEnd; |
892 | if ( event->typeID() == eventID ) | 900 | if ( event->typeID() == eventID ) |
893 | dtEnd = ((Event*)event)->dtEnd(); | 901 | dtEnd = ((Event*)event)->dtEnd(); |
894 | else | 902 | else |
895 | dtEnd = ((Todo*)event)->dtDue(); | 903 | dtEnd = ((Todo*)event)->dtDue(); |
896 | 904 | ||
897 | setDefaults( event->dtStart(), dtEnd ); | 905 | setDefaults( event->dtStart(), dtEnd ); |
898 | QBitArray rDays( 7 ); | 906 | QBitArray rDays( 7 ); |
899 | QPtrList<Recurrence::rMonthPos> rmp; | 907 | Q3PtrList<Recurrence::rMonthPos> rmp; |
900 | QPtrList<int> rmd; | 908 | Q3PtrList<int> rmd; |
901 | int day = 0; | 909 | int day = 0; |
902 | int count = 0; | 910 | int count = 0; |
903 | int month = 0; | 911 | int month = 0; |
904 | setDateTimes( event->dtStart(), dtEnd ); | 912 | setDateTimes( event->dtStart(), dtEnd ); |
905 | 913 | ||
906 | 914 | ||
907 | 915 | ||
908 | int recurs = event->doesRecur(); | 916 | int recurs = event->doesRecur(); |
909 | 917 | ||
910 | mEnabledCheck->setChecked( recurs ); | 918 | mEnabledCheck->setChecked( recurs ); |
911 | setEnabled( recurs ); | 919 | setEnabled( recurs ); |
912 | 920 | ||
913 | int recurrenceType = RecurrenceChooser::Weekly; | 921 | int recurrenceType = RecurrenceChooser::Weekly; |
914 | if ( recurs ) { | 922 | if ( recurs ) { |
915 | Recurrence *r = event->recurrence(); | 923 | Recurrence *r = event->recurrence(); |
916 | int f = r->frequency(); | 924 | int f = r->frequency(); |
@@ -955,33 +963,33 @@ void KOEditorRecurrence::readEvent(Incidence *event) | |||
955 | mMonthly->setFrequency( f ); | 963 | mMonthly->setFrequency( f ); |
956 | 964 | ||
957 | break; | 965 | break; |
958 | case Recurrence::rYearlyMonth: | 966 | case Recurrence::rYearlyMonth: |
959 | { | 967 | { |
960 | recurrenceType = RecurrenceChooser::Yearly; | 968 | recurrenceType = RecurrenceChooser::Yearly; |
961 | //qDebug("Recurrence::rYearlyMonth: "); | 969 | //qDebug("Recurrence::rYearlyMonth: "); |
962 | day = event->dtStart().date().day(); | 970 | day = event->dtStart().date().day(); |
963 | rmd = r->yearNums(); | 971 | rmd = r->yearNums(); |
964 | if ( rmd.count() > 0 ) | 972 | if ( rmd.count() > 0 ) |
965 | month = *rmd.first(); | 973 | month = *rmd.first(); |
966 | else | 974 | else |
967 | month = event->dtStart().date().month() ; | 975 | month = event->dtStart().date().month() ; |
968 | mYearly->setByMonth( month, day ); | 976 | mYearly->setByMonth( month, day ); |
969 | #if 0 | 977 | #if 0 |
970 | //qDebug("2day = %d ",day ); | 978 | //qDebug("2day = %d ",day ); |
971 | QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions(); | 979 | Q3PtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions(); |
972 | int month; | 980 | int month; |
973 | if ( !monthlist.isEmpty() ) { | 981 | if ( !monthlist.isEmpty() ) { |
974 | month = monthlist.first()->rPos ; | 982 | month = monthlist.first()->rPos ; |
975 | } else { | 983 | } else { |
976 | month = event->dtStart().date().month() ; | 984 | month = event->dtStart().date().month() ; |
977 | } | 985 | } |
978 | mYearly->setByMonth( day, month ); | 986 | mYearly->setByMonth( day, month ); |
979 | #endif | 987 | #endif |
980 | mYearly->setFrequency( f ); | 988 | mYearly->setFrequency( f ); |
981 | } | 989 | } |
982 | 990 | ||
983 | break; | 991 | break; |
984 | case Recurrence::rYearlyDay: | 992 | case Recurrence::rYearlyDay: |
985 | //qDebug("Recurrence::rYearlyDay: "); | 993 | //qDebug("Recurrence::rYearlyDay: "); |
986 | recurrenceType = RecurrenceChooser::Yearly; | 994 | recurrenceType = RecurrenceChooser::Yearly; |
987 | mYearly->setByDay( event->dtStart().date().dayOfYear() ); | 995 | mYearly->setByDay( event->dtStart().date().dayOfYear() ); |