summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp6
-rw-r--r--korganizer/korganizer.pro10
-rw-r--r--korganizer/kotodoview.h1
-rw-r--r--korganizer/koviewmanager.cpp5
4 files changed, 17 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 904bbe2..a8ad467 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1658,8 +1658,10 @@ bool CalendarView::openCalendar(QString filename, bool merge)
}
globalFlagBlockAgenda = 1;
- if (!merge) mCalendar->close();
-
+ if (!merge) {
+ mCalendar->close();
+ mTodoList->clearList();
+ }
mStorage->setFileName( filename );
if ( mStorage->load() ) {
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index d88c300..32ad10a 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -56,17 +56,23 @@ LIBS += ../libical/lib/ical.lib
LIBS += ../libical/lib/icalss.lib
#LIBS += atls.lib
QMAKE_LINK += /NODEFAULTLIB:LIBC
-#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
-#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
+QMAKE_LINK += /NODEFAULTLIB:MSVCRT
+QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
OBJECTS_DIR = obj/win
MOC_DIR = moc/win
#olimport section
#blabla: {
+debug: {
+LIBS += mfc71ud.lib
+}
+release: {
LIBS += mfc71u.lib
+}
DEFINES += _OL_IMPORT_
HEADERS += ../outport/msoutl9.h \
koimportoldialog.h
+
SOURCES += ../outport/msoutl9.cpp \
koimportoldialog.cpp
#}
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index d368513..1ffc34a 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -139,6 +139,7 @@ class KOTodoView : public KOrg::BaseView
QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem);
void setNavigator( DateNavigator* nav ) {mNavigator = nav;}
QString getWhatsThisText(QPoint p);
+ void clearList() {mTodoListView->clear(); }
public slots:
void updateView();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 2e5a943..fb4de37 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -831,5 +831,8 @@ void KOViewManager::addView(KOrg::BaseView *view)
void KOViewManager::setDocumentId( const QString &id )
{
- if (mTodoView) mTodoView->setDocumentId( id );
+ if (mTodoView) {
+ mTodoView->clearList();
+ mTodoView->setDocumentId( id );
+ }
}