summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp2
-rw-r--r--korganizer/koviewmanager.cpp65
-rw-r--r--korganizer/koviewmanager.h1
-rw-r--r--korganizer/mainwindow.cpp5
4 files changed, 72 insertions, 1 deletions
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()
741 str = dayName.left( 2 ) + " " +QString::number( date.day()); 741 str = dayName.left( 2 ) + " " +QString::number( date.day());
742 742
743 break; 743 break;
744 case 6: 744 case 6:
745 str = dayName.left( 3 ) + " " +QString::number( date.day()); 745 str = dayName.left( 3 ) + " " +QString::number( date.day());
746 break; 746 break;
747 747
748 default: 748 default:
749 break; 749 break;
750 } 750 }
751 if ( oneday ) { 751 if ( oneday ) {
752 QString addString; 752 QString addString;
753 if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) 753 if ( mSelectedDates.first() == QDateTime::currentDateTime().date() )
754 addString = i18n("Today"); 754 addString = i18n("Today");
755 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) 755 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) )
756 addString = i18n("Tomorrow"); 756 addString = i18n("Tomorrow");
757 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) 757 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) )
758 addString = i18n("Yesterday"); 758 addString = i18n("Yesterday");
759 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) 759 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) )
760 addString = i18n("Day before yesterday"); 760 addString = i18n("Day before yesterday");
761 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) 761 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) )
762 addString = i18n("Day after tomorrow"); 762 addString = i18n("Day after tomorrow");
763 if ( !addString.isEmpty() ) { 763 if ( !addString.isEmpty() ) {
764 str = addString+", " + str; 764 str = addString+", " + str;
765 } else {
766 str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer);
765 } 767 }
766 } 768 }
767 dayLabel->setText(str); 769 dayLabel->setText(str);
768 //dayLabel->setAlignment(QLabel::AlignHCenter); 770 //dayLabel->setAlignment(QLabel::AlignHCenter);
769 if (date == QDate::currentDate()) { 771 if (date == QDate::currentDate()) {
770 QFont bFont = dlf; 772 QFont bFont = dlf;
771 bFont.setBold( true ); 773 bFont.setBold( true );
772 dayLabel->setFont(bFont); 774 dayLabel->setFont(bFont);
773 } 775 }
774 //dayLayout->addWidget(dayLabel); 776 //dayLayout->addWidget(dayLabel);
775 777
776#ifndef KORG_NOPLUGINS 778#ifndef KORG_NOPLUGINS
777 CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); 779 CalendarDecoration::List cds = KOCore::self()->calendarDecorations();
778 CalendarDecoration *it; 780 CalendarDecoration *it;
779 for(it = cds.first(); it; it = cds.next()) { 781 for(it = cds.first(); it; it = cds.next()) {
780 QString text = it->shortText( date ); 782 QString text = it->shortText( date );
781 if ( !text.isEmpty() ) { 783 if ( !text.isEmpty() ) {
782 QLabel *label = new QLabel(text,mDayLabels); 784 QLabel *label = new QLabel(text,mDayLabels);
783 label->setAlignment(AlignCenter); 785 label->setAlignment(AlignCenter);
784 dayLayout->addWidget(label); 786 dayLayout->addWidget(label);
785 } 787 }
786 } 788 }
787 789
788 for(it = cds.first(); it; it = cds.next()) { 790 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)
177 QString view; 177 QString view;
178 if (mCurrentView == mWhatsNextView) view = "WhatsNext"; 178 if (mCurrentView == mWhatsNextView) view = "WhatsNext";
179 else if (mCurrentView == mMonthView) view = "Month"; 179 else if (mCurrentView == mMonthView) view = "Month";
180 else if (mCurrentView == mListView) view = "List"; 180 else if (mCurrentView == mListView) view = "List";
181 else if (mCurrentView == mJournalView) view = "Journal"; 181 else if (mCurrentView == mJournalView) view = "Journal";
182 else if (mCurrentView == mTimeSpanView) view = "TimeSpan"; 182 else if (mCurrentView == mTimeSpanView) view = "TimeSpan";
183 else if (mCurrentView == mTodoView) view = "Todo"; 183 else if (mCurrentView == mTodoView) view = "Todo";
184 else view = "Agenda"; 184 else view = "Agenda";
185 185
186 config->writeEntry("Current View",view); 186 config->writeEntry("Current View",view);
187 187
188 if (mAgendaView) { 188 if (mAgendaView) {
189 mAgendaView->writeSettings(config); 189 mAgendaView->writeSettings(config);
190 } 190 }
191 if (mTimeSpanView) { 191 if (mTimeSpanView) {
192 mTimeSpanView->writeSettings(config); 192 mTimeSpanView->writeSettings(config);
193 } 193 }
194 if (mListView) { 194 if (mListView) {
195 mListView->writeSettings(config); 195 mListView->writeSettings(config);
196 } 196 }
197 if (mTodoView) { 197 if (mTodoView) {
198 mTodoView->saveLayout(config,"Todo View"); 198 mTodoView->saveLayout(config,"Todo View");
199 } 199 }
200} 200}
201void KOViewManager::showNextView()
202{
203 if (mCurrentView == mWhatsNextView) goto NEXT_X;
204
205 if (mCurrentView == mAgendaView && mFlagShowNextxDays) goto LIST;
206
207 if (mCurrentView == mListView ) goto DAY_1;
208
209 if (mCurrentView == mAgendaView && mCurrentAgendaView == 1 ) goto DAY_5;
210
211 if (mCurrentView == mAgendaView && mCurrentAgendaView == 5 ) goto DAY_7;
212
213 if (mCurrentView == mAgendaView ) goto DAY_6;
214
215 if (mCurrentView == mMonthView && KOPrefs::instance()->mMonthViewWeek) goto MONTH;
216
217 if (mCurrentView == mMonthView ) goto TODO;
218
219 if (mCurrentView == mTodoView ) goto JOURNAL;
220
221 NEXT:
222 if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;}
223 NEXT_X:
224 if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;}
225 LIST:
226 if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;}
227 DAY_1:
228 if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;}
229 DAY_5:
230 if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;}
231 DAY_7:
232 if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;}
233 DAY_6:
234 if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;}
235 MONTH:
236 if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;}
237 TODO:
238 if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;}
239 JOURNAL:
240 if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;}
241
242
243
244 if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;}
245
246 if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;}
247
248 if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;}
249
250 if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;}
201 251
252 if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;}
253
254 if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;}
255
256 if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;}
257
258 if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;}
259
260 if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;}
261
262 if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;}
263
264
265
266}
202void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) 267void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
203{ 268{
204 269
205 //mFlagShowNextxDays = false; 270 //mFlagShowNextxDays = false;
206 //if(view == mCurrentView) return; 271 //if(view == mCurrentView) return;
207 if ( view == 0 ) { 272 if ( view == 0 ) {
208 view = mCurrentView; 273 view = mCurrentView;
209 if ( view == 0 ) 274 if ( view == 0 )
210 return; 275 return;
211 } 276 }
212 bool callupdate = !(view == mCurrentView); 277 bool callupdate = !(view == mCurrentView);
213 bool full = fullScreen; 278 bool full = fullScreen;
214 if(view == mCurrentView && view != mWhatsNextView ) { 279 if(view == mCurrentView && view != mWhatsNextView ) {
215 if ( mCurrentAgendaView < 0 ) 280 if ( mCurrentAgendaView < 0 )
216 return; 281 return;
217 if ( view != mMonthView ) 282 if ( view != mMonthView )
218 full = mMainView->leftFrame()->isVisible(); 283 full = mMainView->leftFrame()->isVisible();
219 } else { 284 } else {
220 if ( view == mMonthView && mMonthView) 285 if ( view == mMonthView && mMonthView)
221 ;//mMonthView->skipResize = true ; 286 ;//mMonthView->skipResize = true ;
222 mCurrentView = view; 287 mCurrentView = view;
223 // bool full = fullScreen; 288 // bool full = fullScreen;
224 bool isFull = !mMainView->leftFrame()->isVisible(); 289 bool isFull = !mMainView->leftFrame()->isVisible();
225 if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen ) 290 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
61 void readCurrentView(KConfig *); 61 void readCurrentView(KConfig *);
62 /** Write which view is currently shown to config file */ 62 /** Write which view is currently shown to config file */
63 void writeCurrentView(KConfig *); 63 void writeCurrentView(KConfig *);
64 64
65 KOrg::BaseView *currentView(); 65 KOrg::BaseView *currentView();
66 66
67 void setDocumentId( const QString & ); 67 void setDocumentId( const QString & );
68 68
69 void updateView( const QDate &start, const QDate &end ); 69 void updateView( const QDate &start, const QDate &end );
70 70
71 void raiseCurrentView( bool fullScreen = false , bool updateView = false); 71 void raiseCurrentView( bool fullScreen = false , bool updateView = false);
72 72
73 void addView(KOrg::BaseView *); 73 void addView(KOrg::BaseView *);
74 74
75 Incidence *currentSelection(); 75 Incidence *currentSelection();
76 QDate currentSelectionDate(); 76 QDate currentSelectionDate();
77 77
78 KOAgendaView *agendaView() const { return mAgendaView; } 78 KOAgendaView *agendaView() const { return mAgendaView; }
79 79
80 signals: 80 signals:
81 void printWNV(); 81 void printWNV();
82 void signalFullScreen( bool ); 82 void signalFullScreen( bool );
83 void signalAgendaView( bool ); 83 void signalAgendaView( bool );
84 public slots: 84 public slots:
85 void showNextView();
85 void showMonth( const QDate & ); 86 void showMonth( const QDate & );
86 void showDateView( int, QDate ); 87 void showDateView( int, QDate );
87 void updateView(); 88 void updateView();
88 void showWhatsNextView(); 89 void showWhatsNextView();
89 void showListView(); 90 void showListView();
90 void showAgendaView( bool fullScreen = false ); 91 void showAgendaView( bool fullScreen = false );
91 void showDayView(); 92 void showDayView();
92 void showWorkWeekView(); 93 void showWorkWeekView();
93 void showWeekView(); 94 void showWeekView();
94 void showNextXView(); 95 void showNextXView();
95 void showMonthView(); 96 void showMonthView();
96 void showMonthViewWeek(); 97 void showMonthViewWeek();
97 void showTodoView(); 98 void showTodoView();
98 void showJournalView(); 99 void showJournalView();
99 void showTimeSpanView(); 100 void showTimeSpanView();
100 101
101 private: 102 private:
102 void createMonthView(); 103 void createMonthView();
103 CalendarView *mMainView; 104 CalendarView *mMainView;
104 105
105 int mCurrentAgendaView; 106 int mCurrentAgendaView;
106 KOAgendaView *mAgendaView; 107 KOAgendaView *mAgendaView;
107 KOListView *mListView; 108 KOListView *mListView;
108 KOMonthView *mMonthView; 109 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 )
463 } 463 }
464 else if ( msg == "-showDay" ) { 464 else if ( msg == "-showDay" ) {
465 mView->viewManager()->showDayView(); 465 mView->viewManager()->showDayView();
466 } 466 }
467 else if ( msg == "-showWWeek" ) { 467 else if ( msg == "-showWWeek" ) {
468 mView->viewManager()->showWorkWeekView(); 468 mView->viewManager()->showWorkWeekView();
469 } 469 }
470 else if ( msg == "-ringSync" ) { 470 else if ( msg == "-ringSync" ) {
471 mSyncManager->multiSync( false ); 471 mSyncManager->multiSync( false );
472 } 472 }
473 else if ( msg == "-showWeek" ) { 473 else if ( msg == "-showWeek" ) {
474 mView->viewManager()->showWeekView(); 474 mView->viewManager()->showWeekView();
475 } 475 }
476 else if ( msg == "-showTodo" ) { 476 else if ( msg == "-showTodo" ) {
477 mView->viewManager()->showTodoView(); 477 mView->viewManager()->showTodoView();
478 } 478 }
479 else if ( msg == "-showJournal" ) { 479 else if ( msg == "-showJournal" ) {
480 mView->dateNavigator()->selectDates( 1 ); 480 mView->dateNavigator()->selectDates( 1 );
481 mView->dateNavigator()->selectToday(); 481 mView->dateNavigator()->selectToday();
482 mView->viewManager()->showJournalView(); 482 mView->viewManager()->showJournalView();
483 } 483 }
484 else if ( msg == "-showKO" ) { 484 else if ( msg == "-showKO" ) {
485 mView->viewManager()->showNextXView(); 485 mView->viewManager()->showNextXView();
486 } 486 }
487 else if ( msg == "-showWNext" || msg == "nextView()" ) { 487 else if ( msg == "-showWNext" ) {
488 mView->viewManager()->showWhatsNextView(); 488 mView->viewManager()->showWhatsNextView();
489 } 489 }
490 else if ( msg == "nextView()" ) {
491 mView->viewManager()->showNextView();
492 }
490 else if ( msg == "-showNextXView" ) { 493 else if ( msg == "-showNextXView" ) {
491 mView->viewManager()->showNextXView(); 494 mView->viewManager()->showNextXView();
492 } 495 }
493 496
494 497
495 } 498 }
496 499
497 showMaximized(); 500 showMaximized();
498 raise(); 501 raise();
499} 502}
500 503
501QPixmap MainWindow::loadPixmap( QString name ) 504QPixmap MainWindow::loadPixmap( QString name )
502{ 505{
503 return SmallIcon( name ); 506 return SmallIcon( name );
504 507
505} 508}
506void MainWindow::initActions() 509void MainWindow::initActions()
507{ 510{
508 //KOPrefs::instance()->mShowFullMenu 511 //KOPrefs::instance()->mShowFullMenu
509 iconToolBar->clear(); 512 iconToolBar->clear();
510 KOPrefs *p = KOPrefs::instance(); 513 KOPrefs *p = KOPrefs::instance();
511 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); 514 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
512 515
513 QPopupMenu *viewMenu = new QPopupMenu( this ); 516 QPopupMenu *viewMenu = new QPopupMenu( this );