From: Heli Hyvättinen <heli.hyvattinen@kymp.net>
Date: Sat, 13 Nov 2010 17:52:26 +0000 (+0200)
Subject: Small fixes
X-Git-Tag: v0.4.0~31
X-Git-Url: http://vcs.maemo.org/git/?p=kitchenalert;a=commitdiff_plain;h=dfa2785310e26af75c39038314d0dd1d2f19b600

Small fixes
---

diff --git a/src/kitchenalertmainwindow.cpp b/src/kitchenalertmainwindow.cpp
index fbc6c5d..f65a002 100644
--- a/src/kitchenalertmainwindow.cpp
+++ b/src/kitchenalertmainwindow.cpp
@@ -173,8 +173,9 @@ void KitchenAlertMainWindow::alert(QModelIndex indexOfAlerter)
 
     // The program is brought to front and activated when alerted
 
-    raise();
+
     activateWindow();
+    raise();
 
     // The alerting timer is selected
     ui->ComingAlertsTableView->selectionModel()->select(QItemSelection(indexOfAlerter,indexOfAlerter),QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows );
@@ -306,7 +307,7 @@ bool KitchenAlertMainWindow::event(QEvent *event)
 
     switch (event->type())
     {
-        case QEvent::ApplicationActivate:
+        case QEvent::WindowActivate:
 
             model_.setUpdateViewOnChanges(true);
             ui->debugLabel->setText("Returned to the application!");
@@ -314,7 +315,7 @@ bool KitchenAlertMainWindow::event(QEvent *event)
 
               break;
 
-       case QEvent::ApplicationDeactivate:
+       case QEvent::WindowDeactivate:
             model_.setUpdateViewOnChanges(false);
             ui->debugLabel->setText("");
             break;
diff --git a/src/kitchenalertmainwindow.ui b/src/kitchenalertmainwindow.ui
index 0b419ec..5f13826 100644
--- a/src/kitchenalertmainwindow.ui
+++ b/src/kitchenalertmainwindow.ui
@@ -31,8 +31,8 @@
       <rect>
        <x>0</x>
        <y>0</y>
-       <width>1447</width>
-       <height>587</height>
+       <width>1445</width>
+       <height>585</height>
       </rect>
      </property>
      <widget class="QWidget" name="verticalLayoutWidget">
@@ -74,7 +74,7 @@
          <item>
           <widget class="QPushButton" name="DoneButton">
            <property name="text">
-            <string>Done</string>
+            <string>Stop</string>
            </property>
           </widget>
          </item>