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 <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">