From c41d8b7b643afafc899907f5aaf3da6299da88e0 Mon Sep 17 00:00:00 2001 From: Duncan Ogilvie Date: Tue, 5 Nov 2019 00:08:45 +0100 Subject: [PATCH] GUI: add HistoryLineEdit support in LineEditDialog --- src/gui/Src/Gui/LineEditDialog.cpp | 15 +++++++++- src/gui/Src/Gui/LineEditDialog.h | 4 ++- src/gui/Src/Gui/LineEditDialog.ui | 44 ++++++------------------------ 3 files changed, 26 insertions(+), 37 deletions(-) diff --git a/src/gui/Src/Gui/LineEditDialog.cpp b/src/gui/Src/Gui/LineEditDialog.cpp index d1df96eb..0574863e 100644 --- a/src/gui/Src/Gui/LineEditDialog.cpp +++ b/src/gui/Src/Gui/LineEditDialog.cpp @@ -71,7 +71,7 @@ void LineEditDialog::setCheckBoxText(const QString & text) ui->checkBox->setText(text); } -void LineEditDialog::on_textEdit_textChanged(const QString & arg1) +void LineEditDialog::on_textEdit_textEdited(const QString & arg1) { editText = arg1; if(this->fixed_size != 0) @@ -104,3 +104,16 @@ void LineEditDialog::setTextMaxLength(int length) { ui->textEdit->setMaxLength(length); } + +void LineEditDialog::on_buttonOk_clicked() +{ + ui->textEdit->addLineToHistory(editText); + ui->textEdit->setText(""); + accept(); +} + +void LineEditDialog::on_buttonCancel_clicked() +{ + ui->textEdit->setText(""); + close(); +} diff --git a/src/gui/Src/Gui/LineEditDialog.h b/src/gui/Src/Gui/LineEditDialog.h index 015c0783..4fb6939c 100644 --- a/src/gui/Src/Gui/LineEditDialog.h +++ b/src/gui/Src/Gui/LineEditDialog.h @@ -29,8 +29,10 @@ public: void selectAllText(); private slots: - void on_textEdit_textChanged(const QString & arg1); + void on_textEdit_textEdited(const QString & arg1); void on_checkBox_toggled(bool checked); + void on_buttonOk_clicked(); + void on_buttonCancel_clicked(); private: Ui::LineEditDialog* ui; diff --git a/src/gui/Src/Gui/LineEditDialog.ui b/src/gui/Src/Gui/LineEditDialog.ui index f308c0e1..e768d7f9 100644 --- a/src/gui/Src/Gui/LineEditDialog.ui +++ b/src/gui/Src/Gui/LineEditDialog.ui @@ -21,7 +21,7 @@ - + @@ -81,41 +81,15 @@ + + + HistoryLineEdit + QLineEdit +
HistoryLineEdit.h
+
+
- - - buttonOk - clicked() - LineEditDialog - accept() - - - 243 - 49 - - - 150 - 57 - - - - - buttonCancel - clicked() - LineEditDialog - close() - - - 320 - 51 - - - 150 - 41 - - - - +