8 files changed, 119 insertions, 22 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 257a4dd..035d630 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2647,5 +2647,8 @@ void CalendarView::newEvent(QDate dt)
              QDateTime(dt, QTime(0,0,0)), true);
 }
-
+void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint)
+{
+    newEvent(fromHint,  toHint, false);
+}
 void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint, bool allDay)
 {
@@ -2685,10 +2688,9 @@ void  CalendarView::todoDeleted()
 
 
-
-void CalendarView::newTodo()
+void CalendarView::newTodoDateTime( QDateTime dt, bool allday )
 { 
- 
+    qDebug("datetime ");
     showTodoEditor();
-    mTodoEditor->newTodo(QDateTime::currentDateTime().addDays(7),0,true);
+    mTodoEditor->newTodo(dt,0,allday);
     if ( mFilterView->filtersEnabled() ) {
         CalFilter *filter = mFilterView->selectedFilter();
@@ -2701,4 +2703,9 @@ void CalendarView::newTodo()
 }
 
+void CalendarView::newTodo()
+{ 
+    newTodoDateTime( QDateTime(),true );
+}
+
 void CalendarView::newSubTodo()
 {
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index c8d6bdd..7c59a8d 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -226,5 +226,6 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     /** create an editeventwin with supplied date/time, and if bool is true,
      * make the event take all day. */
-    void newEvent(QDateTime, QDateTime, bool allDay = false);
+    void newEvent(QDateTime, QDateTime, bool allDay );
+    void newEvent(QDateTime, QDateTime);
     void newEvent(QDateTime fh);
     void newEvent(QDate dt);
@@ -261,4 +262,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     /** create new todo */
     void newTodo();
+    void newTodoDateTime(QDateTime, bool allday); 
     /** create new todo with a parent todo */
     void newSubTodo();
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 7e0b216..73ee5cb 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -169,5 +169,16 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
   QScrollView(parent,name,f)
 {
-  
+    mNewItemPopup = new QPopupMenu( this );
+    connect ( mNewItemPopup, SIGNAL (activated ( int )  ), this, SLOT ( newItem(int)) );
+    QString pathString = "";
+    if ( !KOPrefs::instance()->mToolBarMiniIcons ) {
+    if ( QApplication::desktop()->width() < 480 )
+        pathString += "icons16/";
+    } else
+        pathString += "iconsmini/";
+
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); 
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ),  i18n("New Todo..."),2 ); 
+
   mColumns = columns;
   mRows = rows;
@@ -188,5 +199,14 @@ KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
-  
+    mNewItemPopup = new QPopupMenu( this );
+    connect ( mNewItemPopup, SIGNAL (activated ( int )  ), this, SLOT ( newItem(int)) );
+    QString pathString = "";
+    if ( !KOPrefs::instance()->mToolBarMiniIcons ) {
+    if ( QApplication::desktop()->width() < 480 )
+        pathString += "icons16/";
+    } else
+        pathString += "iconsmini/";
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."),1 ); 
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ), i18n("New Todo..."),2 ); 
   blockResize = false;
   mColumns = columns;
@@ -419,6 +439,22 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
             selectItem(0);
             mActionItem = 0;
-            setCursor(arrowCursor);
-            startSelectAction(viewportPos);
+            if (me->button() == RightButton ) {
+                blockNewEvent = true;
+                qDebug("right ");
+                int x,y;
+                viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
+                int gx,gy;
+                contentsToGrid(x,y,gx,gy);
+                mStartCellX = gx;
+                mStartCellY = gy;
+                mCurrentCellX = gx;
+                mCurrentCellY = gy;
+                mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) );
+                
+            } else {
+                blockNewEvent = false;
+                setCursor(arrowCursor);
+                startSelectAction(viewportPos);
+            }
         }
         break;
@@ -457,5 +493,9 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
             endItemAction();
         } else if ( mActionType == SELECT ) {
-            endSelectAction();
+            if (me->button() == RightButton ) {
+
+            } else {
+                endSelectAction( !blockNewEvent   );
+            }
         }
         break;
@@ -521,4 +561,14 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 }
 
+void KOAgenda::newItem( int item )
+{
+    qDebug("new %d ", item);
+    if ( item == 1 ) { //new event
+        newEventSignal(mStartCellX ,mStartCellY  );
+    }
+    if ( item == 2 ) { //new event
+        newTodoSignal(mStartCellX ,mStartCellY  );
+    }
+}
 void KOAgenda::startSelectAction(QPoint viewportPos)
 {
@@ -610,5 +660,5 @@ void KOAgenda::performSelectAction(QPoint viewportPos)
 }
 
-void KOAgenda::endSelectAction()
+void KOAgenda::endSelectAction( bool emitNewEvent )
 {
   mActionType = NOP;
@@ -617,4 +667,6 @@ void KOAgenda::endSelectAction()
   
   emit newTimeSpanSignal(mStartCellX,mStartCellY,mCurrentCellX,mCurrentCellY);
+  if ( emitNewEvent && mStartCellY < mCurrentCellY )
+      emit newEventSignal(mStartCellX,mStartCellY,mCurrentCellX,mCurrentCellY);
 }
 
@@ -1661,5 +1713,5 @@ void KOAgenda::popupAlarm()
 {
   if (!mClickedItem) {
-    kdDebug() << "KOAgenda::popupAlarm() called without having a clicked item" << endl;
+      qDebug("KOAgenda::popupAlarm() called without having a clicked item ");
     return;
   }
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 111242f..12943d7 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -127,4 +127,5 @@ class KOAgenda : public QScrollView
 
   public slots:
+    void newItem( int );
     void moveChild( QWidget *, int, int );
     void scrollUp();
@@ -146,4 +147,5 @@ class KOAgenda : public QScrollView
     void newEventSignal();
     void newEventSignal(int gx,int gy);
+    void newTodoSignal(int gx,int gy);
     void newEventSignal(int gxStart, int gyStart, int gxEnd, int gyEnd);
     void newTimeSpanSignal(int gxStart, int gyStart, int gxEnd, int gyEnd);
@@ -181,5 +183,5 @@ class KOAgenda : public QScrollView
 
     /** Emd selecting time span. */
-    void endSelectAction();
+    void endSelectAction( bool emitNewEvent = false );
 
     /** Start moving/resizing agenda item */
@@ -208,4 +210,5 @@ class KOAgenda : public QScrollView
 
   private:
+    bool blockNewEvent;
     void init();
     void marcus_bains();
@@ -275,4 +278,5 @@ class KOAgenda : public QScrollView
     KOAgendaItem* getNewItem(Incidence * event,QDate qd, QWidget* viewport);
     QPopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems
+    QPopupMenu *mNewItemPopup;
 
     int mOldLowerScrollValue;
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index f54f7bc..60ae41f 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -489,8 +489,12 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     connect(mAgenda,SIGNAL(newEventSignal(int,int)),
             SLOT(newEvent(int,int)));
+    connect(mAgenda,SIGNAL(newTodoSignal(int,int)),
+            SLOT(newTodo(int,int)));
     connect(mAgenda,SIGNAL(newEventSignal(int,int,int,int)),
             SLOT(newEvent(int,int,int,int)));
     connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int)),
             SLOT(newEventAllDay(int,int)));
+    connect(mAllDayAgenda,SIGNAL(newTodoSignal(int,int)),
+            SLOT(newTodoAllDay(int,int)));
     connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int,int,int)),
             SLOT(newEventAllDay(int,int)));
@@ -1284,4 +1288,19 @@ void KOAgendaView::newEventAllDay(int gx, int )
     emit newEventSignal(day);
 }
+void KOAgendaView::newTodoAllDay(int gx, int )
+{
+    if (!mSelectedDates.count()) return;
+
+    QDateTime day (mSelectedDates[gx] );
+    emit newTodoSignal(day, true);
+}
+void KOAgendaView::newTodo(int gx, int gy )
+{
+    if (!mSelectedDates.count()) return;
+    QDate dayStart = mSelectedDates[gx];
+    QTime timeStart = mAgenda->gyToTime(gy);
+    QDateTime dt (dayStart,timeStart);
+    emit newTodoSignal( dt, false );
+}
 
 void KOAgendaView::updateEventIndicatorTop(int newY)
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 3cf938f..01d74a1 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -163,7 +163,9 @@ class KOAgendaView : public KOEventView {
     void clearSelection();
 
+    void newTodo(int gx,int gy);
     void newEvent(int gx,int gy);
     void newEvent(int gxStart, int gyStart, int gxEnd, int gyEnd);
     void newEventAllDay(int gx, int gy);
+    void newTodoAllDay(int gx, int gy);
 
     void startDrag(Event *);
@@ -181,4 +183,5 @@ class KOAgendaView : public KOEventView {
 
   signals:
+    void newTodoSignal( QDateTime ,bool );
     void toggleExpand();
     void todoMoved( Todo *, int );
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 158a7d3..b9a028b 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -196,7 +196,12 @@ void KOEditorGeneralTodo::setDefaults(QDateTime due,bool allDay)
   
   enableTimeEdits( !allDay );
-  
-  mDueCheck->setChecked(false);
-  enableDueEdit(false);
+  if ( due.isValid() ) {
+      mDueCheck->setChecked(true);
+      enableDueEdit(true);
+  } else {
+      mDueCheck->setChecked(false);
+      enableDueEdit(false);
+      due = QDateTime::currentDateTime().addDays(7);
+  }
 
   alarmDisable(true);
@@ -207,7 +212,7 @@ void KOEditorGeneralTodo::setDefaults(QDateTime due,bool allDay)
   mDueDateEdit->setDate(due.date());
   mDueTimeEdit->setTime(due.time());
-  
-  mStartDateEdit->setDate(QDate::currentDate());
-  mStartTimeEdit->setTime(QTime::currentTime());  
+  due = due.addDays(-7);
+  mStartDateEdit->setDate(due.date());
+  mStartTimeEdit->setTime(due.time());  
 
   mPriorityCombo->setCurrentItem(2);
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index e8d5ab1..a88276e 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -308,8 +308,13 @@ void KOViewManager::showAgendaView( bool fullScreen )
 
         // SIGNALS/SLOTS FOR DAY/WEEK VIEW
+
+
+
+        connect(mAgendaView,SIGNAL(newTodoSignal(QDateTime,bool)),
+                mMainView, SLOT(newTodoDateTime(QDateTime,bool)));
         connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)),
                 mMainView, SLOT(newEvent(QDateTime)));
-        // connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)),
-        //      mMainView, SLOT(newEvent(QDateTime,QDateTime)));
+        connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)),
+             mMainView, SLOT(newEvent(QDateTime,QDateTime)));
         connect(mAgendaView,SIGNAL(newEventSignal(QDate)),
                 mMainView, SLOT(newEvent(QDate)));