환경 설정 뼈대 추가

김태훈
1 parent d0cfbd177b
Showing 13 changed files with 658 additions and 36 deletions Show diff stats
app/gui/oven_control/config.cpp
app/gui/oven_control/config.h
app/gui/oven_control/configpanelbutton.cpp
app/gui/oven_control/configpanelbutton.h
app/gui/oven_control/configpanelbutton.ui
app/gui/oven_control/configwindow.cpp
app/gui/oven_control/configwindow.h
app/gui/oven_control/configwindow.ui
app/gui/oven_control/cook.h
app/gui/oven_control/define.cpp
app/gui/oven_control/define.h
app/gui/oven_control/mainwindow.cpp
app/gui/oven_control/oven_control.pro
@@ -0,0 +1,6 @@
+#include "config.h"
+
+Config::Config(QObject *parent) : QObject(parent)
+{
+
+}
@@ -0,0 +1,31 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+
+#include <QObject>
+
+namespace Define
+{
+    enum ConfigType {
+
+    };
+}
+
+class Config : public QObject
+{
+    Q_OBJECT
+
+    explicit Config(QObject *parent = 0);
+
+    static Config *instance;
+
+public:
+    static Config *getInstance();
+    static void init();
+
+signals:
+
+public slots:
+};
+
+#endif // CONFIG_H
@@ -0,0 +1,90 @@
+#include "configpanelbutton.h"
+#include "ui_configpanelbutton.h"
+
+#include <QPixmap>
+#include <QPainter>
+
+ConfigPanelButton::ConfigPanelButton(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::ConfigPanelButton)
+{
+    ui->setupUi(this);
+
+    showingFavoriteButton = false;
+    ui->favoriteButton->hide();
+
+    textRect = QRect(20, 0, 556, 65);
+    valueRect = QRect(556, 0, 265, 65);
+    connect(ui->pushButton, SIGNAL(pressed()), SIGNAL(pressed()));
+    connect(ui->pushButton, SIGNAL(released()), SIGNAL(released()));
+    connect(ui->pushButton, SIGNAL(clicked()), SIGNAL(clicked()));
+}
+
+ConfigPanelButton::~ConfigPanelButton()
+{
+    delete ui;
+}
+
+void ConfigPanelButton::setText(const QString &text)
+{
+    if (text_ == text)
+        return;
+
+    text_ = text;
+
+    updateIcon();
+}
+
+void ConfigPanelButton::setValue(const QString &value)
+{
+    if (value_ == value)
+        return;
+
+    value_ = value;
+
+    updateIcon();
+}
+
+void ConfigPanelButton::showFavoriteButton()
+{
+    if (showingFavoriteButton)
+        return;
+
+    showingFavoriteButton = true;
+    ui->favoriteButton->show();
+
+    textRect = QRect(20 + 77, 0, 556 - 77, 65);
+    updateIcon();
+}
+
+void ConfigPanelButton::hideFavoriteButton()
+{
+    if (!showingFavoriteButton)
+        return;
+
+    showingFavoriteButton = false;
+    ui->favoriteButton->hide();
+
+    textRect = QRect(20, 0, 556, 65);
+    updateIcon();
+}
+
+void ConfigPanelButton::updateIcon()
+{
+    QPixmap pixmap(ui->pushButton->size());
+    pixmap.fill(Qt::transparent);
+
+    QFont font = ui->pushButton->font();
+    font.setPixelSize(30);
+
+    QPainter painter(&pixmap);
+    painter.setFont(font);
+    painter.setPen(Qt::white);
+    painter.drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text_);
+    painter.setPen(Qt::gray);
+    painter.drawText(valueRect, Qt::AlignCenter, value_);
+
+    QIcon icon(pixmap);
+    ui->pushButton->setIcon(icon);
+    ui->pushButton->setIconSize(pixmap.size());
+}
@@ -0,0 +1,48 @@
+#ifndef CONFIGPANELBUTTON_H
+#define CONFIGPANELBUTTON_H
+
+#include <QWidget>
+
+namespace Ui {
+class ConfigPanelButton;
+}
+
+class ConfigPanelButton : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ConfigPanelButton(QWidget *parent = 0);
+    ~ConfigPanelButton();
+
+    const QString &text() { return text_; }
+    const QString &value() { return value_; }
+
+public slots:
+    void setText(const QString &text);
+    void setValue(const QString &value);
+    void showFavoriteButton();
+    void hideFavoriteButton();
+
+private:
+    Ui::ConfigPanelButton *ui;
+
+    QString text_;
+    QString value_;
+
+    QRect textRect;
+    QRect valueRect;
+
+    bool showingFavoriteButton;
+    bool isFavorited;
+
+private slots:
+    void updateIcon();
+
+signals:
+    void pressed();
+    void released();
+    void clicked();
+};
+
+#endif // CONFIGPANELBUTTON_H
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ConfigPanelButton</class>
+ <widget class="QWidget" name="ConfigPanelButton">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>821</width>
+    <height>65</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>821</width>
+    <height>65</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>821</width>
+    <height>65</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">QPushButton {
+background-position: center;
+background-repeat: no-repeat;
+border: none;
+}</string>
+  </property>
+  <widget class="QPushButton" name="pushButton">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>821</width>
+     <height>65</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>821</width>
+     <height>65</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>821</width>
+     <height>65</height>
+    </size>
+   </property>
+   <property name="font">
+    <font>
+     <family>Roboto</family>
+     <pointsize>11</pointsize>
+    </font>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">QPushButton { background-image: url(:/images/config/pannel.png); }
+QPushButton:pressed { background-image: url(:/images/config/pannel_ov.png); }
+QPushButton:focus { background-image: url(:/images/config/pannel_ov.png); }</string>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="favoriteButton">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>77</width>
+     <height>65</height>
+    </rect>
+   </property>
+   <property name="focusPolicy">
+    <enum>Qt::NoFocus</enum>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">QPushButton { background-image: url(:/images/config/088_fava_02.png); }
+QPushButton:pressed { background-image: url(:/images/config/088_fava_01.png); }</string>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
@@ -11,6 +11,8 @@ ConfigWindow::ConfigWindow(QWidget *parent) :
  
     ui->clockContainer->setParent(ui->upperStack);
     setAttribute(Qt::WA_DeleteOnClose);
+
+
 }
  
 ConfigWindow::~ConfigWindow()
@@ -20,7 +22,10 @@ ConfigWindow::~ConfigWindow()
  
 void ConfigWindow::on_pushButton_clicked()
 {
-    FunctionTestWindow *w = new FunctionTestWindow(this);
-    w->setAttribute((Qt::WA_DeleteOnClose));
-    w->showFullScreen();
+
+}
+
+void ConfigWindow::on_backButton_clicked()
+{
+    close();
 }
@@ -20,6 +20,8 @@ public:
 private slots:
     void on_pushButton_clicked();
  
+    void on_backButton_clicked();
+
 private:
     Ui::ConfigWindow *ui;
 };
@@ -14,9 +14,20 @@
    <string>MainWindow</string>
   </property>
   <property name="styleSheet">
-   <string notr="true">QWidget#centralwidget {
-background-image: url(:/images/images/config/001_01_background_all.png);
-}</string>
+   <string notr="true">#centralwidget { background-image: url(:/images/background/config.png); }
+#bottomBar { background-image: url(:/images/bottom_bar/background.png); }
+
+QPushButton[style=&quot;type&quot;] {
+background-repeat: no-repeat;
+background-position: center;
+background-origin: margin;
+
+border-top: 140px;
+border-style: hidden;
+color: white;
+font-size: 30px;
+}
+</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <widget class="QStackedWidget" name="upperStack">
@@ -45,26 +56,346 @@ background-image: url(:/images/images/config/001_01_background_all.png);
     </widget>
     <widget class="QWidget" name="page_2"/>
    </widget>
-   <widget class="QPushButton" name="pushButton">
+   <widget class="QWidget" name="verticalLayoutWidget">
     <property name="geometry">
      <rect>
-      <x>740</x>
-      <y>710</y>
-      <width>69</width>
-      <height>90</height>
+      <x>0</x>
+      <y>426</y>
+      <width>900</width>
+      <height>421</height>
      </rect>
     </property>
-    <property name="styleSheet">
-     <string notr="true">QPushButton {
-	border-image: url(:/images/images/config/050_setting_btn_08.png);
-}
-QPushButton:pressed {
-	border-image: url(:/images/images/config/050_setting_btn_08_ov.png);
-}</string>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,1,0,1,0,1">
+       <item>
+        <widget class="QPushButton" name="pushButton">
+         <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/config/050_setting_btn_01.png); }
+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_01_ov.png); }</string>
+         </property>
+         <property name="text">
+          <string>즐겨찾기</string>
+         </property>
+         <property name="style" stdset="0">
+          <string>type</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line">
+         <property name="maximumSize">
+          <size>
+           <width>1</width>
+           <height>171</height>
+          </size>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_8">
+         <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/config/050_setting_btn_02.png); }
+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_02_ov.png); }</string>
+         </property>
+         <property name="text">
+          <string>설정</string>
+         </property>
+         <property name="style" stdset="0">
+          <string>type</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line_2">
+         <property name="maximumSize">
+          <size>
+           <width>1</width>
+           <height>170</height>
+          </size>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_7">
+         <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/config/050_setting_btn_03.png); }
+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_03_ov.png); }</string>
+         </property>
+         <property name="text">
+          <string>음향 관리</string>
+         </property>
+         <property name="style" stdset="0">
+          <string>type</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line_3">
+         <property name="maximumSize">
+          <size>
+           <width>1</width>
+           <height>170</height>
+          </size>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_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/config/050_setting_btn_04.png); }
+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_04_ov.png); }</string>
+         </property>
+         <property name="text">
+          <string>시스템 관리</string>
+         </property>
+         <property name="style" stdset="0">
+          <string>type</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QPushButton" name="pushButton_4">
+         <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/config/050_setting_btn_05.png); }
+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_05_ov.png); }</string>
+         </property>
+         <property name="text">
+          <string>에너지 관리</string>
+         </property>
+         <property name="style" stdset="0">
+          <string>type</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line_4">
+         <property name="maximumSize">
+          <size>
+           <width>1</width>
+           <height>170</height>
+          </size>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_5">
+         <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/config/050_setting_btn_06.png); }
+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_06_ov.png); }</string>
+         </property>
+         <property name="text">
+          <string>전문가 설정</string>
+         </property>
+         <property name="style" stdset="0">
+          <string>type</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line_5">
+         <property name="maximumSize">
+          <size>
+           <width>1</width>
+           <height>170</height>
+          </size>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_6">
+         <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/config/050_setting_btn_07.png); }
+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_07_ov.png); }</string>
+         </property>
+         <property name="text">
+          <string>화면 관리</string>
+         </property>
+         <property name="style" stdset="0">
+          <string>type</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line_6">
+         <property name="maximumSize">
+          <size>
+           <width>1</width>
+           <height>170</height>
+          </size>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_3">
+         <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/config/050_setting_btn_08.png); }
+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_08_ov.png); }</string>
+         </property>
+         <property name="text">
+          <string>서비스</string>
+         </property>
+         <property name="style" stdset="0">
+          <string>type</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </widget>
+   <widget class="Line" name="line_7">
+    <property name="geometry">
+     <rect>
+      <x>16</x>
+      <y>636</y>
+      <width>868</width>
+      <height>1</height>
+     </rect>
+    </property>
+    <property name="maximumSize">
+     <size>
+      <width>868</width>
+      <height>16777215</height>
+     </size>
     </property>
-    <property name="text">
-     <string/>
+    <property name="orientation">
+     <enum>Qt::Horizontal</enum>
+    </property>
+   </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/wash.png); }
+QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.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>
  </widget>
@@ -5,7 +5,7 @@
  
 struct CookConfig
 {
-    Define::ConfigType type;
+    Define::CookConfigType type;
     int maximum;
     int current;
 };
 #include "define.h"
  
-Define::ConfigType Define::identifyConfigType(QString type)
+Define::CookConfigType Define::identifyConfigType(QString type)
 {
     if (type == "brightness")
         return Brightness;
@@ -178,7 +178,7 @@ QString Define::icon(Define::CookType type)
     }
 }
  
-QString Define::icon(Define::ConfigType type)
+QString Define::icon(Define::CookConfigType type)
 {
     switch (type)
     {
@@ -213,7 +213,7 @@ QString Define::icon(Define::ConfigType type)
     }
 }
  
-QString Define::iconOverlay(Define::ConfigType type)
+QString Define::iconOverlay(Define::CookConfigType type)
 {
     switch (type)
     {
@@ -248,7 +248,7 @@ QString Define::iconOverlay(Define::ConfigType type)
     }
 }
  
-QString Define::minimum(Define::ConfigType type)
+QString Define::minimum(Define::CookConfigType type)
 {
     switch (type)
     {
@@ -283,7 +283,7 @@ QString Define::minimum(Define::ConfigType type)
     }
 }
  
-QString Define::maximum(Define::ConfigType type)
+QString Define::maximum(Define::CookConfigType type)
 {
     switch (type)
     {
@@ -19,7 +19,7 @@ namespace Define
  
     QString icon(CookType type);
  
-    enum ConfigType
+    enum CookConfigType
     {
         InvalidConfig,
         ConfigNotUsed,
@@ -37,11 +37,11 @@ namespace Define
         Thermometer
     };
  
-    ConfigType identifyConfigType(QString type);
-    QString icon(ConfigType type);
-    QString iconOverlay(ConfigType type);
-    QString minimum(ConfigType type);
-    QString maximum(ConfigType type);
+    CookConfigType identifyConfigType(QString type);
+    QString icon(CookConfigType type);
+    QString iconOverlay(CookConfigType type);
+    QString minimum(CookConfigType type);
+    QString maximum(CookConfigType type);
  
     enum StepClass
     {
@@ -101,10 +101,14 @@ void MainWindow::on_washButton_clicked()
  
 void MainWindow::on_configButton_clicked()
 {
-    EngineerMenuWindow *w = new EngineerMenuWindow(this);
+    ConfigWindow *w = new ConfigWindow(this);
     w->setWindowModality(Qt::WindowModal);
     w->showFullScreen();
     w->raise();
+//    EngineerMenuWindow *w = new EngineerMenuWindow(this);
+//    w->setWindowModality(Qt::WindowModal);
+//    w->showFullScreen();
+//    w->raise();
 }
  
 void MainWindow::on_helpButton_clicked()
@@ -62,7 +62,9 @@ SOURCES += main.cpp\
     soundplayer.cpp \
     servicedata.cpp \
     adjustmentwindow.cpp \
-    yesnopopupdlg.cpp
+    yesnopopupdlg.cpp \
+    configpanelbutton.cpp \
+    config.cpp
  
 HEADERS  += mainwindow.h \
     cook.h \
@@ -114,7 +116,9 @@ HEADERS  += mainwindow.h \
     soundplayer.h \
     servicedata.h \
     adjustmentwindow.h \
-    yesnopopupdlg.h
+    yesnopopupdlg.h \
+    configpanelbutton.h \
+    config.h
  
 FORMS    += mainwindow.ui \
     manualcookwindow.ui \
@@ -145,7 +149,8 @@ FORMS    += mainwindow.ui \
     realtimepartswindow.ui \
     realtimesensorwindow.ui \
     adjustmentwindow.ui \
-    yesnopopupdlg.ui
+    yesnopopupdlg.ui \
+    configpanelbutton.ui
  
 RESOURCES += \
     resources.qrc
...	...	@@ -0,0 +1,6 @@
	1	+#include "config.h"
	2	+
	3	+Config::Config(QObject *parent) : QObject(parent)
	4	+{
	5	+
	6	+}
...	...
...	...	@@ -0,0 +1,31 @@
	1	+#ifndef CONFIG_H
	2	+#define CONFIG_H
	3	+
	4	+
	5	+#include <QObject>
	6	+
	7	+namespace Define
	8	+{
	9	+ enum ConfigType {
	10	+
	11	+ };
	12	+}
	13	+
	14	+class Config : public QObject
	15	+{
	16	+ Q_OBJECT
	17	+
	18	+ explicit Config(QObject *parent = 0);
	19	+
	20	+ static Config *instance;
	21	+
	22	+public:
	23	+ static Config *getInstance();
	24	+ static void init();
	25	+
	26	+signals:
	27	+
	28	+public slots:
	29	+};
	30	+
	31	+#endif // CONFIG_H
...	...
...	...	@@ -0,0 +1,90 @@
	1	+#include "configpanelbutton.h"
	2	+#include "ui_configpanelbutton.h"
	3	+
	4	+#include <QPixmap>
	5	+#include <QPainter>
	6	+
	7	+ConfigPanelButton::ConfigPanelButton(QWidget *parent) :
	8	+ QWidget(parent),
	9	+ ui(new Ui::ConfigPanelButton)
	10	+{
	11	+ ui->setupUi(this);
	12	+
	13	+ showingFavoriteButton = false;
	14	+ ui->favoriteButton->hide();
	15	+
	16	+ textRect = QRect(20, 0, 556, 65);
	17	+ valueRect = QRect(556, 0, 265, 65);
	18	+ connect(ui->pushButton, SIGNAL(pressed()), SIGNAL(pressed()));
	19	+ connect(ui->pushButton, SIGNAL(released()), SIGNAL(released()));
	20	+ connect(ui->pushButton, SIGNAL(clicked()), SIGNAL(clicked()));
	21	+}
	22	+
	23	+ConfigPanelButton::~ConfigPanelButton()
	24	+{
	25	+ delete ui;
	26	+}
	27	+
	28	+void ConfigPanelButton::setText(const QString &text)
	29	+{
	30	+ if (text_ == text)
	31	+ return;
	32	+
	33	+ text_ = text;
	34	+
	35	+ updateIcon();
	36	+}
	37	+
	38	+void ConfigPanelButton::setValue(const QString &value)
	39	+{
	40	+ if (value_ == value)
	41	+ return;
	42	+
	43	+ value_ = value;
	44	+
	45	+ updateIcon();
	46	+}
	47	+
	48	+void ConfigPanelButton::showFavoriteButton()
	49	+{
	50	+ if (showingFavoriteButton)
	51	+ return;
	52	+
	53	+ showingFavoriteButton = true;
	54	+ ui->favoriteButton->show();
	55	+
	56	+ textRect = QRect(20 + 77, 0, 556 - 77, 65);
	57	+ updateIcon();
	58	+}
	59	+
	60	+void ConfigPanelButton::hideFavoriteButton()
	61	+{
	62	+ if (!showingFavoriteButton)
	63	+ return;
	64	+
	65	+ showingFavoriteButton = false;
	66	+ ui->favoriteButton->hide();
	67	+
	68	+ textRect = QRect(20, 0, 556, 65);
	69	+ updateIcon();
	70	+}
	71	+
	72	+void ConfigPanelButton::updateIcon()
	73	+{
	74	+ QPixmap pixmap(ui->pushButton->size());
	75	+ pixmap.fill(Qt::transparent);
	76	+
	77	+ QFont font = ui->pushButton->font();
	78	+ font.setPixelSize(30);
	79	+
	80	+ QPainter painter(&pixmap);
	81	+ painter.setFont(font);
	82	+ painter.setPen(Qt::white);
	83	+ painter.drawText(textRect, Qt::AlignLeft \| Qt::AlignVCenter, text_);
	84	+ painter.setPen(Qt::gray);
	85	+ painter.drawText(valueRect, Qt::AlignCenter, value_);
	86	+
	87	+ QIcon icon(pixmap);
	88	+ ui->pushButton->setIcon(icon);
	89	+ ui->pushButton->setIconSize(pixmap.size());
	90	+}
...	...
...	...	@@ -0,0 +1,48 @@
	1	+#ifndef CONFIGPANELBUTTON_H
	2	+#define CONFIGPANELBUTTON_H
	3	+
	4	+#include <QWidget>
	5	+
	6	+namespace Ui {
	7	+class ConfigPanelButton;
	8	+}
	9	+
	10	+class ConfigPanelButton : public QWidget
	11	+{
	12	+ Q_OBJECT
	13	+
	14	+public:
	15	+ explicit ConfigPanelButton(QWidget *parent = 0);
	16	+ ~ConfigPanelButton();
	17	+
	18	+ const QString &text() { return text_; }
	19	+ const QString &value() { return value_; }
	20	+
	21	+public slots:
	22	+ void setText(const QString &text);
	23	+ void setValue(const QString &value);
	24	+ void showFavoriteButton();
	25	+ void hideFavoriteButton();
	26	+
	27	+private:
	28	+ Ui::ConfigPanelButton *ui;
	29	+
	30	+ QString text_;
	31	+ QString value_;
	32	+
	33	+ QRect textRect;
	34	+ QRect valueRect;
	35	+
	36	+ bool showingFavoriteButton;
	37	+ bool isFavorited;
	38	+
	39	+private slots:
	40	+ void updateIcon();
	41	+
	42	+signals:
	43	+ void pressed();
	44	+ void released();
	45	+ void clicked();
	46	+};
	47	+
	48	+#endif // CONFIGPANELBUTTON_H
...	...
...	...	@@ -0,0 +1,100 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<ui version="4.0">
	3	+ <class>ConfigPanelButton</class>
	4	+ <widget class="QWidget" name="ConfigPanelButton">
	5	+ <property name="geometry">
	6	+ <rect>
	7	+ <x>0</x>
	8	+ <y>0</y>
	9	+ <width>821</width>
	10	+ <height>65</height>
	11	+ </rect>
	12	+ </property>
	13	+ <property name="minimumSize">
	14	+ <size>
	15	+ <width>821</width>
	16	+ <height>65</height>
	17	+ </size>
	18	+ </property>
	19	+ <property name="maximumSize">
	20	+ <size>
	21	+ <width>821</width>
	22	+ <height>65</height>
	23	+ </size>
	24	+ </property>
	25	+ <property name="windowTitle">
	26	+ <string>Form</string>
	27	+ </property>
	28	+ <property name="styleSheet">
	29	+ <string notr="true">QPushButton {
	30	+background-position: center;
	31	+background-repeat: no-repeat;
	32	+border: none;
	33	+}</string>
	34	+ </property>
	35	+ <widget class="QPushButton" name="pushButton">
	36	+ <property name="geometry">
	37	+ <rect>
	38	+ <x>0</x>
	39	+ <y>0</y>
	40	+ <width>821</width>
	41	+ <height>65</height>
	42	+ </rect>
	43	+ </property>
	44	+ <property name="sizePolicy">
	45	+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
	46	+ <horstretch>0</horstretch>
	47	+ <verstretch>0</verstretch>
	48	+ </sizepolicy>
	49	+ </property>
	50	+ <property name="minimumSize">
	51	+ <size>
	52	+ <width>821</width>
	53	+ <height>65</height>
	54	+ </size>
	55	+ </property>
	56	+ <property name="maximumSize">
	57	+ <size>
	58	+ <width>821</width>
	59	+ <height>65</height>
	60	+ </size>
	61	+ </property>
	62	+ <property name="font">
	63	+ <font>
	64	+ <family>Roboto</family>
	65	+ <pointsize>11</pointsize>
	66	+ </font>
	67	+ </property>
	68	+ <property name="styleSheet">
	69	+ <string notr="true">QPushButton { background-image: url(:/images/config/pannel.png); }
	70	+QPushButton:pressed { background-image: url(:/images/config/pannel_ov.png); }
	71	+QPushButton:focus { background-image: url(:/images/config/pannel_ov.png); }</string>
	72	+ </property>
	73	+ <property name="text">
	74	+ <string/>
	75	+ </property>
	76	+ </widget>
	77	+ <widget class="QPushButton" name="favoriteButton">
	78	+ <property name="geometry">
	79	+ <rect>
	80	+ <x>0</x>
	81	+ <y>0</y>
	82	+ <width>77</width>
	83	+ <height>65</height>
	84	+ </rect>
	85	+ </property>
	86	+ <property name="focusPolicy">
	87	+ <enum>Qt::NoFocus</enum>
	88	+ </property>
	89	+ <property name="styleSheet">
	90	+ <string notr="true">QPushButton { background-image: url(:/images/config/088_fava_02.png); }
	91	+QPushButton:pressed { background-image: url(:/images/config/088_fava_01.png); }</string>
	92	+ </property>
	93	+ <property name="text">
	94	+ <string/>
	95	+ </property>
	96	+ </widget>
	97	+ </widget>
	98	+ <resources/>
	99	+ <connections/>
	100	+</ui>
...	...
...	...	@@ -11,6 +11,8 @@ ConfigWindow::ConfigWindow(QWidget *parent) :
11	11
12	12	ui->clockContainer->setParent(ui->upperStack);
13	13	setAttribute(Qt::WA_DeleteOnClose);
	14	+
	15	+
14	16	}
15	17
16	18	ConfigWindow::~ConfigWindow()
...	...	@@ -20,7 +22,10 @@ ConfigWindow::~ConfigWindow()
20	22
21	23	void ConfigWindow::on_pushButton_clicked()
22	24	{
23		- FunctionTestWindow *w = new FunctionTestWindow(this);
24		- w->setAttribute((Qt::WA_DeleteOnClose));
25		- w->showFullScreen();
	25	+
	26	+}
	27	+
	28	+void ConfigWindow::on_backButton_clicked()
	29	+{
	30	+ close();
26	31	}
...	...
...	...	@@ -20,6 +20,8 @@ public:
20	20	private slots:
21	21	void on_pushButton_clicked();
22	22
	23	+ void on_backButton_clicked();
	24	+
23	25	private:
24	26	Ui::ConfigWindow *ui;
25	27	};
...	...
...	...	@@ -14,9 +14,20 @@
14	14	<string>MainWindow</string>
15	15	</property>
16	16	<property name="styleSheet">
17		- <string notr="true">QWidget#centralwidget {
18		-background-image: url(:/images/images/config/001_01_background_all.png);
19		-}</string>
	17	+ <string notr="true">#centralwidget { background-image: url(:/images/background/config.png); }
	18	+#bottomBar { background-image: url(:/images/bottom_bar/background.png); }
	19	+
	20	+QPushButton[style="type"] {
	21	+background-repeat: no-repeat;
	22	+background-position: center;
	23	+background-origin: margin;
	24	+
	25	+border-top: 140px;
	26	+border-style: hidden;
	27	+color: white;
	28	+font-size: 30px;
	29	+}
	30	+</string>
20	31	</property>
21	32	<widget class="QWidget" name="centralwidget">
22	33	<widget class="QStackedWidget" name="upperStack">
...	...	@@ -45,26 +56,346 @@ background-image: url(:/images/images/config/001_01_background_all.png);
45	56	</widget>
46	57	<widget class="QWidget" name="page_2"/>
47	58	</widget>
48		- <widget class="QPushButton" name="pushButton">
	59	+ <widget class="QWidget" name="verticalLayoutWidget">
49	60	<property name="geometry">
50	61	<rect>
51		- <x>740</x>
52		- <y>710</y>
53		- <width>69</width>
54		- <height>90</height>
	62	+ <x>0</x>
	63	+ <y>426</y>
	64	+ <width>900</width>
	65	+ <height>421</height>
55	66	</rect>
56	67	</property>
57		- <property name="styleSheet">
58		- <string notr="true">QPushButton {
59		- border-image: url(:/images/images/config/050_setting_btn_08.png);
60		-}
61		-QPushButton:pressed {
62		- border-image: url(:/images/images/config/050_setting_btn_08_ov.png);
63		-}</string>
	68	+ <layout class="QVBoxLayout" name="verticalLayout">
	69	+ <property name="spacing">
	70	+ <number>0</number>
	71	+ </property>
	72	+ <item>
	73	+ <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,1,0,1,0,1">
	74	+ <item>
	75	+ <widget class="QPushButton" name="pushButton">
	76	+ <property name="sizePolicy">
	77	+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
	78	+ <horstretch>0</horstretch>
	79	+ <verstretch>0</verstretch>
	80	+ </sizepolicy>
	81	+ </property>
	82	+ <property name="styleSheet">
	83	+ <string notr="true">QPushButton { background-image: url(:/images/config/050_setting_btn_01.png); }
	84	+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_01_ov.png); }</string>
	85	+ </property>
	86	+ <property name="text">
	87	+ <string>즐겨찾기</string>
	88	+ </property>
	89	+ <property name="style" stdset="0">
	90	+ <string>type</string>
	91	+ </property>
	92	+ </widget>
	93	+ </item>
	94	+ <item>
	95	+ <widget class="Line" name="line">
	96	+ <property name="maximumSize">
	97	+ <size>
	98	+ <width>1</width>
	99	+ <height>171</height>
	100	+ </size>
	101	+ </property>
	102	+ <property name="orientation">
	103	+ <enum>Qt::Vertical</enum>
	104	+ </property>
	105	+ </widget>
	106	+ </item>
	107	+ <item>
	108	+ <widget class="QPushButton" name="pushButton_8">
	109	+ <property name="sizePolicy">
	110	+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
	111	+ <horstretch>0</horstretch>
	112	+ <verstretch>0</verstretch>
	113	+ </sizepolicy>
	114	+ </property>
	115	+ <property name="styleSheet">
	116	+ <string notr="true">QPushButton { background-image: url(:/images/config/050_setting_btn_02.png); }
	117	+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_02_ov.png); }</string>
	118	+ </property>
	119	+ <property name="text">
	120	+ <string>설정</string>
	121	+ </property>
	122	+ <property name="style" stdset="0">
	123	+ <string>type</string>
	124	+ </property>
	125	+ </widget>
	126	+ </item>
	127	+ <item>
	128	+ <widget class="Line" name="line_2">
	129	+ <property name="maximumSize">
	130	+ <size>
	131	+ <width>1</width>
	132	+ <height>170</height>
	133	+ </size>
	134	+ </property>
	135	+ <property name="orientation">
	136	+ <enum>Qt::Vertical</enum>
	137	+ </property>
	138	+ </widget>
	139	+ </item>
	140	+ <item>
	141	+ <widget class="QPushButton" name="pushButton_7">
	142	+ <property name="sizePolicy">
	143	+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
	144	+ <horstretch>0</horstretch>
	145	+ <verstretch>0</verstretch>
	146	+ </sizepolicy>
	147	+ </property>
	148	+ <property name="styleSheet">
	149	+ <string notr="true">QPushButton { background-image: url(:/images/config/050_setting_btn_03.png); }
	150	+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_03_ov.png); }</string>
	151	+ </property>
	152	+ <property name="text">
	153	+ <string>음향 관리</string>
	154	+ </property>
	155	+ <property name="style" stdset="0">
	156	+ <string>type</string>
	157	+ </property>
	158	+ </widget>
	159	+ </item>
	160	+ <item>
	161	+ <widget class="Line" name="line_3">
	162	+ <property name="maximumSize">
	163	+ <size>
	164	+ <width>1</width>
	165	+ <height>170</height>
	166	+ </size>
	167	+ </property>
	168	+ <property name="orientation">
	169	+ <enum>Qt::Vertical</enum>
	170	+ </property>
	171	+ </widget>
	172	+ </item>
	173	+ <item>
	174	+ <widget class="QPushButton" name="pushButton_2">
	175	+ <property name="sizePolicy">
	176	+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
	177	+ <horstretch>0</horstretch>
	178	+ <verstretch>0</verstretch>
	179	+ </sizepolicy>
	180	+ </property>
	181	+ <property name="styleSheet">
	182	+ <string notr="true">QPushButton { background-image: url(:/images/config/050_setting_btn_04.png); }
	183	+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_04_ov.png); }</string>
	184	+ </property>
	185	+ <property name="text">
	186	+ <string>시스템 관리</string>
	187	+ </property>
	188	+ <property name="style" stdset="0">
	189	+ <string>type</string>
	190	+ </property>
	191	+ </widget>
	192	+ </item>
	193	+ </layout>
	194	+ </item>
	195	+ <item>
	196	+ <layout class="QHBoxLayout" name="horizontalLayout_2">
	197	+ <item>
	198	+ <widget class="QPushButton" name="pushButton_4">
	199	+ <property name="sizePolicy">
	200	+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
	201	+ <horstretch>0</horstretch>
	202	+ <verstretch>0</verstretch>
	203	+ </sizepolicy>
	204	+ </property>
	205	+ <property name="styleSheet">
	206	+ <string notr="true">QPushButton { background-image: url(:/images/config/050_setting_btn_05.png); }
	207	+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_05_ov.png); }</string>
	208	+ </property>
	209	+ <property name="text">
	210	+ <string>에너지 관리</string>
	211	+ </property>
	212	+ <property name="style" stdset="0">
	213	+ <string>type</string>
	214	+ </property>
	215	+ </widget>
	216	+ </item>
	217	+ <item>
	218	+ <widget class="Line" name="line_4">
	219	+ <property name="maximumSize">
	220	+ <size>
	221	+ <width>1</width>
	222	+ <height>170</height>
	223	+ </size>
	224	+ </property>
	225	+ <property name="orientation">
	226	+ <enum>Qt::Vertical</enum>
	227	+ </property>
	228	+ </widget>
	229	+ </item>
	230	+ <item>
	231	+ <widget class="QPushButton" name="pushButton_5">
	232	+ <property name="sizePolicy">
	233	+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
	234	+ <horstretch>0</horstretch>
	235	+ <verstretch>0</verstretch>
	236	+ </sizepolicy>
	237	+ </property>
	238	+ <property name="styleSheet">
	239	+ <string notr="true">QPushButton { background-image: url(:/images/config/050_setting_btn_06.png); }
	240	+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_06_ov.png); }</string>
	241	+ </property>
	242	+ <property name="text">
	243	+ <string>전문가 설정</string>
	244	+ </property>
	245	+ <property name="style" stdset="0">
	246	+ <string>type</string>
	247	+ </property>
	248	+ </widget>
	249	+ </item>
	250	+ <item>
	251	+ <widget class="Line" name="line_5">
	252	+ <property name="maximumSize">
	253	+ <size>
	254	+ <width>1</width>
	255	+ <height>170</height>
	256	+ </size>
	257	+ </property>
	258	+ <property name="orientation">
	259	+ <enum>Qt::Vertical</enum>
	260	+ </property>
	261	+ </widget>
	262	+ </item>
	263	+ <item>
	264	+ <widget class="QPushButton" name="pushButton_6">
	265	+ <property name="sizePolicy">
	266	+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
	267	+ <horstretch>0</horstretch>
	268	+ <verstretch>0</verstretch>
	269	+ </sizepolicy>
	270	+ </property>
	271	+ <property name="styleSheet">
	272	+ <string notr="true">QPushButton { background-image: url(:/images/config/050_setting_btn_07.png); }
	273	+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_07_ov.png); }</string>
	274	+ </property>
	275	+ <property name="text">
	276	+ <string>화면 관리</string>
	277	+ </property>
	278	+ <property name="style" stdset="0">
	279	+ <string>type</string>
	280	+ </property>
	281	+ </widget>
	282	+ </item>
	283	+ <item>
	284	+ <widget class="Line" name="line_6">
	285	+ <property name="maximumSize">
	286	+ <size>
	287	+ <width>1</width>
	288	+ <height>170</height>
	289	+ </size>
	290	+ </property>
	291	+ <property name="orientation">
	292	+ <enum>Qt::Vertical</enum>
	293	+ </property>
	294	+ </widget>
	295	+ </item>
	296	+ <item>
	297	+ <widget class="QPushButton" name="pushButton_3">
	298	+ <property name="sizePolicy">
	299	+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
	300	+ <horstretch>0</horstretch>
	301	+ <verstretch>0</verstretch>
	302	+ </sizepolicy>
	303	+ </property>
	304	+ <property name="styleSheet">
	305	+ <string notr="true">QPushButton { background-image: url(:/images/config/050_setting_btn_08.png); }
	306	+QPushButton:pressed, QPushButton:focus { background-image: url(:/images/config/050_setting_btn_08_ov.png); }</string>
	307	+ </property>
	308	+ <property name="text">
	309	+ <string>서비스</string>
	310	+ </property>
	311	+ <property name="style" stdset="0">
	312	+ <string>type</string>
	313	+ </property>
	314	+ </widget>
	315	+ </item>
	316	+ </layout>
	317	+ </item>
	318	+ </layout>
	319	+ </widget>
	320	+ <widget class="Line" name="line_7">
	321	+ <property name="geometry">
	322	+ <rect>
	323	+ <x>16</x>
	324	+ <y>636</y>
	325	+ <width>868</width>
	326	+ <height>1</height>
	327	+ </rect>
	328	+ </property>
	329	+ <property name="maximumSize">
	330	+ <size>
	331	+ <width>868</width>
	332	+ <height>16777215</height>
	333	+ </size>
64	334	</property>
65		- <property name="text">
66		- <string/>
	335	+ <property name="orientation">
	336	+ <enum>Qt::Horizontal</enum>
	337	+ </property>
	338	+ </widget>
	339	+ <widget class="QWidget" name="bottomBar" native="true">
	340	+ <property name="geometry">
	341	+ <rect>
	342	+ <x>0</x>
	343	+ <y>1450</y>
	344	+ <width>900</width>
	345	+ <height>150</height>
	346	+ </rect>
67	347	</property>
	348	+ <widget class="QPushButton" name="backButton">
	349	+ <property name="geometry">
	350	+ <rect>
	351	+ <x>288</x>
	352	+ <y>26</y>
	353	+ <width>97</width>
	354	+ <height>97</height>
	355	+ </rect>
	356	+ </property>
	357	+ <property name="styleSheet">
	358	+ <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); }
	359	+QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string>
	360	+ </property>
	361	+ <property name="text">
	362	+ <string/>
	363	+ </property>
	364	+ </widget>
	365	+ <widget class="QPushButton" name="washButton">
	366	+ <property name="geometry">
	367	+ <rect>
	368	+ <x>402</x>
	369	+ <y>26</y>
	370	+ <width>97</width>
	371	+ <height>97</height>
	372	+ </rect>
	373	+ </property>
	374	+ <property name="styleSheet">
	375	+ <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/wash.png); }
	376	+QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); }</string>
	377	+ </property>
	378	+ <property name="text">
	379	+ <string/>
	380	+ </property>
	381	+ </widget>
	382	+ <widget class="QPushButton" name="helpButton">
	383	+ <property name="geometry">
	384	+ <rect>
	385	+ <x>515</x>
	386	+ <y>26</y>
	387	+ <width>97</width>
	388	+ <height>97</height>
	389	+ </rect>
	390	+ </property>
	391	+ <property name="styleSheet">
	392	+ <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); }
	393	+QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }</string>
	394	+ </property>
	395	+ <property name="text">
	396	+ <string/>
	397	+ </property>
	398	+ </widget>
68	399	</widget>
69	400	</widget>
70	401	</widget>
...	...
...	...	@@ -5,7 +5,7 @@
5	5
6	6	struct CookConfig
7	7	{
8		- Define::ConfigType type;
	8	+ Define::CookConfigType type;
9	9	int maximum;
10	10	int current;
11	11	};
...	...
1	1	#include "define.h"
2	2
3		-Define::ConfigType Define::identifyConfigType(QString type)
	3	+Define::CookConfigType Define::identifyConfigType(QString type)
4	4	{
5	5	if (type == "brightness")
6	6	return Brightness;
...	...	@@ -178,7 +178,7 @@ QString Define::icon(Define::CookType type)
178	178	}
179	179	}
180	180
181		-QString Define::icon(Define::ConfigType type)
	181	+QString Define::icon(Define::CookConfigType type)
182	182	{
183	183	switch (type)
184	184	{
...	...	@@ -213,7 +213,7 @@ QString Define::icon(Define::ConfigType type)
213	213	}
214	214	}
215	215
216		-QString Define::iconOverlay(Define::ConfigType type)
	216	+QString Define::iconOverlay(Define::CookConfigType type)
217	217	{
218	218	switch (type)
219	219	{
...	...	@@ -248,7 +248,7 @@ QString Define::iconOverlay(Define::ConfigType type)
248	248	}
249	249	}
250	250
251		-QString Define::minimum(Define::ConfigType type)
	251	+QString Define::minimum(Define::CookConfigType type)
252	252	{
253	253	switch (type)
254	254	{
...	...	@@ -283,7 +283,7 @@ QString Define::minimum(Define::ConfigType type)
283	283	}
284	284	}
285	285
286		-QString Define::maximum(Define::ConfigType type)
	286	+QString Define::maximum(Define::CookConfigType type)
287	287	{
288	288	switch (type)
289	289	{
...	...