볼륨 조정 수정

- 볼륨 조정시 설정에 즉시 적용 - 최종 확인 취소시 저장안함은 유지

볼륨 조정 수정
- 볼륨 조정시 설정에 즉시 적용 - 최종 확인 취소시 저장안함은 유지
고영탁
1 parent d0ee3ccc85
Showing 2 changed files with 14 additions and 5 deletions Show diff stats
app/gui/oven_control/configmastervolumedlg.cpp
app/gui/oven_control/configmastervolumedlg.h
@@ -17,7 +17,7 @@ ConfigMasterVolumeDlg::ConfigMasterVolumeDlg(QWidget *parent) :
     this->setAttribute( Qt::WA_DeleteOnClose);
  
     item = cfg->getConfigValue(config_marster_vol);
-    m_nCurMasterVol = item.d32;
+    m_nPrevMasterVol = m_nCurMasterVol = item.d32;
     ui->ctrProgressLight->setMaxProgress(m_nCurMasterVol,MAX_MASTER_VOL);
 }
  
@@ -28,26 +28,34 @@ ConfigMasterVolumeDlg::~ConfigMasterVolumeDlg()
  
 void ConfigMasterVolumeDlg::on_ctrBtnOk_clicked()
 {
-    Config* cfg = Config::getInstance();
-    config_item item;
-    item.d32 = m_nCurMasterVol;
-    cfg->setConfigValue(config_marster_vol,item);
     accept();
 }
  
 void ConfigMasterVolumeDlg::on_ctrBtnCancel_clicked()
 {
+    Config* cfg = Config::getInstance();
+    config_item item;
+    item.d32 = m_nPrevMasterVol;
+    cfg->setConfigValue(config_marster_vol,item);
     reject();
 }
  
 void ConfigMasterVolumeDlg::on_ctrBtnMinus_clicked()
 {
+    Config* cfg = Config::getInstance();
+    config_item item;
     m_nCurMasterVol = m_nCurMasterVol > 0?m_nCurMasterVol-1:0;
+    item.d32 = m_nCurMasterVol;
+    cfg->setConfigValue(config_marster_vol,item);
     ui->ctrProgressLight->setCurrentProgress(m_nCurMasterVol);
 }
  
 void ConfigMasterVolumeDlg::on_ctrBtnPlus_clicked()
 {
+    Config* cfg = Config::getInstance();
+    config_item item;
     m_nCurMasterVol = m_nCurMasterVol<MAX_MASTER_VOL?m_nCurMasterVol+1:MAX_MASTER_VOL;
+    item.d32 = m_nCurMasterVol;
+    cfg->setConfigValue(config_marster_vol,item);
     ui->ctrProgressLight->setCurrentProgress(m_nCurMasterVol);
 }
@@ -27,6 +27,7 @@ private slots:
 private:
     Ui::ConfigMasterVolumeDlg *ui;
     int m_nCurMasterVol;
+    int m_nPrevMasterVol;
 };
  
 #endif // CONFIGMASTERVOLUMEDLG_H
...	...	@@ -17,7 +17,7 @@ ConfigMasterVolumeDlg::ConfigMasterVolumeDlg(QWidget *parent) :
17	17	this->setAttribute( Qt::WA_DeleteOnClose);
18	18
19	19	item = cfg->getConfigValue(config_marster_vol);
20		- m_nCurMasterVol = item.d32;
	20	+ m_nPrevMasterVol = m_nCurMasterVol = item.d32;
21	21	ui->ctrProgressLight->setMaxProgress(m_nCurMasterVol,MAX_MASTER_VOL);
22	22	}
23	23
...	...	@@ -28,26 +28,34 @@ ConfigMasterVolumeDlg::~ConfigMasterVolumeDlg()
28	28
29	29	void ConfigMasterVolumeDlg::on_ctrBtnOk_clicked()
30	30	{
31		- Config* cfg = Config::getInstance();
32		- config_item item;
33		- item.d32 = m_nCurMasterVol;
34		- cfg->setConfigValue(config_marster_vol,item);
35	31	accept();
36	32	}
37	33
38	34	void ConfigMasterVolumeDlg::on_ctrBtnCancel_clicked()
39	35	{
	36	+ Config* cfg = Config::getInstance();
	37	+ config_item item;
	38	+ item.d32 = m_nPrevMasterVol;
	39	+ cfg->setConfigValue(config_marster_vol,item);
40	40	reject();
41	41	}
42	42
43	43	void ConfigMasterVolumeDlg::on_ctrBtnMinus_clicked()
44	44	{
	45	+ Config* cfg = Config::getInstance();
	46	+ config_item item;
45	47	m_nCurMasterVol = m_nCurMasterVol > 0?m_nCurMasterVol-1:0;
	48	+ item.d32 = m_nCurMasterVol;
	49	+ cfg->setConfigValue(config_marster_vol,item);
46	50	ui->ctrProgressLight->setCurrentProgress(m_nCurMasterVol);
47	51	}
48	52
49	53	void ConfigMasterVolumeDlg::on_ctrBtnPlus_clicked()
50	54	{
	55	+ Config* cfg = Config::getInstance();
	56	+ config_item item;
51	57	m_nCurMasterVol = m_nCurMasterVol<MAX_MASTER_VOL?m_nCurMasterVol+1:MAX_MASTER_VOL;
	58	+ item.d32 = m_nCurMasterVol;
	59	+ cfg->setConfigValue(config_marster_vol,item);
52	60	ui->ctrProgressLight->setCurrentProgress(m_nCurMasterVol);
53	61	}
...	...
...	...	@@ -27,6 +27,7 @@ private slots:
27	27	private:
28	28	Ui::ConfigMasterVolumeDlg *ui;
29	29	int m_nCurMasterVol;
	30	+ int m_nPrevMasterVol;
30	31	};
31	32
32	33	#endif // CONFIGMASTERVOLUMEDLG_H
...	...