Formatted alarm message (closes ticket #46).

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index b20b3ba75b652604080c567f9e1bb61d1effc111..c01b4f46c7f915cc23ec31fe1829b154649fc212 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -234,13 +234,13 @@ void MainWindow::onAlarmTimerTimeout() {
     QString message;
     if (events.size() == 1) {
         event = events.first();
-        title = tr("Next event at %1").arg(event.start().toString());
-        message = tr("Title: %1\nRoom: %2").arg(event.title()).arg(event.room()->name());
+        title = tr("Next event at %1").arg(event.start().toString("HH:mm"));
+        message = tr("\"%1\"\n(%2)").arg(event.title()).arg(event.room()->name());
     } else {
         title = tr("%1 upcoming events").arg(events.size());
         QStringList messages;
         foreach (event, events) {
-            messages += tr("Start: %1; Title: %2; Room: %3").arg(event.start().toString()).arg(event.title()).arg(event.room()->name());
+            messages += tr("%1: \"%2\" (%3)").arg(event.start().toString("HH:mm")).arg(event.title()).arg(event.room()->name());
         }
         message = messages.join("\n");
     }