1 files changed, 43 insertions, 27 deletions

diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index 0ab6230..f0aa455 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -29,2 +29,3 @@
 #include <unistd.h>
+#include <stdio.h>
 
@@ -45,2 +46,3 @@
 #include <qpe/qpemessagebox.h>
+#include <qpe/qpetoolbar.h>
 
@@ -87,2 +89,7 @@ void MainWindow::initTemplate() {
 void MainWindow::initActions() {
+    
+    // Data menu
+    m_edit->insertItem(tr("New from template"), m_template,
+                       -1, 0 );
+    
     QAction* a = new QAction( tr("New Task" ), Resource::loadPixmap( "new" ),
@@ -150,6 +157,6 @@ void MainWindow::initActions() {
 
+    // Options menu
     a = new QAction( tr("Find"), Resource::loadIconSet( "mag" ),
                      QString::null, 0, this, 0 );
-    connect(a, SIGNAL( activated() ),
-            this, SLOT( slotFind() ) );
+    connect(a, SIGNAL( activated() ), this, SLOT( slotFind() ) );
     a->addTo( m_options );
@@ -159,3 +166,3 @@ void MainWindow::initActions() {
 
-    m_completedAction = new QAction( QString::null, tr("Completed tasks"),
+    m_completedAction = new QAction( QString::null, tr("Show completed tasks"),
                                      0, this, 0, TRUE );
@@ -163,6 +170,11 @@ void MainWindow::initActions() {
     m_completedAction->setOn( showCompleted() );
-    connect(m_completedAction, SIGNAL( toggled(bool) ),
-            this, SLOT(slotShowCompleted(bool) ) );
+    connect(m_completedAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowCompleted(bool) ) );
 
-    m_showDeadLineAction = new QAction( QString::null, tr("Show Deadline"),
+    a = new QAction( QString::null, tr("Show only over-due tasks"),
+                     0, this, 0, TRUE );
+    a->addTo( m_options );
+    a->setOn( showOverDue() );
+    connect(a, SIGNAL(toggled(bool)), this, SLOT(slotShowDue(bool) ) );
+
+    m_showDeadLineAction = new QAction( QString::null, tr("Show task deadlines"),
                                         0, this, 0, TRUE );
@@ -170,4 +182,9 @@ void MainWindow::initActions() {
     m_showDeadLineAction->setOn( showDeadline() );
-    connect(m_showDeadLineAction, SIGNAL(toggled(bool) ),
-            this, SLOT( slotShowDeadLine( bool ) ) );
+    connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine( bool ) ) );
+
+    m_showQuickTaskAction = new QAction( QString::null, tr("Show quick task bar"),
+                                     0, this, 0, TRUE );
+    m_showQuickTaskAction->addTo( m_options );
+    m_showQuickTaskAction->setOn( showQuickTask() );
+    connect(m_showQuickTaskAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowQuickTask(bool) ) );
 
@@ -179,13 +196,5 @@ void MainWindow::initActions() {
 
-    /* initialize the view menu */
-    a = new QAction( QString::null, tr("Show only over due"),
-                     0, this, 0, TRUE );
-    a->addTo( m_options );
-    a->setOn( showOverDue() );
-    connect(a, SIGNAL(toggled(bool)),
-            this, SLOT(slotShowDue(bool) ) );
-
-    /* templates */
-    m_edit->insertItem(tr("New from template"), m_template,
-                       -1, 0 );
+    m_curQuick = new QuickEditImpl( this, m_quicktask );
+    addToolBar( (QPEToolBar *)m_curQuick->widget(), tr( "QuickEdit" ), QMainWindow::Top, TRUE );
+    m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) );
 
@@ -199,3 +208,4 @@ void MainWindow::initConfig() {
     m_deadline =  config.readBoolEntry( "ShowDeadLine", TRUE);
-    m_overdue = config.readBoolEntry("ShowOverDue", TRUE );
+    m_overdue = config.readBoolEntry("ShowOverDue", FALSE );
+    m_quicktask = config.readBoolEntry("ShowQuickTask", TRUE);
 }
@@ -203,7 +213,2 @@ void MainWindow::initUI() {
     m_mainBox = new QVBox(this, "main box ");
-    m_curQuick = new QuickEditImpl(this, m_mainBox );
-    m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) );
-    m_quickEdit.append( m_curQuick );
-
-
 
@@ -214,3 +219,3 @@ void MainWindow::initUI() {
 
-    m_tool = new QToolBar( this );
+    m_tool = new QPEToolBar( this );
     m_tool->setHorizontalStretchable( TRUE );
@@ -373,3 +378,4 @@ void MainWindow::closeEvent( QCloseEvent* e ) {
         config.writeEntry( "ShowOverDue", showOverDue() );
-        /* svae templates */
+        config.writeEntry( "ShowQuickTask", showQuickTask() );
+        /* save templates */
         templateManager()->save();
@@ -517,2 +523,9 @@ void MainWindow::slotShowCompleted( bool show) {
 }
+void MainWindow::slotShowQuickTask( bool show ) {
+    m_quicktask = show;
+    if ( m_quicktask )
+        m_curQuick->widget()->show();
+    else
+        m_curQuick->widget()->hide();
+}
 bool MainWindow::showOverDue()const {
@@ -593,2 +606,5 @@ bool MainWindow::showDeadline()const {
 }
+bool MainWindow::showQuickTask()const {
+    return m_quicktask;
+}
 QString MainWindow::currentCategory()const {