From 078a5f639a6aceb78fe1dcd687a80deb1bed5a28 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com> Date: Fri, 25 May 2018 20:55:09 +0200 Subject: [PATCH] Added AbsenceDialog --- plugins/absenceplugin/absencedialog.cpp | 14 +++++ plugins/absenceplugin/absencedialog.h | 19 +++++++ plugins/absenceplugin/absencedialog.ui | 71 ++++++++++++++++++++++++ plugins/absenceplugin/absenceplugin.pro | 9 ++- plugins/absenceplugin/absencesdialog.cpp | 13 ++++- 5 files changed, 121 insertions(+), 5 deletions(-) create mode 100644 plugins/absenceplugin/absencedialog.cpp create mode 100644 plugins/absenceplugin/absencedialog.h create mode 100644 plugins/absenceplugin/absencedialog.ui diff --git a/plugins/absenceplugin/absencedialog.cpp b/plugins/absenceplugin/absencedialog.cpp new file mode 100644 index 0000000..0b8faf8 --- /dev/null +++ b/plugins/absenceplugin/absencedialog.cpp @@ -0,0 +1,14 @@ +#include "absencedialog.h" +#include "ui_absencedialog.h" + +AbsenceDialog::AbsenceDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::AbsenceDialog) +{ + ui->setupUi(this); +} + +AbsenceDialog::~AbsenceDialog() +{ + delete ui; +} diff --git a/plugins/absenceplugin/absencedialog.h b/plugins/absenceplugin/absencedialog.h new file mode 100644 index 0000000..2c44d92 --- /dev/null +++ b/plugins/absenceplugin/absencedialog.h @@ -0,0 +1,19 @@ +#pragma once + +#include + +namespace Ui { +class AbsenceDialog; +} + +class AbsenceDialog : public QDialog +{ + Q_OBJECT + +public: + explicit AbsenceDialog(QWidget *parent = 0); + ~AbsenceDialog(); + +private: + Ui::AbsenceDialog *ui; +}; diff --git a/plugins/absenceplugin/absencedialog.ui b/plugins/absenceplugin/absencedialog.ui new file mode 100644 index 0000000..a33709b --- /dev/null +++ b/plugins/absenceplugin/absencedialog.ui @@ -0,0 +1,71 @@ + + + + + AbsenceDialog + + + + 0 + 0 + 400 + 300 + + + + Dialog + + + + + 30 + 240 + 341 + 32 + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + buttonBox + accepted() + AbsenceDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + AbsenceDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/plugins/absenceplugin/absenceplugin.pro b/plugins/absenceplugin/absenceplugin.pro index 65a0bbe..02ef15c 100644 --- a/plugins/absenceplugin/absenceplugin.pro +++ b/plugins/absenceplugin/absenceplugin.pro @@ -8,16 +8,19 @@ HEADERS += \ absencesmodel.h \ absenceplugin.h \ absencewidget.h \ - absencesdialog.h + absencesdialog.h \ + absencedialog.h SOURCES += \ absencesmodel.cpp \ absenceplugin.cpp \ absencewidget.cpp \ - absencesdialog.cpp + absencesdialog.cpp \ + absencedialog.cpp FORMS += \ - absencesdialog.ui + absencesdialog.ui \ + absencedialog.ui RESOURCES += absenceplugin_resources.qrc diff --git a/plugins/absenceplugin/absencesdialog.cpp b/plugins/absenceplugin/absencesdialog.cpp index 0e249aa..6df62f9 100644 --- a/plugins/absenceplugin/absencesdialog.cpp +++ b/plugins/absenceplugin/absencesdialog.cpp @@ -9,6 +9,7 @@ #include #include "absencesmodel.h" +#include "absencedialog.h" AbsencesDialog::AbsencesDialog(int userId, const QDate &date, ZeiterfassungApi &erfassung, QWidget *parent) : ZeiterfassungDialog(parent), @@ -50,7 +51,11 @@ void AbsencesDialog::customContextMenuRequested(const QPoint &pos) auto selectedAction = menu.exec(ui->treeView->viewport()->mapToGlobal(pos)); if(selectedAction == createAction) { - //TODO + AbsenceDialog dialog(this); + if(dialog.exec() == QDialog::Accepted) + { + //TODO + } } else if(selectedAction == refreshAction) { @@ -67,7 +72,11 @@ void AbsencesDialog::customContextMenuRequested(const QPoint &pos) auto selectedAction = menu.exec(ui->treeView->viewport()->mapToGlobal(pos)); if(selectedAction == editAction) { - //TODO + AbsenceDialog dialog(this); + if(dialog.exec() == QDialog::Accepted) + { + //TODO + } } else if(selectedAction == deleteAction) {