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
@@ -542,48 +542,51 @@ void DateBook::initWeek()
 	//number of the current week.
 	int yearNumber, totWeeks;
 	calcWeek( currentDate(), totWeeks, yearNumber, onMonday );
 
 	QDate d = QDate( yearNumber, 12, 31 );
 	calcWeek( d, totWeeks, yearNumber, onMonday );
 
 	while ( totWeeks == 1 ) {
 		d = d.addDays( -1 );
 		calcWeek( d, totWeeks, yearNumber, onMonday );
 	}
 }
 
 void DateBook::initWeekLst() {
 	if ( !weekLstView ) {
 		weekLstView = new DateBookWeekLst( ampm, onMonday, db, views, "weeklst view" );
 		views->addWidget( weekLstView, WEEKLST );
 
 		//weekLstView->setStartViewTime( startTime );
 		connect( weekLstView, SIGNAL( showDate(int,int,int) ), this, SLOT( showDay(int,int,int) ) );
 		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 & ) ) );
 	}
 }
 
 
 void DateBook::initMonth()
 {
 	if ( !monthView ) {
 		monthView = new DateBookMonth( views, "month view", FALSE, db );
 		views->addWidget( monthView, MONTH );
 		connect( monthView, SIGNAL( dateClicked(int,int,int) ), this, SLOT( showDay(int,int,int) ) );
 		connect( this, SIGNAL( newEvent() ), monthView, SLOT( redraw() ) );
 		qApp->processEvents();
 	}
 }
 
 void DateBook::loadSettings()
 {
 	Config qpeconfig( "qpe" );
 	qpeconfig.setGroup("Time");
 	ampm = qpeconfig.readBoolEntry( "AMPM", TRUE );
 	onMonday = qpeconfig.readBoolEntry( "MONDAY" );
 
 	Config config("DateBook");
 	config.setGroup("Main");
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
@@ -1,33 +1,34 @@
 #include "namespace_hack.h"
 #include "datebookweeklst.h"
 
 #include "datebook.h"
 
 #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>
 #include <qtl.h>
 
 bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false);
 
 using namespace Opie::Ui;
 DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl)
     : DateBookWeekLstHeaderBase(parent, name, fl)
 {
 	setBackgroundMode( PaletteButton );
 	labelDate->setBackgroundMode( PaletteButton );
 	forwardweek->setBackgroundMode( PaletteButton );
 	forwardweek->setPixmap( Resource::loadPixmap("forward") );
 	forwardmonth->setBackgroundMode( PaletteButton );
 	forwardmonth->setPixmap( Resource::loadPixmap("fastforward") );
 	backweek->setBackgroundMode( PaletteButton );
 	backweek->setPixmap( Resource::loadPixmap("back") );
 	backmonth->setBackgroundMode( PaletteButton );
 	backmonth->setPixmap( Resource::loadPixmap("fastback") );
 	DateBookWeekLstHeaderBaseLayout->setSpacing(0);
 	DateBookWeekLstHeaderBaseLayout->setMargin(0);
@@ -171,55 +172,77 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
 		middle.sprintf("   |---");
 		end.sprintf("__|__");
 		day.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());
 	} else if(weeklistviewconfig==EXTENDED) { // Extended mode, display start and end times.
 		start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());
 		middle.sprintf("<--->");
 		end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());
 		day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute());
 	}
 
 	if(ev.event().type() == Event::Normal) {
 		if(ev.startDate()==ev.date() && ev.endDate()==ev.date()) {	// day event.
 			s=day;
 		} else if(ev.startDate()==ev.date()) {	// start event.
 			s=start;
 		} else if(ev.endDate()==ev.date()) { // end event.
 			s=end;
 		} else {	// middle day.
 			s=middle;
 		}
 	} 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,
 					 const char* name, WFlags fl)
     : QWidget( parent, name, fl )
 {
 	Config config("DateBook");
 	config.setGroup("Main");
 	int weeklistviewconfig=config.readNumEntry("weeklistviewconfig", NORMAL);
 	odebug << "weeklistviewconfig: " << weeklistviewconfig << oendl;
 
 	bStartOnMonday=onM;
 	setPalette(white);
 	setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
 
 	QVBoxLayout *layout = new QVBoxLayout( this );
 
 	qBubbleSort(ev);
 	QValueListIterator<EffectiveEvent> it;
 	it=ev.begin();
 
 	int dayOrder[7];
 	if (bStartOnMonday) {
@@ -227,77 +250,89 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 	} else {
 		for (int d=0; d<7; d++) dayOrder[d]=d;
 		dayOrder[0]=7;
 	}
 
 	// Calculate offset to first day of week.
 	int dayoffset=d.dayOfWeek();
 	if(bStartOnMonday) dayoffset--;
 	else if( dayoffset == 7 ) dayoffset = 0;
 
 	for (int i=0; i<7; i++) {
 	// Header
 		DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i-dayoffset), bStartOnMonday,this);
 		connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
 		connect(hdr, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
 			this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 		layout->addWidget(hdr);
 
 		// Events
 		while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {
 			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));
     }
 }
 DateBookWeekLstView::~DateBookWeekLstView(){}
 void DateBookWeekLstView::keyPressEvent(QKeyEvent *e) {e->ignore();}
 
 DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 					       QValueList<EffectiveEvent> &ev2,
 					       QDate &d, bool onM,
 					       QWidget* parent,
 					       const char* name, WFlags fl)
     : QWidget( parent, name, fl )
 {
 	QHBoxLayout *layout = new QHBoxLayout( this );
 
 	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&)));
 }
 
 DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
 				  QWidget *parent,
 				  const char *name )
     : QWidget( parent, name ),
       db( newDB ),
       startTime( 0 ),
       ampm( ap ),
       bStartOnMonday(onM)
 {
 	setFocusPolicy(StrongFocus);
 	layout = new QVBoxLayout( this );
 	layout->setMargin(0);
 
 	header=new DateBookWeekLstHeader(onM, this);
 	layout->addWidget( header );
 	connect(header, SIGNAL(dateChanged(QDate&)), this, SLOT(dateChanged(QDate&)));
 	connect(header, SIGNAL(setDbl(bool)), this, SLOT(setDbl(bool)));
 
 	scroll=new QScrollView(this);
@@ -341,48 +376,52 @@ QDate DateBookWeekLst::weekDate() const
 	int dayoffset=d.dayOfWeek();
 	if(bStartOnMonday) dayoffset--;
 	else if( dayoffset == 7 )
 	    dayoffset = 0;
 
 	return d.addDays(-dayoffset);
 }
 
 void DateBookWeekLst::getEvents() {
 	QDate start = weekDate(); //date();
 	QDate stop = start.addDays(6);
 	QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop);
 
 	if (view) delete view;
 	if (dbl) {
 		QDate start2=start.addDays(7);
 		stop=start2.addDays(6);
 		QValueList<EffectiveEvent> el2 = db->getEffectiveEvents(start2, stop);
 		view=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,scroll);
 	} else {
 		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&)));
 
 	scroll->addChild(view);
 	view->show();
 	scroll->updateScrollBars();
 }
 
 void DateBookWeekLst::dateChanged(QDate &newdate) {
 	bdate=newdate;
 	getEvents();
 }
 
 void DateBookWeekLst::keyPressEvent(QKeyEvent *e)
 {
 	switch(e->key()) {
 		case Key_Up:
 			scroll->scrollBy(0, -20);
 			break;
 		case Key_Down:
 			scroll->scrollBy(0, 20);
 			break;
 		case Key_Left:
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,156 +1,177 @@
 #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"
 
 #include <opie2/oclickablelabel.h>
 
 class QDateTime;
 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();
 	void prevMonth();
 	void pickDate();
 	void setDate(int y, int m, int d);
 signals:
 	void dateChanged(QDate &newdate);
 	void setDbl(bool on);
 private:
 	QDate date;
 //	bool onMonday;
 	bool bStartOnMonday;
 };
 
 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
 {
     Q_OBJECT
 public:
     DateBookWeekLstView(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM,
 			QWidget* parent = 0, const char* name = 0,
 			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:
 	bool bStartOnMonday;
 protected slots:
 	void keyPressEvent(QKeyEvent *);
 };
 
 class DateBookWeekLstDblView: public QWidget {
         Q_OBJECT
 public:
     DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 			   QValueList<EffectiveEvent> &ev2,
 			   QDate &d, bool onM,
 			   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);
 };
 
 class DateBookWeekLst : public QWidget
 {
     Q_OBJECT
 
 public:
     DateBookWeekLst( bool ampm, bool onM, DateBookDB *newDB,
 		     QWidget *parent = 0,
 		     const char *name = 0 );
     ~DateBookWeekLst();
     void setDate( int y, int w );
     void setDate(const QDate &d );
     int week() const { return _week; };
     QDate date();
     QDate weekDate() const;
 
 public slots:
     void redraw();
     void dateChanged(QDate &date);
 
 protected slots:
     void keyPressEvent(QKeyEvent *);
     void setDbl(bool on);
 
 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;
     bool ampm;
     bool bStartOnMonday;
     bool dbl;
 	QDate bdate;
     int year, _week,dow;
     DateBookWeekLstHeader *header;
     QWidget *view;
     QVBoxLayout *layout;
     QScrollView *scroll;
 
     void getEvents();
 };
 
 #endif