author | zautrix <zautrix> | 2004-10-06 12:40:40 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-06 12:40:40 (UTC) |
commit | 3e949ed97c7a65eeaddecb1048872cd8595b3caf (patch) (unidiff) | |
tree | a964f4f0ac4d0390655f72aec71185c3f26f04de /korganizer | |
parent | 8ac1973bfa65844df80d74c482559470bc704041 (diff) | |
download | kdepimpi-3e949ed97c7a65eeaddecb1048872cd8595b3caf.zip kdepimpi-3e949ed97c7a65eeaddecb1048872cd8595b3caf.tar.gz kdepimpi-3e949ed97c7a65eeaddecb1048872cd8595b3caf.tar.bz2 |
added missing actions in kopi
-rw-r--r-- | korganizer/calendarview.cpp | 35 | ||||
-rw-r--r-- | korganizer/calendarview.h | 4 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 25 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 6 |
4 files changed, 69 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index b1da144..38b55f7 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2398,8 +2398,43 @@ void CalendarView::showTodoEditor() | |||
2398 | #else | 2398 | #else |
2399 | mTodoEditor->showMaximized(); | 2399 | mTodoEditor->showMaximized(); |
2400 | #endif | 2400 | #endif |
2401 | } | 2401 | } |
2402 | |||
2403 | void CalendarView::cloneIncidence() | ||
2404 | { | ||
2405 | Incidence *incidence = currentSelection(); | ||
2406 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | ||
2407 | if ( incidence ) { | ||
2408 | cloneIncidence(incidence); | ||
2409 | } | ||
2410 | } | ||
2411 | void CalendarView::moveIncidence() | ||
2412 | { | ||
2413 | Incidence *incidence = currentSelection(); | ||
2414 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | ||
2415 | if ( incidence ) { | ||
2416 | moveIncidence(incidence); | ||
2417 | } | ||
2418 | } | ||
2419 | void CalendarView::beamIncidence() | ||
2420 | { | ||
2421 | Incidence *incidence = currentSelection(); | ||
2422 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | ||
2423 | if ( incidence ) { | ||
2424 | beamIncidence(incidence); | ||
2425 | } | ||
2426 | } | ||
2427 | void CalendarView::toggleCancelIncidence() | ||
2428 | { | ||
2429 | Incidence *incidence = currentSelection(); | ||
2430 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | ||
2431 | if ( incidence ) { | ||
2432 | cancelIncidence(incidence); | ||
2433 | } | ||
2434 | } | ||
2435 | |||
2436 | |||
2402 | void CalendarView::cancelIncidence(Incidence * inc ) | 2437 | void CalendarView::cancelIncidence(Incidence * inc ) |
2403 | { | 2438 | { |
2404 | inc->setCancelled( ! inc->cancelled() ); | 2439 | inc->setCancelled( ! inc->cancelled() ); |
2405 | changeIncidenceDisplay( inc,KOGlobals::EVENTEDITED ); | 2440 | changeIncidenceDisplay( inc,KOGlobals::EVENTEDITED ); |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index cd54685..a713c91 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -210,8 +210,12 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
210 | void showIncidence(); | 210 | void showIncidence(); |
211 | void editIncidence(); | 211 | void editIncidence(); |
212 | void editIncidenceDescription(); | 212 | void editIncidenceDescription(); |
213 | void deleteIncidence(); | 213 | void deleteIncidence(); |
214 | void cloneIncidence(); | ||
215 | void moveIncidence(); | ||
216 | void beamIncidence(); | ||
217 | void toggleCancelIncidence(); | ||
214 | 218 | ||
215 | /** create an editeventwin with supplied date/time, and if bool is true, | 219 | /** create an editeventwin with supplied date/time, and if bool is true, |
216 | * make the event take all day. */ | 220 | * make the event take all day. */ |
217 | void newEvent(QDateTime, QDateTime, bool allDay = false); | 221 | void newEvent(QDateTime, QDateTime, bool allDay = false); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 6a9a2f1..bd14fbf 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -636,8 +636,26 @@ void MainWindow::initActions() | |||
636 | mDeleteAction->addTo( actionMenu ); | 636 | mDeleteAction->addTo( actionMenu ); |
637 | connect( mDeleteAction, SIGNAL( activated() ), | 637 | connect( mDeleteAction, SIGNAL( activated() ), |
638 | mView, SLOT( deleteIncidence() ) ); | 638 | mView, SLOT( deleteIncidence() ) ); |
639 | 639 | ||
640 | |||
641 | mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); | ||
642 | mCloneAction->addTo( actionMenu ); | ||
643 | connect( mCloneAction, SIGNAL( activated() ), | ||
644 | mView, SLOT( cloneIncidence() ) ); | ||
645 | mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); | ||
646 | mMoveAction->addTo( actionMenu ); | ||
647 | connect( mMoveAction, SIGNAL( activated() ), | ||
648 | mView, SLOT( moveIncidence() ) ); | ||
649 | mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); | ||
650 | mBeamAction->addTo( actionMenu ); | ||
651 | connect( mBeamAction, SIGNAL( activated() ), | ||
652 | mView, SLOT( beamIncidence() ) ); | ||
653 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); | ||
654 | mCancelAction->addTo( actionMenu ); | ||
655 | connect( mCancelAction, SIGNAL( activated() ), | ||
656 | mView, SLOT( toggleCancelIncidence() ) ); | ||
657 | |||
640 | actionMenu->insertSeparator(); | 658 | actionMenu->insertSeparator(); |
641 | 659 | ||
642 | action = new QAction( "purge_completed", i18n("Purge Completed"), 0, | 660 | action = new QAction( "purge_completed", i18n("Purge Completed"), 0, |
643 | this ); | 661 | this ); |
@@ -1185,9 +1203,9 @@ void MainWindow::exportToPhone( int mode ) | |||
1185 | Incidence *incidence = delSel.first(); | 1203 | Incidence *incidence = delSel.first(); |
1186 | QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); | 1204 | QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); |
1187 | QDateTime end = cur.addDays( ( inFuture +1 ) *7 ); | 1205 | QDateTime end = cur.addDays( ( inFuture +1 ) *7 ); |
1188 | while ( incidence ) { | 1206 | while ( incidence ) { |
1189 | if ( incidence->type() != "journal" ) { | 1207 | if ( incidence->type() != "Journal" ) { |
1190 | bool add = true; | 1208 | bool add = true; |
1191 | if ( inFuture ) { | 1209 | if ( inFuture ) { |
1192 | QDateTime dt; | 1210 | QDateTime dt; |
1193 | if ( incidence->type() == "Todo" ) { | 1211 | if ( incidence->type() == "Todo" ) { |
@@ -1497,8 +1515,13 @@ void MainWindow::enableIncidenceActions( bool enabled ) | |||
1497 | { | 1515 | { |
1498 | mShowAction->setEnabled( enabled ); | 1516 | mShowAction->setEnabled( enabled ); |
1499 | mEditAction->setEnabled( enabled ); | 1517 | mEditAction->setEnabled( enabled ); |
1500 | mDeleteAction->setEnabled( enabled ); | 1518 | mDeleteAction->setEnabled( enabled ); |
1519 | |||
1520 | mCloneAction->setEnabled( enabled ); | ||
1521 | mMoveAction->setEnabled( enabled ); | ||
1522 | mBeamAction->setEnabled( enabled ); | ||
1523 | mCancelAction->setEnabled( enabled ); | ||
1501 | } | 1524 | } |
1502 | 1525 | ||
1503 | void MainWindow::importOL() | 1526 | void MainWindow::importOL() |
1504 | { | 1527 | { |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 74c7f45..4f89e03 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -196,8 +196,14 @@ class MainWindow : public QMainWindow | |||
196 | 196 | ||
197 | QAction *mShowAction; | 197 | QAction *mShowAction; |
198 | QAction *mEditAction; | 198 | QAction *mEditAction; |
199 | QAction *mDeleteAction; | 199 | QAction *mDeleteAction; |
200 | QAction *mCloneAction; | ||
201 | QAction *mMoveAction; | ||
202 | QAction *mBeamAction; | ||
203 | QAction *mCancelAction; | ||
204 | |||
205 | |||
200 | void closeEvent( QCloseEvent* ce ); | 206 | void closeEvent( QCloseEvent* ce ); |
201 | SimpleAlarmClient mAlarmClient; | 207 | SimpleAlarmClient mAlarmClient; |
202 | QTimer mSaveTimer; | 208 | QTimer mSaveTimer; |
203 | bool mBlockSaveFlag; | 209 | bool mBlockSaveFlag; |