From cf095bd105dd42dd32011307bb229a026039cd32 Mon Sep 17 00:00:00 2001
From: byloveletter <byloveletter@falinux.com>
Date: Thu, 28 Sep 2017 17:36:34 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EB=89=B4=EC=96=BC=20=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - 메뉴얼 화면 디자인 적용
---
 app/gui/oven_control/manualviewerdlg.cpp |  37 ++++++--
 app/gui/oven_control/manualviewerdlg.h   |  13 ++-
 app/gui/oven_control/manualviewerdlg.ui  | 154 ++++++++++---------------------
 3 files changed, 88 insertions(+), 116 deletions(-)

diff --git a/app/gui/oven_control/manualviewerdlg.cpp b/app/gui/oven_control/manualviewerdlg.cpp
index 181a573..1135399 100644
--- a/app/gui/oven_control/manualviewerdlg.cpp
+++ b/app/gui/oven_control/manualviewerdlg.cpp
@@ -3,22 +3,23 @@
 #include "manualviewerdlg.h"
 #include "ui_manualviewerdlg.h"
 
-ManualViewerDlg::ManualViewerDlg(QWidget *parent) :
+ManualViewerDlg::ManualViewerDlg(QWidget *parent, uint32_t start) :
     QDialog(parent),
     ui(new Ui::ManualViewerDlg)
 {
     ui->setupUi(this);
-    ui->clockContainer->setParent(ui->upperStack);
     setAttribute(Qt::WA_DeleteOnClose);
+    this->setFocus();
 
+    m_nCurPage = start;
+    if(m_nCurPage<1 || m_nCurPage > MAX_MANUAL_PAGE) m_nCurPage = 1;
 
-    ui->ctrLbManual->setScaledContents(true);
-    //ui->ctrLbManual->setSizePolicy(QSizePolicy::);
-    QPixmap image("/prime/manual/manual-15.png");
-    int w = ui->ctrLbManual->width();
-    int h = ui->ctrLbManual->height();
-    ui->ctrLbManual->setPixmap(image);
-    //ui->ctrLbManual->setPixmap(image.scaled(w,h,Qt::IgnoreAspectRatio));
+
+    m_nCurPage =10;
+
+    //ui->ctrLbManual->setScaledContents(true);
+    QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0')));
+    ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
 }
 
 ManualViewerDlg::~ManualViewerDlg()
@@ -30,3 +31,21 @@ void ManualViewerDlg::on_backButton_clicked()
 {
     deleteLater();
 }
+
+void ManualViewerDlg::on_leftButton_clicked()
+{
+    m_nCurPage--;
+    if(m_nCurPage<1) m_nCurPage=MAX_MANUAL_PAGE;
+    QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0')));
+    ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
+}
+
+
+
+void ManualViewerDlg::on_rightButton_clicked()
+{
+    m_nCurPage++;
+    if(m_nCurPage > MAX_MANUAL_PAGE) m_nCurPage = 1;
+    QPixmap image(QString("/prime/manual/manual-%1.png").arg(m_nCurPage,2,10,QLatin1Char('0')));
+    ui->ctrLbManual->setPixmap(image.scaled(ui->ctrLbManual->size(),Qt::KeepAspectRatio, Qt::SmoothTransformation));
+}
diff --git a/app/gui/oven_control/manualviewerdlg.h b/app/gui/oven_control/manualviewerdlg.h
index 0df4ad8..1294289 100644
--- a/app/gui/oven_control/manualviewerdlg.h
+++ b/app/gui/oven_control/manualviewerdlg.h
@@ -3,6 +3,12 @@
 
 #include <QDialog>
 
+#define MAX_MANUAL_PAGE 60
+#define START_X 0
+#define START_Y 0
+#define SIZE_WIDTH  900
+#define SIZE_HEIGHT  1450
+
 namespace Ui {
 class ManualViewerDlg;
 }
@@ -12,14 +18,19 @@ class ManualViewerDlg : public QDialog
     Q_OBJECT
 
 public:
-    explicit ManualViewerDlg(QWidget *parent = 0);
+    explicit ManualViewerDlg(QWidget *parent = 0, uint32_t start=1);
     ~ManualViewerDlg();
 
 private slots:
     void on_backButton_clicked();
 
+    void on_leftButton_clicked();
+
+    void on_rightButton_clicked();
+
 private:
     Ui::ManualViewerDlg *ui;
+    uint32_t m_nCurPage;
 };
 
 #endif // MANUALVIEWERDLG_H
diff --git a/app/gui/oven_control/manualviewerdlg.ui b/app/gui/oven_control/manualviewerdlg.ui
index 349a120..8421430 100644
--- a/app/gui/oven_control/manualviewerdlg.ui
+++ b/app/gui/oven_control/manualviewerdlg.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="styleSheet">
-   <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
+   <string notr="true">#centralwidget { background-image: url(:/images/background/original.png); }
 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
 #midwidget { background-image: url(:/images/config/service/realtime_parts_bgnd.png); }</string>
   </property>
@@ -20,82 +20,13 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1555</width>
+     <width>900</width>
      <height>1600</height>
     </rect>
    </property>
    <property name="styleSheet">
     <string notr="true"/>
    </property>
-   <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 class="WashWarnIcon" name="label">
-      <property name="geometry">
-       <rect>
-        <x>800</x>
-        <y>320</y>
-        <width>80</width>
-        <height>84</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="DemoIcon" name="label_2">
-      <property name="geometry">
-       <rect>
-        <x>780</x>
-        <y>230</y>
-        <width>101</width>
-        <height>90</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="HalfEnergyIcon" name="label_3">
-      <property name="geometry">
-       <rect>
-        <x>780</x>
-        <y>160</y>
-        <width>108</width>
-        <height>67</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="DigitalClock" name="label_4">
-      <property name="geometry">
-       <rect>
-        <x>20</x>
-        <y>310</y>
-        <width>600</width>
-        <height>100</height>
-       </rect>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-      </property>
-     </widget>
-    </widget>
-    <widget class="QWidget" name="page_2"/>
-   </widget>
    <widget class="QWidget" name="bottomBar" native="true">
     <property name="geometry">
      <rect>
@@ -108,7 +39,7 @@
     <widget class="QPushButton" name="backButton">
      <property name="geometry">
       <rect>
-       <x>343</x>
+       <x>401</x>
        <y>26</y>
        <width>97</width>
        <height>97</height>
@@ -132,52 +63,63 @@ QPushButton:pressed, QPushButton:focus{ border-image: url(:/images/bottom_bar/ba
    <widget class="QLabel" name="ctrLbManual">
     <property name="geometry">
      <rect>
-      <x>30</x>
-      <y>425</y>
-      <width>840</width>
-      <height>1021</height>
+      <x>0</x>
+      <y>5</y>
+      <width>901</width>
+      <height>1441</height>
      </rect>
     </property>
     <property name="text">
-     <string notr="true">TextLabel</string>
+     <string notr="true"/>
     </property>
     <property name="scaledContents">
-     <bool>true</bool>
+     <bool>false</bool>
     </property>
     <property name="alignment">
      <set>Qt::AlignCenter</set>
     </property>
    </widget>
+   <widget class="QPushButton" name="leftButton">
+    <property name="geometry">
+     <rect>
+      <x>14</x>
+      <y>770</y>
+      <width>100</width>
+      <height>100</height>
+     </rect>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">QPushButton { border-image: url(:/images/help/page_prev.png); }
+QPushButton:pressed, QPushButton:focus  { border-image: url(:/images/help/page_prev_over.png); }</string>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
+   <widget class="QPushButton" name="rightButton">
+    <property name="geometry">
+     <rect>
+      <x>788</x>
+      <y>770</y>
+      <width>100</width>
+      <height>100</height>
+     </rect>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">QPushButton { border-image: url(:/images/help/page_next.png); }
+QPushButton:pressed , QPushButton:focus { border-image: url(:/images/help/page_next_over.png); }</string>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
   </widget>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>Clock</class>
-   <extends>QWidget</extends>
-   <header>clock.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>WashWarnIcon</class>
-   <extends>QLabel</extends>
-   <header>washwarnicon.h</header>
-  </customwidget>
-  <customwidget>
-   <class>DemoIcon</class>
-   <extends>QLabel</extends>
-   <header>demoicon.h</header>
-  </customwidget>
-  <customwidget>
-   <class>HalfEnergyIcon</class>
-   <extends>QLabel</extends>
-   <header>halfenergyicon.h</header>
-  </customwidget>
-  <customwidget>
-   <class>DigitalClock</class>
-   <extends>QLabel</extends>
-   <header>digitalclock.h</header>
-  </customwidget>
- </customwidgets>
+ <tabstops>
+  <tabstop>backButton</tabstop>
+  <tabstop>leftButton</tabstop>
+  <tabstop>rightButton</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
-- 
2.1.4