Minor cosmetic changes

diff --git a/TimedSilencer.pro.user b/TimedSilencer.pro.user
index 0a399d8..7e82d5e 100644 (file)
--- a/TimedSilencer.pro.user
+++ b/TimedSilencer.pro.user
@@ -138,7 +138,7 @@
     <value key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId" type="qulonglong">16</value>
     <valuemap key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployed" type="QVariantMap">
      <value key="192.168.1.4" type="QDateTime">2010-06-29T00:09:20</value>
-     <value key="localhost" type="QDateTime">2010-07-10T17:45:09</value>
+     <value key="localhost" type="QDateTime">2010-07-10T21:27:51</value>
     </valuemap>
    </valuemap>
    <value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>

diff --git a/eventlistdelegate.cpp b/eventlistdelegate.cpp
index 600d547..36bcda0 100644 (file)
--- a/eventlistdelegate.cpp
+++ b/eventlistdelegate.cpp
@@ -25,13 +25,16 @@ EventListDelegate::EventListDelegate()
 }
 
 void EventListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const {
+  QStyleOptionViewItem opt = option;
+  opt.displayAlignment = Qt::AlignCenter;
+  QStyledItemDelegate::paint(painter, opt, index);
   if(index.column() == EV_STATUS) {
     // Draw checkbox
     QIcon::fromTheme("general_tickmark_checked");
     // Is selected
     // Draw checkbox
     QIcon cbIco;
-    if(index.data().toBool()) {
+    if(index.data(Qt::UserRole).toBool()) {
       cbIco = QIcon::fromTheme("clock_alarm_on");
     } else {
       cbIco = QIcon::fromTheme("clock_alarm_off");
@@ -42,9 +45,5 @@ void EventListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt
     cbRect.setHeight(cbPix.height());
     cbRect.moveCenter(option.rect.center());;
     painter->drawPixmap(cbRect, cbPix);
-  } else {
-    QStyleOptionViewItem opt = option;
-    opt.displayAlignment = Qt::AlignCenter;
-    QStyledItemDelegate::paint(painter, opt, index);
   }
 }

diff --git a/lang/timedsilencer_en.ts b/lang/timedsilencer_en.ts
index 976d855..72e583a 100644 (file)
--- a/lang/timedsilencer_en.ts
+++ b/lang/timedsilencer_en.ts
@@ -4,33 +4,155 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="39"/>
-        <source>Use the silent profile between</source>
+        <location filename="../mainwindow.cpp" line="37"/>
+        <source>New profile switching event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewAlarmDlg</name>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="43"/>
+        <source>Edit profile switching event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="45"/>
-        <source>and</source>
+        <location filename="../newalarmdlg.cpp" line="45"/>
+        <source>New profile switching event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="53"/>
+        <location filename="../newalarmdlg.cpp" line="49"/>
+        <source>Use the silent profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="50"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="60"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="72"/>
+        <source>Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="81"/>
         <source>Activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="58"/>
+        <location filename="../newalarmdlg.cpp" line="93"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="100"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="79"/>
-        <source>The daily profile switching is activated</source>
+        <location filename="../newalarmdlg.cpp" line="176"/>
+        <source>This profile switching event already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ProfileEvent</name>
+    <message>
+        <location filename="../profileevent.h" line="109"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profileevent.h" line="112"/>
+        <source>Every day</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QMaemo5WeekDaysPickWidget</name>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="34"/>
+        <source>Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="38"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="39"/>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="40"/>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="41"/>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="42"/>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="43"/>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="44"/>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="45"/>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="46"/>
+        <source>Every day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="63"/>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SwitchingEventList</name>
+    <message>
+        <location filename="../switchingeventlist.cpp" line="36"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../switchingeventlist.cpp" line="37"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../switchingeventlist.cpp" line="38"/>
+        <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
-        <source>The daily profile switching is deactivated</source>
+        <location filename="../switchingeventlist.cpp" line="39"/>
+        <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/lang/timedsilencer_fr.qm b/lang/timedsilencer_fr.qm
index ca39b43..6e4c8c1 100644 (file)
Binary files a/lang/timedsilencer_fr.qm and b/lang/timedsilencer_fr.qm differ

diff --git a/lang/timedsilencer_fr.ts b/lang/timedsilencer_fr.ts
index 2c30e91..32b851f 100644 (file)
--- a/lang/timedsilencer_fr.ts
+++ b/lang/timedsilencer_fr.ts
@@ -19,34 +19,28 @@
         <translation type="obsolete">Utiliser le profil silencieux entre</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="39"/>
         <source>Use the silent profile between</source>
-        <translation>Utiliser le profil silencieux entre</translation>
+        <translation type="obsolete">Utiliser le profil silencieux entre</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="45"/>
         <source>and</source>
-        <translation>et</translation>
+        <translation type="obsolete">et</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="53"/>
         <source>Activated</source>
-        <translation>Activé</translation>
+        <translation type="obsolete">Activé</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="58"/>
         <source>Save</source>
-        <translation>Enregistrer</translation>
+        <translation type="obsolete">Enregistrer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="79"/>
         <source>The daily profile switching is activated</source>
-        <translation>Le changement de profil journalier est activé</translation>
+        <translation type="obsolete">Le changement de profil journalier est activé</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
         <source>The daily profile switching is deactivated</source>
-        <translation>Le changement de profil journalier est désactivé</translation>
+        <translation type="obsolete">Le changement de profil journalier est désactivé</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -68,5 +62,157 @@
         <source>The Timed Silencer is now disabled</source>
         <translation type="obsolete">La mise en silence est désormais inactive</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="37"/>
+        <source>New profile switching event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewAlarmDlg</name>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="43"/>
+        <source>Edit profile switching event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="45"/>
+        <source>New profile switching event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="49"/>
+        <source>Use the silent profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="50"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="60"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="72"/>
+        <source>Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="81"/>
+        <source>Activated</source>
+        <translation type="unfinished">Activé</translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="93"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="100"/>
+        <source>Save</source>
+        <translation type="unfinished">Enregistrer</translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="176"/>
+        <source>This profile switching event already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ProfileEvent</name>
+    <message>
+        <location filename="../profileevent.h" line="109"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profileevent.h" line="112"/>
+        <source>Every day</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QMaemo5WeekDaysPickWidget</name>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="34"/>
+        <source>Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="38"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="39"/>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="40"/>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="41"/>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="42"/>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="43"/>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="44"/>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="45"/>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="46"/>
+        <source>Every day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="63"/>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SwitchingEventList</name>
+    <message>
+        <location filename="../switchingeventlist.cpp" line="36"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../switchingeventlist.cpp" line="37"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../switchingeventlist.cpp" line="38"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../switchingeventlist.cpp" line="39"/>
+        <source>Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

diff --git a/lang/timedsilencer_zh.qm b/lang/timedsilencer_zh.qm
index eabb8d5..fe90e44 100644 (file)
Binary files a/lang/timedsilencer_zh.qm and b/lang/timedsilencer_zh.qm differ

diff --git a/lang/timedsilencer_zh.ts b/lang/timedsilencer_zh.ts
index 9ed9769..87598b8 100644 (file)
--- a/lang/timedsilencer_zh.ts
+++ b/lang/timedsilencer_zh.ts
@@ -19,34 +19,28 @@
         <translation type="obsolete">使用静音模式时段</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="39"/>
         <source>Use the silent profile between</source>
-        <translation>使用静音模式时段</translation>
+        <translation type="obsolete">使用静音模式时段</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="45"/>
         <source>and</source>
-        <translation>至</translation>
+        <translation type="obsolete">至</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="53"/>
         <source>Activated</source>
-        <translation>已激活</translation>
+        <translation type="obsolete">已激活</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="58"/>
         <source>Save</source>
-        <translation>保存</translation>
+        <translation type="obsolete">保存</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="79"/>
         <source>The daily profile switching is activated</source>
-        <translation>每日模式交换已激活</translation>
+        <translation type="obsolete">每日模式交换已激活</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="82"/>
         <source>The daily profile switching is deactivated</source>
-        <translation>每日模式交换已禁用</translation>
+        <translation type="obsolete">每日模式交换已禁用</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -68,5 +62,157 @@
         <source>The Timed Silencer is now disabled</source>
         <translation type="obsolete">定时静音器已禁用</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="37"/>
+        <source>New profile switching event</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewAlarmDlg</name>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="43"/>
+        <source>Edit profile switching event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="45"/>
+        <source>New profile switching event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="49"/>
+        <source>Use the silent profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="50"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="60"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="72"/>
+        <source>Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="81"/>
+        <source>Activated</source>
+        <translation type="unfinished">已激活</translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="93"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="100"/>
+        <source>Save</source>
+        <translation type="unfinished">保存</translation>
+    </message>
+    <message>
+        <location filename="../newalarmdlg.cpp" line="176"/>
+        <source>This profile switching event already exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ProfileEvent</name>
+    <message>
+        <location filename="../profileevent.h" line="109"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../profileevent.h" line="112"/>
+        <source>Every day</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QMaemo5WeekDaysPickWidget</name>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="34"/>
+        <source>Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="38"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="39"/>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="40"/>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="41"/>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="42"/>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="43"/>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="44"/>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="45"/>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="46"/>
+        <source>Every day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qmaemo5weekdayspickwidget.cpp" line="63"/>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SwitchingEventList</name>
+    <message>
+        <location filename="../switchingeventlist.cpp" line="36"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../switchingeventlist.cpp" line="37"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../switchingeventlist.cpp" line="38"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../switchingeventlist.cpp" line="39"/>
+        <source>Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

diff --git a/switchingeventlist.cpp b/switchingeventlist.cpp
index abcc147..8773bcb 100644 (file)
--- a/switchingeventlist.cpp
+++ b/switchingeventlist.cpp
@@ -25,6 +25,8 @@
 #include "eventlistdelegate.h"
 #include "alarmd_backend.h"
 
+const int ROW_HEIGHT = 60;
+
 SwitchingEventList::SwitchingEventList(QWidget *parent) :
     QTableView(parent)
 {
@@ -44,6 +46,11 @@ SwitchingEventList::SwitchingEventList(QWidget *parent) :
   hideColumn(EV_ID);
   // Load saved events
   loadSavedEvents();
+  // Height hint
+  if(verticalHeader()->defaultSectionSize() < ROW_HEIGHT)
+    verticalHeader()->setDefaultSectionSize(ROW_HEIGHT);
+  if (sizeHintForRow(0)>0)
+    setMinimumHeight(sizeHintForRow(0) * 5);
 }
 
 SwitchingEventList::~SwitchingEventList() {
@@ -51,7 +58,7 @@ SwitchingEventList::~SwitchingEventList() {
 }
 
 void SwitchingEventList::updateRow(int row, ProfileEvent *pe) {
-  model->setData(model->index(row, EV_STATUS), pe->activated);
+  model->setData(model->index(row, EV_STATUS), pe->activated, Qt::UserRole);
   model->setData(model->index(row, EV_FROM), pe->from_time.toString());
   model->setData(model->index(row, EV_TO), pe->to_time.toString());
   model->setData(model->index(row, EV_REPEAT), ProfileEvent::formatDays(pe->days));
@@ -101,8 +108,8 @@ void SwitchingEventList::loadSavedEvents() {
     long to_cookie = settings.value("unsilencing_cookie", 0).toLongLong();
     if(to_cookie > 0)
       pe.alarmd_cookies << to_cookie;
-    if(to_cookie == 0 || from_cookie == 0)
-      pe.activated = 0;
+    if(to_cookie <= 0 || from_cookie <= 0)
+      pe.activated = false;
     events.insert(pe.getID(), pe.save());
     // Remove old format values
     settings.clear();
@@ -145,7 +152,7 @@ void SwitchingEventList::editEvent(QByteArray id, bool new_status) {
   const int row = getRowFromID(id);
   qDebug("Editing event at row %d", row);
   Q_ASSERT(row >= 0);
-  model->setData(model->index(row, EV_STATUS), new_status);
+  model->setData(model->index(row, EV_STATUS), new_status, Qt::UserRole);
 }
 
 void SwitchingEventList::deleteEvent(QByteArray id) {