updated alarm dialog

diff --git a/src/gui/alarmdialog.ui b/src/gui/alarmdialog.ui
index 09eb2f3330c88b70f27bdb0225a61fc4545a798e..eabdbd797ddb43177100e02ce7af9ae66719a3af 100644 (file)
--- a/src/gui/alarmdialog.ui
+++ b/src/gui/alarmdialog.ui
@@ -5,16 +5,26 @@
    <rect>
     <x>0</x>
     <y>0</y>
    <rect>
     <x>0</x>
     <y>0</y>

-    <width>334</width>
-    <height>135</height>
+    <width>337</width>
+    <height>151</height>

    </rect>
   </property>
   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout" >
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout" >

-   <item row="0" column="0" >
+   <item row="2" column="0" >

     <layout class="QVBoxLayout" name="verticalLayout" >
     <layout class="QVBoxLayout" name="verticalLayout" >

+     <item>
+      <widget class="QLabel" name="message" >
+       <property name="text" >
+        <string>Alarm message goes here</string>
+       </property>
+       <property name="wordWrap" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>

      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_2" >
        <item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_2" >
        <item>


@@ -28,11 +38,50 @@
         </widget>
        </item>
        <item>
         </widget>
        </item>
        <item>

-        <widget class="QLabel" name="message" >
-         <property name="text" >
-          <string>Alarm message goes here</string>
-         </property>
-        </widget>
+        <layout class="QGridLayout" name="gridLayout_2" >
+         <item row="0" column="1" >
+          <widget class="QLabel" name="label_2" >
+           <property name="text" >
+            <string>Time:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1" >
+          <widget class="QLabel" name="label_3" >
+           <property name="text" >
+            <string>Presenter(s):</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1" >
+          <widget class="QLabel" name="label_4" >
+           <property name="text" >
+            <string>Room:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="2" >
+          <widget class="QLabel" name="persons" >
+           <property name="text" >
+            <string>PRESETNER(S)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2" >
+          <widget class="QLabel" name="time" >
+           <property name="text" >
+            <string>TIME</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="2" >
+          <widget class="QLabel" name="room" >
+           <property name="text" >
+            <string>ROOM</string>
+           </property>
+          </widget>
+         </item>
+        </layout>

        </item>
        <item>
         <spacer name="horizontalSpacer" >
        </item>
        <item>
         <spacer name="horizontalSpacer" >

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 709859a0da146f543dbd99bea5443753d2e526c4..1c1becf921ac57687db39e799b6a7152e783a6d7 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -83,7 +83,7 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     connect(dayTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
     connect(favTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
     connect(actTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
     connect(dayTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
     connect(favTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));
     connect(actTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));

-    connect(searchTreeView, SIGNAL(doubleClicked(const QModelIndex &)), SLOT(itemDoubleClicked(const QModelIndex &)));
+    connect(searchTreeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));

     // request for map to be displayed
     connect(dayTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(favTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     // request for map to be displayed
     connect(dayTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(favTreeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));