From 25ec23561cf98dd8042de53a09ad48197b08c51d Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 29 May 2017 15:27:54 +0900 Subject: [PATCH] =?UTF-8?q?=EB=88=84=EB=9D=BD=EB=90=9C=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=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/programmingnamepopup.cpp | 23 +++- app/gui/oven_control/programmingnamepopup.h | 14 ++- app/gui/oven_control/programmingnamepopup.ui | 166 ++++++++++++++++++++++++-- 3 files changed, 193 insertions(+), 10 deletions(-) diff --git a/app/gui/oven_control/programmingnamepopup.cpp b/app/gui/oven_control/programmingnamepopup.cpp index 681b8d7..ded48ee 100644 --- a/app/gui/oven_control/programmingnamepopup.cpp +++ b/app/gui/oven_control/programmingnamepopup.cpp @@ -1,14 +1,33 @@ #include "programmingnamepopup.h" #include "ui_programmingnamepopup.h" -ProgrammingNamePopup::ProgrammingNamePopup(QWidget *parent) : +ProgrammingNamePopup::ProgrammingNamePopup(QWidget *parent, CookRecord record) : QWidget(parent), - ui(new Ui::ProgrammingNamePopup) + ui(new Ui::ProgrammingNamePopup), + record(record) { ui->setupUi(this); + + setAttribute(Qt::WA_DeleteOnClose); + + ui->lineEdit->setText(record.name); } ProgrammingNamePopup::~ProgrammingNamePopup() { delete ui; } + +void ProgrammingNamePopup::on_okButton_clicked() +{ + CookProgram::rename(record, ui->lineEdit->text()); + + emit changed(); + + close(); +} + +void ProgrammingNamePopup::on_cancelButton_clicked() +{ + close(); +} diff --git a/app/gui/oven_control/programmingnamepopup.h b/app/gui/oven_control/programmingnamepopup.h index c1d50c4..1f4eea0 100644 --- a/app/gui/oven_control/programmingnamepopup.h +++ b/app/gui/oven_control/programmingnamepopup.h @@ -3,6 +3,8 @@ #include +#include "cookprogram.h" + namespace Ui { class ProgrammingNamePopup; } @@ -12,11 +14,21 @@ class ProgrammingNamePopup : public QWidget Q_OBJECT public: - explicit ProgrammingNamePopup(QWidget *parent = 0); + explicit ProgrammingNamePopup(QWidget *parent, CookRecord record); ~ProgrammingNamePopup(); +private slots: + void on_okButton_clicked(); + + void on_cancelButton_clicked(); + private: Ui::ProgrammingNamePopup *ui; + + CookRecord record; + +signals: + void changed(); }; #endif // PROGRAMMINGNAMEPOPUP_H diff --git a/app/gui/oven_control/programmingnamepopup.ui b/app/gui/oven_control/programmingnamepopup.ui index 6f8489e..cd199c9 100644 --- a/app/gui/oven_control/programmingnamepopup.ui +++ b/app/gui/oven_control/programmingnamepopup.ui @@ -1,21 +1,173 @@ + - - - ProgrammingNamePopup - + 0 0 - 400 - 300 + 900 + 1600 Form + + #background { background-image: url(:/images/background/popup/503.png); } +QLabel, QPushButton, QLineEdit { color: white; } +QLineEdit { background : transparent; border: none; } +QPushButton { border: none; } +QPushButton:pressed { color: yellow; } + + + + + 0 + 850 + 900 + 600 + + + + + + + 0 + 426 + 900 + 1024 + + + + + + 0 + 95 + 900 + 3 + + + + color: rgb(255, 255, 255); + + + Qt::Horizontal + + + + + + 460 + 320 + 371 + 101 + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 12 + true + + + + 확인 + + + true + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 12 + true + + + + 취소 + + + true + + + + + + + + + 0 + 0 + 900 + 95 + + + + + 14 + + + + 이름 변경 + + + Qt::AlignCenter + + + + + + 0 + 100 + 900 + 200 + + + + + 12 + true + + + + 즐겨찾기 이름 + + + Qt::AlignCenter + + + + background + keyboard - + + + KeyboardWidget + QWidget +
keyboardwidget.h
+ 1 +
+
+
-- 2.1.4