-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 90be237..b0f26d1 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -103,21 +103,24 @@ void KOViewManager::showDateView( int view, QDate date) | |||
103 | static int lastMode = 0; | 103 | static int lastMode = 0; |
104 | static int lastCount = 0; | 104 | static int lastCount = 0; |
105 | static bool lastNDMode = false; | 105 | static bool lastNDMode = false; |
106 | static QDate lastDate; | 106 | static QDate lastDate; |
107 | //qDebug("date %d %s", view, date.toString().latin1()); | 107 | //qDebug("date %d %s", view, date.toString().latin1()); |
108 | 108 | ||
109 | if (view != 9) | ||
110 | lastMode = 0; | ||
109 | //qDebug("%d %d ", lastNDMode, mFlagShowNextxDays ); | 111 | //qDebug("%d %d ", lastNDMode, mFlagShowNextxDays ); |
110 | bool savemFlagShowNextxDays = mFlagShowNextxDays; | 112 | bool savemFlagShowNextxDays = mFlagShowNextxDays; |
111 | mFlagShowNextxDays = false; | 113 | mFlagShowNextxDays = false; |
112 | if ( view == 3 ) { | 114 | if ( view == 3 ) { |
113 | //mCurrentAgendaView = 1 ; | 115 | //mCurrentAgendaView = 1 ; |
114 | lastDate = mMainView->dateNavigator()->selectedDates().first(); | 116 | lastDate = mMainView->dateNavigator()->selectedDates().first(); |
115 | lastCount = mMainView->dateNavigator()->selectedDates().count(); | 117 | lastCount = mMainView->dateNavigator()->selectedDates().count(); |
116 | lastNDMode = savemFlagShowNextxDays; | 118 | lastNDMode = savemFlagShowNextxDays; |
117 | mMainView->showDay( date ); | 119 | mMainView->showDay( date ); |
120 | lastMode = 1; | ||
118 | } else if (view == 4 ) { | 121 | } else if (view == 4 ) { |
119 | mCurrentAgendaView = 7 ; | 122 | mCurrentAgendaView = 7 ; |
120 | mMainView->dateNavigator()->selectDates( date, 7 ); | 123 | mMainView->dateNavigator()->selectDates( date, 7 ); |
121 | } else if (view == 5 ) { | 124 | } else if (view == 5 ) { |
122 | mCurrentAgendaView = 14 ; | 125 | mCurrentAgendaView = 14 ; |
123 | mMainView->dateNavigator()->selectDates( date, 14); | 126 | mMainView->dateNavigator()->selectDates( date, 14); |
@@ -147,13 +150,12 @@ void KOViewManager::showDateView( int view, QDate date) | |||
147 | } | 150 | } |
148 | } else | 151 | } else |
149 | showWeekView(); | 152 | showWeekView(); |
150 | } else if (view == 10) { | 153 | } else if (view == 10) { |
151 | mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() ); | 154 | mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() ); |
152 | } | 155 | } |
153 | lastMode = view; | ||
154 | } | 156 | } |
155 | 157 | ||
156 | 158 | ||
157 | 159 | ||
158 | void KOViewManager::writeSettings(KConfig *config) | 160 | void KOViewManager::writeSettings(KConfig *config) |
159 | { | 161 | { |