From 8597f5496da304b593111a3deb5c1fd688c094b0 Mon Sep 17 00:00:00 2001
From: victor <taehoon@falinux.com>
Date: Thu, 27 Apr 2017 21:04:17 +0900
Subject: [PATCH] Merge
---
app/gui/oven_control/mainwindow.cpp | 9 ++
app/gui/oven_control/mainwindow.h | 2 +
app/gui/oven_control/oven_control.pro | 9 +-
app/gui/oven_control/programmingwindow.cpp | 14 ++
app/gui/oven_control/programmingwindow.h | 22 ++++
app/gui/oven_control/programmingwindow.ui | 204 +++++++++++++++++++++++++++++
6 files changed, 257 insertions(+), 3 deletions(-)
create mode 100644 app/gui/oven_control/programmingwindow.cpp
create mode 100644 app/gui/oven_control/programmingwindow.h
create mode 100644 app/gui/oven_control/programmingwindow.ui
diff --git a/app/gui/oven_control/mainwindow.cpp b/app/gui/oven_control/mainwindow.cpp
index c0723ed..f8f4679 100644
--- a/app/gui/oven_control/mainwindow.cpp
+++ b/app/gui/oven_control/mainwindow.cpp
@@ -12,6 +12,7 @@
#include "autocookselectionwindow.h"
#include "washwindow.h"
#include "engineermenuwindow.h"
+#include "programmingwindow.h"
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
@@ -115,3 +116,11 @@ void MainWindow::on_helpButton_clicked()
{
}
+
+void MainWindow::on_programmingButton_clicked()
+{
+ ProgrammingWindow *w = new ProgrammingWindow(this);
+ w->setWindowModality(Qt::WindowModal);
+ w->showFullScreen();
+ w->raise();
+}
diff --git a/app/gui/oven_control/mainwindow.h b/app/gui/oven_control/mainwindow.h
index 07262b0..f2bf39e 100644
--- a/app/gui/oven_control/mainwindow.h
+++ b/app/gui/oven_control/mainwindow.h
@@ -39,6 +39,8 @@ private slots:
void on_configButton_clicked();
void on_helpButton_clicked();
+ void on_programmingButton_clicked();
+
private:
Ui::MainWindow *ui;
};
diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro
index 7cbc89e..70b1c08 100644
--- a/app/gui/oven_control/oven_control.pro
+++ b/app/gui/oven_control/oven_control.pro
@@ -65,7 +65,8 @@ SOURCES += main.cpp\
yesnopopupdlg.cpp \
configpanelbutton.cpp \
config.cpp \
- basicsettingwindow.cpp
+ basicsettingwindow.cpp \
+ programmingwindow.cpp
HEADERS += mainwindow.h \
cook.h \
@@ -120,7 +121,8 @@ HEADERS += mainwindow.h \
yesnopopupdlg.h \
configpanelbutton.h \
config.h \
- basicsettingwindow.h
+ basicsettingwindow.h \
+ programmingwindow.h
FORMS += mainwindow.ui \
manualcookwindow.ui \
@@ -153,7 +155,8 @@ FORMS += mainwindow.ui \
adjustmentwindow.ui \
yesnopopupdlg.ui \
configpanelbutton.ui \
- basicsettingwindow.ui
+ basicsettingwindow.ui \
+ programmingwindow.ui
RESOURCES += \
resources.qrc
diff --git a/app/gui/oven_control/programmingwindow.cpp b/app/gui/oven_control/programmingwindow.cpp
new file mode 100644
index 0000000..7666c45
--- /dev/null
+++ b/app/gui/oven_control/programmingwindow.cpp
@@ -0,0 +1,14 @@
+#include "programmingwindow.h"
+#include "ui_programmingwindow.h"
+
+ProgrammingWindow::ProgrammingWindow(QWidget *parent) :
+ QMainWindow(parent),
+ ui(new Ui::ProgrammingWindow)
+{
+ ui->setupUi(this);
+}
+
+ProgrammingWindow::~ProgrammingWindow()
+{
+ delete ui;
+}
diff --git a/app/gui/oven_control/programmingwindow.h b/app/gui/oven_control/programmingwindow.h
new file mode 100644
index 0000000..1134550
--- /dev/null
+++ b/app/gui/oven_control/programmingwindow.h
@@ -0,0 +1,22 @@
+#ifndef PROGRAMMINGWINDOW_H
+#define PROGRAMMINGWINDOW_H
+
+#include <QMainWindow>
+
+namespace Ui {
+class ProgrammingWindow;
+}
+
+class ProgrammingWindow : public QMainWindow
+{
+ Q_OBJECT
+
+public:
+ explicit ProgrammingWindow(QWidget *parent = 0);
+ ~ProgrammingWindow();
+
+private:
+ Ui::ProgrammingWindow *ui;
+};
+
+#endif // PROGRAMMINGWINDOW_H
diff --git a/app/gui/oven_control/programmingwindow.ui b/app/gui/oven_control/programmingwindow.ui
new file mode 100644
index 0000000..a7abe39
--- /dev/null
+++ b/app/gui/oven_control/programmingwindow.ui
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ProgrammingWindow</class>
+ <widget class="QMainWindow" name="ProgrammingWindow">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>900</width>
+ <height>1600</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>MainWindow</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">#centralwidget { background-image: url(:/images/background/etc.png); }
+#bottomBar { background-image: url(:/images/bottom_bar/background.png); }
+
+
+QPushButton[style="mode"] {
+background-repeat: no-repeat;
+background-position: center;
+background-clip: border;
+background-origin: border;
+margin-bottom: 50px;
+
+border-top: 130px;
+border-bottom: -50px;
+border-style: hidden;
+color: white;
+font-size: 30px;
+}
+
+QPushButton[style="mode"]:checked {
+image: url(:/images/cook_mode/indicator.png);
+image-position: bottom;
+}</string>
+ </property>
+ <widget class="QWidget" name="centralwidget">
+ <widget class="QStackedWidget" name="upperStack">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>900</width>
+ <height>426</height>
+ </rect>
+ </property>
+ <widget class="QWidget" name="clockContainer">
+ <property name="styleSheet">
+ <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string>
+ </property>
+ <widget class="Clock" name="clock" native="true">
+ <property name="geometry">
+ <rect>
+ <x>272</x>
+ <y>36</y>
+ <width>356</width>
+ <height>355</height>
+ </rect>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="page_2"/>
+ </widget>
+ <widget class="QWidget" name="bottomBar" native="true">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>1450</y>
+ <width>900</width>
+ <height>150</height>
+ </rect>
+ </property>
+ <widget class="QPushButton" name="backButton">
+ <property name="geometry">
+ <rect>
+ <x>288</x>
+ <y>26</y>
+ <width>97</width>
+ <height>97</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); }
+QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="washButton">
+ <property name="geometry">
+ <rect>
+ <x>402</x>
+ <y>26</y>
+ <width>97</width>
+ <height>97</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/006_sys_icon_15.png); }
+QPushButton:pressed { border-image: url(:/images/bottom_bar/006_sys_icon_15.png); }</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="helpButton">
+ <property name="geometry">
+ <rect>
+ <x>515</x>
+ <y>26</y>
+ <width>97</width>
+ <height>97</height>
+ </rect>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); }
+QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="horizontalLayoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>100</x>
+ <y>426</y>
+ <width>700</width>
+ <height>221</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="steamButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">QPushButton { background-image: url(:/images/etc/main_btn_01.png); }
+QPushButton:pressed { background-image: url(:/images/etc/main_btn_01_ov.png); }</string>
+ </property>
+ <property name="text">
+ <string>자동 요리 만들기</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ <property name="style" stdset="0">
+ <string>mode</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="steamButton_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">QPushButton { background-image: url(:/images/etc/main_btn_02.png); }
+QPushButton:pressed { background-image: url(:/images/etc/main_btn_02_ov.png); }</string>
+ </property>
+ <property name="text">
+ <string>수동 요리 만들기</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ <property name="style" stdset="0">
+ <string>mode</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>Clock</class>
+ <extends>QWidget</extends>
+ <header>clock.h</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
--
2.1.4