Use popup menu for edit, duplicate, delete and beam in week list view - patch courtesy of Thomas Schnetzer

3 files changed, 72 insertions, 9 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 0a47bb8..a18a5b4 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -562,8 +562,11 @@ void DateBook::initWeekLst() {
 		connect( weekLstView, SIGNAL( addEvent(const QDateTime&,const QDateTime&,const QString&, const QString&) ),
 			this, SLOT( slotNewEntry(const QDateTime&,const QDateTime&,const QString&, const QString&) ) );
 		connect( this, SIGNAL( newEvent() ), weekLstView, SLOT( redraw() ) );
 		connect( weekLstView, SIGNAL( editEvent(const Event&) ), this, SLOT( editEvent(const Event&) ) );
+		connect( weekLstView, SIGNAL( duplicateEvent( const Event & ) ), this, SLOT( duplicateEvent( const Event & ) ) );
+		connect( weekLstView, SIGNAL( beamEvent(const Event&) ), this, SLOT( beamEvent(const Event&) ) );
+		connect( weekLstView, SIGNAL( removeEvent( const Event & ) ), this, SLOT( removeEvent( const Event & ) ) );
 	}
 }
 
 
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index fe2ab51..771aa00 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -6,8 +6,9 @@
 #include <opie2/odebug.h>
 
 #include <qpe/datebookmonth.h>
 #include <qpe/config.h>
+#include <qpe/ir.h>
 #include <qpe/resource.h>
 
 #include <qlayout.h>
 #include <qtoolbutton.h>
@@ -191,15 +192,37 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
 	} else {
 		s="";
 	}
 	setText(QString(s) + " " + ev.description());
-	connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
+//	connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
 	setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
 void DateBookWeekLstEvent::editMe() {
 	emit editEvent(event.event());
 }
-
+void DateBookWeekLstEvent::duplicateMe()
+{
+       emit duplicateEvent(event.event());
+}
+void DateBookWeekLstEvent::deleteMe()
+{
+       emit removeEvent(event.event());
+       emit redraw();
+}
+void DateBookWeekLstEvent::beamMe()
+{
+	emit beamEvent( event.event() );
+}
+void DateBookWeekLstEvent::mousePressEvent( QMouseEvent *e )
+{
+	popmenue = new QPopupMenu;
+	popmenue->insertItem( tr( "Edit" ), this, SLOT(editMe()));
+	popmenue->insertItem( tr( "Duplicate" ), this, SLOT(duplicateMe()));
+	popmenue->insertItem( tr( "Delete" ), this, SLOT(deleteMe()));
+	if(Ir::supported())
+		popmenue->insertItem( tr( "Beam" ), this, SLOT(beamMe()));
+	popmenue->popup( mapToGlobal( e->pos() ));
+}
 
 DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 					 const QDate &d, bool onM,
 					 QWidget* parent,
@@ -247,8 +270,12 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 			if(!(((*it).end().hour()==0) && ((*it).end().minute()==0) && ((*it).startDate()!=(*it).date()))) {	// Skip events ending at 00:00 starting at another day.
 				DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,weeklistviewconfig,this);
 				layout->addWidget(l);
 				connect (l, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
+				connect (l, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));
+				connect (l, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
+				connect (l, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));
+				connect (l, SIGNAL(redraw()), this, SIGNAL(redraw()));
 			}
 			it++;
 		}
 		layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
@@ -268,16 +295,24 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 
 	DateBookWeekLstView *w=new DateBookWeekLstView(ev1,d,onM,this);
 	layout->addWidget(w);
 	connect (w, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
+	connect (w, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));
+	connect (w, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
+	connect (w, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));
+	connect (w, SIGNAL(redraw()), this, SIGNAL(redraw()));
 	connect (w, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
 	connect (w, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
 		this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 
 
 	w=new DateBookWeekLstView(ev2,d.addDays(7),onM,this);
 	layout->addWidget(w);
 	connect (w, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
+	connect (w, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));
+	connect (w, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
+	connect (w, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));
+	connect (w, SIGNAL(redraw()), this, SIGNAL(redraw()));
 	connect (w, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
 	connect (w, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
 		this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 }
@@ -361,8 +396,12 @@ void DateBookWeekLst::getEvents() {
 		view=new DateBookWeekLstView(el,start,bStartOnMonday,scroll);
 	}
 
 	connect (view, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
+	connect (view, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));
+	connect (view, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
+	connect (view, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));
+	connect (view, SIGNAL(redraw()), this, SLOT(redraw()));
 	connect (view, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
 	connect (view, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
 		this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h
index 32fa23f..3bc7f2f 100644
--- a/core/pim/datebook/datebookweeklst.h
+++ b/core/pim/datebook/datebookweeklst.h
@@ -1,11 +1,11 @@
 #ifndef DATEBOOKWEEKLST
 #define DATEBOOKWEEKLST
 
 #include <qwidget.h>
-#include <qdatetime.h> 
+#include <qdatetime.h>
 #include <qpe/event.h>
-#include <qlabel.h> 
+#include <qlabel.h>
 #include <qscrollview.h>
 
 #include "datebookweeklstheader.h"
 #include "datebookweeklstdayhdr.h"
@@ -18,13 +18,13 @@ class DateBookDB;
 class DateBookWeekLstHeader: public DateBookWeekLstHeaderBase
 {
     Q_OBJECT
 public:
-    DateBookWeekLstHeader(bool onM, QWidget* parent = 0, const char* name = 0, 
+    DateBookWeekLstHeader(bool onM, QWidget* parent = 0, const char* name = 0,
 			  WFlags fl = 0 );
     ~DateBookWeekLstHeader();
     void setDate(const QDate &d);
-    
+
 public slots:
 	void nextWeek();
 	void prevWeek();
 	void nextMonth();
@@ -44,34 +44,44 @@ class DateBookWeekLstDayHdr: public DateBookWeekLstDayHdrBase
 {
     Q_OBJECT
 public:
     DateBookWeekLstDayHdr(const QDate &d, bool onM,
-			  QWidget* parent = 0, const char* name = 0, 
+			  QWidget* parent = 0, const char* name = 0,
 			  WFlags fl = 0 );
 public slots:
     void showDay();
-    void newEvent(); 
+    void newEvent();
 signals:
     void showDate(int y, int m, int d);
     void addEvent(const QDateTime &start, const QDateTime &stop,
 		  const QString &str, const QString &location);
 private:
     QDate date;
 };
 
-class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel 
+class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel
 {
   Q_OBJECT
 public:
     DateBookWeekLstEvent(const EffectiveEvent &ev, int weeklistviewconfig =1,
 			 QWidget* parent = 0, const char* name = 0,
 			 WFlags fl = 0);
 signals:
     void editEvent(const Event &e);
+    void duplicateEvent(const Event &e);
+    void removeEvent(const Event &e);
+    void beamEvent(const Event &e);
+    void redraw();
 private slots:
     void editMe();
+    void duplicateMe();
+    void deleteMe();
+    void beamMe();
 private:
     const EffectiveEvent event;
+    QPopupMenu* popmenue;
+protected:
+    void mousePressEvent( QMouseEvent *e );
 };
 
 class DateBookWeekLstView: public QWidget
 {
@@ -82,8 +92,12 @@ public:
 			WFlags fl = 0 );
     ~DateBookWeekLstView();
 signals:
 	void editEvent(const Event &e);
+	void duplicateEvent(const Event &e);
+	void removeEvent(const Event &e);
+	void beamEvent(const Event &e);
+	void redraw();
 	void showDate(int y, int m, int d);
 	void addEvent(const QDateTime &start, const QDateTime &stop,
 	const QString &str, const QString &location);
 private:
@@ -101,8 +115,12 @@ public:
 			   QWidget* parent = 0, const char* name = 0,
 			   WFlags fl = 0 );
 signals:
     void editEvent(const Event &e);
+    void duplicateEvent(const Event &e);
+    void removeEvent(const Event &e);
+    void beamEvent(const Event &e);
+    void redraw();
     void showDate(int y, int m, int d);
     void addEvent(const QDateTime &start, const QDateTime &stop,
 		  const QString &str, const QString &location);
 };
@@ -134,8 +152,11 @@ signals:
 	void showDate(int y, int m, int d);
 	void addEvent(const QDateTime &start, const QDateTime &stop,
 	const QString &str, const QString &location);
 	void editEvent(const Event &e);
+	void duplicateEvent(const Event &e);
+	void removeEvent(const Event &e);
+	void beamEvent(const Event &e);
 
 private:
     DateBookDB *db;
     int startTime;