summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-02-20 11:14:04 (UTC)
committer zautrix <zautrix>2005-02-20 11:14:04 (UTC)
commitbb74ffa01010ca364e101e05a6b3e090ae363a0e (patch) (side-by-side diff)
tree573f3b5244f064996c9cb4c73cc0ad04816bda9b /korganizer
parentce9aa88149547443452a2077f5c3832fbea34f63 (diff)
downloadkdepimpi-bb74ffa01010ca364e101e05a6b3e090ae363a0e.zip
kdepimpi-bb74ffa01010ca364e101e05a6b3e090ae363a0e.tar.gz
kdepimpi-bb74ffa01010ca364e101e05a6b3e090ae363a0e.tar.bz2
minor month-weekview fixes
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/komonthview.h2
-rw-r--r--korganizer/koviewmanager.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index b79a41f..f92a69a 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -217,25 +217,25 @@ class KOMonthView: public KOEventView
/** Returns number of currently shown dates. */
virtual int currentDateCount();
/** returns the currently selected events */
virtual QPtrList<Incidence> selectedIncidences();
/** returns dates of the currently selected events */
virtual DateList selectedDates();
virtual void printPreview(CalPrinter *calPrinter,
const QDate &, const QDate &);
- bool isMonthView() { return true; }
+ bool isMonthView() { return !mShowWeekView; }
bool isUpdatePossible() { return updatePossible; }
MonthViewCell * selectedCell();
bool skipResize;
NavigatorBar* navigatorBar() { return mNavigatorBar ;}
public slots:
virtual void updateView();
virtual void updateConfig();
virtual void showDates(const QDate &start, const QDate &end);
virtual void showEvents(QPtrList<Event> eventList);
void changeEventDisplay(Event *, int);
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index ac67b58..a9f5a41 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -548,24 +548,25 @@ if (!mMonthView) {
connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) );
connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ),
mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) );
}
}
void KOViewManager::showMonthViewWeek()
{
createMonthView();
+ globalFlagBlockAgenda = 1;
bool full = true;
if ( mCurrentView == mMonthView)
full = mMainView->leftFrame()->isVisible();
if ( !KOPrefs::instance()->mMonthViewWeek ) {
mMonthView->switchView();
if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() )
full = false;
else
full = true;
}
mMainView->dateNavigator()->selectWeek();
showView(mMonthView, full );