summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/journalentry.cpp4
-rw-r--r--korganizer/koagenda.cpp6
-rw-r--r--korganizer/koagenda.h2
-rw-r--r--korganizer/kotodoview.cpp4
4 files changed, 11 insertions, 5 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 5fc3f2f..7f6f221 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -252,3 +252,5 @@ void JournalEntry::fillCalendar( int setToID )
void JournalEntry::toggleShowJournal()
-{
+{
+ if ( mEditor->text().isEmpty() && mTitle->currentText ().isEmpty() )
+ return;
if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty())
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index c738f7e..7e9fa71 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -89,3 +89,6 @@ MarcusBains::~MarcusBains()
}
-
+void MarcusBains::hideMe()
+{
+ hide(); mTimeBox->hide();
+}
int MarcusBains::todayColumn()
@@ -374,2 +377,3 @@ void KOAgenda::changeColumns(int columns)
computeSizes();
+ if(mMarcusBains) mMarcusBains->hideMe();
}
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 86cf2f4..59e7472 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -50,3 +50,3 @@ class MarcusBains : public QFrame {
virtual ~MarcusBains();
-
+ void hideMe();
public slots:
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index f46a103..82c0f4c 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1359,3 +1359,3 @@ void KOTodoView::toggleRunningItem()
tp.exec();
- mActiveItem->construct();
+ updateTodo ( t, 0 );
} else {
@@ -1376,3 +1376,3 @@ void KOTodoView::toggleRunningItem()
t->setRunning( true );
- mActiveItem->construct();
+ updateTodo ( t, 0 );
}