From a3f776b7db4a4a2e678959669b414542fbd07883 Mon Sep 17 00:00:00 2001 From: joshua Date: Sun, 4 Apr 2021 19:39:21 +0200 Subject: [PATCH] Add 'comment' to terminal strip --- sources/TerminalStrip/terminalstrip.cpp | 4 ++++ sources/TerminalStrip/terminalstrip.h | 2 ++ sources/TerminalStrip/terminalstripdata.h | 1 + .../TerminalStrip/ui/terminalstripcreatordialog.cpp | 10 +++++++--- .../TerminalStrip/ui/terminalstripcreatordialog.ui | 11 +++++++++++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/sources/TerminalStrip/terminalstrip.cpp b/sources/TerminalStrip/terminalstrip.cpp index 7d3700a41..7cd69a696 100644 --- a/sources/TerminalStrip/terminalstrip.cpp +++ b/sources/TerminalStrip/terminalstrip.cpp @@ -195,6 +195,10 @@ void TerminalStrip::setName(const QString &name) { m_data.m_name = name; } +void TerminalStrip::setComment(const QString &comment) { + m_data.m_comment = comment; +} + void TerminalStrip::setDescription(const QString &description) { m_data.m_description = description; } diff --git a/sources/TerminalStrip/terminalstrip.h b/sources/TerminalStrip/terminalstrip.h index abcede0ce..6b4ae3a12 100644 --- a/sources/TerminalStrip/terminalstrip.h +++ b/sources/TerminalStrip/terminalstrip.h @@ -44,6 +44,8 @@ class TerminalStrip : public QObject QString location() const {return m_data.m_location;} void setName(const QString &name); QString name() const {return m_data.m_name;} + void setComment(const QString &comment); + QString comment() const {return m_data.m_comment;} void setDescription(const QString &description); QString description() const {return m_data.m_description;} diff --git a/sources/TerminalStrip/terminalstripdata.h b/sources/TerminalStrip/terminalstripdata.h index 94eda3090..d0f20cc33 100644 --- a/sources/TerminalStrip/terminalstripdata.h +++ b/sources/TerminalStrip/terminalstripdata.h @@ -37,6 +37,7 @@ class TerminalStripData : public PropertiesInterface QString m_installation = QStringLiteral("="), m_location = QStringLiteral("+"), m_name, + m_comment, m_description; }; diff --git a/sources/TerminalStrip/ui/terminalstripcreatordialog.cpp b/sources/TerminalStrip/ui/terminalstripcreatordialog.cpp index 24dbe9cbd..8b048e935 100644 --- a/sources/TerminalStrip/ui/terminalstripcreatordialog.cpp +++ b/sources/TerminalStrip/ui/terminalstripcreatordialog.cpp @@ -79,9 +79,13 @@ TerminalStrip *TerminalStripCreatorDialog::generatedTerminalStrip() const if (name_.isEmpty()) { name_ = QStringLiteral("X"); } - return m_project->newTerminalStrip(installation_, - location_, - name_); + auto strip = m_project->newTerminalStrip(installation_, + location_, + name_); + strip->setComment(ui->m_comment_le->text()); + strip->setDescription(ui->m_description_te->toPlainText()); + + return strip; } /** diff --git a/sources/TerminalStrip/ui/terminalstripcreatordialog.ui b/sources/TerminalStrip/ui/terminalstripcreatordialog.ui index b7119de46..803e37f0d 100644 --- a/sources/TerminalStrip/ui/terminalstripcreatordialog.ui +++ b/sources/TerminalStrip/ui/terminalstripcreatordialog.ui @@ -89,12 +89,23 @@ + + + + Commentaire : + + + + + + m_installation_le m_location_le m_name_le + m_comment_le m_description_te