From d1404f93d3a68a48e549d708e1c4f53a4eb3db4d Mon Sep 17 00:00:00 2001 From: byloveletter Date: Thu, 21 Sep 2017 15:24:27 +0900 Subject: [PATCH] GUI V1.0.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - cookbook //r -> //n 으로 변경 - 메뉴얼 기능 추가 --- app/gui/oven_control/cookbook.cpp | 2 +- app/gui/oven_control/define.h | 2 +- app/gui/oven_control/manualviewerdlg.cpp | 2 +- app/gui/oven_control/manualviewerdlg.ui | 23 ----------------------- 4 files changed, 3 insertions(+), 26 deletions(-) diff --git a/app/gui/oven_control/cookbook.cpp b/app/gui/oven_control/cookbook.cpp index 901b2e2..80f1b79 100644 --- a/app/gui/oven_control/cookbook.cpp +++ b/app/gui/oven_control/cookbook.cpp @@ -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 }); diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index 32d50c5..80e6002 100644 --- a/app/gui/oven_control/define.h +++ b/app/gui/oven_control/define.h @@ -5,7 +5,7 @@ #define MAJOR_VER 1 #define MINOR_VER 0 -#define HOTFIX_VER 3 +#define HOTFIX_VER 4 namespace Define { diff --git a/app/gui/oven_control/manualviewerdlg.cpp b/app/gui/oven_control/manualviewerdlg.cpp index 556bc86..181a573 100644 --- a/app/gui/oven_control/manualviewerdlg.cpp +++ b/app/gui/oven_control/manualviewerdlg.cpp @@ -28,5 +28,5 @@ ManualViewerDlg::~ManualViewerDlg() void ManualViewerDlg::on_backButton_clicked() { - + deleteLater(); } diff --git a/app/gui/oven_control/manualviewerdlg.ui b/app/gui/oven_control/manualviewerdlg.ui index 1b8720c..349a120 100644 --- a/app/gui/oven_control/manualviewerdlg.ui +++ b/app/gui/oven_control/manualviewerdlg.ui @@ -128,29 +128,6 @@ QPushButton:pressed, QPushButton:focus{ border-image: url(:/images/bottom_bar/ba - - - - 457 - 26 - 97 - 97 - - - - - 0 - 0 - - - - QPushButton { border-image: url(:/images/bottom_bar/help.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); } - - - - - -- 2.1.4