alarm dialog changes

 - displayed additional Event's details
 - autoresizing title (if it doesn't fit in one line)

diff --git a/src/gui/alarmdialog.cpp b/src/gui/alarmdialog.cpp
index e54bc6f646f39914eb87f59a3b51361a519ce6f4..da494e26d2d6dea879ef88293db17eb45569691b 100644 (file)
--- a/src/gui/alarmdialog.cpp
+++ b/src/gui/alarmdialog.cpp
@@ -40,25 +40,38 @@ AlarmDialog::AlarmDialog(int argc, char *argv[], QWidget *aParent)
     database.setDatabaseName(QDir::homePath() + "/.fosdem/fosdem.sqlite");
     database.open();
 
+    QString titleStr;
+    QString messageStr;
+    QString timeStr;
+    QString personsStr;
+    QString roomStr;
     try
     {
         Event event = Event::getById(mEventId,confId);
-        message->setText(event.title());
-        setWindowTitle(event.title());
+        titleStr = "Event alarm";
+        messageStr = event.title();
+        timeStr = event.start().toString("hh:mm") + "-" + event.start().addSecs(event.duration()).toString("hh:mm");
+        personsStr = event.persons().join(" and ");
+        roomStr = event.room();
     }
     catch(OrmNoObjectException*)
     {
-        message->setText(QString("No such event in the DB: %1").arg(QString::number(mEventId)));
-        setWindowTitle("ERROR");
+        titleStr = QString("ERROR");
+        messageStr = QString("No such event in the DB: %1").arg(QString::number(mEventId));
     }
     catch(...) {} // TODO: implement
+    message->setText(messageStr);
+    setWindowTitle(titleStr);
+    time->setText(timeStr);
+    persons->setText(personsStr);
+    room->setText(roomStr);
 }
 
 void AlarmDialog::runApp()
 {
     QString program = QDir::currentPath() + "/" + *qApp->argv();
     QProcess::startDetached(program,QStringList()<<QString::number(mEventId));
-    qApp->quit();
+    closeDialog();
 }
 
 void AlarmDialog::snooze()

diff --git a/src/gui/alarmdialog.ui b/src/gui/alarmdialog.ui
index eabdbd797ddb43177100e02ce7af9ae66719a3af..d0bd806dd1eb7a0b519060e67cb51d1e7bc10246 100644 (file)
--- a/src/gui/alarmdialog.ui
+++ b/src/gui/alarmdialog.ui
@@ -5,10 +5,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>337</width>
-    <height>151</height>
+    <width>406</width>
+    <height>176</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
@@ -17,6 +23,12 @@
     <layout class="QVBoxLayout" name="verticalLayout" >
      <item>
       <widget class="QLabel" name="message" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text" >
         <string>Alarm message goes here</string>
        </property>
@@ -60,27 +72,41 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="2" >
+         <item row="1" column="3" >
           <widget class="QLabel" name="persons" >
            <property name="text" >
             <string>PRESETNER(S)</string>
            </property>
           </widget>
          </item>
-         <item row="0" column="2" >
+         <item row="0" column="3" >
           <widget class="QLabel" name="time" >
            <property name="text" >
             <string>TIME</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="2" >
+         <item row="2" column="3" >
           <widget class="QLabel" name="room" >
            <property name="text" >
             <string>ROOM</string>
            </property>
           </widget>
          </item>
+         <item row="1" column="0" >
+          <widget class="QLabel" name="label_5" >
+           <property name="text" >
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="2" >
+          <widget class="QLabel" name="label_6" >
+           <property name="text" >
+            <string/>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
        <item>