From f84e0e227ce2be62e6ef3db03dc3e7d09f6489c4 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 17 Dec 2019 13:52:02 +0100 Subject: [PATCH] Improve widget --- .../snippetcustomfileattachmentnamedialog.cpp | 14 ++++++++++++++ .../snippetcustomfileattachmentnamedialog.h | 6 ++++++ .../snippetcustomfileattachmentnamewidget.cpp | 15 +++++++++++++++ .../snippetcustomfileattachmentnamewidget.h | 3 +++ 4 files changed, 38 insertions(+) diff --git a/src/snippets/snippetcustomfileattachmentnamedialog.cpp b/src/snippets/snippetcustomfileattachmentnamedialog.cpp index 41cc1a2..4d9130a 100644 --- a/src/snippets/snippetcustomfileattachmentnamedialog.cpp +++ b/src/snippets/snippetcustomfileattachmentnamedialog.cpp @@ -18,14 +18,28 @@ */ #include "snippetcustomfileattachmentnamedialog.h" +#include +#include +#include "snippetcustomfileattachmentnamewidget.h" + using namespace MailCommon; SnippetCustomFileAttachmentNameDialog::SnippetCustomFileAttachmentNameDialog(QWidget *parent) : QDialog(parent) { + QVBoxLayout *mainLayout = new QVBoxLayout(this); + mainLayout->setObjectName(QStringLiteral("mainLayout")); + mCustomWidget = new SnippetCustomFileAttachmentNameWidget(this); + mCustomWidget->setObjectName(QStringLiteral("mCustomWidget")); + mainLayout->addWidget(mCustomWidget); } SnippetCustomFileAttachmentNameDialog::~SnippetCustomFileAttachmentNameDialog() { } + +QString SnippetCustomFileAttachmentNameDialog::result() const +{ + return mCustomWidget->result(); +} diff --git a/src/snippets/snippetcustomfileattachmentnamedialog.h b/src/snippets/snippetcustomfileattachmentnamedialog.h index 9aa587b..8766d3b 100644 --- a/src/snippets/snippetcustomfileattachmentnamedialog.h +++ b/src/snippets/snippetcustomfileattachmentnamedialog.h @@ -27,12 +27,18 @@ class QLineEdit; namespace MailCommon { +class SnippetCustomFileAttachmentNameWidget; class MAILCOMMON_TESTS_EXPORT SnippetCustomFileAttachmentNameDialog : public QDialog { Q_OBJECT public: explicit SnippetCustomFileAttachmentNameDialog(QWidget *parent = nullptr); ~SnippetCustomFileAttachmentNameDialog(); + + Q_REQUIRED_RESULT QString result() const; + +private: + SnippetCustomFileAttachmentNameWidget *mCustomWidget = nullptr; }; } #endif // SNIPPETCUSTOMFILEATTACHMENTNAMEDIALOG_H diff --git a/src/snippets/snippetcustomfileattachmentnamewidget.cpp b/src/snippets/snippetcustomfileattachmentnamewidget.cpp index 3776a8f..692d1fd 100644 --- a/src/snippets/snippetcustomfileattachmentnamewidget.cpp +++ b/src/snippets/snippetcustomfileattachmentnamewidget.cpp @@ -18,14 +18,29 @@ */ #include "snippetcustomfileattachmentnamewidget.h" +#include +#include +#include using namespace MailCommon; SnippetCustomFileAttachmentNameWidget::SnippetCustomFileAttachmentNameWidget(QWidget *parent) : QWidget(parent) { + QHBoxLayout *mainLayout = new QHBoxLayout(this); + mainLayout->setObjectName(QStringLiteral("mainLayout")); + mainLayout->setContentsMargins(0, 0, 0, 0); + mLineEdit = new QLineEdit(this); + mLineEdit->setObjectName(QStringLiteral("mLineEdit")); + mainLayout->addWidget(mLineEdit); } SnippetCustomFileAttachmentNameWidget::~SnippetCustomFileAttachmentNameWidget() { } + +QString SnippetCustomFileAttachmentNameWidget::result() const +{ + return mLineEdit->text(); +} + diff --git a/src/snippets/snippetcustomfileattachmentnamewidget.h b/src/snippets/snippetcustomfileattachmentnamewidget.h index 0f8ae65..32751c7 100644 --- a/src/snippets/snippetcustomfileattachmentnamewidget.h +++ b/src/snippets/snippetcustomfileattachmentnamewidget.h @@ -32,6 +32,9 @@ class MAILCOMMON_TESTS_EXPORT SnippetCustomFileAttachmentNameWidget : public QWi public: explicit SnippetCustomFileAttachmentNameWidget(QWidget *parent = nullptr); ~SnippetCustomFileAttachmentNameWidget(); + Q_REQUIRED_RESULT QString result() const; +private: + QLineEdit *mLineEdit = nullptr; }; }