From ec04831f577033dcd47e62fa98f0b0baa1c01094 Mon Sep 17 00:00:00 2001
From: byloveletter <byloveletter@falinux.com>
Date: Mon, 12 Jun 2017 12:06:01 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=8D=B8=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - 변경 확인 팝업 추가
 - 버튼 체크 추가
---
 .../oven_control/electricmodelsettingwindow.cpp    | 46 ++++++++++++--
 app/gui/oven_control/electricmodelsettingwindow.h  |  1 +
 app/gui/oven_control/electricmodelsettingwindow.ui | 32 ++++++++--
 app/gui/oven_control/gasmodelsettingwindow.cpp     | 70 +++++++++++++++++++---
 app/gui/oven_control/gasmodelsettingwindow.h       |  1 +
 app/gui/oven_control/gasmodelsettingwindow.ui      | 64 +++++++++++++++++---
 6 files changed, 190 insertions(+), 24 deletions(-)

diff --git a/app/gui/oven_control/electricmodelsettingwindow.cpp b/app/gui/oven_control/electricmodelsettingwindow.cpp
index 22febef..0681350 100644
--- a/app/gui/oven_control/electricmodelsettingwindow.cpp
+++ b/app/gui/oven_control/electricmodelsettingwindow.cpp
@@ -1,5 +1,6 @@
 #include "electricmodelsettingwindow.h"
 #include "ui_electricmodelsettingwindow.h"
+#include "yesnopopupdlg.h"
 
 #include "soundplayer.h"
 
@@ -14,6 +15,26 @@ ElectricModelSettingWindow::ElectricModelSettingWindow(QWidget *parent) :
 
     foreach (QPushButton *button, findChildren<QPushButton *>())
         connect(button, &QPushButton::pressed, SoundPlayer::playClick);
+
+   Config* cfg = Config::getInstance();
+   Define::config_item item;
+   item = cfg->getConfigValue(Define::config_model);
+   selitem = item.d32;
+   switch(selitem){
+   case Define::model_electric_10:
+       ui->e10Button->setChecked(true);
+       break;
+   case Define::model_electric_20:
+       ui->e20Button->setChecked(true);
+       break;
+   case Define::model_electric_24:
+       ui->e24Button->setChecked(true);
+       break;
+   case Define::model_electric_40:
+       ui->e40Button->setChecked(true);
+       break;
+   }
+
 }
 
 ElectricModelSettingWindow::~ElectricModelSettingWindow()
@@ -33,25 +54,42 @@ void ElectricModelSettingWindow::setModel(Define::model_type model)
 
 void ElectricModelSettingWindow::on_e10Button_clicked()
 {
-    setModel(Define::model_electric_10);
+    //setModel(Define::model_electric_10);
+    selitem = Define::model_electric_10;
 }
 
 void ElectricModelSettingWindow::on_e20Button_clicked()
 {
-    setModel(Define::model_electric_20);
+    //setModel(Define::model_electric_20);
+    selitem = Define::model_electric_20;
 }
 
 void ElectricModelSettingWindow::on_e24Button_clicked()
 {
-    setModel(Define::model_electric_24);
+    //setModel(Define::model_electric_24);
+    selitem = Define::model_electric_24;
+
 }
 
 void ElectricModelSettingWindow::on_e40Button_clicked()
 {
-    setModel(Define::model_electric_40);
+    //setModel(Define::model_electric_40);
+    selitem = Define::model_electric_40;
 }
 
 void ElectricModelSettingWindow::on_backButton_clicked()
 {
+    Config* cfg = Config::getInstance();
+    Define::config_item item;
+    item = cfg->getConfigValue(Define::config_model);
+
+    if(selitem != item.d32){
+        YesNoPopupDlg* yesnopop = new YesNoPopupDlg(this, tr("모델을 변경하시겠습니까?"));
+        yesnopop->setModal(true);
+        yesnopop->exec();
+        if(yesnopop->result() == QDialog::Accepted){
+            setModel((Define::model_type)selitem);
+        }
+    }
     close();
 }
diff --git a/app/gui/oven_control/electricmodelsettingwindow.h b/app/gui/oven_control/electricmodelsettingwindow.h
index 9d35a44..1e69dd9 100644
--- a/app/gui/oven_control/electricmodelsettingwindow.h
+++ b/app/gui/oven_control/electricmodelsettingwindow.h
@@ -29,6 +29,7 @@ private slots:
 
 private:
     Ui::ElectricModelSettingWindow *ui;
+    int selitem;
 };
 
 #endif // ELECTRICMODELSETTINGWINDOW_H
diff --git a/app/gui/oven_control/electricmodelsettingwindow.ui b/app/gui/oven_control/electricmodelsettingwindow.ui
index 40eea48..873b762 100644
--- a/app/gui/oven_control/electricmodelsettingwindow.ui
+++ b/app/gui/oven_control/electricmodelsettingwindow.ui
@@ -40,11 +40,17 @@
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed, QPushButton:checked { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>24단</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="QWidget" name="widget" native="true">
     <property name="geometry">
@@ -168,11 +174,17 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed, QPushButton:checked { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>40단</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="QLabel" name="label_15">
     <property name="geometry">
@@ -375,11 +387,17 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</str
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed, QPushButton:checked { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>10단</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="QPushButton" name="e20Button">
     <property name="geometry">
@@ -406,11 +424,17 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed, QPushButton:checked { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>20단</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="Line" name="line_3">
     <property name="geometry">
diff --git a/app/gui/oven_control/gasmodelsettingwindow.cpp b/app/gui/oven_control/gasmodelsettingwindow.cpp
index 829b39b..ddd3fd5 100644
--- a/app/gui/oven_control/gasmodelsettingwindow.cpp
+++ b/app/gui/oven_control/gasmodelsettingwindow.cpp
@@ -1,5 +1,7 @@
+#include <QDebug>
 #include "gasmodelsettingwindow.h"
 #include "ui_gasmodelsettingwindow.h"
+#include "yesnopopupdlg.h"
 
 #include "soundplayer.h"
 
@@ -14,6 +16,37 @@ GasModelSettingWindow::GasModelSettingWindow(QWidget *parent) :
 
     foreach (QPushButton *button, findChildren<QPushButton *>())
         connect(button, &QPushButton::pressed, SoundPlayer::playClick);
+
+    Config* cfg = Config::getInstance();
+   Define::config_item item;
+   item = cfg->getConfigValue(Define::config_model);
+   selitem = item.d32;
+   switch(item.d32){
+   case Define::model_gas_lng_10:
+       ui->lng10Button->setChecked(true);
+       break;
+   case Define::model_gas_lng_20:
+       ui->lng20Button->setChecked(true);
+       break;
+   case Define::model_gas_lng_24:
+       ui->lng24Button->setChecked(true);
+       break;
+   case Define::model_gas_lng_40:
+       ui->lng40Button->setChecked(true);
+       break;
+   case Define::model_gas_lpg_10:
+       ui->lpg10Button->setChecked(true);
+       break;
+   case Define::model_gas_lpg_20:
+       ui->lpg20Button->setChecked(true);
+       break;
+   case Define::model_gas_lpg_24:
+       ui->lpg24Button->setChecked(true);
+       break;
+   case Define::model_gas_lpg_40:
+       ui->lpg40Button->setChecked(true);
+       break;
+   }
 }
 
 GasModelSettingWindow::~GasModelSettingWindow()
@@ -33,45 +66,66 @@ void GasModelSettingWindow::setModel(Define::model_type model)
 
 void GasModelSettingWindow::on_lpg10Button_clicked()
 {
-    setModel(Define::model_gas_lpg_10);
+    //setModel(Define::model_gas_lpg_10);
+    selitem = Define::model_gas_lpg_10;
 }
 
 void GasModelSettingWindow::on_lng10Button_clicked()
 {
-    setModel(Define::model_gas_lng_10);
+    //setModel(Define::model_gas_lng_10);
+    selitem = Define::model_gas_lng_10;
 }
 
 void GasModelSettingWindow::on_lpg20Button_clicked()
 {
-    setModel(Define::model_gas_lpg_20);
+    //setModel(Define::model_gas_lpg_20);
+    selitem = Define::model_gas_lpg_20;
 }
 
 void GasModelSettingWindow::on_lng20Button_clicked()
 {
-    setModel(Define::model_gas_lng_20);
+    //setModel(Define::model_gas_lng_20);
+    selitem = Define::model_gas_lng_20;
 }
 
 void GasModelSettingWindow::on_lpg24Button_clicked()
 {
-    setModel(Define::model_gas_lpg_24);
+    //setModel(Define::model_gas_lpg_24);
+    selitem = Define::model_gas_lpg_24;
 }
 
 void GasModelSettingWindow::on_lng24Button_clicked()
 {
-    setModel(Define::model_gas_lng_24);
+    //setModel(Define::model_gas_lng_24);
+    selitem = Define::model_gas_lng_24;
 }
 
 void GasModelSettingWindow::on_lpg40Button_clicked()
 {
-    setModel(Define::model_gas_lpg_40);
+    //setModel(Define::model_gas_lpg_40);
+    selitem = Define::model_gas_lpg_40;
 }
 
 void GasModelSettingWindow::on_lng40Button_clicked()
 {
-    setModel(Define::model_gas_lng_40);
+    //setModel(Define::model_gas_lng_40);
+    selitem = Define::model_gas_lng_40;
 }
 
 void GasModelSettingWindow::on_backButton_clicked()
 {
+    Config* cfg = Config::getInstance();
+    Define::config_item item;
+    item = cfg->getConfigValue(Define::config_model);
+
+    if(selitem != item.d32){
+        YesNoPopupDlg* yesnopop = new YesNoPopupDlg(this, tr("모델을 변경하시겠습니까?"));
+        yesnopop->setModal(true);
+        yesnopop->exec();
+        if(yesnopop->result() == QDialog::Accepted){
+            setModel((Define::model_type)selitem);
+            qDebug() << "saved";
+        }
+    }
     close();
 }
diff --git a/app/gui/oven_control/gasmodelsettingwindow.h b/app/gui/oven_control/gasmodelsettingwindow.h
index 512f3fe..5a3bdbf 100644
--- a/app/gui/oven_control/gasmodelsettingwindow.h
+++ b/app/gui/oven_control/gasmodelsettingwindow.h
@@ -32,6 +32,7 @@ private slots:
 
 private:
     Ui::GasModelSettingWindow *ui;
+    uint32_t selitem;
 };
 
 #endif // GASMODELSETTINGWINDOW_H
diff --git a/app/gui/oven_control/gasmodelsettingwindow.ui b/app/gui/oven_control/gasmodelsettingwindow.ui
index a2b38f8..b3665f2 100644
--- a/app/gui/oven_control/gasmodelsettingwindow.ui
+++ b/app/gui/oven_control/gasmodelsettingwindow.ui
@@ -40,11 +40,17 @@
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed, QPushButton::checked { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>20단 LPG</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="QWidget" name="widget" native="true">
     <property name="geometry">
@@ -181,11 +187,17 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed, QPushButton::checked { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>24단 LNG</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="QPushButton" name="lng20Button">
     <property name="geometry">
@@ -212,11 +224,17 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed , QPushButton::checked { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>20단 LNG</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="QPushButton" name="lpg24Button">
     <property name="geometry">
@@ -243,11 +261,17 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed, QPushButton::checked { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>24단 LPG</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="QLabel" name="label_15">
     <property name="geometry">
@@ -463,11 +487,17 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</str
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed, QPushButton::checked { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>10단 LPG</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="QPushButton" name="lng10Button">
     <property name="geometry">
@@ -494,11 +524,17 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed , QPushButton::checked{ border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>10단 LNG</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="Line" name="line_3">
     <property name="geometry">
@@ -574,11 +610,17 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed,QPushButton::checked { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>40단 LPG</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="Line" name="line_8">
     <property name="geometry">
@@ -631,11 +673,17 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="styleSheet">
      <string notr="true">QPushButton { border-image: url(:/images/button/379.png); }
-QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }</string>
+QPushButton:pressed, QPushButton::checked { border-image: url(:/images/button/379_ov.png); }</string>
     </property>
     <property name="text">
      <string>40단 LNG</string>
     </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="autoExclusive">
+     <bool>true</bool>
+    </property>
    </widget>
   </widget>
  </widget>
-- 
2.1.4