Diffstat (limited to 'korganizer/koeditorrecurrence.cpp') (more/less context) (show 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 | |||
@@ -23,15 +23,23 @@ | |||
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> |
@@ -82,5 +90,5 @@ 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() ); |
@@ -101,5 +109,5 @@ 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() ); |
@@ -107,5 +115,5 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) : | |||
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 ); |
@@ -117,6 +125,6 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) : | |||
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 ) { |
@@ -157,10 +165,10 @@ 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 ); |
@@ -173,9 +181,9 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) : | |||
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() ); |
@@ -190,5 +198,5 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) : | |||
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") ); |
@@ -294,10 +302,10 @@ 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 ); |
@@ -310,9 +318,9 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) : | |||
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); |
@@ -321,5 +329,5 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) : | |||
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") ); |
@@ -384,7 +392,7 @@ 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 ); |
@@ -392,5 +400,5 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) : | |||
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 ); |
@@ -404,5 +412,5 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) : | |||
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 | ||
@@ -507,12 +515,12 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, | |||
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() ); |
@@ -521,5 +529,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, | |||
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 ); |
@@ -527,5 +535,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, | |||
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 | ||
@@ -540,5 +548,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, | |||
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 | ||
@@ -667,5 +675,5 @@ 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 ); |
@@ -726,5 +734,5 @@ 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() ); |
@@ -736,5 +744,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) : | |||
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 ); |
@@ -753,5 +761,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) : | |||
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 ); |
@@ -760,5 +768,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) : | |||
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 ); |
@@ -897,6 +905,6 @@ void KOEditorRecurrence::readEvent(Incidence *event) | |||
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; |
@@ -969,5 +977,5 @@ void KOEditorRecurrence::readEvent(Incidence *event) | |||
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() ) { |