summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt1
-rw-r--r--korganizer/koeditorgeneraltodo.cpp12
-rw-r--r--libkcal/todo.cpp1
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
KO/Pi:
Fixed a problem displaying very long allday events in agenda view in single day mode.
+Fixed a problem with the default settings for new todos.
KA/Pi:
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)
KOEditorGeneral::setDefaults(allDay);
mTimeButton->setChecked( !allDay );
- if(mTimeButton->isChecked()) {
- mTimeButton->setEnabled(true);
- }
- else {
- mTimeButton->setEnabled(false);
- }
+ mTimeButton->setEnabled( !allDay );
enableTimeEdits( !allDay );
if ( due.isValid() ) {
@@ -252,6 +247,8 @@ void KOEditorGeneralTodo::readTodo(Todo *todo)
KOEditorGeneral::readIncidence(todo);
QDateTime dueDT;
+ mTimeButton->setChecked( !todo->doesFloat() );
+ mTimeButton->setEnabled( !todo->doesFloat() );
if (todo->hasDueDate()) {
enableAlarmEdit(true);
@@ -259,6 +256,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo)
mDueDateEdit->setDate(todo->dtDue().date());
mDueTimeEdit->setTime(todo->dtDue().time());
mDueCheck->setChecked(true);
+ mTimeButton->setEnabled( true );
} else {
alarmDisable(true);
mDueDateEdit->setEnabled(false);
@@ -272,6 +270,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo)
mStartDateEdit->setDate(todo->dtStart().date());
mStartTimeEdit->setTime(todo->dtStart().time());
mStartCheck->setChecked(true);
+ mTimeButton->setEnabled( true );
} else {
mStartDateEdit->setEnabled(false);
mStartTimeEdit->setEnabled(false);
@@ -280,7 +279,6 @@ void KOEditorGeneralTodo::readTodo(Todo *todo)
mStartCheck->setChecked(false);
}
- mTimeButton->setChecked( !todo->doesFloat() );
mCompletedCombo->setCurrentItem(todo->percentComplete() / 20);
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()
mPercentComplete = 0;
mRunning = false;
mRunSaveTimer = 0;
+ setFloats( true );
}
Todo::Todo(const Todo &t) : QObject(),Incidence(t)