/**************************************************************************
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);
}
case timeRemainingColumnNumber_:
+ if (currentTimers_.at(index.row())->isRunning()) //timer running
+ {
+
allseconds = currentTimers_.at(index.row())->getRemainingTimeInSeconds();
- if (allseconds < 0)
- {
- timeAsText = tr("-", "negative sign");
- allseconds = -allseconds;
+ if (allseconds < 0)
+ {
+ timeAsText = tr("-", "negative sign");
+ allseconds = -allseconds;
+ }
+ }
+
+ else //timer stopped or never started
+
+ {
+ //use original time
+ allseconds = currentTimers_.at(index.row())->getOriginalTimeInSeconds();
}
hoursOnly.setNum( allseconds/(60*60));
case statusColumnNumber_:
if (currentTimers_.at(index.row())->isAlerting() == true)
- return QString("ALERT!");
+ return tr("ALERT!");
+
+ if (!currentTimers_.at(index.row())->isRunning())
+ return tr("stopped");
else return QString();
{
updateViewOnChanges_ = update;
if (update == true)
+ {
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();
+
+}
+
+bool CurrentAlertsTableModel::saveTimer(QModelIndex index, QString filename)
+{
+ return currentTimers_.at(index.row())->save(filename);
+}
+