summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt13
-rw-r--r--korganizer/calendarview.cpp46
-rw-r--r--korganizer/calendarview.h3
-rw-r--r--korganizer/koagendaitem.cpp4
-rw-r--r--korganizer/komonthview.cpp10
-rw-r--r--korganizer/komonthview.h3
-rw-r--r--korganizer/koviewmanager.cpp3
-rw-r--r--korganizer/mainwindow.cpp7
-rw-r--r--libkcal/calendar.cpp11
-rw-r--r--libkcal/calendar.h3
-rw-r--r--libkcal/calendarlocal.cpp17
-rw-r--r--libkcal/incidence.cpp14
-rw-r--r--libkcal/incidence.h1
-rw-r--r--version2
14 files changed, 123 insertions, 14 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 5021212..46d59a3 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,4 +1,17 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 1.9.15 ************
4
5Usebilty enhancements in KO/Pi:
6When clicking on the date in a month view cell, the day view is shown.
7Old behaviour was, that the "new event" dialog popped up.
8
9Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu).
10That means, you can restore the latest
11event/todo/journal you have deleted.
12A journal is deleted, if you clear all the text of the journal.
13
14
15
3********** VERSION 1.9.14 ************ 16********** VERSION 1.9.14 ************
4 17
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 543897a..15c5dd9 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -492,4 +492,11 @@ CalendarView::~CalendarView()
492 //kdDebug() << "~CalendarView() done" << endl; 492 //kdDebug() << "~CalendarView() done" << endl;
493} 493}
494
495void CalendarView::showDay( QDate d )
496{
497 dateNavigator()->selectDate( d );
498 mViewManager->showWeekView();
499 dateNavigator()->selectDate( d );
500}
494void CalendarView::timerAlarm() 501void CalendarView::timerAlarm()
495{ 502{
@@ -2210,4 +2217,5 @@ void CalendarView::edit_options()
2210} 2217}
2211 2218
2219
2212void CalendarView::slotSelectPickerDate( QDate d) 2220void CalendarView::slotSelectPickerDate( QDate d)
2213{ 2221{
@@ -2230,4 +2238,17 @@ void CalendarView::slotSelectPickerDate( QDate d)
2230 todoChanged( to ); 2238 todoChanged( to );
2231 } else { 2239 } else {
2240 if ( mMoveIncidence->doesRecur() ) {
2241#if 0
2242 // PENDING implement this
2243 Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate );
2244 mCalendar()->addIncidence( newInc );
2245 if ( mMoveIncidence->type() == "Todo" )
2246 emit todoMoved((Todo*)mMoveIncidence, KOGlobals::EVENTEDITED );
2247 else
2248 emit incidenceChanged(mMoveIncidence, KOGlobals::EVENTEDITED);
2249 mMoveIncidence = newInc;
2250
2251#endif
2252 }
2232 QTime tim = mMoveIncidence->dtStart().time(); 2253 QTime tim = mMoveIncidence->dtStart().time();
2233 int secs = mMoveIncidence->dtStart().secsTo( mMoveIncidence->dtEnd()); 2254 int secs = mMoveIncidence->dtStart().secsTo( mMoveIncidence->dtEnd());
@@ -2427,4 +2448,6 @@ void CalendarView::moveIncidence(Incidence * inc )
2427 da = mMoveIncidence->dtStart().date(); 2448 da = mMoveIncidence->dtStart().date();
2428 } 2449 }
2450 //PENDING set date for recurring incidence to date of recurrence
2451 //mMoveIncidenceOldDate;
2429 mDatePicker->setDate( da ); 2452 mDatePicker->setDate( da );
2430} 2453}
@@ -2885,5 +2908,5 @@ void CalendarView::deleteEvent(Event *anEvent)
2885 //kdDebug() << "Date Not Valid" << endl; 2908 //kdDebug() << "Date Not Valid" << endl;
2886 if (KOPrefs::instance()->mConfirm) { 2909 if (KOPrefs::instance()->mConfirm) {
2887 km = KMessageBox::warningContinueCancel(this,anEvent->summary() + 2910 km = KMessageBox::warningContinueCancel(this,anEvent->summary().left(25) +
2888 i18n("\nThis event recurs\nover multiple dates.\nAre you sure you want\nto delete this event\nand all its recurrences?"), 2911 i18n("\nThis event recurs\nover multiple dates.\nAre you sure you want\nto delete this event\nand all its recurrences?"),
2889 i18n("KO/Pi Confirmation"),i18n("Delete All")); 2912 i18n("KO/Pi Confirmation"),i18n("Delete All"));
@@ -2893,5 +2916,5 @@ void CalendarView::deleteEvent(Event *anEvent)
2893 km = KMessageBox::No; 2916 km = KMessageBox::No;
2894 } else { 2917 } else {
2895 km = KMessageBox::warningYesNoCancel(this,anEvent->summary() + 2918 km = KMessageBox::warningYesNoCancel(this,anEvent->summary().left(25) +
2896 i18n("\nThis event recurs\nover multiple dates.\nDo you want to delete\nall it's recurrences,\nor only the current one on:\n")+ 2919 i18n("\nThis event recurs\nover multiple dates.\nDo you want to delete\nall it's recurrences,\nor only the current one on:\n")+
2897 KGlobal::locale()->formatDate(itemDate)+i18n(" ?\n\nDelete:\n"), 2920 KGlobal::locale()->formatDate(itemDate)+i18n(" ?\n\nDelete:\n"),
@@ -2934,5 +2957,5 @@ void CalendarView::deleteEvent(Event *anEvent)
2934 } else { 2957 } else {
2935 if (KOPrefs::instance()->mConfirm) { 2958 if (KOPrefs::instance()->mConfirm) {
2936 switch (KMessageBox::warningContinueCancel(this,anEvent->summary() + 2959 switch (KMessageBox::warningContinueCancel(this,anEvent->summary().left(25) +
2937 i18n("\nAre you sure you want\nto delete this event?"), 2960 i18n("\nAre you sure you want\nto delete this event?"),
2938 i18n("KO/Pi Confirmation"),i18n("Delete"))) { 2961 i18n("KO/Pi Confirmation"),i18n("Delete"))) {
@@ -3800,2 +3823,19 @@ void CalendarView::removeSyncInfo( QString syncProfile)
3800 3823
3801} 3824}
3825
3826void CalendarView::undo_delete()
3827{
3828 //qDebug("undo_delete() ");
3829 Incidence* undo = mCalendar->undoIncidence();
3830 if ( !undo ) {
3831 KMessageBox::sorry(this,i18n("There is nothing to undo!"),
3832 i18n("KO/Pi"));
3833 return;
3834 }
3835 if ( KMessageBox::Continue ==KMessageBox::warningContinueCancel(this,undo->summary().left(25) +
3836 i18n("\nAre you sure you want\nto restore this?"),
3837 i18n("KO/Pi Confirmation"),i18n("Restore"))) {
3838 mCalendar->undoDeleteIncidence();
3839 updateView();
3840 }
3841}
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 437a51c..646973d 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -451,4 +451,6 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
451 void setSyncDevice( QString ); 451 void setSyncDevice( QString );
452 void setSyncName( QString ); 452 void setSyncName( QString );
453 void showDay( QDate );
454 void undo_delete();
453 protected slots: 455 protected slots:
454 void timerAlarm(); 456 void timerAlarm();
@@ -555,4 +557,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
555 Incidence *mSelectedIncidence; 557 Incidence *mSelectedIncidence;
556 Incidence *mMoveIncidence; 558 Incidence *mMoveIncidence;
559 QDate mMoveIncidenceOldDate;
557 KOTodoView *mTodoList; 560 KOTodoView *mTodoList;
558 KOEventEditor * mEventEditor; 561 KOEventEditor * mEventEditor;
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index f027343..46184ac 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -151,4 +151,5 @@ KOAgendaItem::~KOAgendaItem()
151void KOAgendaItem::recreateIncidence() 151void KOAgendaItem::recreateIncidence()
152{ 152{
153#if 0
153 Incidence* newInc = mIncidence->clone(); 154 Incidence* newInc = mIncidence->clone();
154 newInc->recreate(); 155 newInc->recreate();
@@ -161,5 +162,6 @@ void KOAgendaItem::recreateIncidence()
161 ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) ); 162 ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) );
162 } 163 }
163 mIncidence = newInc; 164#endif
165 mIncidence = mIncidence->recreateCloneException( mDate );
164} 166}
165bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout) 167bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 7d1e82f..08232e2 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -282,6 +282,6 @@ MonthViewCell::MonthViewCell( KOMonthView *parent)
282 enableScrollBars( false ); 282 enableScrollBars( false );
283 updateConfig(); 283 updateConfig();
284 connect( mLabel, SIGNAL( clicked( )), 284 //connect( mLabel, SIGNAL( clicked( )), SLOT( newEvent() ));
285 SLOT( newEvent() )); 285 connect( mLabel, SIGNAL( clicked( )), SLOT( showDay() ));
286 connect( mItemList, SIGNAL( doubleClicked( QListBoxItem *) ), 286 connect( mItemList, SIGNAL( doubleClicked( QListBoxItem *) ),
287 SLOT( defaultAction( QListBoxItem * ) ) ); 287 SLOT( defaultAction( QListBoxItem * ) ) );
@@ -630,4 +630,8 @@ void MonthViewCell::defaultAction( QListBoxItem *item )
630 if ( incidence ) mMonthView->defaultAction( incidence ); 630 if ( incidence ) mMonthView->defaultAction( incidence );
631} 631}
632void MonthViewCell::showDay()
633{
634 emit showDaySignal( date() );
635}
632void MonthViewCell::newEvent() 636void MonthViewCell::newEvent()
633{ 637{
@@ -730,4 +734,6 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
730 connect( cell, SIGNAL( newEventSignal( QDateTime ) ), 734 connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
731 SIGNAL( newEventSignal( QDateTime ) ) ); 735 SIGNAL( newEventSignal( QDateTime ) ) );
736 connect( cell, SIGNAL( showDaySignal( QDate ) ),
737 SIGNAL( showDaySignal( QDate ) ) );
732 } 738 }
733 } 739 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index e94952f..5124057 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -144,4 +144,5 @@ class MonthViewCell : public QWidget
144 void defaultAction( Incidence * ); 144 void defaultAction( Incidence * );
145 void newEventSignal( QDateTime ); 145 void newEventSignal( QDateTime );
146 void showDaySignal( QDate );
146 147
147 protected: 148 protected:
@@ -154,4 +155,5 @@ class MonthViewCell : public QWidget
154 void cellClicked( QListBoxItem * ); 155 void cellClicked( QListBoxItem * );
155 void newEvent(); 156 void newEvent();
157 void showDay();
156 158
157 private: 159 private:
@@ -222,4 +224,5 @@ class KOMonthView: public KOEventView
222 signals: 224 signals:
223 void selectWeekNum ( int ); 225 void selectWeekNum ( int );
226 void showDaySignal( QDate );
224 protected: 227 protected:
225 void resizeEvent(QResizeEvent *); 228 void resizeEvent(QResizeEvent *);
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 391f98c..6e151f9 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -33,4 +33,5 @@
33#include <qapplication.h> 33#include <qapplication.h>
34#endif 34#endif
35#include <qdatetime.h>
35#include "calendarview.h" 36#include "calendarview.h"
36#include "datenavigator.h" 37#include "datenavigator.h"
@@ -445,4 +446,6 @@ void KOViewManager::showMonthView()
445 connect( mMonthView, SIGNAL( selectWeekNum( int ) ), 446 connect( mMonthView, SIGNAL( selectWeekNum( int ) ),
446 mMainView, SLOT ( selectWeekNum( int ) ) ); 447 mMainView, SLOT ( selectWeekNum( int ) ) );
448 connect( mMonthView, SIGNAL( showDaySignal( QDate ) ),
449 mMainView, SLOT ( showDay( QDate ) ) );
447 connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); 450 connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig()));
448 mMonthView->updateConfig(); 451 mMonthView->updateConfig();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 46ae6a0..a652c05 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -577,4 +577,11 @@ void MainWindow::initActions()
577 mView, SLOT( edit_options() ) ); 577 mView, SLOT( edit_options() ) );
578 actionMenu->insertSeparator(); 578 actionMenu->insertSeparator();
579
580 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
581 action->addTo( actionMenu );
582 connect( action, SIGNAL( activated() ),
583 mView, SLOT( undo_delete() ) );
584 actionMenu->insertSeparator();
585
579 icon = loadPixmap( pathString + "newevent" ); 586 icon = loadPixmap( pathString + "newevent" );
580 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 587 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index 52daaaa..88351eb 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -53,5 +53,5 @@ void Calendar::init()
53 mObserver = 0; 53 mObserver = 0;
54 mNewObserver = false; 54 mNewObserver = false;
55 55 mUndoIncidence = 0;
56 mModified = false; 56 mModified = false;
57 57
@@ -110,4 +110,6 @@ Calendar::~Calendar()
110{ 110{
111 delete mDefaultFilter; 111 delete mDefaultFilter;
112 if ( mUndoIncidence )
113 delete mUndoIncidence;
112} 114}
113 115
@@ -117,4 +119,11 @@ const QString &Calendar::getOwner() const
117} 119}
118 120
121bool Calendar::undoDeleteIncidence()
122{
123 if (!mUndoIncidence)
124 return false;
125 addIncidence(mUndoIncidence);
126 mUndoIncidence = 0;
127}
119void Calendar::setOwner(const QString &os) 128void Calendar::setOwner(const QString &os)
120{ 129{
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index b7d6a1f..2f2c3aa 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -66,4 +66,6 @@ public:
66 Calendar(const QString &timeZoneId); 66 Calendar(const QString &timeZoneId);
67 virtual ~Calendar(); 67 virtual ~Calendar();
68 Incidence * undoIncidence() { return mUndoIncidence; };
69 bool undoDeleteIncidence();
68 void deleteIncidence(Incidence *in); 70 void deleteIncidence(Incidence *in);
69 void resetTempSyncStat(); 71 void resetTempSyncStat();
@@ -323,4 +325,5 @@ public:
323 bool inclusive = false ) = 0; 325 bool inclusive = false ) = 0;
324 Incidence *mNextAlarmIncidence; 326 Incidence *mNextAlarmIncidence;
327 Incidence *mUndoIncidence;
325 328
326private: 329private:
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 3f46d53..12294c0 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -153,9 +153,9 @@ bool CalendarLocal::addEvent( Event *event )
153void CalendarLocal::deleteEvent( Event *event ) 153void CalendarLocal::deleteEvent( Event *event )
154{ 154{
155 155 if ( mUndoIncidence ) delete mUndoIncidence;
156 156 mUndoIncidence = event->clone();
157 if ( mEventList.removeRef( event ) ) { 157 if ( mEventList.removeRef( event ) ) {
158 setModified( true ); 158 setModified( true );
159 } 159 }
160} 160}
161 161
@@ -202,5 +202,7 @@ void CalendarLocal::deleteTodo( Todo *todo )
202{ 202{
203 // Handle orphaned children 203 // Handle orphaned children
204 removeRelations( todo ); 204 if ( mUndoIncidence ) delete mUndoIncidence;
205 mUndoIncidence = todo->clone();
206 removeRelations( todo );
205 207
206 if ( mTodoList.removeRef( todo ) ) { 208 if ( mTodoList.removeRef( todo ) ) {
@@ -688,4 +690,7 @@ bool CalendarLocal::addJournal(Journal *journal)
688void CalendarLocal::deleteJournal( Journal *journal ) 690void CalendarLocal::deleteJournal( Journal *journal )
689{ 691{
692 if ( mUndoIncidence ) delete mUndoIncidence;
693 mUndoIncidence = journal->clone();
694 mUndoIncidence->setSummary( mUndoIncidence->description().left(25));
690 if ( mJournalList.removeRef(journal) ) { 695 if ( mJournalList.removeRef(journal) ) {
691 setModified( true ); 696 setModified( true );
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 5a9ef0e..28402ae 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -174,4 +174,18 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 )
174} 174}
175 175
176Incidence* Incidence::recreateCloneException( QDate d )
177{
178 Incidence* newInc = clone();
179 newInc->recreate();
180 if ( doesRecur() ) {
181 addExDate( d );
182 newInc->recurrence()->unsetRecurs();
183 int len = dtStart().secsTo( ((Event*)this)->dtEnd());
184 QTime tim = dtStart().time();
185 newInc->setDtStart( QDateTime(d, tim) );
186 ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) );
187 }
188 return newInc;
189}
176 190
177void Incidence::recreate() 191void Incidence::recreate()
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 7dc6f10..1807bc4 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -123,4 +123,5 @@ class Incidence : public IncidenceBase
123 */ 123 */
124 void recreate(); 124 void recreate();
125 Incidence* recreateCloneException(QDate);
125 126
126 /** set creation date */ 127 /** set creation date */
diff --git a/version b/version
index 0343cbb..ef03779 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "1.9.14"; version = "1.9.15";