자동 요리 선택 화면에 요리 종류 설명 추가

김태훈
1 parent 390e12852f
Showing 4 changed files with 44 additions and 1 deletions Show diff stats
app/gui/oven_control/autocookselectionwindow.cpp
app/gui/oven_control/autocookselectionwindow.ui
app/gui/oven_control/define.cpp
app/gui/oven_control/define.h
@@ -26,6 +26,7 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookTy
     setAttribute(Qt::WA_DeleteOnClose);
     ui->cookTypeIcon->setPixmap(Define::icon(type));
+    ui->cookTypeLabel->setText(Define::label(type));
     book = CookBook(type);
@@ -138,7 +138,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
      <rect>
       <x>0</x>
       <y>516</y>
-      <width>1080</width>
+      <width>240</width>
       <height>180</height>
      </rect>
     </property>
@@ -190,12 +190,30 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_pop
 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_popup/next_ov.png); }</string>
     </property>
    </widget>
+   <widget class="QLabel" name="cookTypeLabel">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>516</y>
+      <width>1080</width>
+      <height>180</height>
+     </rect>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">color: white;
+font-size: 48px;</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+   </widget>
    <zorder>upperStack</zorder>
    <zorder>bottomBar</zorder>
    <zorder>cookTypeIcon</zorder>
    <zorder>bullets</zorder>
    <zorder>next</zorder>
    <zorder>prev</zorder>
+   <zorder>cookTypeLabel</zorder>
   </widget>
  </widget>
  <customwidgets>
@@ -599,3 +599,26 @@ QString Define::name(Define::CookConfigType type)
         return "unknownconfig";
     }
 }
+
+QString Define::label(Define::CookType type)
+{
+    switch (type)
+    {
+    case Poultry:
+        return QObject::tr("구이류");
+    case Meat:
+        return QObject::tr("볶음류");
+    case Fish:
+        return QObject::tr("스팀류");
+    case Desert:
+        return QObject::tr("조림류");
+    case Vegetable:
+        return QObject::tr("초벌");
+    case Bread:
+        return QObject::tr("보온");
+    case Etc:
+        return QObject::tr("기타요리");
+    default:
+        return "";
+    }
+}
@@ -31,6 +31,7 @@ namespace Define
     QString icon(CookType type);
     QString name(CookType type);
+    QString label(CookType type);
     enum CookConfigType
     {
	@@ -26,6 +26,7 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookTy		@@ -26,6 +26,7 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookTy
26	setAttribute(Qt::WA_DeleteOnClose);	26	setAttribute(Qt::WA_DeleteOnClose);
27		27
28	ui->cookTypeIcon->setPixmap(Define::icon(type));	28	ui->cookTypeIcon->setPixmap(Define::icon(type));
		29	+ ui->cookTypeLabel->setText(Define::label(type));
29		30
30	book = CookBook(type);	31	book = CookBook(type);
31		32
	@@ -138,7 +138,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h		@@ -138,7 +138,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
138	<rect>	138	<rect>
139	<x>0</x>	139	<x>0</x>
140	<y>516</y>	140	<y>516</y>
141	- <width>1080</width>	141	+ <width>240</width>
142	<height>180</height>	142	<height>180</height>
143	</rect>	143	</rect>
144	</property>	144	</property>
	@@ -190,12 +190,30 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_pop		@@ -190,12 +190,30 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_pop
190	QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_popup/next_ov.png); }</string>	190	QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_popup/next_ov.png); }</string>
191	</property>	191	</property>
192	</widget>	192	</widget>
		193	+ <widget class="QLabel" name="cookTypeLabel">
		194	+ <property name="geometry">
		195	+ <rect>
		196	+ <x>0</x>
		197	+ <y>516</y>
		198	+ <width>1080</width>
		199	+ <height>180</height>
		200	+ </rect>
		201	+ </property>
		202	+ <property name="styleSheet">
		203	+ <string notr="true">color: white;
		204	+font-size: 48px;</string>
		205	+ </property>
		206	+ <property name="alignment">
		207	+ <set>Qt::AlignCenter</set>
		208	+ </property>
		209	+ </widget>
193	<zorder>upperStack</zorder>	210	<zorder>upperStack</zorder>
194	<zorder>bottomBar</zorder>	211	<zorder>bottomBar</zorder>
195	<zorder>cookTypeIcon</zorder>	212	<zorder>cookTypeIcon</zorder>
196	<zorder>bullets</zorder>	213	<zorder>bullets</zorder>
197	<zorder>next</zorder>	214	<zorder>next</zorder>
198	<zorder>prev</zorder>	215	<zorder>prev</zorder>
		216	+ <zorder>cookTypeLabel</zorder>
199	</widget>	217	</widget>
200	</widget>	218	</widget>
201	<customwidgets>	219	<customwidgets>
	@@ -599,3 +599,26 @@ QString Define::name(Define::CookConfigType type)		@@ -599,3 +599,26 @@ QString Define::name(Define::CookConfigType type)
599	return "unknownconfig";	599	return "unknownconfig";
600	}	600	}
601	}	601	}
		602	+
		603	+QString Define::label(Define::CookType type)
		604	+{
		605	+ switch (type)
		606	+ {
		607	+ case Poultry:
		608	+ return QObject::tr("구이류");
		609	+ case Meat:
		610	+ return QObject::tr("볶음류");
		611	+ case Fish:
		612	+ return QObject::tr("스팀류");
		613	+ case Desert:
		614	+ return QObject::tr("조림류");
		615	+ case Vegetable:
		616	+ return QObject::tr("초벌");
		617	+ case Bread:
		618	+ return QObject::tr("보온");
		619	+ case Etc:
		620	+ return QObject::tr("기타요리");
		621	+ default:
		622	+ return "";
		623	+ }
		624	+}
	@@ -31,6 +31,7 @@ namespace Define		@@ -31,6 +31,7 @@ namespace Define
31		31
32	QString icon(CookType type);	32	QString icon(CookType type);
33	QString name(CookType type);	33	QString name(CookType type);
		34	+ QString label(CookType type);
34		35
35	enum CookConfigType	36	enum CookConfigType
36	{	37	{