Add .pro.user.* to svn:ignore and remove it in the release target.

[toast/confclerk.git] / src / gui / eventdialog.cpp

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 0a186434b71662e5ae1e3240676789c3ae3c0d61..ff3ceccb13f35e3f933faaf132f354ef17737f43 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011 Philipp Spitzer, gregor herrmann
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -18,12 +18,12 @@
  * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "eventdialog.h"
-#include <conference.h>
+#include "conference.h"
 
 #include <QScrollBar>
 
 #ifdef MAEMO
-#include <alarm.h>
+#include "alarm.h"
 #endif
 
 EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
@@ -44,19 +44,22 @@ EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
     persons->setText(event.persons().join(" and "));
     abstract->setText(event.abstract());
     description->setText(event.description());
-    links->setText(static_cast<QStringList>(event.links().values()).join("\n"));
+    QStringList linksText = static_cast<QStringList>(event.links().values());
+    for (QStringList::iterator linkIterator = linksText.begin(); linkIterator != linksText.end(); ++linkIterator)
+        *linkIterator = QString("<a href=\"%1\">%1</a>").arg(*linkIterator);
+    links->setText(linksText.join("<br/>"));
 
     connect(favouriteButton, SIGNAL(clicked()), SLOT(favouriteClicked()));
     connect(alarmButton, SIGNAL(clicked()), SLOT(alarmClicked()));
 
     if(event.isFavourite())
     {
-        favouriteButton->setIcon(QIcon(":/icons/favourite-onBig.png"));
+        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
     }
 
     if(event.hasAlarm())
     {
-        alarmButton->setIcon(QIcon(":/icons/alarm-onBig.png"));
+        alarmButton->setIcon(QIcon(":/icons/alarm-on.png"));
     }
 }
 
@@ -68,12 +71,12 @@ void EventDialog::favouriteClicked()
     if(event.isFavourite())
     {
         event.setFavourite(false);
-        favouriteButton->setIcon(QIcon(":/icons/favourite-offBig.png"));
+        favouriteButton->setIcon(QIcon(":/icons/favourite-off.png"));
     }
     else
     {
         event.setFavourite(true);
-        favouriteButton->setIcon(QIcon(":/icons/favourite-onBig.png"));
+        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
     }
     event.update("favourite");
 
@@ -83,15 +86,13 @@ void EventDialog::favouriteClicked()
         conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
     }
 
-    qDebug() << " FAVOURITE [" << event.id() << "] -> " << event.isFavourite();
-
-    // have to emit 'eventHasChanged' signal on all events in conflict
+    // have to emit 'eventChanged' signal on all events in conflict
     for(int i=0; i<conflicts.count(); i++)
-        emit(eventHasChanged(conflicts[i].id()));
+        emit eventChanged(conflicts[i].id(), false);
 
     // since the Favourite icon has changed, update TreeViews accordingly
     // all TreeViews have to listen on this signal
-    emit(eventHasChanged(event.id(),true));
+    emit eventChanged(event.id(), true);
 }
 
 void EventDialog::alarmClicked()
@@ -101,29 +102,27 @@ void EventDialog::alarmClicked()
     if(event.hasAlarm())
     {
         event.setHasAlarm(false); // update DB
-        alarmButton->setIcon(QIcon(":/icons/alarm-offBig.png"));
+        alarmButton->setIcon(QIcon(":/icons/alarm-off.png"));
 #ifdef MAEMO
         // remove alarm from the 'alarmd' alrms list
         Alarm alarm;
-        alarm.deleteAlarm(event.id());
+        alarm.deleteAlarm(event.conferenceId(), event.id());
         // TODO: test if removing was successfull
 #endif /* MAEMO */
     }
     else
     {
         event.setHasAlarm(true);
-        alarmButton->setIcon(QIcon(":/icons/alarm-onBig.png"));
+        alarmButton->setIcon(QIcon(":/icons/alarm-on.png"));
 #ifdef MAEMO
         // add alarm to the 'alarmd'
         Alarm alarm;
-        int cookie = alarm.addAlarm(event.id(),QDateTime::currentDateTime().addSecs(10));
-        qDebug() << "cookie: " << cookie;
+        alarm.addAlarm(event.conferenceId(), event.id(), event.title(), event.start().addSecs(PRE_EVENT_ALARM_SEC));
 #endif /* MAEMO */
     }
     event.update("alarm");
-    qDebug() << " ALARM [" << event.id() << "] -> " << event.hasAlarm();
     // since the Alarm icon has changed, update TreeView accordingly
     // all TreeViews have to listen on this signal
-    emit(eventHasChanged(event.id()));
+    emit eventChanged(event.id(), false);
 }