GUI V1.0.4

- cookbook //r -> //n 으로 변경 - 메뉴얼 기능 추가

GUI V1.0.4
- cookbook //r -> //n 으로 변경 - 메뉴얼 기능 추가
고영탁
1 parent 35b9cc32ef
Showing 4 changed files with 3 additions and 26 deletions Show diff stats
app/gui/oven_control/cookbook.cpp
app/gui/oven_control/define.h
app/gui/oven_control/manualviewerdlg.cpp
app/gui/oven_control/manualviewerdlg.ui
@@ -101,7 +101,7 @@ CookBook::CookBook(Define::CookType type)
             continue;
         }
-        cookname.replace("\\r", "\n");
+        cookname.replace("\\n", "\n");
         list.append(cookname);
         book.append(ListEntity { directory, cookname });
@@ -5,7 +5,7 @@
 #define MAJOR_VER  1
 #define MINOR_VER   0
-#define HOTFIX_VER  3
+#define HOTFIX_VER  4
 namespace Define
 {
@@ -28,5 +28,5 @@ ManualViewerDlg::~ManualViewerDlg()
 void ManualViewerDlg::on_backButton_clicked()
 {
-
+    deleteLater();
 }
@@ -128,29 +128,6 @@ QPushButton:pressed, QPushButton:focus{ border-image: url(:/images/bottom_bar/ba
       <string/>
      </property>
     </widget>
-    <widget class="QPushButton" name="helpButton">
-     <property name="geometry">
-      <rect>
-       <x>457</x>
-       <y>26</y>
-       <width>97</width>
-       <height>97</height>
-      </rect>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); }
-QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
    </widget>
    <widget class="QLabel" name="ctrLbManual">
     <property name="geometry">
	@@ -101,7 +101,7 @@ CookBook::CookBook(Define::CookType type)		@@ -101,7 +101,7 @@ CookBook::CookBook(Define::CookType type)
101	continue;	101	continue;
102	}	102	}
103		103
104	- cookname.replace("\\r", "\n");	104	+ cookname.replace("\\n", "\n");
105		105
106	list.append(cookname);	106	list.append(cookname);
107	book.append(ListEntity { directory, cookname });	107	book.append(ListEntity { directory, cookname });
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5		5
6	#define MAJOR_VER 1	6	#define MAJOR_VER 1
7	#define MINOR_VER 0	7	#define MINOR_VER 0
8	-#define HOTFIX_VER 3	8	+#define HOTFIX_VER 4
9		9
10	namespace Define	10	namespace Define
11	{	11	{
	@@ -28,5 +28,5 @@ ManualViewerDlg::~ManualViewerDlg()		@@ -28,5 +28,5 @@ ManualViewerDlg::~ManualViewerDlg()
28		28
29	void ManualViewerDlg::on_backButton_clicked()	29	void ManualViewerDlg::on_backButton_clicked()
30	{	30	{
31	-	31	+ deleteLater();
32	}	32	}
	@@ -128,29 +128,6 @@ QPushButton:pressed, QPushButton:focus{ border-image: url(:/images/bottom_bar/ba		@@ -128,29 +128,6 @@ QPushButton:pressed, QPushButton:focus{ border-image: url(:/images/bottom_bar/ba
128	<string/>	128	<string/>
129	</property>	129	</property>
130	</widget>	130	</widget>
131	- <widget class="QPushButton" name="helpButton">
132	- <property name="geometry">
133	- <rect>
134	- <x>457</x>
135	- <y>26</y>
136	- <width>97</width>
137	- <height>97</height>
138	- </rect>
139	- </property>
140	- <property name="sizePolicy">
141	- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
142	- <horstretch>0</horstretch>
143	- <verstretch>0</verstretch>
144	- </sizepolicy>
145	- </property>
146	- <property name="styleSheet">
147	- <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); }
148	-QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }</string>
149	- </property>
150	- <property name="text">
151	- <string/>
152	- </property>
153	- </widget>
154	</widget>	131	</widget>
155	<widget class="QLabel" name="ctrLbManual">	132	<widget class="QLabel" name="ctrLbManual">
156	<property name="geometry">	133	<property name="geometry">