summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-31 12:09:55 (UTC)
committer zautrix <zautrix>2005-01-31 12:09:55 (UTC)
commit5d52c81be9b43887c13f8534a04164d3b44b821f (patch) (unidiff)
tree79942122f3745a55fa08371970625f3e8733f5fa
parent0ee7cc932ca9c973b086f847a38d29531a815712 (diff)
downloadkdepimpi-5d52c81be9b43887c13f8534a04164d3b44b821f.zip
kdepimpi-5d52c81be9b43887c13f8534a04164d3b44b821f.tar.gz
kdepimpi-5d52c81be9b43887c13f8534a04164d3b44b821f.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koviewmanager.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 2cd8792..c95917f 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -109,28 +109,29 @@ void KOViewManager::showDateView( int view, QDate date)
109 mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("Next Two Weeks"),5 ); 109 mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("Next Two Weeks"),5 );
110 mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("Next Month"),6 ); 110 mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("Next Month"),6 );
111 mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ), i18n("Journal view"),7 ); 111 mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ), i18n("Journal view"),7 );
112#endif 112#endif
113 if ( view == 3 ) { 113 if ( view == 3 ) {
114 mMainView->showDay( date ); 114 mMainView->showDay( date );
115 } else if (view == 4 ) { 115 } else if (view == 4 ) {
116 mMainView->dateNavigator()->selectDates( date, 7 ); 116 mMainView->dateNavigator()->selectDates( date, 7 );
117 } else if (view == 5 ) { 117 } else if (view == 5 ) {
118 mMainView->dateNavigator()->selectDates( date, 14); 118 mMainView->dateNavigator()->selectDates( date, 14);
119 } else if (view == 6 ) { 119 } else if (view == 6 ) {
120 mMainView->dateNavigator()->blockSignals( true ); 120 mMainView->dateNavigator()->blockSignals( true );
121 showMonthView();
122 qApp->processEvents();
121 mMainView->dateNavigator()->selectMonthByDate( date ); 123 mMainView->dateNavigator()->selectMonthByDate( date );
122 mMainView->dateNavigator()->selectDate( date );
123 mMainView->dateNavigator()->blockSignals( false ); 124 mMainView->dateNavigator()->blockSignals( false );
124 showMonthView(); 125 mMainView->dateNavigator()->selectDate( date );
125 } else if (view == 7 ) { 126 } else if (view == 7 ) {
126 mMainView->dateNavigator()->selectDate( date ); 127 mMainView->dateNavigator()->selectDate( date );
127 showJournalView(); 128 showJournalView();
128 } else if (view == 8 ) { 129 } else if (view == 8 ) {
129 globalFlagBlockAgenda = 1; 130 globalFlagBlockAgenda = 1;
130 if ( mCurrentAgendaView != 3 ) 131 if ( mCurrentAgendaView != 3 )
131 mCurrentAgendaView = -1; 132 mCurrentAgendaView = -1;
132 showAgendaView(KOPrefs::instance()->mFullViewMonth); 133 showAgendaView(KOPrefs::instance()->mFullViewMonth);
133 globalFlagBlockAgenda = 2; 134 globalFlagBlockAgenda = 2;
134 mMainView->dateNavigator()->selectDates( date , 135 mMainView->dateNavigator()->selectDates( date ,
135 KOPrefs::instance()->mNextXDays ); 136 KOPrefs::instance()->mNextXDays );
136 mFlagShowNextxDays = true; 137 mFlagShowNextxDays = true;
@@ -141,25 +142,25 @@ void KOViewManager::showDateView( int view, QDate date)
141 dateNavigator()->blockSignals( true ); 142 dateNavigator()->blockSignals( true );
142 dateNavigator()->selectDate( d ); 143 dateNavigator()->selectDate( d );
143 dateNavigator()->blockSignals( false ); 144 dateNavigator()->blockSignals( false );
144 mViewManager->showDayView(); 145 mViewManager->showDayView();
145#endif 146#endif
146 147
147} 148}
148 149
149 150
150 151
151void KOViewManager::writeSettings(KConfig *config) 152void KOViewManager::writeSettings(KConfig *config)
152{ 153{
153 config->setGroup("General"); 154 config->setGroup("General");
154 155
155 QString view; 156 QString view;
156 if (mCurrentView == mWhatsNextView) view = "WhatsNext"; 157 if (mCurrentView == mWhatsNextView) view = "WhatsNext";
157 else if (mCurrentView == mMonthView) view = "Month"; 158 else if (mCurrentView == mMonthView) view = "Month";
158 else if (mCurrentView == mListView) view = "List"; 159 else if (mCurrentView == mListView) view = "List";
159 else if (mCurrentView == mJournalView) view = "Journal"; 160 else if (mCurrentView == mJournalView) view = "Journal";
160 else if (mCurrentView == mTimeSpanView) view = "TimeSpan"; 161 else if (mCurrentView == mTimeSpanView) view = "TimeSpan";
161 else if (mCurrentView == mTodoView) view = "Todo"; 162 else if (mCurrentView == mTodoView) view = "Todo";
162 else view = "Agenda"; 163 else view = "Agenda";
163 164
164 config->writeEntry("Current View",view); 165 config->writeEntry("Current View",view);
165 166
@@ -514,29 +515,25 @@ void KOViewManager::showMonthView()
514 mMainView, SLOT ( showDay( QDate ) ) ); 515 mMainView, SLOT ( showDay( QDate ) ) );
515 connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); 516 connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig()));
516 connect( mMonthView, SIGNAL(nextMonth() ), 517 connect( mMonthView, SIGNAL(nextMonth() ),
517 mMainView->navigatorBar(), SIGNAL(goNextMonth() ) ); 518 mMainView->navigatorBar(), SIGNAL(goNextMonth() ) );
518 connect( mMonthView, SIGNAL(prevMonth() ), 519 connect( mMonthView, SIGNAL(prevMonth() ),
519 mMainView->navigatorBar(), SIGNAL(goPrevMonth() ) ); 520 mMainView->navigatorBar(), SIGNAL(goPrevMonth() ) );
520 mMonthView->updateConfig(); 521 mMonthView->updateConfig();
521 } 522 }
522 523
523 globalFlagBlockAgenda = 1; 524 globalFlagBlockAgenda = 1;
524 //mFlagShowNextxDays = false; 525 //mFlagShowNextxDays = false;
525 // if(mMonthView == mCurrentView) return; 526 // if(mMonthView == mCurrentView) return;
526 mMainView->dateNavigator()->blockSignals( true );
527 mMainView->dateNavigator()->selectMonth(); 527 mMainView->dateNavigator()->selectMonth();
528 mMainView->dateNavigator()->blockSignals( false);
529 // DateList tmpList = mMainView->dateNavigator()->selectedDates( );
530 //mMonthView->showDates(tmpList.first(), tmpList.last());
531 528
532 showView(mMonthView, true ); 529 showView(mMonthView, true );
533 530
534} 531}
535 532
536void KOViewManager::showTodoView() 533void KOViewManager::showTodoView()
537{ 534{
538 //mFlagShowNextxDays = false; 535 //mFlagShowNextxDays = false;
539 if ( !mTodoView ) { 536 if ( !mTodoView ) {
540 mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(), 537 mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(),
541 "KOViewManager::TodoView" ); 538 "KOViewManager::TodoView" );
542 539