completed todo

5 files changed, 23 insertions, 1 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,31 +1,34 @@
 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 ************
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 363dc32..378c7d4 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2705,48 +2705,50 @@ void CalendarView::editJournal( Journal *jour )
 }
 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)
 // {
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 68c0e1a..772fd95 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -129,104 +129,120 @@ void KOEventViewerDialog::setIncidence(Incidence *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();
+  if ( !mSyncMode ) {
+    findButton( User1 )->setText( i18n("Agenda"));
+  }
 }
 
 void KOEventViewerDialog::setTodo(Todo *event)
 {
   mEventViewer->setTodo(event);
   mIncidence = (Incidence*)event;
   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; 
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 21cb3ee..b6b4103 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -34,37 +34,38 @@ 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
@@ -45,63 +45,63 @@ using namespace KCal;
   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;