/**************************************************************************
KitchenAlert
- Copyright (C) 2010 Heli Hyvättinen
+ Copyright (C) 2010-2011 Heli Hyvättinen
This file is part of KitchenAlert.
case alertTextColumnNumber_:
- return int (Qt::AlignLeft || Qt::AlignVCenter);
+ return int (Qt::AlignLeft | Qt::AlignVCenter);
case timeRemainingColumnNumber_:
- return int (Qt::AlignRight || Qt::AlignVCenter);
+ return int (Qt::AlignRight | Qt::AlignVCenter);
case statusColumnNumber_:
- return int (Qt::AlignLeft || Qt::AlignVCenter);
+ return int (Qt::AlignLeft | Qt::AlignVCenter);
}
//preparatory work
foreach (Timer* timer, timers)
{
- connect (timer,SIGNAL(remainingTimeChanged()),this,SLOT(refreshTimeColumn()));
+ connect (timer,SIGNAL(remainingTimeChanged()),this,SLOT(refreshTimeAndStatusColumns()));
// qDebug() << "timer connected";
timer->setParent(this); //The model becomes the timers parent giving the timer access to model
}
}
-void CurrentAlertsTableModel::refreshTimeColumn()
+void CurrentAlertsTableModel::refreshTimeAndStatusColumns()
{
if (updateViewOnChanges_ == true) //Only update GUI if active to save battery
{
- emit dataChanged(createIndex(0,1),createIndex(rowCount(QModelIndex())-1,1)); //Entire time column refreshed
-// qDebug() << "Refresh time column";
+ emit dataChanged(createIndex(0,1),createIndex((rowCount(QModelIndex())-1),2)); //Entire time and status columns refreshed
+
}
if (ptimer != NULL)
{
ptimer->start();
- refreshTimeColumn();
+ refreshTimeAndStatusColumns();
}
}
if (ptimer != NULL)
{
ptimer->stop();
- refreshTimeColumn();
+ refreshTimeAndStatusColumns();
}
}
if (ptimer != NULL)
{
ptimer->snooze();
- refreshTimeColumn();
+ refreshTimeAndStatusColumns();
}
}
{
updateViewOnChanges_ = update;
if (update == true)
- refreshTimeColumn(); //Refresh to catch up with past changes
-}
+ {
+ refreshTimeAndStatusColumns(); //Refresh to catch up with past changes
+// qDebug() << "Just refreshed time and status colums after returning to the app";
+ }
+ }
bool CurrentAlertsTableModel::isThisTimerAlerting(QModelIndex index)
{
}
return false;
}
+
+void CurrentAlertsTableModel::removeTimer(QModelIndex index)
+{
+ if (index.isValid() == false)
+ return;
+
+ int i = index.row();
+ beginRemoveRows(QModelIndex(),i,i);
+ Timer * p_timer = currentTimers_.takeAt(i);
+ delete p_timer;
+ endRemoveRows();
+
+}
+