author | zautrix <zautrix> | 2005-05-25 09:43:34 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-05-25 09:43:34 (UTC) |
commit | ce9b826d7c0d9249751f8fb7b791c3757aff3c39 (patch) (side-by-side diff) | |
tree | 719bc7dea987d15c1ee38de58c5b2902c8e0a5ab /korganizer | |
parent | 75c935404e0a803b7d39dd0cf4d83d4d6cd07da2 (diff) | |
download | kdepimpi-ce9b826d7c0d9249751f8fb7b791c3757aff3c39.zip kdepimpi-ce9b826d7c0d9249751f8fb7b791c3757aff3c39.tar.gz kdepimpi-ce9b826d7c0d9249751f8fb7b791c3757aff3c39.tar.bz2 |
fix
-rw-r--r-- | korganizer/calendarview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a8ad467..503ef12 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1,24 +1,24 @@ /* This file is part of KOrganizer. Requires the Qt and KDE widget libraries, available at no cost at http://www.troll.no and http://www.kde.org respectively Copyright (c) 1997, 1998, 1999 - Preston Brown (preston.brown@yale.edu) + Preston Brown (preton.brown@yale.edu) Fester Zigterman (F.J.F.ZigtermanRustenburg@student.utwente.nl) Ian Dawes (iadawes@globalserve.net) Laszlo Boloni (boloni@cs.purdue.edu) Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -1646,34 +1646,35 @@ void CalendarView::setSyncEventsReadOnly() } } bool CalendarView::openCalendar(QString filename, bool merge) { if (filename.isEmpty()) { return false; } if (!QFile::exists(filename)) { KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); return false; } globalFlagBlockAgenda = 1; if (!merge) { - mCalendar->close(); mTodoList->clearList(); + mViewManager->setDocumentId( filename ); + mCalendar->close(); } mStorage->setFileName( filename ); if ( mStorage->load() ) { if ( merge ) ;//setModified( true ); else { //setModified( true ); mViewManager->setDocumentId( filename ); mDialogManager->setDocumentId( filename ); mTodoList->setDocumentId( filename ); } globalFlagBlockAgenda = 2; // if ( getLastSyncEvent() ) // getLastSyncEvent()->setReadOnly( true ); mCalendar->reInitAlarmSettings(); setSyncEventsReadOnly(); |