8 files changed, 93 insertions, 31 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 6a20868..8572bf9 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1191,11 +1191,15 @@
 { "Day before yesterday","Vorgestern" },
 { "Size %1","Größe %1" },
 { "New Agendasize: %1","Neue Agendagröße: %1" },
 { " (%1 y.)"," (%1 J.)" },
 { "Allday:","Ganztägig:" },
 { "compl.todos","erled.Todos" },
-{ "","" },
-{ "","" },
+{ "Day view","Tagesansicht" },
+{ "Next days","Nächste Tage" },
+{ "Next week","Nächste Woche" },
+{ "Next two weeks","Nächste zwei Wochen" },
+{ "Next month","Nächster Monat" },
+{ "Journal view","Journal" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 035d630..e7b6755 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2686,13 +2686,12 @@ void  CalendarView::todoDeleted()
     updateTodoViews();
 }
 
 
 void CalendarView::newTodoDateTime( QDateTime dt, bool allday )
 { 
-    qDebug("datetime ");
     showTodoEditor();
     mTodoEditor->newTodo(dt,0,allday);
     if ( mFilterView->filtersEnabled() ) {
         CalFilter *filter = mFilterView->selectedFilter();
         if (filter && filter->showCategories()) {
             mTodoEditor->setCategories(filter->categoryList().join(",") );
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 73ee5cb..0eeacb3 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -165,23 +165,13 @@ void MarcusBains::updateLocation(bool recalculate)
   Create an agenda widget with rows rows and columns columns.
 */
 KOAgenda::KOAgenda(int columns,int rows,int rowSize,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 ); 
+   
 
   mColumns = columns;
   mRows = rows;
   mGridSpacingY = rowSize;
   mAllDayMode = false; 
 #ifndef DESKTOP_VERSION
@@ -195,22 +185,12 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
   Create an agenda widget with columns columns and one row. This is used for
   all-day events.
 */
 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;
   mRows = 1;
   //qDebug("aaaaaaaaaaaaaaaaaaldays %d ", KOPrefs::instance()->mAllDaySize);
   mGridSpacingY = KOPrefs::instance()->mAllDaySize;
   mAllDayMode = true;
@@ -238,13 +218,31 @@ QDate KOAgenda::selectedIncidenceDate() const
 {
   return (mSelectedItem ? mSelectedItem->itemDate() : QDate());
 }
 
 
 void KOAgenda::init()
-{ 
+{  
+    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 ); 
+    mNewItemPopup->insertSeparator ( ); 
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ),  i18n("Day view"),3 );  
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"xdays" ),  i18n("Next days"),8 );  
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next week"),4 );  
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next two weeks"),5 );   
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("Next month"),6 );  
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ),  i18n("Journal view"),7 ); 
 #ifndef _WIN32_
   int wflags = viewport()-> getWFlags() |WRepaintNoErase;//WResizeNoErase
   viewport()->setWFlags ( wflags);
 #endif
   mGridSpacingX = 80;
   mResizeBorderWidth = 8;
@@ -559,19 +557,26 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 
     return true;
 }
 
 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  );
-    }
+    } else
+        if ( item == 2 ) { //new event
+            newTodoSignal(mStartCellX ,mStartCellY  );
+        } else 
+            {
+                QDate day = mSelectedDates[mStartCellX];
+                emit showDateView( item, day );
+                // 3Day view
+                // 4Week view
+                // 5Month view
+                // 6Journal view
+            }
 }
 void KOAgenda::startSelectAction(QPoint viewportPos)
 {
     //emit newStartSelectSignal();
 
   mActionType = SELECT;
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 12943d7..2069b22 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -141,12 +141,13 @@ class KOAgenda : public QScrollView
      deselected. This function emits the itemSelected(bool) signal to inform
      about selection/deseelction of events. */
     void selectItem(KOAgendaItem *);
     void finishResize();
 
   signals:
+    void showDateView( int, QDate );
     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);
     void newStartSelectSignal();
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 60ae41f..e0a1a21 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -482,12 +482,15 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     // Scrolling
     connect(mAgenda->verticalScrollBar(),SIGNAL(valueChanged(int)),
             mTimeLabels, SLOT(positionChanged()));
     connect(mTimeLabels->verticalScrollBar(),SIGNAL(valueChanged(int)),
             SLOT(setContentsPos(int)));
 
+    connect(mAgenda,SIGNAL(showDateView( int, QDate )),SIGNAL(showDateView( int, QDate )));
+    connect(mAllDayAgenda,SIGNAL(showDateView( int, QDate )),SIGNAL(showDateView( int, QDate )));
+
     // Create/Show/Edit/Delete Event
     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)),
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 01d74a1..7774fbe 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -179,12 +179,13 @@ class KOAgendaView : public KOEventView {
     void setExpandedButton( bool expanded );
     void scrollOneHourUp();
     void scrollOneHourDown();
     void addToCalSlot(Incidence *, Incidence *);
 
   signals:
+    void showDateView( int, QDate );
     void newTodoSignal( QDateTime ,bool );
     void toggleExpand();
     void todoMoved( Todo *, int );
     void incidenceChanged(Incidence * , int );
     // void cloneIncidenceSignal(Incidence *);
 
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index a88276e..6da4799 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -95,12 +95,60 @@ void KOViewManager::readSettings(KConfig *config)
     else if (view == "Todo") showTodoView();
     else {
         showAgendaView();
     }
 }
 
+
+void KOViewManager::showDateView( int view, QDate date)
+{
+
+    qDebug("date %d %s", view, date.toString().latin1());
+#if 0
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ),  i18n("Day view"),3 );  
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next Week"),4 );  
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("Next Two Weeks"),5 );   
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("Next Month"),6 );  
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ),  i18n("Journal view"),7 ); 
+#endif
+    if ( view == 3 ) {
+        mMainView->showDay( date );
+    } else if (view == 4 ) {
+        mMainView->dateNavigator()->selectDates( date, 7 );
+    } else if (view == 5 ) {
+        mMainView->dateNavigator()->selectDates( date, 14);
+    } else if (view == 6 ) {
+        showMonthView();
+        mMainView->dateNavigator()->selectMonthByDate( date );
+        mMainView->dateNavigator()->selectDate( date );
+    } else if (view == 7 ) {
+        mMainView->dateNavigator()->selectDate( date );
+        showJournalView();
+    } else if (view == 8 ) {
+        globalFlagBlockAgenda = 1;
+        if ( mCurrentAgendaView != 3 )
+            mCurrentAgendaView = -1;
+        showAgendaView(KOPrefs::instance()->mFullViewMonth);
+        globalFlagBlockAgenda = 2;
+        mMainView->dateNavigator()->selectDates( date ,
+                                                 KOPrefs::instance()->mNextXDays );
+        mFlagShowNextxDays = true;
+        mCurrentAgendaView = 3 ;
+    }
+
+#if 0
+  dateNavigator()->blockSignals( true );
+    dateNavigator()->selectDate( d );
+    dateNavigator()->blockSignals( false );
+    mViewManager->showDayView();
+#endif
+
+}
+
+   
+
 void KOViewManager::writeSettings(KConfig *config)
 {
     config->setGroup("General");
 
     QString view;
     if (mCurrentView == mWhatsNextView) view = "WhatsNext";
@@ -305,13 +353,13 @@ void KOViewManager::showAgendaView( bool fullScreen )
 #endif
         connect( mAgendaView, SIGNAL( incidenceChanged(Incidence  *, int )),
                  mMainView, SLOT( changeIncidenceDisplay( Incidence  *, int ) ));
 
         // SIGNALS/SLOTS FOR DAY/WEEK VIEW
 
-
+        connect(mAgendaView,SIGNAL(showDateView( int, QDate )),SLOT(showDateView( int, QDate )));
 
         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)),
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index c8c7a7a..137eb2d 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -79,12 +79,13 @@ class KOViewManager : public QObject
 
  signals:
     void printWNV();
     void signalFullScreen( bool );
     void signalAgendaView( bool );
   public slots:
+    void showDateView( int, QDate );
     void updateView();
     void showWhatsNextView();
     void showListView();
     void showAgendaView( bool fullScreen = false );
     void showDayView();
     void showWorkWeekView();