fixes

4 files changed, 79 insertions, 12 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index a5e2597..cb92677 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1492,6 +1492,8 @@
 { "Journal viewer","Journal Anzeige" },
 { "Configure Calendar Files...","Konfiguriere Kalenderdateien..." },
 { "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." },
+{ "Hide Completed","Verstecke erledigte Todos" },
+{ "Show not Running","Zeige nicht Laufende" },
 { "","" },
 { "","" },
 { "","" },
@@ -1499,7 +1501,6 @@
 { "","" },
 { "","" },
 { "","" },
-{ "","" },
-{ "","" },
-{ "","" },
-{ "","" },
+
+
+
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 555c1b1..100a81b 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -298,6 +298,7 @@ void KOTodoEditor::setDefaults(QDateTime due,Todo *relatedEvent,bool allDay)
   mDetails->setDefaults(); 
   showPage( 0 );
   if ( mRelatedTodo ) {
+      mGeneral->fillCalCombo(mRelatedTodo->calID() );
       mGeneral->setCategories (mRelatedTodo->categoriesStr ());
       mGeneral->setSecrecy (mRelatedTodo->secrecy ());
       if ( mRelatedTodo->priority() < 3 )
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index a87e6fc..c23a8ee 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -504,10 +504,44 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   QBoxLayout *topLayout = new QVBoxLayout(this);
   mName = QString ( name );
   mBlockUpdate = false;
-  mQuickAdd = new KOQuickTodo(this);
-  topLayout->addWidget(mQuickAdd);
-
-  if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickAdd->hide();
+  mQuickBar = new QWidget( this );
+  topLayout->addWidget(mQuickBar);
+  
+  mQuickAdd = new KOQuickTodo(mQuickBar); 
+  QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar);
+  quickLayout->addWidget( mQuickAdd );
+  QPushButton * flat = new QPushButton( "F",mQuickBar );
+  int fixwid = flat->sizeHint().height();
+  if ( QApplication::desktop()->width() > 320 )
+      fixwid *= 2;
+  flat->setFixedWidth( fixwid );
+  connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat()));
+  QPushButton * allopen = new QPushButton( "O",mQuickBar );
+  allopen->setFixedWidth( fixwid );
+  connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen()));
+  QPushButton * allclose = new QPushButton( "C",mQuickBar );
+  allclose->setFixedWidth( fixwid );
+  connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose()));
+  QPushButton * s_done = new QPushButton( "D",mQuickBar );
+  s_done->setFixedWidth( fixwid );
+  connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted()));
+  QPushButton * s_run = new QPushButton( "R",mQuickBar );
+  s_run->setFixedWidth( fixwid );
+  connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning()));
+
+  mNewSubBut =  new QPushButton( "sub",mQuickBar );
+  mNewSubBut->setFixedWidth( fixwid*3/2 );
+  connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo()));
+  mNewSubBut->setEnabled( false );
+  quickLayout->addWidget( mNewSubBut );
+  quickLayout->addWidget( s_done );
+  quickLayout->addWidget( s_run );
+
+  quickLayout->addWidget( allopen );
+  quickLayout->addWidget( allclose );
+  quickLayout->addWidget( flat );
+
+  if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickBar->hide();
 
   mTodoListView = new KOTodoListView(calendar,this, name );
   topLayout->addWidget(mTodoListView);
@@ -1082,7 +1116,11 @@ void KOTodoView::newTodo()
 
 void KOTodoView::newSubTodo()
 {
+    mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
   if (mActiveItem) {
+      if ( mQuickAdd->isVisible() && !mQuickAdd->text().isEmpty() && mQuickAdd->text() != i18n("Click to add a new Todo") ) {
+          addQuickTodoPar( mActiveItem->todo());
+      } else
     emit newSubTodoSignal(mActiveItem->todo());
   }
 }
@@ -1391,8 +1429,10 @@ void KOTodoView::processSelectionChange()
 
   if ( !item ) {
     emit incidenceSelected( 0 );
+    mNewSubBut->setEnabled( false );
   } else {
     emit incidenceSelected( item->todo() );
+    mNewSubBut->setEnabled( true );
   }
 }
 
@@ -1480,12 +1520,12 @@ void KOTodoView::purgeCompleted()
 }
 void KOTodoView::toggleQuickTodo()
 {
-    if ( mQuickAdd->isVisible() ) {
-        mQuickAdd->hide();
+    if ( mQuickBar->isVisible() ) {
+        mQuickBar->hide();
         KOPrefs::instance()->mEnableQuickTodo = false;
     }
     else {
-        mQuickAdd->show();
+        mQuickBar->show();
         KOPrefs::instance()->mEnableQuickTodo = true;
     }
     mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo);
@@ -1498,6 +1538,10 @@ void KOTodoView::toggleRunning()
     mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
     mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
     updateView();
+    if ( KOPrefs::instance()->mHideNonStartedTodos )
+        topLevelWidget()->setCaption(i18n("Hide not Running"));
+    else
+        topLevelWidget()->setCaption(i18n("Show not Running"));
 }
 
 void KOTodoView::toggleCompleted()
@@ -1506,13 +1550,30 @@ void KOTodoView::toggleCompleted()
     mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo  );
     mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo   );
     updateView();
+    if ( KOPrefs::instance()->mShowCompletedTodo )
+        topLevelWidget()->setCaption(i18n("Show Completed"));
+    else
+        topLevelWidget()->setCaption(i18n("Hide Completed"));
 }
 
 void KOTodoView::addQuickTodo()
 {
+    addQuickTodoPar( 0 );
+}
+void KOTodoView::addQuickTodoPar( Todo * parentTodo)
+{
   Todo *todo = new Todo();
   todo->setSummary(mQuickAdd->text());
   todo->setOrganizer(KOPrefs::instance()->email());
+    if ( parentTodo ) {
+        todo->setRelatedTo(parentTodo);
+
+        todo->setCategories (parentTodo->categoriesStr ());
+        todo->setSecrecy (parentTodo->secrecy ());
+        if ( parentTodo->priority() < 3 )
+            todo->setPriority( parentTodo->priority() );
+        todo->setCalID( parentTodo->calID() );
+    } else {
   CalFilter * cf = mCalendar->filter();
   if ( cf ) {
       if ( cf->isEnabled()&& cf->showCategories()) {
@@ -1521,12 +1582,13 @@ void KOTodoView::addQuickTodo()
       if ( cf->isEnabled() )
           todo->setSecrecy( cf->getSecrecy());
   }
+    }
   mCalendar->addTodo(todo);
   mQuickAdd->setText("");
   todoModified (todo,  KOGlobals::EVENTADDED );
   updateView();
-}
 
+}
 void KOTodoView::keyPressEvent ( QKeyEvent * e )
 {  
     //    e->ignore();
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 79cc756..a8e90e2 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -254,6 +254,7 @@ class KOTodoView : public KOrg::BaseView
     void todoModified(Todo *, int );
 
   private:
+    void addQuickTodoPar( Todo * parentTodo);
     /*
      * the TodoEditor approach is rather unscaling in the long
      * run.
@@ -289,6 +290,7 @@ class KOTodoView : public KOrg::BaseView
 
     QMap<Todo *,KOTodoViewItem *> mTodoMap;
     QString mName;
+    QWidget* mQuickBar;
 
     DocPrefs *mDocPrefs;
     QString mCurrentDoc;
@@ -300,6 +302,7 @@ class KOTodoView : public KOrg::BaseView
     void storeCurrentItem();
     void resetCurrentItem();
     Incidence * mCurItem, *mCurItemRootParent, *mCurItemParent,*mCurItemAbove; 
+    QPushButton * mNewSubBut;
 };
 
 #endif