버튼 음향 추가

김태훈
1 parent 0bceaf0069
Showing 11 changed files with 52 additions and 9 deletions Show diff stats
app/gui/oven_control/autocookconfigwindow.cpp
app/gui/oven_control/autocookselectionwindow.cpp
app/gui/oven_control/autocookwindow.cpp
app/gui/oven_control/configmastervolumedlg.cpp
app/gui/oven_control/confirmpopup.cpp
app/gui/oven_control/cookpanelbutton.cpp
app/gui/oven_control/cooldownpopup.cpp
app/gui/oven_control/favoritenamepopup.cpp
app/gui/oven_control/manualcookwindow.cpp
app/gui/oven_control/primewindow.cpp
app/gui/oven_control/washwindow.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<QPushButton *>())
+    {
+        connect(button, &QPushButton::pressed, SoundPlayer::playClick);
+    }
+
     startTimer();
 }
@@ -5,7 +5,7 @@
 #include <QtDebug>
 #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<QPushButton *>())
+        connect(button, &QPushButton::pressed, SoundPlayer::playClick);
 }
 AutoCookSelectionWindow::~AutoCookSelectionWindow()
@@ -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<QPushButton *>())
+        connect(button, &QPushButton::pressed, SoundPlayer::playClick);
+
     connect(&updateViewTimer, SIGNAL(timeout()), SLOT(updateView()));
     updateViewTimer.start(100);
 }
@@ -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();
 }
 #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<QPushButton *>())
+        connect(button, &QPushButton::pressed, SoundPlayer::playClick);
 }
 ConfirmPopup::~ConfirmPopup()
 #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<QPushButton *>())
+        connect(button, &QPushButton::pressed, SoundPlayer::playClick);
 }
 CookPanelButton::~CookPanelButton()
 #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<QPushButton *>())
+        connect(button, &QPushButton::pressed, SoundPlayer::playClick);
 }
 CooldownPopup::~CooldownPopup()
 #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)
@@ -109,6 +109,11 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) :
         ui->steamLabel_12->hide();
         ui->steamLabel_13->hide();
     }
+
+    foreach (QPushButton *button, findChildren<QPushButton *>())
+    {
+        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)
@@ -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<QPushButton *>())
+        connect(button, &QPushButton::pressed, SoundPlayer::playClick);
 }
 PrimeWindow::~PrimeWindow()
@@ -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<QPushButton *>())
+        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();
-
 }