-rw-r--r-- | korganizer/koviewmanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index e255b83..94c459b 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -161,70 +161,72 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | |||
161 | } | 161 | } |
162 | 162 | ||
163 | void KOViewManager::raiseCurrentView( bool fullScreen ) | 163 | void KOViewManager::raiseCurrentView( bool fullScreen ) |
164 | { | 164 | { |
165 | //qDebug("raiseCurrentView "); | 165 | //qDebug("raiseCurrentView "); |
166 | mCurrentAgendaView = 0; | 166 | mCurrentAgendaView = 0; |
167 | int wid = mMainView->width() ; | 167 | int wid = mMainView->width() ; |
168 | int hei = mMainView->height(); | 168 | int hei = mMainView->height(); |
169 | if ( mCurrentView == mMonthView ) { | 169 | if ( mCurrentView == mMonthView ) { |
170 | mMainView->navigatorBar()->show(); | 170 | mMainView->navigatorBar()->show(); |
171 | hei -= mMainView->navigatorBar()->sizeHint().height(); | 171 | hei -= mMainView->navigatorBar()->sizeHint().height(); |
172 | //mMainView->navigatorBar()->hide(); | 172 | //mMainView->navigatorBar()->hide(); |
173 | } else { | 173 | } else { |
174 | mMainView->navigatorBar()->hide(); | 174 | mMainView->navigatorBar()->hide(); |
175 | } | 175 | } |
176 | if ( fullScreen ) { | 176 | if ( fullScreen ) { |
177 | mMainView->leftFrame()->hide(); | 177 | mMainView->leftFrame()->hide(); |
178 | } else { | 178 | } else { |
179 | mMainView->leftFrame()->show(); | 179 | mMainView->leftFrame()->show(); |
180 | if ( KOPrefs::instance()->mVerticalScreen ) | 180 | if ( KOPrefs::instance()->mVerticalScreen ) |
181 | hei -= mMainView->leftFrame()->height(); | 181 | hei -= mMainView->leftFrame()->height(); |
182 | else | 182 | else |
183 | wid -= mMainView->leftFrame()->width(); | 183 | wid -= mMainView->leftFrame()->width(); |
184 | } | 184 | } |
185 | 185 | emit signalFullScreen( !fullScreen ); | |
186 | if ( globalFlagBlockAgenda == 5 ) { | 186 | if ( globalFlagBlockAgenda == 5 ) { |
187 | globalFlagBlockAgenda = 4; | 187 | globalFlagBlockAgenda = 4; |
188 | globalFlagBlockAgendaItemPaint = 1; | 188 | globalFlagBlockAgendaItemPaint = 1; |
189 | } | 189 | } |
190 | mMainView->viewStack()->raiseWidget(mCurrentView); | 190 | mMainView->viewStack()->raiseWidget(mCurrentView); |
191 | if ( globalFlagBlockAgenda == 4 ) { | 191 | if ( globalFlagBlockAgenda == 4 ) { |
192 | if ( mCurrentView == mAgendaView ) { | 192 | if ( mCurrentView == mAgendaView ) { |
193 | //globalFlagBlockAgenda =1 ; | 193 | //globalFlagBlockAgenda =1 ; |
194 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) | 194 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) |
195 | mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins ); | 195 | mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins ); |
196 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) | 196 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) |
197 | mAgendaView->setStartHour( QTime::currentTime ().hour() ); | 197 | mAgendaView->setStartHour( QTime::currentTime ().hour() ); |
198 | qApp->processEvents(); | 198 | qApp->processEvents(); |
199 | //qDebug("qApp->processEvents() "); | 199 | //qDebug("qApp->processEvents() "); |
200 | globalFlagBlockAgenda = 0; | 200 | globalFlagBlockAgenda = 0; |
201 | mAgendaView->repaintAgenda(); | 201 | mAgendaView->repaintAgenda(); |
202 | 202 | ||
203 | } | 203 | } |
204 | globalFlagBlockAgenda = 0; | 204 | globalFlagBlockAgenda = 0; |
205 | } | 205 | } |
206 | emit signalAgendaView( mCurrentView == mAgendaView ); | ||
206 | //qDebug("raiseCurrentView ende "); | 207 | //qDebug("raiseCurrentView ende "); |
208 | |||
207 | } | 209 | } |
208 | 210 | ||
209 | void KOViewManager::updateView() | 211 | void KOViewManager::updateView() |
210 | { | 212 | { |
211 | // qDebug("KOViewManager::updateView() "); | 213 | // qDebug("KOViewManager::updateView() "); |
212 | // if we are updating mTodoView, we get endless recursion | 214 | // if we are updating mTodoView, we get endless recursion |
213 | if ( mTodoView == mCurrentView ) | 215 | if ( mTodoView == mCurrentView ) |
214 | return; | 216 | return; |
215 | if ( mCurrentView ) mCurrentView->updateView(); | 217 | if ( mCurrentView ) mCurrentView->updateView(); |
216 | 218 | ||
217 | } | 219 | } |
218 | 220 | ||
219 | void KOViewManager::updateView(const QDate &start, const QDate &end) | 221 | void KOViewManager::updateView(const QDate &start, const QDate &end) |
220 | { | 222 | { |
221 | // kdDebug() << "KOViewManager::updateView()" << endl; | 223 | // kdDebug() << "KOViewManager::updateView()" << endl; |
222 | 224 | ||
223 | if (mCurrentView) mCurrentView->showDates(start, end); | 225 | if (mCurrentView) mCurrentView->showDates(start, end); |
224 | 226 | ||
225 | if (mTodoView) mTodoView->updateView(); | 227 | if (mTodoView) mTodoView->updateView(); |
226 | } | 228 | } |
227 | 229 | ||
228 | 230 | ||
229 | void KOViewManager::updateWNview() | 231 | void KOViewManager::updateWNview() |
230 | { | 232 | { |