| -rw-r--r-- | kalarmd/simplealarmdaemonimpl.cpp | 4 | ||||
| -rw-r--r-- | korganizer/koagendaview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/koviewmanager.cpp | 65 | ||||
| -rw-r--r-- | korganizer/koviewmanager.h | 1 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 5 |
5 files changed, 75 insertions, 2 deletions
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp index ec7f730..e8ec033 100644 --- a/kalarmd/simplealarmdaemonimpl.cpp +++ b/kalarmd/simplealarmdaemonimpl.cpp @@ -660,3 +660,5 @@ void SimpleAlarmDaemonImpl::showKO() { - QCopEnvelope e("QPE/Application/kopi", "-showKO"); + QCopEnvelope e("QPE/Application/kopi", "-showKO"); + // testing only + //QCopEnvelope e("QPE/Application/kopi", "nextView()"); diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index a32333c..fa6b951 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -764,2 +764,4 @@ void KOAgendaView::createDayLabels() str = addString+", " + str; + } else { + str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); } diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 31ee5e2..b5de4a1 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -200,3 +200,68 @@ void KOViewManager::writeSettings(KConfig *config) } +void KOViewManager::showNextView() +{ + if (mCurrentView == mWhatsNextView) goto NEXT_X; + + if (mCurrentView == mAgendaView && mFlagShowNextxDays) goto LIST; + + if (mCurrentView == mListView ) goto DAY_1; + + if (mCurrentView == mAgendaView && mCurrentAgendaView == 1 ) goto DAY_5; + + if (mCurrentView == mAgendaView && mCurrentAgendaView == 5 ) goto DAY_7; + + if (mCurrentView == mAgendaView ) goto DAY_6; + + if (mCurrentView == mMonthView && KOPrefs::instance()->mMonthViewWeek) goto MONTH; + + if (mCurrentView == mMonthView ) goto TODO; + + if (mCurrentView == mTodoView ) goto JOURNAL; + + NEXT: + if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;} + NEXT_X: + if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;} + LIST: + if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} + DAY_1: + if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} + DAY_5: + if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;} + DAY_7: + if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;} + DAY_6: + if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;} + MONTH: + if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} + TODO: + if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} + JOURNAL: + if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;} + + + + if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;} + + if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;} + + if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} + + if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} + if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;} + + if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;} + + if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;} + + if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} + + if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} + + if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;} + + + +} void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h index 6290227..d829f14 100644 --- a/korganizer/koviewmanager.h +++ b/korganizer/koviewmanager.h @@ -84,2 +84,3 @@ class KOViewManager : public QObject public slots: + void showNextView(); void showMonth( const QDate & ); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 7d5cf72..b947cac 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -486,5 +486,8 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) } - else if ( msg == "-showWNext" || msg == "nextView()" ) { + else if ( msg == "-showWNext" ) { mView->viewManager()->showWhatsNextView(); } + else if ( msg == "nextView()" ) { + mView->viewManager()->showNextView(); + } else if ( msg == "-showNextXView" ) { |