Diffstat (limited to 'korganizer/koeditorgeneraltodo.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | korganizer/koeditorgeneraltodo.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index 4a1576a..e86b4d0 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp | |||
@@ -18,48 +18,49 @@ | |||
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 <qfiledialog.h> |
26 | #include <qlayout.h> | 26 | #include <qlayout.h> |
27 | #include <qvbox.h> | 27 | #include <qvbox.h> |
28 | #include <qbuttongroup.h> | 28 | #include <qbuttongroup.h> |
29 | #include <qvgroupbox.h> | 29 | #include <qvgroupbox.h> |
30 | #include <qwidgetstack.h> | 30 | #include <qwidgetstack.h> |
31 | #include <qdatetime.h> | 31 | #include <qdatetime.h> |
32 | #include <qapplication.h> | 32 | #include <qapplication.h> |
33 | 33 | ||
34 | #include <kglobal.h> | 34 | #include <kglobal.h> |
35 | #include <klocale.h> | 35 | #include <klocale.h> |
36 | #include <kiconloader.h> | 36 | #include <kiconloader.h> |
37 | #include <kmessagebox.h> | 37 | #include <kmessagebox.h> |
38 | #include <kdebug.h> | 38 | #include <kdebug.h> |
39 | #include <krestrictedline.h> | 39 | #include <krestrictedline.h> |
40 | #include <kstandarddirs.h> | 40 | #include <kstandarddirs.h> |
41 | #include <kfiledialog.h> | 41 | #include <kfiledialog.h> |
42 | #include <kdialog.h> | ||
42 | 43 | ||
43 | #include <libkcal/todo.h> | 44 | #include <libkcal/todo.h> |
44 | 45 | ||
45 | #include <libkdepim/kdateedit.h> | 46 | #include <libkdepim/kdateedit.h> |
46 | 47 | ||
47 | #include "koprefs.h" | 48 | #include "koprefs.h" |
48 | #include "ktimeedit.h" | 49 | #include "ktimeedit.h" |
49 | 50 | ||
50 | #include "koeditorgeneraltodo.h" | 51 | #include "koeditorgeneraltodo.h" |
51 | #include "kolocationbox.h" | 52 | #include "kolocationbox.h" |
52 | 53 | ||
53 | KOEditorGeneralTodo::KOEditorGeneralTodo(QObject* parent, | 54 | KOEditorGeneralTodo::KOEditorGeneralTodo(QObject* parent, |
54 | const char* name) | 55 | const char* name) |
55 | : KOEditorGeneral( parent, name) | 56 | : KOEditorGeneral( parent, name) |
56 | { | 57 | { |
57 | } | 58 | } |
58 | 59 | ||
59 | KOEditorGeneralTodo::~KOEditorGeneralTodo() | 60 | KOEditorGeneralTodo::~KOEditorGeneralTodo() |
60 | { | 61 | { |
61 | } | 62 | } |
62 | 63 | ||
63 | void KOEditorGeneralTodo::finishSetup() | 64 | void KOEditorGeneralTodo::finishSetup() |
64 | { | 65 | { |
65 | 66 | ||
@@ -67,78 +68,78 @@ void KOEditorGeneralTodo::finishSetup() | |||
67 | // QWidget::setTabOrder(mLocationEdit, mDueCheck); | 68 | // QWidget::setTabOrder(mLocationEdit, mDueCheck); |
68 | // QWidget::setTabOrder(mDueCheck, mDueDateEdit); | 69 | // QWidget::setTabOrder(mDueCheck, mDueDateEdit); |
69 | // QWidget::setTabOrder(mDueDateEdit, mDueTimeEdit); | 70 | // QWidget::setTabOrder(mDueDateEdit, mDueTimeEdit); |
70 | // QWidget::setTabOrder(mDueTimeEdit, mStartCheck); | 71 | // QWidget::setTabOrder(mDueTimeEdit, mStartCheck); |
71 | // QWidget::setTabOrder(mStartCheck, mStartDateEdit); | 72 | // QWidget::setTabOrder(mStartCheck, mStartDateEdit); |
72 | // QWidget::setTabOrder(mStartDateEdit, mStartTimeEdit); | 73 | // QWidget::setTabOrder(mStartDateEdit, mStartTimeEdit); |
73 | // QWidget::setTabOrder(mStartTimeEdit, mTimeButton); | 74 | // QWidget::setTabOrder(mStartTimeEdit, mTimeButton); |
74 | // QWidget::setTabOrder(mTimeButton, mCompletedCombo); | 75 | // QWidget::setTabOrder(mTimeButton, mCompletedCombo); |
75 | // QWidget::setTabOrder(mCompletedCombo, mPriorityCombo); | 76 | // QWidget::setTabOrder(mCompletedCombo, mPriorityCombo); |
76 | // QWidget::setTabOrder(mPriorityCombo, mAlarmButton); | 77 | // QWidget::setTabOrder(mPriorityCombo, mAlarmButton); |
77 | // QWidget::setTabOrder(mAlarmButton, mCategoriesButton); | 78 | // QWidget::setTabOrder(mAlarmButton, mCategoriesButton); |
78 | // QWidget::setTabOrder(mCategoriesButton, mSecrecyCombo); | 79 | // QWidget::setTabOrder(mCategoriesButton, mSecrecyCombo); |
79 | // QWidget::setTabOrder(mSecrecyCombo, mDescriptionEdit); | 80 | // QWidget::setTabOrder(mSecrecyCombo, mDescriptionEdit); |
80 | mSummaryEdit->load(KOLocationBox::SUMMARYTODO); | 81 | mSummaryEdit->load(KOLocationBox::SUMMARYTODO); |
81 | mSummaryEdit->setFocus(); | 82 | mSummaryEdit->setFocus(); |
82 | } | 83 | } |
83 | 84 | ||
84 | void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout) | 85 | void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout) |
85 | { | 86 | { |
86 | QBoxLayout *timeLayout = new QVBoxLayout(topLayout); | 87 | QBoxLayout *timeLayout = new QVBoxLayout(topLayout); |
87 | 88 | ||
88 | QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal, | 89 | QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal, |
89 | i18n("Date && Time"),parent); | 90 | i18n("Date && Time"),parent); |
90 | timeLayout->addWidget(timeGroupBox); | 91 | timeLayout->addWidget(timeGroupBox); |
91 | timeGroupBox->layout()->setSpacing( 0 ); | 92 | timeGroupBox->layout()->setSpacing( KDialog::spacingHintSmall() ); |
92 | timeGroupBox->layout()->setMargin( 5 ); | 93 | timeGroupBox->layout()->setMargin( KDialog::marginHint() ); |
93 | QFrame *timeBoxFrame = new QFrame(timeGroupBox); | 94 | QFrame *timeBoxFrame = new QFrame(timeGroupBox); |
94 | 95 | ||
95 | QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,3,3); | 96 | QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,3,3); |
96 | layoutTimeBox->setSpacing(topLayout->spacing()); | 97 | layoutTimeBox->setSpacing(KDialog::spacingHintSmall()); |
97 | layoutTimeBox->setColStretch( 1, 1 ); | 98 | layoutTimeBox->setColStretch( 1, 1 ); |
98 | 99 | ||
99 | mDueCheck = new QCheckBox(i18n("Due:"),timeBoxFrame); | 100 | mDueCheck = new QCheckBox(i18n("Due:"),timeBoxFrame); |
100 | layoutTimeBox->addWidget(mDueCheck,0,0); | 101 | layoutTimeBox->addWidget(mDueCheck,1,0); |
101 | connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(enableDueEdit(bool))); | 102 | connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(enableDueEdit(bool))); |
102 | connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(showAlarm())); | 103 | connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(showAlarm())); |
103 | 104 | ||
104 | 105 | ||
105 | mDueDateEdit = new KDateEdit(timeBoxFrame); | 106 | mDueDateEdit = new KDateEdit(timeBoxFrame); |
106 | layoutTimeBox->addWidget(mDueDateEdit,0,1); | 107 | layoutTimeBox->addWidget(mDueDateEdit,1,1); |
107 | 108 | ||
108 | mDueTimeEdit = new KOTimeEdit(timeBoxFrame); | 109 | mDueTimeEdit = new KOTimeEdit(timeBoxFrame); |
109 | layoutTimeBox->addWidget(mDueTimeEdit,0,2); | 110 | layoutTimeBox->addWidget(mDueTimeEdit,1,2); |
110 | 111 | ||
111 | 112 | ||
112 | mStartCheck = new QCheckBox(i18n("Start:"),timeBoxFrame); | 113 | mStartCheck = new QCheckBox(i18n("Start:"),timeBoxFrame); |
113 | layoutTimeBox->addWidget(mStartCheck,1,0); | 114 | layoutTimeBox->addWidget(mStartCheck,0,0); |
114 | connect(mStartCheck,SIGNAL(toggled(bool)),SLOT(enableStartEdit(bool))); | 115 | connect(mStartCheck,SIGNAL(toggled(bool)),SLOT(enableStartEdit(bool))); |
115 | 116 | ||
116 | mStartDateEdit = new KDateEdit(timeBoxFrame); | 117 | mStartDateEdit = new KDateEdit(timeBoxFrame); |
117 | layoutTimeBox->addWidget(mStartDateEdit,1,1); | 118 | layoutTimeBox->addWidget(mStartDateEdit,0,1); |
118 | 119 | ||
119 | mStartTimeEdit = new KOTimeEdit(timeBoxFrame); | 120 | mStartTimeEdit = new KOTimeEdit(timeBoxFrame); |
120 | layoutTimeBox->addWidget(mStartTimeEdit,1,2); | 121 | layoutTimeBox->addWidget(mStartTimeEdit,0,2); |
121 | 122 | ||
122 | 123 | ||
123 | mTimeButton = new QCheckBox(i18n("Time associated"),timeBoxFrame); | 124 | mTimeButton = new QCheckBox(i18n("Time associated"),timeBoxFrame); |
124 | layoutTimeBox->addMultiCellWidget(mTimeButton,2,2,0,1); | 125 | layoutTimeBox->addMultiCellWidget(mTimeButton,2,2,0,1); |
125 | 126 | ||
126 | connect(mTimeButton,SIGNAL(toggled(bool)),SLOT(enableTimeEdits(bool))); | 127 | connect(mTimeButton,SIGNAL(toggled(bool)),SLOT(enableTimeEdits(bool))); |
127 | connect(mDueDateEdit,SIGNAL(setTimeTo(QTime)),mDueTimeEdit,SLOT(setTime(QTime))); | 128 | connect(mDueDateEdit,SIGNAL(setTimeTo(QTime)),mDueTimeEdit,SLOT(setTime(QTime))); |
128 | connect(mStartDateEdit,SIGNAL(setTimeTo(QTime)),mStartTimeEdit,SLOT(setTime(QTime))); | 129 | connect(mStartDateEdit,SIGNAL(setTimeTo(QTime)),mStartTimeEdit,SLOT(setTime(QTime))); |
129 | 130 | ||
130 | // some more layouting | 131 | // some more layouting |
131 | //layoutTimeBox->setColStretch(3,1); | 132 | //layoutTimeBox->setColStretch(3,1); |
132 | } | 133 | } |
133 | 134 | ||
134 | 135 | ||
135 | void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout) | 136 | void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout) |
136 | { | 137 | { |
137 | mCompletedCombo = new QComboBox(parent); | 138 | mCompletedCombo = new QComboBox(parent); |
138 | // xgettext:no-c-format | 139 | // xgettext:no-c-format |
139 | mCompletedCombo->insertItem(i18n(" 0 %")); | 140 | mCompletedCombo->insertItem(i18n(" 0 %")); |
140 | // xgettext:no-c-format | 141 | // xgettext:no-c-format |
141 | mCompletedCombo->insertItem(i18n(" 20 %")); | 142 | mCompletedCombo->insertItem(i18n(" 20 %")); |
142 | // xgettext:no-c-format | 143 | // xgettext:no-c-format |
143 | mCompletedCombo->insertItem(i18n(" 40 %")); | 144 | mCompletedCombo->insertItem(i18n(" 40 %")); |
144 | // xgettext:no-c-format | 145 | // xgettext:no-c-format |
@@ -320,49 +321,48 @@ void KOEditorGeneralTodo::writeTodo(Todo *todo) | |||
320 | tmpDT.setTime(tmpTime); | 321 | tmpDT.setTime(tmpTime); |
321 | todo->setDtStart(tmpDT); | 322 | todo->setDtStart(tmpDT); |
322 | } else { | 323 | } else { |
323 | todo->setFloats(true); | 324 | todo->setFloats(true); |
324 | 325 | ||
325 | // need to change this. | 326 | // need to change this. |
326 | tmpDate = mDueDateEdit->date(); | 327 | tmpDate = mDueDateEdit->date(); |
327 | tmpTime.setHMS(0,0,0); | 328 | tmpTime.setHMS(0,0,0); |
328 | tmpDT.setDate(tmpDate); | 329 | tmpDT.setDate(tmpDate); |
329 | tmpDT.setTime(tmpTime); | 330 | tmpDT.setTime(tmpTime); |
330 | todo->setDtDue(tmpDT); | 331 | todo->setDtDue(tmpDT); |
331 | 332 | ||
332 | tmpDate = mStartDateEdit->date(); | 333 | tmpDate = mStartDateEdit->date(); |
333 | tmpTime.setHMS(0,0,0); | 334 | tmpTime.setHMS(0,0,0); |
334 | tmpDT.setDate(tmpDate); | 335 | tmpDT.setDate(tmpDate); |
335 | tmpDT.setTime(tmpTime); | 336 | tmpDT.setTime(tmpTime); |
336 | todo->setDtStart(tmpDT); | 337 | todo->setDtStart(tmpDT); |
337 | } | 338 | } |
338 | todo->setPriority(mPriorityCombo->currentItem()+1); | 339 | todo->setPriority(mPriorityCombo->currentItem()+1); |
339 | 340 | ||
340 | // set completion state | 341 | // set completion state |
341 | if ( mCompletedCombo->currentItem() == 5 ) { | 342 | if ( mCompletedCombo->currentItem() == 5 ) { |
342 | QDateTime comp ( mCompleteDateEdit->date(), mCompleteTimeEdit->getTime() ); | 343 | QDateTime comp ( mCompleteDateEdit->date(), mCompleteTimeEdit->getTime() ); |
343 | if ( comp.isValid () ) { | 344 | if ( comp.isValid () ) { |
344 | todo->setPercentComplete(0); | ||
345 | todo->setPercentComplete(100); | 345 | todo->setPercentComplete(100); |
346 | todo->setCompleted(comp); | 346 | todo->setCompleted(comp); |
347 | } else { | 347 | } else { |
348 | todo->setPercentComplete( 100 ); | 348 | todo->setPercentComplete( 100 ); |
349 | if ( mCompleted.isValid() ) | 349 | if ( mCompleted.isValid() ) |
350 | todo->setCompleted(mCompleted); | 350 | todo->setCompleted(mCompleted); |
351 | } | 351 | } |
352 | } else { | 352 | } else { |
353 | todo->setPercentComplete(mCompletedCombo->currentItem() * 20); | 353 | todo->setPercentComplete(mCompletedCombo->currentItem() * 20); |
354 | } | 354 | } |
355 | 355 | ||
356 | mSummaryEdit->save(KOLocationBox::SUMMARYTODO); | 356 | mSummaryEdit->save(KOLocationBox::SUMMARYTODO); |
357 | } | 357 | } |
358 | 358 | ||
359 | void KOEditorGeneralTodo::enableDueEdit(bool enable) | 359 | void KOEditorGeneralTodo::enableDueEdit(bool enable) |
360 | { | 360 | { |
361 | mDueDateEdit->setEnabled( enable ); | 361 | mDueDateEdit->setEnabled( enable ); |
362 | 362 | ||
363 | if(mDueCheck->isChecked() || mStartCheck->isChecked()) { | 363 | if(mDueCheck->isChecked() || mStartCheck->isChecked()) { |
364 | mTimeButton->setEnabled(true); | 364 | mTimeButton->setEnabled(true); |
365 | } | 365 | } |
366 | else { | 366 | else { |
367 | mTimeButton->setEnabled(false); | 367 | mTimeButton->setEnabled(false); |
368 | mTimeButton->setChecked(false); | 368 | mTimeButton->setChecked(false); |