summaryrefslogtreecommitdiffabout
path: root/korganizer/koviewmanager.cpp
Side-by-side diff
Diffstat (limited to 'korganizer/koviewmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koviewmanager.cpp50
1 files changed, 49 insertions, 1 deletions
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)),