-rw-r--r-- | bin/kdepim/WhatsNew.txt | 1 | ||||
-rw-r--r-- | korganizer/koeditorgeneraltodo.cpp | 12 | ||||
-rw-r--r-- | libkcal/todo.cpp | 1 |
3 files changed, 7 insertions, 7 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 18e94a7..15caf9e 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -4,6 +4,7 @@ Info about the changes in new versions of KDE-Pim/Pi | |||
4 | 4 | ||
5 | KO/Pi: | 5 | KO/Pi: |
6 | Fixed a problem displaying very long allday events in agenda view in single day mode. | 6 | Fixed a problem displaying very long allday events in agenda view in single day mode. |
7 | Fixed a problem with the default settings for new todos. | ||
7 | 8 | ||
8 | KA/Pi: | 9 | KA/Pi: |
9 | Added a config option to turn on asking before a contact is deleted. | 10 | Added a config option to turn on asking before a contact is deleted. |
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index 10d9a8c..d32d5a5 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp | |||
@@ -208,12 +208,7 @@ void KOEditorGeneralTodo::setDefaults(QDateTime due,bool allDay) | |||
208 | KOEditorGeneral::setDefaults(allDay); | 208 | KOEditorGeneral::setDefaults(allDay); |
209 | 209 | ||
210 | mTimeButton->setChecked( !allDay ); | 210 | mTimeButton->setChecked( !allDay ); |
211 | if(mTimeButton->isChecked()) { | 211 | mTimeButton->setEnabled( !allDay ); |
212 | mTimeButton->setEnabled(true); | ||
213 | } | ||
214 | else { | ||
215 | mTimeButton->setEnabled(false); | ||
216 | } | ||
217 | 212 | ||
218 | enableTimeEdits( !allDay ); | 213 | enableTimeEdits( !allDay ); |
219 | if ( due.isValid() ) { | 214 | if ( due.isValid() ) { |
@@ -252,6 +247,8 @@ void KOEditorGeneralTodo::readTodo(Todo *todo) | |||
252 | KOEditorGeneral::readIncidence(todo); | 247 | KOEditorGeneral::readIncidence(todo); |
253 | 248 | ||
254 | QDateTime dueDT; | 249 | QDateTime dueDT; |
250 | mTimeButton->setChecked( !todo->doesFloat() ); | ||
251 | mTimeButton->setEnabled( !todo->doesFloat() ); | ||
255 | 252 | ||
256 | if (todo->hasDueDate()) { | 253 | if (todo->hasDueDate()) { |
257 | enableAlarmEdit(true); | 254 | enableAlarmEdit(true); |
@@ -259,6 +256,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo) | |||
259 | mDueDateEdit->setDate(todo->dtDue().date()); | 256 | mDueDateEdit->setDate(todo->dtDue().date()); |
260 | mDueTimeEdit->setTime(todo->dtDue().time()); | 257 | mDueTimeEdit->setTime(todo->dtDue().time()); |
261 | mDueCheck->setChecked(true); | 258 | mDueCheck->setChecked(true); |
259 | mTimeButton->setEnabled( true ); | ||
262 | } else { | 260 | } else { |
263 | alarmDisable(true); | 261 | alarmDisable(true); |
264 | mDueDateEdit->setEnabled(false); | 262 | mDueDateEdit->setEnabled(false); |
@@ -272,6 +270,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo) | |||
272 | mStartDateEdit->setDate(todo->dtStart().date()); | 270 | mStartDateEdit->setDate(todo->dtStart().date()); |
273 | mStartTimeEdit->setTime(todo->dtStart().time()); | 271 | mStartTimeEdit->setTime(todo->dtStart().time()); |
274 | mStartCheck->setChecked(true); | 272 | mStartCheck->setChecked(true); |
273 | mTimeButton->setEnabled( true ); | ||
275 | } else { | 274 | } else { |
276 | mStartDateEdit->setEnabled(false); | 275 | mStartDateEdit->setEnabled(false); |
277 | mStartTimeEdit->setEnabled(false); | 276 | mStartTimeEdit->setEnabled(false); |
@@ -280,7 +279,6 @@ void KOEditorGeneralTodo::readTodo(Todo *todo) | |||
280 | mStartCheck->setChecked(false); | 279 | mStartCheck->setChecked(false); |
281 | } | 280 | } |
282 | 281 | ||
283 | mTimeButton->setChecked( !todo->doesFloat() ); | ||
284 | 282 | ||
285 | mCompletedCombo->setCurrentItem(todo->percentComplete() / 20); | 283 | mCompletedCombo->setCurrentItem(todo->percentComplete() / 20); |
286 | if (todo->isCompleted() && todo->hasCompletedDate()) { | 284 | if (todo->isCompleted() && todo->hasCompletedDate()) { |
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index e4508a0..48d37d5 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -42,6 +42,7 @@ Todo::Todo(): QObject(), Incidence() | |||
42 | mPercentComplete = 0; | 42 | mPercentComplete = 0; |
43 | mRunning = false; | 43 | mRunning = false; |
44 | mRunSaveTimer = 0; | 44 | mRunSaveTimer = 0; |
45 | setFloats( true ); | ||
45 | } | 46 | } |
46 | 47 | ||
47 | Todo::Todo(const Todo &t) : QObject(),Incidence(t) | 48 | Todo::Todo(const Todo &t) : QObject(),Incidence(t) |