-rw-r--r-- | korganizer/calendarview.cpp | 6 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 10 | ||||
-rw-r--r-- | korganizer/kotodoview.h | 1 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 5 |
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 | |||
@@ -1613,98 +1613,100 @@ bool CalendarView::importQtopia( const QString &categories, | |||
1613 | getEventViewerDialog()->setSyncMode( false ); | 1613 | getEventViewerDialog()->setSyncMode( false ); |
1614 | qApp->processEvents(); | 1614 | qApp->processEvents(); |
1615 | if ( syncOK ) { | 1615 | if ( syncOK ) { |
1616 | if ( mSyncManager->mWriteBackFile ) | 1616 | if ( mSyncManager->mWriteBackFile ) |
1617 | { | 1617 | { |
1618 | // write back XML file | 1618 | // write back XML file |
1619 | 1619 | ||
1620 | } | 1620 | } |
1621 | setModified( true ); | 1621 | setModified( true ); |
1622 | } | 1622 | } |
1623 | } else { | 1623 | } else { |
1624 | QString question = i18n("Sorry, the file loading\ncommand failed!\n\nNothing synced!\n") ; | 1624 | QString question = i18n("Sorry, the file loading\ncommand failed!\n\nNothing synced!\n") ; |
1625 | QMessageBox::information( 0, i18n("KO/Pi Sync - ERROR"), | 1625 | QMessageBox::information( 0, i18n("KO/Pi Sync - ERROR"), |
1626 | question, i18n("Ok")) ; | 1626 | question, i18n("Ok")) ; |
1627 | } | 1627 | } |
1628 | delete calendar; | 1628 | delete calendar; |
1629 | updateView(); | 1629 | updateView(); |
1630 | return syncOK; | 1630 | return syncOK; |
1631 | 1631 | ||
1632 | 1632 | ||
1633 | #endif | 1633 | #endif |
1634 | 1634 | ||
1635 | } | 1635 | } |
1636 | 1636 | ||
1637 | void CalendarView::setSyncEventsReadOnly() | 1637 | void CalendarView::setSyncEventsReadOnly() |
1638 | { | 1638 | { |
1639 | Event * ev; | 1639 | Event * ev; |
1640 | QPtrList<Event> eL = mCalendar->rawEvents(); | 1640 | QPtrList<Event> eL = mCalendar->rawEvents(); |
1641 | ev = eL.first(); | 1641 | ev = eL.first(); |
1642 | while ( ev ) { | 1642 | while ( ev ) { |
1643 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) | 1643 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) |
1644 | ev->setReadOnly( true ); | 1644 | ev->setReadOnly( true ); |
1645 | ev = eL.next(); | 1645 | ev = eL.next(); |
1646 | } | 1646 | } |
1647 | } | 1647 | } |
1648 | bool CalendarView::openCalendar(QString filename, bool merge) | 1648 | bool CalendarView::openCalendar(QString filename, bool merge) |
1649 | { | 1649 | { |
1650 | 1650 | ||
1651 | if (filename.isEmpty()) { | 1651 | if (filename.isEmpty()) { |
1652 | return false; | 1652 | return false; |
1653 | } | 1653 | } |
1654 | 1654 | ||
1655 | if (!QFile::exists(filename)) { | 1655 | if (!QFile::exists(filename)) { |
1656 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); | 1656 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); |
1657 | return false; | 1657 | return false; |
1658 | } | 1658 | } |
1659 | 1659 | ||
1660 | globalFlagBlockAgenda = 1; | 1660 | globalFlagBlockAgenda = 1; |
1661 | if (!merge) mCalendar->close(); | 1661 | if (!merge) { |
1662 | 1662 | mCalendar->close(); | |
1663 | mTodoList->clearList(); | ||
1664 | } | ||
1663 | mStorage->setFileName( filename ); | 1665 | mStorage->setFileName( filename ); |
1664 | 1666 | ||
1665 | if ( mStorage->load() ) { | 1667 | if ( mStorage->load() ) { |
1666 | if ( merge ) ;//setModified( true ); | 1668 | if ( merge ) ;//setModified( true ); |
1667 | else { | 1669 | else { |
1668 | //setModified( true ); | 1670 | //setModified( true ); |
1669 | mViewManager->setDocumentId( filename ); | 1671 | mViewManager->setDocumentId( filename ); |
1670 | mDialogManager->setDocumentId( filename ); | 1672 | mDialogManager->setDocumentId( filename ); |
1671 | mTodoList->setDocumentId( filename ); | 1673 | mTodoList->setDocumentId( filename ); |
1672 | } | 1674 | } |
1673 | globalFlagBlockAgenda = 2; | 1675 | globalFlagBlockAgenda = 2; |
1674 | // if ( getLastSyncEvent() ) | 1676 | // if ( getLastSyncEvent() ) |
1675 | // getLastSyncEvent()->setReadOnly( true ); | 1677 | // getLastSyncEvent()->setReadOnly( true ); |
1676 | mCalendar->reInitAlarmSettings(); | 1678 | mCalendar->reInitAlarmSettings(); |
1677 | setSyncEventsReadOnly(); | 1679 | setSyncEventsReadOnly(); |
1678 | updateUnmanagedViews(); | 1680 | updateUnmanagedViews(); |
1679 | updateView(); | 1681 | updateView(); |
1680 | if ( filename != MainWindow::defaultFileName() ) { | 1682 | if ( filename != MainWindow::defaultFileName() ) { |
1681 | saveCalendar( MainWindow::defaultFileName() ); | 1683 | saveCalendar( MainWindow::defaultFileName() ); |
1682 | } else { | 1684 | } else { |
1683 | QFileInfo finf ( MainWindow::defaultFileName()); | 1685 | QFileInfo finf ( MainWindow::defaultFileName()); |
1684 | if ( finf.exists() ) { | 1686 | if ( finf.exists() ) { |
1685 | setLoadedFileVersion( finf.lastModified () ); | 1687 | setLoadedFileVersion( finf.lastModified () ); |
1686 | } | 1688 | } |
1687 | } | 1689 | } |
1688 | return true; | 1690 | return true; |
1689 | } else { | 1691 | } else { |
1690 | // while failing to load, the calendar object could | 1692 | // while failing to load, the calendar object could |
1691 | // have become partially populated. Clear it out. | 1693 | // have become partially populated. Clear it out. |
1692 | if ( !merge ) { | 1694 | if ( !merge ) { |
1693 | mCalendar->close(); | 1695 | mCalendar->close(); |
1694 | mViewManager->setDocumentId( filename ); | 1696 | mViewManager->setDocumentId( filename ); |
1695 | mDialogManager->setDocumentId( filename ); | 1697 | mDialogManager->setDocumentId( filename ); |
1696 | mTodoList->setDocumentId( filename ); | 1698 | mTodoList->setDocumentId( filename ); |
1697 | } | 1699 | } |
1698 | 1700 | ||
1699 | //KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename)); | 1701 | //KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename)); |
1700 | 1702 | ||
1701 | QTimer::singleShot ( 1, this, SLOT ( showOpenError() ) ); | 1703 | QTimer::singleShot ( 1, this, SLOT ( showOpenError() ) ); |
1702 | globalFlagBlockAgenda = 2; | 1704 | globalFlagBlockAgenda = 2; |
1703 | mCalendar->reInitAlarmSettings(); | 1705 | mCalendar->reInitAlarmSettings(); |
1704 | setSyncEventsReadOnly(); | 1706 | setSyncEventsReadOnly(); |
1705 | updateUnmanagedViews(); | 1707 | updateUnmanagedViews(); |
1706 | updateView(); | 1708 | updateView(); |
1707 | } | 1709 | } |
1708 | return false; | 1710 | return false; |
1709 | } | 1711 | } |
1710 | void CalendarView::showOpenError() | 1712 | void CalendarView::showOpenError() |
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index d88c300..32ad10a 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||
@@ -11,107 +11,113 @@ INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui | |||
11 | #../qtcompat | 11 | #../qtcompat |
12 | DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 12 | DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL |
13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER | 13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER |
14 | #KORG_NOPRINTER KORG_NOKABC KORG_NODND | 14 | #KORG_NOPRINTER KORG_NOKABC KORG_NODND |
15 | DEFINES += KORG_NOLVALTERNATION | 15 | DEFINES += KORG_NOLVALTERNATION |
16 | DEFINES += DESKTOP_VERSION | 16 | DEFINES += DESKTOP_VERSION |
17 | unix : { | 17 | unix : { |
18 | staticlib: { | 18 | staticlib: { |
19 | LIBS += ../bin/libmicrokabc_qtopia.a | 19 | LIBS += ../bin/libmicrokabc_qtopia.a |
20 | LIBS += ../bin/libmicrokabc_file.a | 20 | LIBS += ../bin/libmicrokabc_file.a |
21 | LIBS += ../bin/libmicrokabc_dir.a | 21 | LIBS += ../bin/libmicrokabc_dir.a |
22 | LIBS += ../bin/libmicrokdepim.a | 22 | LIBS += ../bin/libmicrokdepim.a |
23 | LIBS += ../bin/libmicrokcal.a | 23 | LIBS += ../bin/libmicrokcal.a |
24 | LIBS += ../bin/libmicrokabc.a | 24 | LIBS += ../bin/libmicrokabc.a |
25 | LIBS += ../bin/libmicrokde.a | 25 | LIBS += ../bin/libmicrokde.a |
26 | LIBS += ../bin/libmicrokabc_qtopia.a | 26 | LIBS += ../bin/libmicrokabc_qtopia.a |
27 | LIBS += ../bin/libmicrokabc_file.a | 27 | LIBS += ../bin/libmicrokabc_file.a |
28 | LIBS += ../bin/libmicrokabc_dir.a | 28 | LIBS += ../bin/libmicrokabc_dir.a |
29 | LIBS += ../bin/libmicrokdepim.a | 29 | LIBS += ../bin/libmicrokdepim.a |
30 | LIBS += ../bin/libmicrokcal.a | 30 | LIBS += ../bin/libmicrokcal.a |
31 | LIBS += ../bin/libmicrokabc.a | 31 | LIBS += ../bin/libmicrokabc.a |
32 | LIBS += ../bin/libmicrokde.a | 32 | LIBS += ../bin/libmicrokde.a |
33 | LIBS += ../libical/lib/libical.a | 33 | LIBS += ../libical/lib/libical.a |
34 | LIBS += ../libical/lib/libicalss.a | 34 | LIBS += ../libical/lib/libicalss.a |
35 | } else { | 35 | } else { |
36 | LIBS += ../bin/libmicrokdepim.so | 36 | LIBS += ../bin/libmicrokdepim.so |
37 | LIBS += ../bin/libmicrokcal.so | 37 | LIBS += ../bin/libmicrokcal.so |
38 | LIBS += ../bin/libmicrokde.so | 38 | LIBS += ../bin/libmicrokde.so |
39 | LIBS += ../bin/libmicrokabc.so | 39 | LIBS += ../bin/libmicrokabc.so |
40 | #LIBS += -lbluetooth | 40 | #LIBS += -lbluetooth |
41 | #LIBS += -lsdp | 41 | #LIBS += -lsdp |
42 | 42 | ||
43 | #LIBS += -lldap | 43 | #LIBS += -lldap |
44 | } | 44 | } |
45 | OBJECTS_DIR = obj/unix | 45 | OBJECTS_DIR = obj/unix |
46 | MOC_DIR = moc/unix | 46 | MOC_DIR = moc/unix |
47 | } | 47 | } |
48 | win32: { | 48 | win32: { |
49 | RC_FILE = winicons.rc | 49 | RC_FILE = winicons.rc |
50 | DEFINES += _WIN32_ | 50 | DEFINES += _WIN32_ |
51 | LIBS += ../bin/microkdepim.lib | 51 | LIBS += ../bin/microkdepim.lib |
52 | LIBS += ../bin/microkcal.lib | 52 | LIBS += ../bin/microkcal.lib |
53 | LIBS += ../bin/microkde.lib | 53 | LIBS += ../bin/microkde.lib |
54 | LIBS += ../bin/microkabc.lib | 54 | LIBS += ../bin/microkabc.lib |
55 | LIBS += ../libical/lib/ical.lib | 55 | LIBS += ../libical/lib/ical.lib |
56 | LIBS += ../libical/lib/icalss.lib | 56 | LIBS += ../libical/lib/icalss.lib |
57 | #LIBS += atls.lib | 57 | #LIBS += atls.lib |
58 | QMAKE_LINK += /NODEFAULTLIB:LIBC | 58 | QMAKE_LINK += /NODEFAULTLIB:LIBC |
59 | #QMAKE_LINK += /NODEFAULTLIB:MSVCRT | 59 | QMAKE_LINK += /NODEFAULTLIB:MSVCRT |
60 | #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib | 60 | QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib |
61 | OBJECTS_DIR = obj/win | 61 | OBJECTS_DIR = obj/win |
62 | MOC_DIR = moc/win | 62 | MOC_DIR = moc/win |
63 | #olimport section | 63 | #olimport section |
64 | #blabla: { | 64 | #blabla: { |
65 | debug: { | ||
66 | LIBS += mfc71ud.lib | ||
67 | } | ||
68 | release: { | ||
65 | LIBS += mfc71u.lib | 69 | LIBS += mfc71u.lib |
70 | } | ||
66 | DEFINES += _OL_IMPORT_ | 71 | DEFINES += _OL_IMPORT_ |
67 | 72 | ||
68 | HEADERS += ../outport/msoutl9.h \ | 73 | HEADERS += ../outport/msoutl9.h \ |
69 | koimportoldialog.h | 74 | koimportoldialog.h |
75 | |||
70 | SOURCES += ../outport/msoutl9.cpp \ | 76 | SOURCES += ../outport/msoutl9.cpp \ |
71 | koimportoldialog.cpp | 77 | koimportoldialog.cpp |
72 | #} | 78 | #} |
73 | #olimport section end | 79 | #olimport section end |
74 | 80 | ||
75 | } | 81 | } |
76 | 82 | ||
77 | 83 | ||
78 | INTERFACES = kofilterview_base.ui | 84 | INTERFACES = kofilterview_base.ui |
79 | #filteredit_base.ui | 85 | #filteredit_base.ui |
80 | 86 | ||
81 | # kdateedit.h \ | 87 | # kdateedit.h \ |
82 | 88 | ||
83 | HEADERS += datenavigatorcontainer.h \ | 89 | HEADERS += datenavigatorcontainer.h \ |
84 | filteredit_base.h \ | 90 | filteredit_base.h \ |
85 | alarmclient.h \ | 91 | alarmclient.h \ |
86 | calendarview.h \ | 92 | calendarview.h \ |
87 | customlistviewitem.h \ | 93 | customlistviewitem.h \ |
88 | datenavigator.h \ | 94 | datenavigator.h \ |
89 | docprefs.h \ | 95 | docprefs.h \ |
90 | filtereditdialog.h \ | 96 | filtereditdialog.h \ |
91 | incomingdialog.h \ | 97 | incomingdialog.h \ |
92 | incomingdialog_base.h \ | 98 | incomingdialog_base.h \ |
93 | interfaces/korganizer/baseview.h \ | 99 | interfaces/korganizer/baseview.h \ |
94 | interfaces/korganizer/calendarviewbase.h \ | 100 | interfaces/korganizer/calendarviewbase.h \ |
95 | journalentry.h \ | 101 | journalentry.h \ |
96 | kdatenavigator.h \ | 102 | kdatenavigator.h \ |
97 | koagenda.h \ | 103 | koagenda.h \ |
98 | koagendaitem.h \ | 104 | koagendaitem.h \ |
99 | koagendaview.h \ | 105 | koagendaview.h \ |
100 | kocounterdialog.h \ | 106 | kocounterdialog.h \ |
101 | kodaymatrix.h \ | 107 | kodaymatrix.h \ |
102 | kodialogmanager.h \ | 108 | kodialogmanager.h \ |
103 | koeditordetails.h \ | 109 | koeditordetails.h \ |
104 | koeditorgeneral.h \ | 110 | koeditorgeneral.h \ |
105 | koeditorgeneralevent.h \ | 111 | koeditorgeneralevent.h \ |
106 | koeditorgeneraltodo.h \ | 112 | koeditorgeneraltodo.h \ |
107 | koeditorrecurrence.h \ | 113 | koeditorrecurrence.h \ |
108 | koeventeditor.h \ | 114 | koeventeditor.h \ |
109 | koeventpopupmenu.h \ | 115 | koeventpopupmenu.h \ |
110 | koeventview.h \ | 116 | koeventview.h \ |
111 | koeventviewer.h \ | 117 | koeventviewer.h \ |
112 | koeventviewerdialog.h \ | 118 | koeventviewerdialog.h \ |
113 | kofilterview.h \ | 119 | kofilterview.h \ |
114 | koglobals.h \ | 120 | koglobals.h \ |
115 | koincidenceeditor.h \ | 121 | koincidenceeditor.h \ |
116 | kojournalview.h \ | 122 | kojournalview.h \ |
117 | kolistview.h \ | 123 | kolistview.h \ |
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index d368513..1ffc34a 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h | |||
@@ -94,96 +94,97 @@ class KOTodoListView : public KListView | |||
94 | 94 | ||
95 | 95 | ||
96 | /** | 96 | /** |
97 | This is the line-edit on top of the todoview for fast addition of new todos | 97 | This is the line-edit on top of the todoview for fast addition of new todos |
98 | */ | 98 | */ |
99 | class KOQuickTodo : public QLineEdit | 99 | class KOQuickTodo : public QLineEdit |
100 | { | 100 | { |
101 | public: | 101 | public: |
102 | KOQuickTodo(QWidget *parent=0); | 102 | KOQuickTodo(QWidget *parent=0); |
103 | protected: | 103 | protected: |
104 | void focusInEvent(QFocusEvent *ev); | 104 | void focusInEvent(QFocusEvent *ev); |
105 | void focusOutEvent(QFocusEvent *ev); | 105 | void focusOutEvent(QFocusEvent *ev); |
106 | }; | 106 | }; |
107 | 107 | ||
108 | 108 | ||
109 | /** | 109 | /** |
110 | This class provides a multi-column list view of todo events. | 110 | This class provides a multi-column list view of todo events. |
111 | 111 | ||
112 | @short multi-column list view of todo events. | 112 | @short multi-column list view of todo events. |
113 | @author Cornelius Schumacher <schumacher@kde.org> | 113 | @author Cornelius Schumacher <schumacher@kde.org> |
114 | */ | 114 | */ |
115 | class KOTodoView : public KOrg::BaseView | 115 | class KOTodoView : public KOrg::BaseView |
116 | { | 116 | { |
117 | Q_OBJECT | 117 | Q_OBJECT |
118 | public: | 118 | public: |
119 | KOTodoView(Calendar *, QWidget* parent=0, const char* name=0 ); | 119 | KOTodoView(Calendar *, QWidget* parent=0, const char* name=0 ); |
120 | ~KOTodoView(); | 120 | ~KOTodoView(); |
121 | 121 | ||
122 | QPtrList<Incidence> selectedIncidences(); | 122 | QPtrList<Incidence> selectedIncidences(); |
123 | QPtrList<Todo> selectedTodos(); | 123 | QPtrList<Todo> selectedTodos(); |
124 | 124 | ||
125 | DateList selectedDates() | 125 | DateList selectedDates() |
126 | {DateList q; | 126 | {DateList q; |
127 | return q;} | 127 | return q;} |
128 | 128 | ||
129 | /** Return number of shown dates. TodoView does not show dates, */ | 129 | /** Return number of shown dates. TodoView does not show dates, */ |
130 | int currentDateCount() { return 0; } | 130 | int currentDateCount() { return 0; } |
131 | 131 | ||
132 | void printPreview(CalPrinter *calPrinter, const QDate &fd, const QDate &td); | 132 | void printPreview(CalPrinter *calPrinter, const QDate &fd, const QDate &td); |
133 | 133 | ||
134 | void setDocumentId( const QString & ); | 134 | void setDocumentId( const QString & ); |
135 | 135 | ||
136 | void saveLayout(KConfig *config, const QString &group) const; | 136 | void saveLayout(KConfig *config, const QString &group) const; |
137 | void restoreLayout(KConfig *config, const QString &group); | 137 | void restoreLayout(KConfig *config, const QString &group); |
138 | /** Create a popup menu to set categories */ | 138 | /** Create a popup menu to set categories */ |
139 | QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem); | 139 | QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem); |
140 | void setNavigator( DateNavigator* nav ) {mNavigator = nav;} | 140 | void setNavigator( DateNavigator* nav ) {mNavigator = nav;} |
141 | QString getWhatsThisText(QPoint p); | 141 | QString getWhatsThisText(QPoint p); |
142 | void clearList() {mTodoListView->clear(); } | ||
142 | 143 | ||
143 | public slots: | 144 | public slots: |
144 | void updateView(); | 145 | void updateView(); |
145 | void updateConfig(); | 146 | void updateConfig(); |
146 | 147 | ||
147 | void changeEventDisplay(Event *, int); | 148 | void changeEventDisplay(Event *, int); |
148 | 149 | ||
149 | void showDates(const QDate &start, const QDate &end); | 150 | void showDates(const QDate &start, const QDate &end); |
150 | void showEvents(QPtrList<Event> eventList); | 151 | void showEvents(QPtrList<Event> eventList); |
151 | 152 | ||
152 | void clearSelection(); | 153 | void clearSelection(); |
153 | void jumpToDate (); | 154 | void jumpToDate (); |
154 | 155 | ||
155 | void editItem(QListViewItem *item); | 156 | void editItem(QListViewItem *item); |
156 | void showItem(QListViewItem *item,const QPoint &,int); | 157 | void showItem(QListViewItem *item,const QPoint &,int); |
157 | void popupMenu(QListViewItem *item,const QPoint &,int); | 158 | void popupMenu(QListViewItem *item,const QPoint &,int); |
158 | void newTodo(); | 159 | void newTodo(); |
159 | void newSubTodo(); | 160 | void newSubTodo(); |
160 | void unparentTodo(); | 161 | void unparentTodo(); |
161 | void reparentTodo(); | 162 | void reparentTodo(); |
162 | void showTodo(); | 163 | void showTodo(); |
163 | void editTodo(); | 164 | void editTodo(); |
164 | void cloneTodo(); | 165 | void cloneTodo(); |
165 | void cancelTodo(); | 166 | void cancelTodo(); |
166 | void moveTodo(); | 167 | void moveTodo(); |
167 | void beamTodo(); | 168 | void beamTodo(); |
168 | void deleteTodo(); | 169 | void deleteTodo(); |
169 | 170 | ||
170 | void setNewPriority(int); | 171 | void setNewPriority(int); |
171 | void setNewPercentage(int); | 172 | void setNewPercentage(int); |
172 | void changedCategories(int); | 173 | void changedCategories(int); |
173 | 174 | ||
174 | void setAllOpen(); | 175 | void setAllOpen(); |
175 | void setAllClose(); | 176 | void setAllClose(); |
176 | void setAllFlat(); | 177 | void setAllFlat(); |
177 | void displayAllFlat(); | 178 | void displayAllFlat(); |
178 | 179 | ||
179 | void purgeCompleted(); | 180 | void purgeCompleted(); |
180 | void toggleCompleted(); | 181 | void toggleCompleted(); |
181 | void toggleRunning(); | 182 | void toggleRunning(); |
182 | void toggleQuickTodo(); | 183 | void toggleQuickTodo(); |
183 | void updateTodo( Todo *, int ); | 184 | void updateTodo( Todo *, int ); |
184 | 185 | ||
185 | void itemClicked(QListViewItem *); | 186 | void itemClicked(QListViewItem *); |
186 | void itemStateChanged(QListViewItem *); | 187 | void itemStateChanged(QListViewItem *); |
187 | void modified(bool); | 188 | void modified(bool); |
188 | void itemDoubleClicked(QListViewItem *item); | 189 | void itemDoubleClicked(QListViewItem *item); |
189 | 190 | ||
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 2e5a943..fb4de37 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -786,50 +786,53 @@ void KOViewManager::showJournalView() | |||
786 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; | 786 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW ; |
787 | } | 787 | } |
788 | 788 | ||
789 | void KOViewManager::showTimeSpanView() | 789 | void KOViewManager::showTimeSpanView() |
790 | { | 790 | { |
791 | //mFlagShowNextxDays = false; | 791 | //mFlagShowNextxDays = false; |
792 | if (!mTimeSpanView) { | 792 | if (!mTimeSpanView) { |
793 | mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(), | 793 | mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(), |
794 | "KOViewManager::TimeSpanView"); | 794 | "KOViewManager::TimeSpanView"); |
795 | addView(mTimeSpanView); | 795 | addView(mTimeSpanView); |
796 | 796 | ||
797 | mTimeSpanView->readSettings(); | 797 | mTimeSpanView->readSettings(); |
798 | } | 798 | } |
799 | 799 | ||
800 | showView(mTimeSpanView); | 800 | showView(mTimeSpanView); |
801 | } | 801 | } |
802 | 802 | ||
803 | Incidence *KOViewManager::currentSelection() | 803 | Incidence *KOViewManager::currentSelection() |
804 | { | 804 | { |
805 | if (!mCurrentView) return 0; | 805 | if (!mCurrentView) return 0; |
806 | if ( mCurrentView == mListView ) { | 806 | if ( mCurrentView == mListView ) { |
807 | if ( mListView->currentItem() ) | 807 | if ( mListView->currentItem() ) |
808 | return mListView->currentItem(); | 808 | return mListView->currentItem(); |
809 | } | 809 | } |
810 | return mCurrentView->selectedIncidences().first(); | 810 | return mCurrentView->selectedIncidences().first(); |
811 | } | 811 | } |
812 | 812 | ||
813 | QDate KOViewManager::currentSelectionDate() | 813 | QDate KOViewManager::currentSelectionDate() |
814 | { | 814 | { |
815 | QDate qd; | 815 | QDate qd; |
816 | if (mCurrentView) { | 816 | if (mCurrentView) { |
817 | DateList qvl = mCurrentView->selectedDates(); | 817 | DateList qvl = mCurrentView->selectedDates(); |
818 | if (!qvl.isEmpty()) qd = qvl.first(); | 818 | if (!qvl.isEmpty()) qd = qvl.first(); |
819 | } | 819 | } |
820 | return qd; | 820 | return qd; |
821 | } | 821 | } |
822 | 822 | ||
823 | void KOViewManager::addView(KOrg::BaseView *view) | 823 | void KOViewManager::addView(KOrg::BaseView *view) |
824 | { | 824 | { |
825 | #if QT_VERSION >= 0x030000 | 825 | #if QT_VERSION >= 0x030000 |
826 | mMainView->viewStack()->addWidget( view ); | 826 | mMainView->viewStack()->addWidget( view ); |
827 | #else | 827 | #else |
828 | mMainView->viewStack()->addWidget( view, 1 ); | 828 | mMainView->viewStack()->addWidget( view, 1 ); |
829 | #endif | 829 | #endif |
830 | } | 830 | } |
831 | 831 | ||
832 | void KOViewManager::setDocumentId( const QString &id ) | 832 | void KOViewManager::setDocumentId( const QString &id ) |
833 | { | 833 | { |
834 | if (mTodoView) mTodoView->setDocumentId( id ); | 834 | if (mTodoView) { |
835 | mTodoView->clearList(); | ||
836 | mTodoView->setDocumentId( id ); | ||
837 | } | ||
835 | } | 838 | } |