-rw-r--r-- | bin/kdepim/WhatsNew.txt | 13 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 9 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 25 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 6 | ||||
-rw-r--r-- | libkcal/calendar.cpp | 10 | ||||
-rw-r--r-- | libkcal/calendar.h | 5 | ||||
-rw-r--r-- | libkcal/incidence.cpp | 14 | ||||
-rw-r--r-- | libkcal/incidence.h | 1 |
8 files changed, 73 insertions, 10 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index be0d2b2..aa6ab0a 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,6 +1,19 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.0.27 ************ | ||
4 | |||
5 | More bugfixes. | ||
6 | Added possibility to clone in KO/Pi a todo with all its subtodos. | ||
7 | Added a timetracker funtionality in KO/Pi for todos in the todo view. | ||
8 | If a todo is set to started and then to stopped it is saving information about the runtime in | ||
9 | <yourhome>/kdepim/apps/timetrackerdir. | ||
10 | To read, display, print this information an external program is needed which will be developed. | ||
11 | It will display the data in a Gantt timetable view with one row for each todo. | ||
12 | It will have many possibilities sorting the data after category, parent todos, attendees, ... and for creating/printing status reports/summaries. | ||
13 | Merging of data from different computers/users will be quite easy because every run is stored in a single file. | ||
14 | The program will be only available for the desktop (Linux+Windows) and it will be not Open Source. | ||
15 | |||
3 | ********** VERSION 2.0.26 ************ | 16 | ********** VERSION 2.0.26 ************ |
4 | 17 | ||
5 | Added two more fields to the KA/Pi view config: | 18 | Added two more fields to the KA/Pi view config: |
6 | A "Mobile (home)" and a "Mobile (work)" field. | 19 | A "Mobile (home)" and a "Mobile (work)" field. |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 5257bff..9476a89 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1157,9 +1157,9 @@ | |||
1157 | { "Print only &uncompleted items","Drucke nur nicht erledigte Todos" }, | 1157 | { "Print only &uncompleted items","Drucke nur nicht erledigte Todos" }, |
1158 | { "Only items due in the &range:","Nur Items in dem Zeitraum:" }, | 1158 | { "Only items due in the &range:","Nur Items in dem Zeitraum:" }, |
1159 | { "Todo List","Todo Liste" }, | 1159 | { "Todo List","Todo Liste" }, |
1160 | { "&Title:","&Titel:" }, | 1160 | { "&Title:","&Titel:" }, |
1161 | { "Co&nnect subtodos with its parent","Verbinde Unter-Todos mit ihren Ober-Todos" }, | 1161 | { "Co&nnect subtodos with its parent","Verbinde Untertodos mit ihren Ober-Todos" }, |
1162 | { "Todo list","Todo Liste" }, | 1162 | { "Todo list","Todo Liste" }, |
1163 | { "&Print...","Drucke..." }, | 1163 | { "&Print...","Drucke..." }, |
1164 | { "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" }, | 1164 | { "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" }, |
1165 | { "[Unconfigured]","[Unkonfiguriert]" }, | 1165 | { "[Unconfigured]","[Unkonfiguriert]" }, |
@@ -1176,9 +1176,9 @@ | |||
1176 | { "journals","Journale" }, | 1176 | { "journals","Journale" }, |
1177 | { "public","öffentl." }, | 1177 | { "public","öffentl." }, |
1178 | { "private","privat" }, | 1178 | { "private","privat" }, |
1179 | { "confidential","vertraul." }, | 1179 | { "confidential","vertraul." }, |
1180 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" }, | 1180 | { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Untertodos.\nAlle erledigten Untertodos\nwerden auch gelöscht!" }, |
1181 | { "Yesterday","Gestern" }, | 1181 | { "Yesterday","Gestern" }, |
1182 | { "Day after tomorrow","Übermorgen" }, | 1182 | { "Day after tomorrow","Übermorgen" }, |
1183 | { "Tomorrow","Morgen" }, | 1183 | { "Tomorrow","Morgen" }, |
1184 | { "Day before yesterday","Vorgestern" }, | 1184 | { "Day before yesterday","Vorgestern" }, |
@@ -1342,8 +1342,13 @@ | |||
1342 | { "Stop todo","Stoppe Todo" }, | 1342 | { "Stop todo","Stoppe Todo" }, |
1343 | { "Todo is stopped","Todo ist gestoppt" }, | 1343 | { "Todo is stopped","Todo ist gestoppt" }, |
1344 | { "Start todo","Starte Todo" }, | 1344 | { "Start todo","Starte Todo" }, |
1345 | { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" }, | 1345 | { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" }, |
1346 | { "The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?","Das Todo\n%1\nwird geklont!\nEs hat Untertodos!\nMöchten Sie\nalle Untertodos auch klonen?" }, | ||
1347 | { "Todo has subtodos","Todo hat Untertodos" }, | ||
1348 | { "","" }, | ||
1349 | { "","" }, | ||
1350 | { "","" }, | ||
1346 | { "","" }, | 1351 | { "","" }, |
1347 | { "","" }, | 1352 | { "","" }, |
1348 | { "","" }, | 1353 | { "","" }, |
1349 | { "","" }, | 1354 | { "","" }, |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index c530037..bd7376a 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2703,13 +2703,34 @@ void CalendarView::cloneIncidence(Incidence * orgInc ) | |||
2703 | newInc->recreate(); | 2703 | newInc->recreate(); |
2704 | 2704 | ||
2705 | if ( newInc->type() == "Todo" ) { | 2705 | if ( newInc->type() == "Todo" ) { |
2706 | Todo* t = (Todo*) newInc; | 2706 | Todo* t = (Todo*) newInc; |
2707 | bool cloneSub = false; | ||
2708 | if ( orgInc->relations().count() ) { | ||
2709 | int result = KMessageBox::warningYesNoCancel(this, | ||
2710 | i18n("The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?").arg( newInc->summary().left ( 25 ) ), | ||
2711 | i18n("Todo has subtodos"), | ||
2712 | i18n("Yes"), | ||
2713 | i18n("No")); | ||
2714 | |||
2715 | if ( result == KMessageBox::Cancel ) { | ||
2716 | delete t; | ||
2717 | return; | ||
2718 | } | ||
2719 | if (result == KMessageBox::Yes) cloneSub = true; | ||
2720 | } | ||
2707 | showTodoEditor(); | 2721 | showTodoEditor(); |
2708 | mTodoEditor->editTodo( t ); | 2722 | mTodoEditor->editTodo( t ); |
2709 | if ( mTodoEditor->exec() ) { | 2723 | if ( mTodoEditor->exec() ) { |
2710 | mCalendar->addTodo( t ); | 2724 | if ( cloneSub ) { |
2711 | updateView(); | 2725 | orgInc->cloneRelations( t ); |
2726 | mCalendar->addIncidenceBranch( t ); | ||
2727 | updateView(); | ||
2728 | |||
2729 | } else { | ||
2730 | mCalendar->addTodo( t ); | ||
2731 | updateView(); | ||
2732 | } | ||
2712 | } else { | 2733 | } else { |
2713 | delete t; | 2734 | delete t; |
2714 | } | 2735 | } |
2715 | } | 2736 | } |
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 7ee1eef..9b5d4ce 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -1118,21 +1118,21 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item) | |||
1118 | showItem( item , QPoint(), 0 ); | 1118 | showItem( item , QPoint(), 0 ); |
1119 | } | 1119 | } |
1120 | void KOTodoView::toggleRunningItem() | 1120 | void KOTodoView::toggleRunningItem() |
1121 | { | 1121 | { |
1122 | qDebug("KOTodoView::toggleRunning() "); | 1122 | // qDebug("KOTodoView::toggleRunning() "); |
1123 | if ( ! mActiveItem ) | 1123 | if ( ! mActiveItem ) |
1124 | return; | 1124 | return; |
1125 | Todo * t = mActiveItem->todo(); | 1125 | Todo * t = mActiveItem->todo(); |
1126 | if ( t->isRunning() ) { | 1126 | if ( t->isRunning() ) { |
1127 | int result = KMessageBox::warningContinueCancel(this, | 1127 | int result = KMessageBox::warningContinueCancel(this, |
1128 | i18n("The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?").arg(mActiveItem->text(0).left( 20 ) ),i18n("Todo is started"),i18n("Stop todo"),i18n("Cancel"), true); | 1128 | i18n("The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?").arg(mActiveItem->text(0).left( 25 ) ),i18n("Todo is started"),i18n("Stop todo"),i18n("Cancel"), true); |
1129 | if (result != KMessageBox::Continue) return; | 1129 | if (result != KMessageBox::Continue) return; |
1130 | t->setRunning( false ); | 1130 | t->setRunning( false ); |
1131 | mActiveItem->construct(); | 1131 | mActiveItem->construct(); |
1132 | } else { | 1132 | } else { |
1133 | int result = KMessageBox::warningContinueCancel(this, | 1133 | int result = KMessageBox::warningContinueCancel(this, |
1134 | i18n("The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?").arg(mActiveItem->text(0).left( 20 ) ),i18n("Todo is stopped"),i18n("Start todo"),i18n("Cancel"), true); | 1134 | i18n("The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?").arg(mActiveItem->text(0).left( 25 ) ),i18n("Todo is stopped"),i18n("Start todo"),i18n("Cancel"), true); |
1135 | if (result != KMessageBox::Continue) return; | 1135 | if (result != KMessageBox::Continue) return; |
1136 | t->setRunning( true ); | 1136 | t->setRunning( true ); |
1137 | mActiveItem->construct(); | 1137 | mActiveItem->construct(); |
1138 | } | 1138 | } |
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index 406cd48..ed39ddb 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp | |||
@@ -334,9 +334,17 @@ QPtrList<Event> Calendar::events() | |||
334 | QPtrList<Event> el = rawEvents(); | 334 | QPtrList<Event> el = rawEvents(); |
335 | mFilter->apply(&el); | 335 | mFilter->apply(&el); |
336 | return el; | 336 | return el; |
337 | } | 337 | } |
338 | 338 | void Calendar::addIncidenceBranch(Incidence *i) | |
339 | { | ||
340 | addIncidence( i ); | ||
341 | Incidence * inc; | ||
342 | QPtrList<Incidence> Relations = i->relations(); | ||
343 | for (inc=Relations.first();inc;inc=Relations.next()) { | ||
344 | addIncidenceBranch( inc ); | ||
345 | } | ||
346 | } | ||
339 | 347 | ||
340 | bool Calendar::addIncidence(Incidence *i) | 348 | bool Calendar::addIncidence(Incidence *i) |
341 | { | 349 | { |
342 | Incidence::AddVisitor<Calendar> v(this); | 350 | Incidence::AddVisitor<Calendar> v(this); |
diff --git a/libkcal/calendar.h b/libkcal/calendar.h index 2f2c3aa..ab40970 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h | |||
@@ -138,9 +138,12 @@ public: | |||
138 | Add an incidence to calendar. | 138 | Add an incidence to calendar. |
139 | 139 | ||
140 | @return true on success, false on error. | 140 | @return true on success, false on error. |
141 | */ | 141 | */ |
142 | virtual bool addIncidence( Incidence * ); | 142 | virtual bool addIncidence( Incidence * ); |
143 | |||
144 | // Adds an incidence and all relatedto incidences to the cal | ||
145 | void addIncidenceBranch( Incidence * ); | ||
143 | /** | 146 | /** |
144 | Return filtered list of all incidences of this calendar. | 147 | Return filtered list of all incidences of this calendar. |
145 | */ | 148 | */ |
146 | virtual QPtrList<Incidence> incidences(); | 149 | virtual QPtrList<Incidence> incidences(); |
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index 6bca12c..78fa24f 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp | |||
@@ -262,9 +262,21 @@ void Incidence::recreate() | |||
262 | setRevision(0); | 262 | setRevision(0); |
263 | setIDStr( ":" ); | 263 | setIDStr( ":" ); |
264 | setLastModified(QDateTime::currentDateTime()); | 264 | setLastModified(QDateTime::currentDateTime()); |
265 | } | 265 | } |
266 | 266 | void Incidence::cloneRelations( Incidence * newInc ) | |
267 | { | ||
268 | // newInc is already a clone of this incidence | ||
269 | Incidence * inc; | ||
270 | Incidence * cloneInc; | ||
271 | QPtrList<Incidence> Relations = relations(); | ||
272 | for (inc=Relations.first();inc;inc=Relations.next()) { | ||
273 | cloneInc = inc->clone(); | ||
274 | cloneInc->recreate(); | ||
275 | cloneInc->setRelatedTo( newInc ); | ||
276 | inc->cloneRelations( cloneInc ); | ||
277 | } | ||
278 | } | ||
267 | void Incidence::setReadOnly( bool readOnly ) | 279 | void Incidence::setReadOnly( bool readOnly ) |
268 | { | 280 | { |
269 | IncidenceBase::setReadOnly( readOnly ); | 281 | IncidenceBase::setReadOnly( readOnly ); |
270 | recurrence()->setRecurReadOnly( readOnly); | 282 | recurrence()->setRecurReadOnly( readOnly); |
diff --git a/libkcal/incidence.h b/libkcal/incidence.h index f8da342..60070a2 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h | |||
@@ -111,8 +111,9 @@ class Incidence : public IncidenceBase | |||
111 | */ | 111 | */ |
112 | virtual bool accept(Visitor &) { return false; } | 112 | virtual bool accept(Visitor &) { return false; } |
113 | 113 | ||
114 | virtual Incidence *clone() = 0; | 114 | virtual Incidence *clone() = 0; |
115 | virtual void cloneRelations( Incidence * ); | ||
115 | 116 | ||
116 | virtual QDateTime getNextAlarmDateTime( bool * ok, int * offset ) const = 0; | 117 | virtual QDateTime getNextAlarmDateTime( bool * ok, int * offset ) const = 0; |
117 | void setReadOnly( bool ); | 118 | void setReadOnly( bool ); |
118 | 119 | ||