completed todo

5 files changed, 25 insertions, 3 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 5be1d28..da33d12 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,55 +1,58 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 1.9.17 ************
 
 KO/Pi:
 Fixed that tooltips were not updated after moving an item in agenda view.
 Fixed a bug in sorting start date for recurring events in list view.
+Changed the left button in todo viewer from "Agenda" to "Set completed".
+This makes it possible to change a todo in the What's Next View quickly to the completed state without leaving the What's Next View.
+ 
 
 KA/Pi:
 All fields search does now actually search all the (possible) fields, 
 not only those listed in the contact list.
 Made is possible to inline a picture in a vcard on the Z.
 This was only possible on the desktop, now is it possible on the Z as well.
 Fixed of missing save settings after filter configuration.
 Made saving of addressbook much faster.
 Fixed extension widget layout problem.
 Fixed saving of default formatted name settings.
 Fixed formatted name handling in edit dialog.
 Added an option for changing formatted names of many contacts
 (menu: File - Change - Set formatted name).
 
 QWhatsThis was not working on the Z ( only black rectangle was shown).
 This is Fixed.
 
 KDE-Sync:
 Now readonly KDE resources are synced as well.
 (They are not changed in KDE itself, of course).
 
  
 
 ********** VERSION 1.9.16 ************
 
 KO/Pi:
 Fixed search dialog size on Z 6000 (480x640 display).
 Added setting to hide/show time in agenda items.
 Added setting to hide not running todos in todo view.
 Added columns for start date/time in todo view.
 Replaced the solid half-hour lines in agenda view by dot lines.
 Added possibility of printing the What's Next View on the desktop
 (i.e. Windows and Linux).
 Fixed a crash in KO/Pi when starting KO/Pi with What's Next view.
 Added tooltips in month view.(Tooltips only available on desktop)
 
 Fixed a strange problem in KO/Pi alarm applet.
 Did not find the actual problem, 
 such that now Qtopia reboots again if deinstalling the alarm applet.
 But the alarm applet should work again.
 
 KA/Pi:
 Fixed the problem, that internal pictures were not saved.
 
 Fixed a problem in the pi-sync mode by increasing the timeout for data transfer from 20 seconds to 5 minutes.
 
 Fixed some minor problems. (Like word wrap in help text windows).
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 363dc32..378c7d4 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2681,96 +2681,98 @@ void CalendarView::newFloatingEvent()
     QDate date = tmpList.first();
 
     newEvent( QDateTime( date, QTime( 12, 0, 0 ) ),
               QDateTime( date, QTime( 12, 0, 0 ) ), true );
 }
 
 
 void CalendarView::editEvent( Event *event )
 {
 
     if ( !event ) return;
     if ( event->isReadOnly() ) {
         showEvent( event );
         return;
     }
     showEventEditor();
     mEventEditor->editEvent( event , mFlagEditDescription);
 }
 void CalendarView::editJournal( Journal *jour )
 { 
     if ( !jour ) return;
     mDialogManager->hideSearchDialog();
     mViewManager->showJournalView();
     mNavigator->slotDaySelect( jour->dtStart().date() );
 }
 void CalendarView::editTodo( Todo *todo )
 {
     if ( !todo ) return;
  
     if ( todo->isReadOnly() ) {
         showTodo( todo );
         return;
     }
     showTodoEditor();
     mTodoEditor->editTodo( todo ,mFlagEditDescription);
 
 }
 
 KOEventViewerDialog* CalendarView::getEventViewerDialog()
 {
     if ( !mEventViewerDialog ) {
         mEventViewerDialog = new KOEventViewerDialog(this);
         connect( mEventViewerDialog, SIGNAL(  editIncidence( Incidence* )), this, SLOT(editIncidence( Incidence* )  ) );
         connect( this, SIGNAL(configChanged()), mEventViewerDialog, SLOT(updateConfig()));
         connect( mEventViewerDialog, SIGNAL(jumpToTime( const QDate &)), 
                  dateNavigator(), SLOT( selectWeek( const QDate & ) ) );
         connect( mEventViewerDialog, SIGNAL(showAgendaView( bool ) ), 
                  viewManager(), SLOT( showAgendaView( bool ) ) );
+        connect( mEventViewerDialog, SIGNAL( todoCompleted(Todo *) ), 
+                 this, SLOT( todoChanged(Todo *) ) );
         mEventViewerDialog->resize( 640, 480 );
         
     }
     return mEventViewerDialog;
 }
 void CalendarView::showEvent(Event *event)
 {
     getEventViewerDialog()->setEvent(event);
     getEventViewerDialog()->showMe();
 }
 
 void CalendarView::showTodo(Todo *event)
 {
     getEventViewerDialog()->setTodo(event);
     getEventViewerDialog()->showMe();
 }
 void CalendarView::showJournal( Journal *jour )
 { 
     getEventViewerDialog()->setJournal(jour);
     getEventViewerDialog()->showMe();
    
 }
 // void CalendarView::todoModified (Todo *event, int changed)
 // {
 //  //  if (mDialogList.find (event) != mDialogList.end ()) {
 // //     kdDebug() << "Todo modified and open" << endl;
 // //     KOTodoEditor* temp = (KOTodoEditor *) mDialogList[event];
 // //     temp->modified (changed);
 
 // //   }
 
 //   mViewManager->updateView();
 // }
 
 void CalendarView::appointment_show()
 {
     Event *anEvent = 0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->type() == "Event" ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 68c0e1a..772fd95 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -104,137 +104,153 @@ int KOEventViewerDialog::executeS( bool local )
 {
     mSyncResult = 3; 
     if ( local ) 
         findButton( User1 )->setFocus();
     else 
         findButton( Ok )->setFocus();
     exec();
     return mSyncResult;
 }
 
 void KOEventViewerDialog::updateConfig()
 {
   mEventViewer->setFont( KOPrefs::instance()->mEventViewFont );
 
 }
 void KOEventViewerDialog::setEvent(Event *event)
 {
   mEventViewer->setEvent(event);
   mIncidence = event;
   findButton( Close )->setFocus();
 }
 void KOEventViewerDialog::setIncidence(Incidence *in )
 {
     if ( in->type() == "Event" )
         setEvent( (Event*) in );
     else if ( in->type() =="Todo" )
         setTodo( (Todo*) in );
     else if ( in->type() =="Journal" )
         setJournal( (Journal*) in );
 }
 void KOEventViewerDialog::addIncidence(Incidence *in)
 {
     if ( in->type() == "Event" )
         addEvent( (Event*) in );
     else if ( in->type() =="Todo" )
          mEventViewer->setTodo( (Todo*) in, false );
     else if ( in->type() =="Journal" )
          mEventViewer->setJournal( (Journal*) in, false );
   if ( mSyncMode ) {
       findButton( User1 )->setFocus();
       setCaption(i18n("Conflict! Please choose entry"));
   }   
 }
 
 void KOEventViewerDialog::addEvent(Event *event)
 { 
   mEventViewer->addEvent(event);
   mIncidence = event; 
-  findButton( Close )->setFocus();
+  findButton( Close )->setFocus(); 
+  if ( !mSyncMode ) {
+    findButton( User1 )->setText( i18n("Agenda"));
+  }
 }
 
 void KOEventViewerDialog::setTodo(Todo *event)
 {
   mEventViewer->setTodo(event);
   mIncidence = (Incidence*)event;
-  findButton( Close )->setFocus();
+  findButton( Close )->setFocus(); 
+  if ( !mSyncMode ) {
+    findButton( User1 )->setText( i18n("Set complete"));
+  }
 }
 void KOEventViewerDialog::setJournal(Journal *j)
 {
   mEventViewer->setJournal(j);
   mIncidence = (Incidence*)j;
   findButton( Close )->setFocus();
+  if ( !mSyncMode ) {
+    findButton( User1 )->setText( i18n("Agenda"));
+  }
 }
 
 void KOEventViewerDialog::addText(QString text)
 {
   mEventViewer->addText(text);
   findButton( Close )->setFocus();
 }
 void KOEventViewerDialog::editIncidence()
 {   
     if ( mSyncMode ) {
         mSyncResult = 2;
         accept();
         return;
     }
     if ( mIncidence ){
 #ifndef DESKTOP_VERSION
         hide();
 #endif
         emit editIncidence( mIncidence );
     }
 }
 void KOEventViewerDialog::showIncidence()
 {
 
     if ( mSyncMode ) {
         mSyncResult = 1;
         accept();
         return;
     }
 
     if ( mIncidence ){
 #ifndef DESKTOP_VERSION
         hide();
 #endif
         QDate date;
         if ( mIncidence->type() == "Todo" ) {
+            /*
             if ( ((Todo*)mIncidence)->hasDueDate() )
                 date = ((Todo*)mIncidence)->dtDue().date();
             else {
                 globalFlagBlockAgenda = 2;
                 emit showAgendaView( false );
                 return;
             }
+            */
+            ((Todo*)mIncidence)->setCompleted( true );
+            hide();
+            emit todoCompleted(((Todo*)mIncidence));
+            return;
+        
         } else
             date = mIncidence->dtStart().date();
         globalFlagBlockAgenda = 1;
         emit showAgendaView( false );
         globalFlagBlockAgenda = 2;
         emit jumpToTime( date );
     }
 }
 void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) 
 {
     switch ( e->key() ) {
    
     case Qt::Key_A :
     case Qt::Key_L :
         showIncidence();
         break;
     case Qt::Key_E :
     case Qt::Key_R :
         editIncidence();
         break;
     case Qt::Key_C:
     case Qt::Key_Escape:
         close();
         break; 
     case Qt::Key_I:
         accept();
         break; 
     default:
         break; 
     }
     
 }
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 21cb3ee..b6b4103 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -10,61 +10,62 @@
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #ifndef KOEVENTVIEWERDIALOG_H
 #define KOEVENTVIEWERDIALOG_H
 //
 // Viewer dialog for events.
 //
 
 #include <qtextview.h>
 
 #include <kdialogbase.h>
 
 #include <libkcal/event.h>
 
 using namespace KCal;
 
 class KOEventViewer;
 
 class KOEventViewerDialog : public KDialogBase {
     Q_OBJECT
   public:
     KOEventViewerDialog(QWidget *parent=0,const char *name=0);
     virtual ~KOEventViewerDialog();
 
     void setEvent(Event *event);
     void addEvent(Event *event);
     void setTodo(Todo *event);
     void setJournal(Journal *journal);
     void setIncidence(Incidence *inc);
     void addIncidence(Incidence *inc);
     void addText(QString text);
     void showMe();
     void setSyncMode( bool );
     void setColorMode( int m );
     int executeS( bool );
   public slots:
      void  updateConfig();
  signals:
     void editIncidence( Incidence* );
     void jumpToTime( const QDate &);
     void showAgendaView( bool );
+    void todoCompleted(Todo*);
 private slots:
     void editIncidence();
  void showIncidence();
 
   private:
     bool mSyncMode;
     int mSyncResult;
     KOEventViewer *mEventViewer;
     Incidence* mIncidence;
     void keyPressEvent ( QKeyEvent * e );
 };
 
 #endif
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 6f76e2c..3c251fb 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -21,95 +21,95 @@
   with any edition of Qt, and distribute the resulting executable,
   without including the source code for Qt in the source distribution.
 */
 #ifndef KOVIEWMANAGER_H
 #define KOVIEWMANAGER_H
 
 #include <qobject.h>
 
 #include <korganizer/baseview.h>
 
 class CalendarView;
 
 class KOListView;
 class KOAgendaView;
 class KOMonthView;
 class KOTimeSpanView;
 class KOTodoView;
 class KOWhatsNextView;
 class KOJournalView;
 
 using namespace KCal;
 
 /**
   This class manages the views of the calendar. It owns the objects and handles
   creation and selection.
 */
 class KOViewManager : public QObject
 {
     Q_OBJECT
   public:
     KOViewManager( CalendarView * );
     virtual ~KOViewManager();
 
     /** changes the view to be the currently selected view */
     void showView(KOrg::BaseView *, bool fullScreen = false );
     void updateWNview();
     void readSettings(KConfig *config);
     void writeSettings(KConfig *config);
     bool showsNextDays(); 
     /** Read which view was shown last from config file */
     void readCurrentView(KConfig *);
     /** Write which view is currently shown to config file */
     void writeCurrentView(KConfig *);
 
     KOrg::BaseView *currentView();
 
     void setDocumentId( const QString & );
 
-    void updateView();
     void updateView( const QDate &start, const QDate &end );
 
     void raiseCurrentView( bool fullScreen = false );
 
     void addView(KOrg::BaseView *);
 
     Incidence *currentSelection();
     QDate currentSelectionDate();
 
     KOAgendaView *agendaView() const { return mAgendaView; }
 
  signals:
     void printWNV();
   public slots:
+    void updateView();
     void showWhatsNextView();
     void showListView();
     void showAgendaView( bool fullScreen = false );
     void showDayView();
     void showWorkWeekView();
     void showWeekView();
     void showNextXView();
     void showMonthView();
     void showTodoView();
     void showJournalView();
     void showTimeSpanView();
 
   private:
     CalendarView *mMainView;
 
     int             mCurrentAgendaView;
     KOAgendaView    *mAgendaView;
     KOListView      *mListView;
     KOMonthView     *mMonthView; 
     KOTodoView      *mTodoView;
     KOWhatsNextView *mWhatsNextView;
     KOJournalView   *mJournalView;
     KOTimeSpanView  *mTimeSpanView;
   
     KOrg::BaseView     *mCurrentView;  // currently active event view
     
     int mAgendaViewMode;
     bool mFlagShowNextxDays;
   
 };
 
 #endif