From bd94cf5e00f858ebd7133cd1ea5b15fc17362015 Mon Sep 17 00:00:00 2001 From: taehoon <taehoon@falinux.com> Date: Mon, 19 Aug 2024 15:14:23 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EC=9A=94=EB=A6=AC=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=20=ED=99=94=EB=A9=B4=EC=97=90=20=EC=9A=94?= =?UTF-8?q?=EB=A6=AC=20=EC=A2=85=EB=A5=98=20=EC=84=A4=EB=AA=85=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/autocookselectionwindow.cpp | 1 + app/gui/oven_control/autocookselectionwindow.ui | 20 +++++++++++++++++++- app/gui/oven_control/define.cpp | 23 +++++++++++++++++++++++ app/gui/oven_control/define.h | 1 + 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/app/gui/oven_control/autocookselectionwindow.cpp b/app/gui/oven_control/autocookselectionwindow.cpp index a8c4386..132ab94 100644 --- a/app/gui/oven_control/autocookselectionwindow.cpp +++ b/app/gui/oven_control/autocookselectionwindow.cpp @@ -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); diff --git a/app/gui/oven_control/autocookselectionwindow.ui b/app/gui/oven_control/autocookselectionwindow.ui index e6b4a63..561d086 100644 --- a/app/gui/oven_control/autocookselectionwindow.ui +++ b/app/gui/oven_control/autocookselectionwindow.ui @@ -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> diff --git a/app/gui/oven_control/define.cpp b/app/gui/oven_control/define.cpp index 4aef35d..89350e9 100644 --- a/app/gui/oven_control/define.cpp +++ b/app/gui/oven_control/define.cpp @@ -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 ""; + } +} diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index a2441b5..3663278 100644 --- a/app/gui/oven_control/define.h +++ b/app/gui/oven_control/define.h @@ -31,6 +31,7 @@ namespace Define QString icon(CookType type); QString name(CookType type); + QString label(CookType type); enum CookConfigType { -- 2.1.4