에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 8597f5496da304b593111a3deb5c1fd688c094b0

Authored by 김태훈
1 parent 3f5f5d4ce3
Exists in master and in 2 other branches fhd, fhd-demo

Merge

Showing 6 changed files with 257 additions and 3 deletions   Show diff stats
app/gui/oven_control/mainwindow.cpp
  Diff comments   View file @8597f54
... ... @@ -12,6 +12,7 @@
12 12 #include "autocookselectionwindow.h"
13 13 #include "washwindow.h"
14 14 #include "engineermenuwindow.h"
  15 +#include "programmingwindow.h"
15 16  
16 17 MainWindow::MainWindow(QWidget *parent) :
17 18 QMainWindow(parent),
... ... @@ -115,3 +116,11 @@ void MainWindow::on_helpButton_clicked()
115 116 {
116 117  
117 118 }
  119 +
  120 +void MainWindow::on_programmingButton_clicked()
  121 +{
  122 + ProgrammingWindow *w = new ProgrammingWindow(this);
  123 + w->setWindowModality(Qt::WindowModal);
  124 + w->showFullScreen();
  125 + w->raise();
  126 +}
... ...
app/gui/oven_control/mainwindow.h
  Diff comments   View file @8597f54
... ... @@ -39,6 +39,8 @@ private slots:
39 39 void on_configButton_clicked();
40 40 void on_helpButton_clicked();
41 41  
  42 + void on_programmingButton_clicked();
  43 +
42 44 private:
43 45 Ui::MainWindow *ui;
44 46 };
... ...
app/gui/oven_control/oven_control.pro
  Diff comments   View file @8597f54
... ... @@ -65,7 +65,8 @@ SOURCES += main.cpp\
65 65 yesnopopupdlg.cpp \
66 66 configpanelbutton.cpp \
67 67 config.cpp \
68   - basicsettingwindow.cpp
  68 + basicsettingwindow.cpp \
  69 + programmingwindow.cpp
69 70  
70 71 HEADERS += mainwindow.h \
71 72 cook.h \
... ... @@ -120,7 +121,8 @@ HEADERS += mainwindow.h \
120 121 yesnopopupdlg.h \
121 122 configpanelbutton.h \
122 123 config.h \
123   - basicsettingwindow.h
  124 + basicsettingwindow.h \
  125 + programmingwindow.h
124 126  
125 127 FORMS += mainwindow.ui \
126 128 manualcookwindow.ui \
... ... @@ -153,7 +155,8 @@ FORMS += mainwindow.ui \
153 155 adjustmentwindow.ui \
154 156 yesnopopupdlg.ui \
155 157 configpanelbutton.ui \
156   - basicsettingwindow.ui
  158 + basicsettingwindow.ui \
  159 + programmingwindow.ui
157 160  
158 161 RESOURCES += \
159 162 resources.qrc
... ...
app/gui/oven_control/programmingwindow.cpp
  Diff comments   View file @8597f54
... ... @@ -0,0 +1,14 @@
  1 +#include "programmingwindow.h"
  2 +#include "ui_programmingwindow.h"
  3 +
  4 +ProgrammingWindow::ProgrammingWindow(QWidget *parent) :
  5 + QMainWindow(parent),
  6 + ui(new Ui::ProgrammingWindow)
  7 +{
  8 + ui->setupUi(this);
  9 +}
  10 +
  11 +ProgrammingWindow::~ProgrammingWindow()
  12 +{
  13 + delete ui;
  14 +}
... ...
app/gui/oven_control/programmingwindow.h
  Diff comments   View file @8597f54
... ... @@ -0,0 +1,22 @@
  1 +#ifndef PROGRAMMINGWINDOW_H
  2 +#define PROGRAMMINGWINDOW_H
  3 +
  4 +#include <QMainWindow>
  5 +
  6 +namespace Ui {
  7 +class ProgrammingWindow;
  8 +}
  9 +
  10 +class ProgrammingWindow : public QMainWindow
  11 +{
  12 + Q_OBJECT
  13 +
  14 +public:
  15 + explicit ProgrammingWindow(QWidget *parent = 0);
  16 + ~ProgrammingWindow();
  17 +
  18 +private:
  19 + Ui::ProgrammingWindow *ui;
  20 +};
  21 +
  22 +#endif // PROGRAMMINGWINDOW_H
... ...
app/gui/oven_control/programmingwindow.ui
  Diff comments   View file @8597f54
... ... @@ -0,0 +1,204 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<ui version="4.0">
  3 + <class>ProgrammingWindow</class>
  4 + <widget class="QMainWindow" name="ProgrammingWindow">
  5 + <property name="geometry">
  6 + <rect>
  7 + <x>0</x>
  8 + <y>0</y>
  9 + <width>900</width>
  10 + <height>1600</height>
  11 + </rect>
  12 + </property>
  13 + <property name="windowTitle">
  14 + <string>MainWindow</string>
  15 + </property>
  16 + <property name="styleSheet">
  17 + <string notr="true">#centralwidget { background-image: url(:/images/background/etc.png); }
  18 +#bottomBar { background-image: url(:/images/bottom_bar/background.png); }
  19 +
  20 +
  21 +QPushButton[style=&quot;mode&quot;] {
  22 +background-repeat: no-repeat;
  23 +background-position: center;
  24 +background-clip: border;
  25 +background-origin: border;
  26 +margin-bottom: 50px;
  27 +
  28 +border-top: 130px;
  29 +border-bottom: -50px;
  30 +border-style: hidden;
  31 +color: white;
  32 +font-size: 30px;
  33 +}
  34 +
  35 +QPushButton[style=&quot;mode&quot;]:checked {
  36 +image: url(:/images/cook_mode/indicator.png);
  37 +image-position: bottom;
  38 +}</string>
  39 + </property>
  40 + <widget class="QWidget" name="centralwidget">
  41 + <widget class="QStackedWidget" name="upperStack">
  42 + <property name="geometry">
  43 + <rect>
  44 + <x>0</x>
  45 + <y>0</y>
  46 + <width>900</width>
  47 + <height>426</height>
  48 + </rect>
  49 + </property>
  50 + <widget class="QWidget" name="clockContainer">
  51 + <property name="styleSheet">
  52 + <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string>
  53 + </property>
  54 + <widget class="Clock" name="clock" native="true">
  55 + <property name="geometry">
  56 + <rect>
  57 + <x>272</x>
  58 + <y>36</y>
  59 + <width>356</width>
  60 + <height>355</height>
  61 + </rect>
  62 + </property>
  63 + </widget>
  64 + </widget>
  65 + <widget class="QWidget" name="page_2"/>
  66 + </widget>
  67 + <widget class="QWidget" name="bottomBar" native="true">
  68 + <property name="geometry">
  69 + <rect>
  70 + <x>0</x>
  71 + <y>1450</y>
  72 + <width>900</width>
  73 + <height>150</height>
  74 + </rect>
  75 + </property>
  76 + <widget class="QPushButton" name="backButton">
  77 + <property name="geometry">
  78 + <rect>
  79 + <x>288</x>
  80 + <y>26</y>
  81 + <width>97</width>
  82 + <height>97</height>
  83 + </rect>
  84 + </property>
  85 + <property name="styleSheet">
  86 + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); }
  87 +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string>
  88 + </property>
  89 + <property name="text">
  90 + <string/>
  91 + </property>
  92 + </widget>
  93 + <widget class="QPushButton" name="washButton">
  94 + <property name="geometry">
  95 + <rect>
  96 + <x>402</x>
  97 + <y>26</y>
  98 + <width>97</width>
  99 + <height>97</height>
  100 + </rect>
  101 + </property>
  102 + <property name="styleSheet">
  103 + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/006_sys_icon_15.png); }
  104 +QPushButton:pressed { border-image: url(:/images/bottom_bar/006_sys_icon_15.png); }</string>
  105 + </property>
  106 + <property name="text">
  107 + <string/>
  108 + </property>
  109 + </widget>
  110 + <widget class="QPushButton" name="helpButton">
  111 + <property name="geometry">
  112 + <rect>
  113 + <x>515</x>
  114 + <y>26</y>
  115 + <width>97</width>
  116 + <height>97</height>
  117 + </rect>
  118 + </property>
  119 + <property name="styleSheet">
  120 + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); }
  121 +QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }</string>
  122 + </property>
  123 + <property name="text">
  124 + <string/>
  125 + </property>
  126 + </widget>
  127 + </widget>
  128 + <widget class="QWidget" name="horizontalLayoutWidget">
  129 + <property name="geometry">
  130 + <rect>
  131 + <x>100</x>
  132 + <y>426</y>
  133 + <width>700</width>
  134 + <height>221</height>
  135 + </rect>
  136 + </property>
  137 + <layout class="QHBoxLayout" name="horizontalLayout">
  138 + <item>
  139 + <widget class="QPushButton" name="steamButton">
  140 + <property name="sizePolicy">
  141 + <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
  142 + <horstretch>0</horstretch>
  143 + <verstretch>0</verstretch>
  144 + </sizepolicy>
  145 + </property>
  146 + <property name="styleSheet">
  147 + <string notr="true">QPushButton { background-image: url(:/images/etc/main_btn_01.png); }
  148 +QPushButton:pressed { background-image: url(:/images/etc/main_btn_01_ov.png); }</string>
  149 + </property>
  150 + <property name="text">
  151 + <string>자동 요리 만들기</string>
  152 + </property>
  153 + <property name="checkable">
  154 + <bool>true</bool>
  155 + </property>
  156 + <property name="autoExclusive">
  157 + <bool>true</bool>
  158 + </property>
  159 + <property name="style" stdset="0">
  160 + <string>mode</string>
  161 + </property>
  162 + </widget>
  163 + </item>
  164 + <item>
  165 + <widget class="QPushButton" name="steamButton_2">
  166 + <property name="sizePolicy">
  167 + <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
  168 + <horstretch>0</horstretch>
  169 + <verstretch>0</verstretch>
  170 + </sizepolicy>
  171 + </property>
  172 + <property name="styleSheet">
  173 + <string notr="true">QPushButton { background-image: url(:/images/etc/main_btn_02.png); }
  174 +QPushButton:pressed { background-image: url(:/images/etc/main_btn_02_ov.png); }</string>
  175 + </property>
  176 + <property name="text">
  177 + <string>수동 요리 만들기</string>
  178 + </property>
  179 + <property name="checkable">
  180 + <bool>true</bool>
  181 + </property>
  182 + <property name="autoExclusive">
  183 + <bool>true</bool>
  184 + </property>
  185 + <property name="style" stdset="0">
  186 + <string>mode</string>
  187 + </property>
  188 + </widget>
  189 + </item>
  190 + </layout>
  191 + </widget>
  192 + </widget>
  193 + </widget>
  194 + <customwidgets>
  195 + <customwidget>
  196 + <class>Clock</class>
  197 + <extends>QWidget</extends>
  198 + <header>clock.h</header>
  199 + <container>1</container>
  200 + </customwidget>
  201 + </customwidgets>
  202 + <resources/>
  203 + <connections/>
  204 +</ui>
... ...