summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp4
-rw-r--r--korganizer/koagendaview.cpp2
-rw-r--r--korganizer/koviewmanager.cpp65
-rw-r--r--korganizer/koviewmanager.h1
-rw-r--r--korganizer/mainwindow.cpp5
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
@@ -637,45 +637,47 @@ void SimpleAlarmDaemonImpl::newMail()
QCopEnvelope e("QPE/Application/ompi", "newMail()");
}
void SimpleAlarmDaemonImpl::showAdd()
{
QCopEnvelope e("QPE/Application/kapi", "raise()");
}
void SimpleAlarmDaemonImpl::ringSync()
{
QCopEnvelope e("QPE/Application/kopi", "-ringSync");
}
void SimpleAlarmDaemonImpl::newCountdown()
{
//recieve("cal_alarm", 10 );
}
void SimpleAlarmDaemonImpl::simulate()
{
writeFile();
QString filename = getenv("QPEDIR") ;
filename += "/pics/kdepim/korganizer/koalarm.wav";
startAlarm("Alarm simulation", filename );
}
void SimpleAlarmDaemonImpl::showKO()
{
- QCopEnvelope e("QPE/Application/kopi", "-showKO");
+ QCopEnvelope e("QPE/Application/kopi", "-showKO");
+ // testing only
+ //QCopEnvelope e("QPE/Application/kopi", "nextView()");
}
void SimpleAlarmDaemonImpl::showTodo()
{
QCopEnvelope e("QPE/Application/kopi", "-showTodo");
}
void SimpleAlarmDaemonImpl::writeJournal()
{
QCopEnvelope e("QPE/Application/kopi", "-showJournal");
}
void SimpleAlarmDaemonImpl::mousePressEvent( QMouseEvent * )
{
mPopUp->popup(mapToGlobal(QPoint (0, -mPopUp->height() )));
}
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index a32333c..fa6b951 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -741,48 +741,50 @@ void KOAgendaView::createDayLabels()
str = dayName.left( 2 ) + " " +QString::number( date.day());
break;
case 6:
str = dayName.left( 3 ) + " " +QString::number( date.day());
break;
default:
break;
}
if ( oneday ) {
QString addString;
if ( mSelectedDates.first() == QDateTime::currentDateTime().date() )
addString = i18n("Today");
else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) )
addString = i18n("Tomorrow");
else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) )
addString = i18n("Yesterday");
else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) )
addString = i18n("Day before yesterday");
else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) )
addString = i18n("Day after tomorrow");
if ( !addString.isEmpty() ) {
str = addString+", " + str;
+ } else {
+ str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer);
}
}
dayLabel->setText(str);
//dayLabel->setAlignment(QLabel::AlignHCenter);
if (date == QDate::currentDate()) {
QFont bFont = dlf;
bFont.setBold( true );
dayLabel->setFont(bFont);
}
//dayLayout->addWidget(dayLabel);
#ifndef KORG_NOPLUGINS
CalendarDecoration::List cds = KOCore::self()->calendarDecorations();
CalendarDecoration *it;
for(it = cds.first(); it; it = cds.next()) {
QString text = it->shortText( date );
if ( !text.isEmpty() ) {
QLabel *label = new QLabel(text,mDayLabels);
label->setAlignment(AlignCenter);
dayLayout->addWidget(label);
}
}
for(it = cds.first(); it; it = cds.next()) {
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 31ee5e2..b5de4a1 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -177,49 +177,114 @@ void KOViewManager::writeSettings(KConfig *config)
QString view;
if (mCurrentView == mWhatsNextView) view = "WhatsNext";
else if (mCurrentView == mMonthView) view = "Month";
else if (mCurrentView == mListView) view = "List";
else if (mCurrentView == mJournalView) view = "Journal";
else if (mCurrentView == mTimeSpanView) view = "TimeSpan";
else if (mCurrentView == mTodoView) view = "Todo";
else view = "Agenda";
config->writeEntry("Current View",view);
if (mAgendaView) {
mAgendaView->writeSettings(config);
}
if (mTimeSpanView) {
mTimeSpanView->writeSettings(config);
}
if (mListView) {
mListView->writeSettings(config);
}
if (mTodoView) {
mTodoView->saveLayout(config,"Todo View");
}
}
+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 )
{
//mFlagShowNextxDays = false;
//if(view == mCurrentView) return;
if ( view == 0 ) {
view = mCurrentView;
if ( view == 0 )
return;
}
bool callupdate = !(view == mCurrentView);
bool full = fullScreen;
if(view == mCurrentView && view != mWhatsNextView ) {
if ( mCurrentAgendaView < 0 )
return;
if ( view != mMonthView )
full = mMainView->leftFrame()->isVisible();
} else {
if ( view == mMonthView && mMonthView)
;//mMonthView->skipResize = true ;
mCurrentView = view;
// bool full = fullScreen;
bool isFull = !mMainView->leftFrame()->isVisible();
if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen )
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 6290227..d829f14 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -61,48 +61,49 @@ class KOViewManager : public QObject
void readCurrentView(KConfig *);
/** Write which view is currently shown to config file */
void writeCurrentView(KConfig *);
KOrg::BaseView *currentView();
void setDocumentId( const QString & );
void updateView( const QDate &start, const QDate &end );
void raiseCurrentView( bool fullScreen = false , bool updateView = false);
void addView(KOrg::BaseView *);
Incidence *currentSelection();
QDate currentSelectionDate();
KOAgendaView *agendaView() const { return mAgendaView; }
signals:
void printWNV();
void signalFullScreen( bool );
void signalAgendaView( bool );
public slots:
+ void showNextView();
void showMonth( const QDate & );
void showDateView( int, QDate );
void updateView();
void showWhatsNextView();
void showListView();
void showAgendaView( bool fullScreen = false );
void showDayView();
void showWorkWeekView();
void showWeekView();
void showNextXView();
void showMonthView();
void showMonthViewWeek();
void showTodoView();
void showJournalView();
void showTimeSpanView();
private:
void createMonthView();
CalendarView *mMainView;
int mCurrentAgendaView;
KOAgendaView *mAgendaView;
KOListView *mListView;
KOMonthView *mMonthView;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7d5cf72..b947cac 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -463,51 +463,54 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
}
else if ( msg == "-showDay" ) {
mView->viewManager()->showDayView();
}
else if ( msg == "-showWWeek" ) {
mView->viewManager()->showWorkWeekView();
}
else if ( msg == "-ringSync" ) {
mSyncManager->multiSync( false );
}
else if ( msg == "-showWeek" ) {
mView->viewManager()->showWeekView();
}
else if ( msg == "-showTodo" ) {
mView->viewManager()->showTodoView();
}
else if ( msg == "-showJournal" ) {
mView->dateNavigator()->selectDates( 1 );
mView->dateNavigator()->selectToday();
mView->viewManager()->showJournalView();
}
else if ( msg == "-showKO" ) {
mView->viewManager()->showNextXView();
}
- else if ( msg == "-showWNext" || msg == "nextView()" ) {
+ else if ( msg == "-showWNext" ) {
mView->viewManager()->showWhatsNextView();
}
+ else if ( msg == "nextView()" ) {
+ mView->viewManager()->showNextView();
+ }
else if ( msg == "-showNextXView" ) {
mView->viewManager()->showNextXView();
}
}
showMaximized();
raise();
}
QPixmap MainWindow::loadPixmap( QString name )
{
return SmallIcon( name );
}
void MainWindow::initActions()
{
//KOPrefs::instance()->mShowFullMenu
iconToolBar->clear();
KOPrefs *p = KOPrefs::instance();
//QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
QPopupMenu *viewMenu = new QPopupMenu( this );