openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File r893508.diff of Package kdepim4

Subject: korganizer: backports to help make Paste work
From: wstephenson@suse.de
Bug: 
Patch-upstream: 893508
--- korganizer/koeventview.cpp	(revision 893507)
+++ korganizer/koeventview.cpp	(revision 893508)
@@ -70,6 +70,8 @@ KOEventPopupMenu *KOEventView::eventPopu
                      SIGNAL(cutIncidenceSignal(Incidence *)));
   connect(eventPopup,SIGNAL(copyIncidenceSignal(Incidence *)),
                      SIGNAL(copyIncidenceSignal(Incidence *)));
+  connect(eventPopup,SIGNAL(pasteIncidenceSignal()),
+                     SIGNAL(pasteIncidenceSignal()));
   connect(eventPopup,SIGNAL(toggleAlarmSignal(Incidence *)),
                      SIGNAL(toggleAlarmSignal(Incidence*)));
   connect(eventPopup,SIGNAL(dissociateOccurrenceSignal( Incidence *, const QDate & )),
--- korganizer/calendarview.h	(revision 893507)
+++ korganizer/calendarview.h	(revision 893508)
@@ -348,6 +348,11 @@ class KORGANIZERPRIVATE_EXPORT CalendarV
     */
     void copyIncidence( Incidence *);
 
+    /**
+      Pastes the current incidence using the edit_paste() method
+    */
+    void pasteIncidence();
+
     /** Delete the supplied todo and all sub-todos */
     void deleteSubTodosIncidence ( Todo *todo );
 
--- korganizer/interfaces/korganizer/baseview.h	(revision 893507)
+++ korganizer/interfaces/korganizer/baseview.h	(revision 893508)
@@ -193,6 +193,11 @@ class KORGANIZER_INTERFACES_EXPORT BaseV
     void copyIncidenceSignal(Incidence *);
 
     /**
+    * instructs the receiver to paste the incidence
+    */
+    void pasteIncidenceSignal();
+
+    /**
      * instructs the receiver to toggle the alarms of the Incidence.
      */
     void toggleAlarmSignal(Incidence *);
--- korganizer/calendarview.cpp	(revision 893507)
+++ korganizer/calendarview.cpp	(revision 893508)
@@ -1912,6 +1912,11 @@ void CalendarView::copyIncidence( Incide
   edit_copy();
 }
 
+void CalendarView::pasteIncidence()
+{
+  edit_paste();
+}
+
 void CalendarView::showIncidence( Incidence *incidence )
 {
   KOEventViewerDialog *eventViewer = new KOEventViewerDialog( this );
--- korganizer/koviewmanager.cpp	(revision 893507)
+++ korganizer/koviewmanager.cpp	(revision 893508)
@@ -222,6 +222,8 @@ void KOViewManager::connectView( KOrg::B
            mMainView, SLOT(copyIncidence(Incidence *)) );
   connect( view, SIGNAL(cutIncidenceSignal(Incidence *)),
            mMainView, SLOT(cutIncidence(Incidence *)) );
+  connect( view, SIGNAL(pasteIncidenceSignal()),
+           mMainView, SLOT(pasteIncidence()) );
   connect( view, SIGNAL(toggleAlarmSignal(Incidence *)),
            mMainView, SLOT(toggleAlarm(Incidence *)) );
   connect( view,SIGNAL(dissociateOccurrenceSignal(Incidence *,const QDate &)),
Index: korganizer/koeventview.cpp
===================================================================
Index: korganizer/calendarview.h
===================================================================
Index: korganizer/interfaces/korganizer/baseview.h
===================================================================
Index: korganizer/calendarview.cpp
===================================================================
Index: korganizer/koviewmanager.cpp
===================================================================

Places

File r893508.diff of Package kdepim4

Places