Alignment works + scrolls to the alerting timer

diff --git a/src/.directory b/src/.directory
index 79e0b47..355ab62 100644 (file)
--- a/src/.directory
+++ b/src/.directory
@@ -1,5 +1,5 @@
 [Dolphin]
 SortOrder=1
 Sorting=2
-Timestamp=2010,9,20,14,21,59
+Timestamp=2010,9,23,15,39,47
 ViewMode=1

diff --git a/src/alertsound.cpp b/src/alertsound.cpp
index 54decb8..c10f065 100644 (file)
--- a/src/alertsound.cpp
+++ b/src/alertsound.cpp
@@ -33,6 +33,8 @@ AlertSound::AlertSound(QObject *parent) :
     QObject(parent)
 {
 
+    //THIS NEEDS TESTING: DOES IT REALLY CHANGE TUNE WHEN RESTARTING THE APPLICATION?
+
     defaultsound_ = "/opt/KitchenAlert/06capemaycloser_modifiedlouder.mp3";
     QString filename;
 

diff --git a/src/currentalertstablemodel.cpp b/src/currentalertstablemodel.cpp
index 0684c84..cc47fd0 100644 (file)
--- a/src/currentalertstablemodel.cpp
+++ b/src/currentalertstablemodel.cpp
@@ -84,16 +84,16 @@ QVariant CurrentAlertsTableModel::data(const QModelIndex &index, int role) const
 
             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);
 
             }
 

diff --git a/src/kitchenalertmainwindow.cpp b/src/kitchenalertmainwindow.cpp
index 3d4dc22..13b2454 100644 (file)
--- a/src/kitchenalertmainwindow.cpp
+++ b/src/kitchenalertmainwindow.cpp
@@ -178,6 +178,7 @@ void KitchenAlertMainWindow::alert(QModelIndex indexOfAlerter)
 
     // The alerting timer is selected
     ui->ComingAlertsTableView->selectionModel()->select(QItemSelection(indexOfAlerter,indexOfAlerter),QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows );
+    ui->ComingAlertsTableView->scrollTo(indexOfAlerter);
     qDebug() << "Should be selected now";
 
 
@@ -270,7 +271,7 @@ QModelIndex KitchenAlertMainWindow::selectedRow()
 
 void KitchenAlertMainWindow::openSelectSoundDialog()
 {
-    //THIS CEASED TO WORK WHEN SOUND WAS MOVED TO TIMERS THEMSELVES
+
     SelectSoundDialog dialog;
    if ( dialog.exec() == QDialog::Accepted) //if user pressed OK
     {