From bbd7d8f297255954573757ad4b8058939c26a262 Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 22 May 2017 11:53:11 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=9D=8C=ED=96=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/autocookconfigwindow.cpp | 6 ++++++ app/gui/oven_control/autocookselectionwindow.cpp | 5 ++++- app/gui/oven_control/autocookwindow.cpp | 4 ++++ app/gui/oven_control/configmastervolumedlg.cpp | 6 ++++++ app/gui/oven_control/confirmpopup.cpp | 5 +++++ app/gui/oven_control/cookpanelbutton.cpp | 4 ++++ app/gui/oven_control/cooldownpopup.cpp | 4 ++++ app/gui/oven_control/favoritenamepopup.cpp | 4 ++++ app/gui/oven_control/manualcookwindow.cpp | 8 ++++++++ app/gui/oven_control/primewindow.cpp | 4 ++++ app/gui/oven_control/washwindow.cpp | 11 +++-------- 11 files changed, 52 insertions(+), 9 deletions(-) diff --git a/app/gui/oven_control/autocookconfigwindow.cpp b/app/gui/oven_control/autocookconfigwindow.cpp index 0cfce9e..e1bec1b 100644 --- a/app/gui/oven_control/autocookconfigwindow.cpp +++ b/app/gui/oven_control/autocookconfigwindow.cpp @@ -5,6 +5,7 @@ #include "confirmpopup.h" #include "stringer.h" #include "favoritenamepopup.h" +#include "soundplayer.h" AutoCookConfigWindow::AutoCookConfigWindow(QWidget *parent, Cook cook) : QMainWindow(parent), @@ -71,6 +72,11 @@ AutoCookConfigWindow::AutoCookConfigWindow(QWidget *parent, Cook cook) : setupUi(); + foreach (QPushButton *button, findChildren()) + { + connect(button, &QPushButton::pressed, SoundPlayer::playClick); + } + startTimer(); } diff --git a/app/gui/oven_control/autocookselectionwindow.cpp b/app/gui/oven_control/autocookselectionwindow.cpp index 7edf901..29f69fc 100644 --- a/app/gui/oven_control/autocookselectionwindow.cpp +++ b/app/gui/oven_control/autocookselectionwindow.cpp @@ -5,7 +5,7 @@ #include #include "autocookconfigwindow.h" -//#include "autocookwindow.h" +#include "soundplayer.h" AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookType type) : QMainWindow(parent), @@ -51,6 +51,9 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookTy sm->setMapping(pb, idx); connect(pb, SIGNAL(clicked()), sm, SLOT(map())); } + + foreach (QPushButton *button, findChildren()) + connect(button, &QPushButton::pressed, SoundPlayer::playClick); } AutoCookSelectionWindow::~AutoCookSelectionWindow() diff --git a/app/gui/oven_control/autocookwindow.cpp b/app/gui/oven_control/autocookwindow.cpp index 742271b..2889094 100644 --- a/app/gui/oven_control/autocookwindow.cpp +++ b/app/gui/oven_control/autocookwindow.cpp @@ -6,6 +6,7 @@ #include "confirmpopup.h" #include "favoritenamepopup.h" #include "stringer.h" +#include "soundplayer.h" AutoCookWindow::AutoCookWindow(QWidget *parent, Cook cook) : QMainWindow(parent), @@ -55,6 +56,9 @@ AutoCookWindow::AutoCookWindow(QWidget *parent, Cook cook) : CookHistory::record(setting); + foreach (QPushButton *button, findChildren()) + connect(button, &QPushButton::pressed, SoundPlayer::playClick); + connect(&updateViewTimer, SIGNAL(timeout()), SLOT(updateView())); updateViewTimer.start(100); } diff --git a/app/gui/oven_control/configmastervolumedlg.cpp b/app/gui/oven_control/configmastervolumedlg.cpp index 86206e3..2fd0cde 100644 --- a/app/gui/oven_control/configmastervolumedlg.cpp +++ b/app/gui/oven_control/configmastervolumedlg.cpp @@ -2,6 +2,8 @@ #include "configmastervolumedlg.h" #include "ui_configmastervolumedlg.h" +#include "soundplayer.h" + using namespace Define; #define MAX_MASTER_VOL 7 @@ -48,6 +50,8 @@ void ConfigMasterVolumeDlg::on_ctrBtnMinus_clicked() item.d32 = m_nCurMasterVol; cfg->setConfigValue(config_marster_vol,item); ui->ctrProgressLight->setCurrentProgress(m_nCurMasterVol); + + SoundPlayer::playClick(); } void ConfigMasterVolumeDlg::on_ctrBtnPlus_clicked() @@ -58,4 +62,6 @@ void ConfigMasterVolumeDlg::on_ctrBtnPlus_clicked() item.d32 = m_nCurMasterVol; cfg->setConfigValue(config_marster_vol,item); ui->ctrProgressLight->setCurrentProgress(m_nCurMasterVol); + + SoundPlayer::playClick(); } diff --git a/app/gui/oven_control/confirmpopup.cpp b/app/gui/oven_control/confirmpopup.cpp index b938aba..5c4f4c8 100644 --- a/app/gui/oven_control/confirmpopup.cpp +++ b/app/gui/oven_control/confirmpopup.cpp @@ -1,12 +1,17 @@ #include "confirmpopup.h" #include "ui_confirmpopup.h" +#include "soundplayer.h" + ConfirmPopup::ConfirmPopup(QWidget *parent, QString text) : QWidget(parent), ui(new Ui::ConfirmPopup) { ui->setupUi(this); ui->text->setText(text); + + foreach (QPushButton *button, findChildren()) + connect(button, &QPushButton::pressed, SoundPlayer::playClick); } ConfirmPopup::~ConfirmPopup() diff --git a/app/gui/oven_control/cookpanelbutton.cpp b/app/gui/oven_control/cookpanelbutton.cpp index cff04f7..4eb57a8 100644 --- a/app/gui/oven_control/cookpanelbutton.cpp +++ b/app/gui/oven_control/cookpanelbutton.cpp @@ -1,6 +1,7 @@ #include "cookpanelbutton.h" #include "ui_cookpanelbutton.h" +#include "soundplayer.h" #include "manualcooksettingwidget.h" CookPanelButton::CookPanelButton(CookRecord record, QWidget *parent) : @@ -12,6 +13,9 @@ CookPanelButton::CookPanelButton(CookRecord record, QWidget *parent) : ui->setupUi(this); setText(record.name); + + foreach (QPushButton *button, findChildren()) + connect(button, &QPushButton::pressed, SoundPlayer::playClick); } CookPanelButton::~CookPanelButton() diff --git a/app/gui/oven_control/cooldownpopup.cpp b/app/gui/oven_control/cooldownpopup.cpp index 38fd670..10da5f4 100644 --- a/app/gui/oven_control/cooldownpopup.cpp +++ b/app/gui/oven_control/cooldownpopup.cpp @@ -1,6 +1,7 @@ #include "cooldownpopup.h" #include "ui_cooldownpopup.h" +#include "soundplayer.h" #include "stringer.h" CooldownPopup::CooldownPopup(QWidget *parent, Oven *oven) : @@ -50,6 +51,9 @@ CooldownPopup::CooldownPopup(QWidget *parent, Oven *oven) : updateView(); cooldownStartTimer.start(); + + foreach (QPushButton *button, findChildren()) + connect(button, &QPushButton::pressed, SoundPlayer::playClick); } CooldownPopup::~CooldownPopup() diff --git a/app/gui/oven_control/favoritenamepopup.cpp b/app/gui/oven_control/favoritenamepopup.cpp index ff5783d..7e02f52 100644 --- a/app/gui/oven_control/favoritenamepopup.cpp +++ b/app/gui/oven_control/favoritenamepopup.cpp @@ -1,6 +1,7 @@ #include "favoritenamepopup.h" #include "ui_favoritenamepopup.h" +#include "soundplayer.h" #include "primewindow.h" FavoriteNamePopup::FavoriteNamePopup(QWidget *parent) : @@ -11,6 +12,9 @@ FavoriteNamePopup::FavoriteNamePopup(QWidget *parent) : ui->lineEdit->setFocus(); ui->lineEdit->selectAll(); + + connect(ui->okButton, &QPushButton::pressed, SoundPlayer::playClick); + connect(ui->cancelButton, &QPushButton::pressed, SoundPlayer::playClick); } FavoriteNamePopup::FavoriteNamePopup(QWidget *parent, ManualCookSetting setting) : FavoriteNamePopup(parent) diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index 671f169..928924c 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -109,6 +109,11 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : ui->steamLabel_12->hide(); ui->steamLabel_13->hide(); } + + foreach (QPushButton *button, findChildren()) + { + connect(button, &QPushButton::pressed, SoundPlayer::playClick); + } } ManualCookWindow::ManualCookWindow(QWidget *parent, ManualCookSetting setting) @@ -377,6 +382,9 @@ void ManualCookWindow::setOvenDefault(Define::Mode mode) void ManualCookWindow::start() { + if (oven->cooking()) + return; + SoundPlayer::playStart(); if (oven->time() > 0) diff --git a/app/gui/oven_control/primewindow.cpp b/app/gui/oven_control/primewindow.cpp index 76f1d69..a6a7c24 100644 --- a/app/gui/oven_control/primewindow.cpp +++ b/app/gui/oven_control/primewindow.cpp @@ -7,6 +7,7 @@ #include "manualcooksettingwidget.h" #include "cookhistory.h" +#include "soundplayer.h" PrimeWindow::PrimeWindow(QWidget *parent) : QMainWindow(parent), @@ -20,6 +21,9 @@ PrimeWindow::PrimeWindow(QWidget *parent) : ui->verticalScrollLayout->setAlignment(Qt::AlignTop); lastInfoDisplayed = NULL; + + foreach (QPushButton *button, findChildren()) + connect(button, &QPushButton::pressed, SoundPlayer::playClick); } PrimeWindow::~PrimeWindow() diff --git a/app/gui/oven_control/washwindow.cpp b/app/gui/oven_control/washwindow.cpp index f711d72..fc255f8 100644 --- a/app/gui/oven_control/washwindow.cpp +++ b/app/gui/oven_control/washwindow.cpp @@ -45,6 +45,9 @@ WashWindow::WashWindow(QWidget *parent) : returnToClockTimer.setSingleShot(true); returnToClockTimer.setInterval(10 * 1000); connect(&returnToClockTimer, SIGNAL(timeout()), SLOT(returnToClock())); + + foreach (QPushButton *button, findChildren()) + connect(button, &QPushButton::pressed, SoundPlayer::playClick); } WashWindow::~WashWindow() @@ -54,8 +57,6 @@ WashWindow::~WashWindow() void WashWindow::start(int type) { - SoundPlayer::playClick(); - if (selected) return; @@ -233,8 +234,6 @@ void WashWindow::onChanged() void WashWindow::on_backButton_clicked() { - SoundPlayer::playClick(); - if (started) stop(); else @@ -243,14 +242,10 @@ void WashWindow::on_backButton_clicked() void WashWindow::on_configButton_clicked() { - SoundPlayer::playClick(); - } void WashWindow::on_helpButton_clicked() { - SoundPlayer::playClick(); - } -- 2.1.4