X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fkitchenalertmainwindow.cpp;h=721eb1405a98e716cedb392719cd00f5d1cdc012;hb=b363534f03766e6431d9971bd246703ca1c28fd6;hp=49add3bd4f8f1c0084d55201f878e63635d84f73;hpb=981f6e1b3c110aa5128f08a139c47a4c2a5854cd;p=kitchenalert diff --git a/src/kitchenalertmainwindow.cpp b/src/kitchenalertmainwindow.cpp index 49add3b..721eb14 100644 --- a/src/kitchenalertmainwindow.cpp +++ b/src/kitchenalertmainwindow.cpp @@ -42,6 +42,7 @@ #include #include #include +#include @@ -51,6 +52,13 @@ KitchenAlertMainWindow::KitchenAlertMainWindow(QWidget *parent) : { ui->setupUi(this); + setWindowIcon(QIcon(":/kitchenalert.png")); + + + + + connect(ui->CreateNewScheduleButton, SIGNAL (pressed()), this, SLOT (newTimerSequence())); + //alerts' tableview setup @@ -58,34 +66,29 @@ KitchenAlertMainWindow::KitchenAlertMainWindow(QWidget *parent) : ui->ComingAlertsTableView->setModel(&model_); ui->ComingAlertsTableView->setSelectionMode(QAbstractItemView::SingleSelection); ui->ComingAlertsTableView->setSelectionBehavior(QAbstractItemView::SelectRows); + + ui->ComingAlertsTableView->horizontalHeader()->hide(); +// ui->ComingAlertsTableView->verticalHeader()->setVisible(true); + ui->ComingAlertsTableView->horizontalHeader()->setResizeMode(QHeaderView::Fixed); - ui->ComingAlertsTableView->horizontalHeader()->resizeSection(0,460); + ui->ComingAlertsTableView->horizontalHeader()->resizeSection(0,535); ui->ComingAlertsTableView->horizontalHeader()->resizeSection(1,140); ui->ComingAlertsTableView->horizontalHeader()->resizeSection(2,100); - ui->ComingAlertsTableView->verticalHeader()->setResizeMode(QHeaderView::Fixed); - ui->ComingAlertsTableView->verticalHeader()->setDefaultSectionSize(40); + ui->ComingAlertsTableView->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents); - - - ui->ComingAlertsTableView->horizontalHeader()->hide(); - ui->ComingAlertsTableView->setWordWrap(true); - - - //Buttons used when a timer is selected are disabled by default and enabled upon selection + //Buttons used to reacting an alarm are hidden by default disableSelectionDependentButtons(); + connect(ui->ComingAlertsTableView->selectionModel(),SIGNAL(selectionChanged(QItemSelection,QItemSelection)),this,SLOT(timerSelected(QItemSelection,QItemSelection))); - //connect buttons to respective functions - connect(ui->CreateNewScheduleButton, SIGNAL (pressed()), this, SLOT (newTimerSequence())); connect(ui->DoneButton,SIGNAL(clicked()),this,SLOT(stop())); connect(ui->RestartButton,SIGNAL(clicked()),this,SLOT(restart())); connect(ui->SnoozeButton,SIGNAL(clicked()),this, SLOT(snooze())); connect(ui->RemoveButton,SIGNAL(clicked()),this,SLOT(remove())); - // menu setup QAction * p_SelectSoundAction = new QAction(tr("Select alert sound"),this); @@ -125,37 +128,33 @@ void KitchenAlertMainWindow::newTimerSequence() if (createdialog.exec() == QDialog::Accepted) //if user pressed OK { - //get user input from the dialog - - QList alltimers = createdialog.getTimers(); + QList alltimers = createdialog.getTimers(); //get user input from the dialog - // take first timer (currently the only one!) + Timer* timer1 = alltimers.at(0); // take first timer (currently the only one!) - Timer* timer1 = alltimers.at(0); - - - //connect alert - connect(timer1,SIGNAL(alert(QModelIndex)),this,SLOT(alert(QModelIndex))); - //Disable buttons, as selection is cleared when view is refreshed to show the new timer - disableSelectionDependentButtons(); + connect(this,SIGNAL(defaultSoundEnabled()),timer1,SLOT(enableDefaultSound())); + connect(this,SIGNAL(soundChanged(QString)),timer1,SLOT(changeAlertSound(QString))); - // give timers to the model - model_.addTimers(alltimers); + model_.addTimers(alltimers); // give timers to the model, they are started automatically by default + // ui->ComingAlertsTableView->resizeColumnsToContents(); - //start the timer when it's safely in the model (consider moving this to the model's addTimers function) + //Disable buttons, as selection is cleared when view is refreshed to show the new timer + //But only if the timer has not already alerted and thus been selected + + if (!selectedRow().isValid()) + disableSelectionDependentButtons(); - timer1->start(); } @@ -174,34 +173,39 @@ void KitchenAlertMainWindow::alert(QModelIndex indexOfAlerter) // The program is brought to front and activated when alerted - raise(); + activateWindow(); +// removing everything below does not solve the bug #6752! + + raise(); //this may be unnecessary + // The alerting timer is selected ui->ComingAlertsTableView->selectionModel()->select(QItemSelection(indexOfAlerter,indexOfAlerter),QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows ); -// qDebug() << "Should be selected now"; + //Scrolls the view so that the alerting timer is visible + ui->ComingAlertsTableView->scrollTo(indexOfAlerter); - //Snooze button is enabled + // qDebug() << "Should be selected now"; - ui->SnoozeButton->setEnabled(true); + //Snooze button is enabled - //The alert sound is played (consider moving this operation inside timer, as now stopping one alert will silence all alerting alerts) - alertSound_.play(); + ui->SnoozeButton->setEnabled(true); +//qDebug ("Snooze on when alerting"); } -void KitchenAlertMainWindow::timerSelected(QItemSelection selected,QItemSelection deselected) +void KitchenAlertMainWindow::timerSelected(QItemSelection selected,QItemSelection) { ui->DoneButton->setEnabled(true); ui->RestartButton->setEnabled(true); ui->RemoveButton->setEnabled(true); - //enabled only when alerting + //snooze button enabled only when alerting QModelIndexList indexes = selected.indexes(); //the selection model only allows selecting one row at the time & we only need to know the row, so we can just take the first one @@ -211,8 +215,13 @@ void KitchenAlertMainWindow::timerSelected(QItemSelection selected,QItemSelectio if (model_.isThisTimerAlerting(index) == true) { ui->SnoozeButton->setEnabled(true); +//qDebug() << "Snooze on"; + } + else + { + ui->SnoozeButton->setDisabled(true); +//qDebug() << "Snooze off"; } - else ui->SnoozeButton->setDisabled(true); } } @@ -225,7 +234,7 @@ void KitchenAlertMainWindow::snooze() model_.snoozeTimer(row); } ui->SnoozeButton->setDisabled(true); - alertSound_.stop(); + } @@ -237,8 +246,14 @@ void KitchenAlertMainWindow::restart() model_.startTimer(row); } - ui->SnoozeButton->setDisabled(true); - alertSound_.stop(); + + + if (model_.isThisTimerAlerting(row) == false) //This has to be checked, because 00:00:00 alerts alert *before* the program execution reaches here + { + ui->SnoozeButton->setDisabled(true); + } + // qDebug () << "disabled snooze because of restart"; + } @@ -250,61 +265,67 @@ void KitchenAlertMainWindow::stop() model_.stopTimer(row); } ui->SnoozeButton->setDisabled(true); - alertSound_.stop(); - qDebug() << "Stopped."; + } QModelIndex KitchenAlertMainWindow::selectedRow() { + //Returns the cells in row 0 that have the whole row selected (the selection mode used allows only selecting whole rows + QModelIndexList chosenRows = ui->ComingAlertsTableView->selectionModel()->selectedRows(); //The selection mode used allows only one row to be selected at time, so we just take the first - //There are indexes for all columns in the row in the list, but as we only use the row, it does not matter which one we take + return chosenRows.value(0); //gives an invalid QModelIndex if the list is empty } void KitchenAlertMainWindow::openSelectSoundDialog() { + SelectSoundDialog dialog; if ( dialog.exec() == QDialog::Accepted) //if user pressed OK { if (dialog.isDefaultSoundChecked() == true) - alertSound_.setDefaultSound(); + emit defaultSoundEnabled(); else - alertSound_.setSound(dialog.getSoundFileName()); - - //opening a dialog clears the selection so the selection dependen buttons must be disabled + emit soundChanged(dialog.getSoundFileName()); } - disableSelectionDependentButtons(); + } void KitchenAlertMainWindow::openAbout() { - QMessageBox::about(this,tr("About KitchenAlert"),tr("

Version 0.1.1" - "

Copyright © Heli Hyvättinen 2010" + QMessageBox::about(this,tr("About KitchenAlert"),tr("

Version %1" + "

Copyright © Heli Hyvättinen 2010-2011" "

License: General Public License v3" - "

Bugtracker and project page: https://garage.maemo.org/projects/kitchenalert/")); + "

Web page: http://kitchenalert.garage.maemo.org/" + "

Bugtracker: https://garage.maemo.org/projects/kitchenalert/").arg(QApplication::applicationVersion())); } bool KitchenAlertMainWindow::event(QEvent *event) { - QMainWindow::event(event); + switch (event->type()) { case QEvent::WindowActivate: model_.setUpdateViewOnChanges(true); - break; +// ui->debugLabel->setText("Returned to the application!"); + break; case QEvent::WindowDeactivate: model_.setUpdateViewOnChanges(false); +// ui->debugLabel->setText(""); break; default: break; + } + + return QMainWindow::event(event); // Send the event to the base class implementation (also when handling the event in this function): necessary for the program to work! } void KitchenAlertMainWindow::disableSelectionDependentButtons() @@ -313,16 +334,46 @@ void KitchenAlertMainWindow::disableSelectionDependentButtons() ui->SnoozeButton->setDisabled(true); ui->RestartButton->setDisabled(true); ui->RemoveButton->setDisabled(true); + } -void KitchenAlertMainWindow::remove() +void KitchenAlertMainWindow::initializeAlertSound() { - QModelIndex row = selectedRow(); - if (row.isValid()) + QSettings settings; + + bool useDefaultSound = settings.value("UseDefaultSound",true).toBool(); + QString filename = settings.value("soundfile","").toString(); + + if (useDefaultSound == true) + { + openSelectSoundDialog(); + } + else if (filename.isEmpty()) + { + openSelectSoundDialog(); + } + + QString currentFilename = settings.value("soundfile","").toString(); + + if (currentFilename.isEmpty()) { - model_.removeTimer(row); - alertSound_.stop(); - ui->ComingAlertsTableView->clearSelection(); - disableSelectionDependentButtons(); + ui->debugLabel->setText("No alert sound file set. Alert sound will not be played!"); + } + +} + +void KitchenAlertMainWindow::remove() +{ + QModelIndex row = selectedRow(); + if (row.isValid()) //If there was no row selected invalid row was returned + { + QString text = tr("Are you sure you want to remove this timer from the list:\n"); + text.append((row.data().toString())); + if (QMessageBox::question(this,tr("Confirm timer removal"),text,QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) + { + model_.removeTimer(row); + } + } + ui->SnoozeButton->setDisabled(true); }