diff --git a/src/confirm.ui b/src/confirm.ui
index 96193b0..0485d52 100644
--- a/src/confirm.ui
+++ b/src/confirm.ui
@@ -132,6 +132,9 @@
TextLabel
+
+ true
+
-
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 4baf922..0a3e11d 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -22,7 +22,7 @@
-
- 0
+ 1
@@ -419,6 +419,9 @@
+
+ true
+
diff --git a/src/memodialog.ui b/src/memodialog.ui
index 0cbe59a..e659854 100644
--- a/src/memodialog.ui
+++ b/src/memodialog.ui
@@ -6,17 +6,14 @@
0
0
- 618
- 115
+ 520
+ 168
Dialog
- -
-
-
-
@@ -27,14 +24,14 @@
-
- 6 / 512
+ 0 / 512
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
- -
+
-
Qt::Horizontal
@@ -44,18 +41,8 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
+
-
+
diff --git a/src/sendtab.cpp b/src/sendtab.cpp
index c7be3b8..10447ce 100644
--- a/src/sendtab.cpp
+++ b/src/sendtab.cpp
@@ -191,6 +191,7 @@ void MainWindow::addAddressSection() {
QFont font1 = Address1->font();
font1.setPointSize(font1.pointSize()-1);
MemoTxt1->setFont(font1);
+ MemoTxt1->setWordWrap(true);
sendAddressLayout->addWidget(MemoTxt1);
ui->sendToLayout->insertWidget(itemNumber-1, verticalGroupBox);
@@ -234,33 +235,26 @@ void MainWindow::memoButtonClicked(int number) {
return;
}
- auto memoTxt = ui->sendToWidgets->findChild(QString("MemoTxt") + QString::number(number));
// Get the current memo if it exists
+ auto memoTxt = ui->sendToWidgets->findChild(QString("MemoTxt") + QString::number(number));
QString currentMemo = memoTxt->text();
- // Ref to see if the button was clicked
- // bool ok;
- // QString newMemo = QInputDialog::getText(this, "Memo",
- // "Please type a memo to include with the amount. The memo will be visible to the recepient",
- // QLineEdit::Normal, currentMemo, &ok);
Ui_MemoDialog memoDialog;
QDialog dialog(this);
memoDialog.setupUi(&dialog);
- QObject::connect(memoDialog.memoTxt, &QLineEdit::textChanged, [=] (QString txt) {
+ QObject::connect(memoDialog.memoTxt, &QPlainTextEdit::textChanged, [=] () {
+ QString txt = memoDialog.memoTxt->toPlainText();
memoDialog.memoSize->setText(QString::number(txt.toUtf8().size()) + "/512");
memoDialog.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(txt.toUtf8().size() <= 512);
- if (txt.toUtf8().size() > 512) {
- memoDialog.memoSize->setStyleSheet("color: red;");
- } else {
- memoDialog.memoSize->setStyleSheet("");
- }
});
- memoDialog.memoTxt->setText(currentMemo);
+
+ memoDialog.memoTxt->setPlainText(currentMemo);
+ memoDialog.memoTxt->setFocus();
if (dialog.exec() == QDialog::Accepted) {
- memoTxt->setText(memoDialog.memoTxt->text());
+ memoTxt->setText(memoDialog.memoTxt->toPlainText());
}
}
@@ -414,6 +408,7 @@ bool MainWindow::confirmTx(Tx tx, ToFields devFee) {
QFont font1 = Addr->font();
font1.setPointSize(font1.pointSize() - 1);
Memo->setFont(font1);
+ Memo->setWordWrap(true);
confirm.gridLayout->addWidget(Memo, (i*2)+1, 0, 1, 3);
}
diff --git a/src/ui_confirm.h b/src/ui_confirm.h
index 234138e..941848d 100644
--- a/src/ui_confirm.h
+++ b/src/ui_confirm.h
@@ -125,6 +125,7 @@ public:
Memo1 = new QLabel(sendToAddrs);
Memo1->setObjectName(QStringLiteral("Memo1"));
+ Memo1->setWordWrap(true);
gridLayout->addWidget(Memo1, 1, 0, 1, 3);
diff --git a/src/ui_mainwindow.h b/src/ui_mainwindow.h
index c9a29ea..4f01b1d 100644
--- a/src/ui_mainwindow.h
+++ b/src/ui_mainwindow.h
@@ -434,6 +434,7 @@ public:
QFont font1;
font1.setPointSize(10);
MemoTxt1->setFont(font1);
+ MemoTxt1->setWordWrap(true);
sendAddressLayout->addWidget(MemoTxt1);
@@ -675,7 +676,7 @@ public:
retranslateUi(MainWindow);
- tabWidget->setCurrentIndex(0);
+ tabWidget->setCurrentIndex(1);
QMetaObject::connectSlotsByName(MainWindow);
diff --git a/src/ui_memodialog.h b/src/ui_memodialog.h
index bd00d49..9f9190e 100644
--- a/src/ui_memodialog.h
+++ b/src/ui_memodialog.h
@@ -15,8 +15,7 @@
#include
#include
#include
-#include
-#include
+#include
QT_BEGIN_NAMESPACE
@@ -24,24 +23,18 @@ class Ui_MemoDialog
{
public:
QGridLayout *gridLayout;
- QLineEdit *memoTxt;
QLabel *label;
QLabel *memoSize;
QDialogButtonBox *buttonBox;
- QSpacerItem *verticalSpacer;
+ QPlainTextEdit *memoTxt;
void setupUi(QDialog *MemoDialog)
{
if (MemoDialog->objectName().isEmpty())
MemoDialog->setObjectName(QStringLiteral("MemoDialog"));
- MemoDialog->resize(618, 115);
+ MemoDialog->resize(520, 168);
gridLayout = new QGridLayout(MemoDialog);
gridLayout->setObjectName(QStringLiteral("gridLayout"));
- memoTxt = new QLineEdit(MemoDialog);
- memoTxt->setObjectName(QStringLiteral("memoTxt"));
-
- gridLayout->addWidget(memoTxt, 1, 0, 1, 2);
-
label = new QLabel(MemoDialog);
label->setObjectName(QStringLiteral("label"));
@@ -58,11 +51,12 @@ public:
buttonBox->setOrientation(Qt::Horizontal);
buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
- gridLayout->addWidget(buttonBox, 3, 0, 1, 2);
+ gridLayout->addWidget(buttonBox, 2, 0, 1, 2);
- verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+ memoTxt = new QPlainTextEdit(MemoDialog);
+ memoTxt->setObjectName(QStringLiteral("memoTxt"));
- gridLayout->addItem(verticalSpacer, 2, 0, 1, 2);
+ gridLayout->addWidget(memoTxt, 1, 0, 1, 2);
retranslateUi(MemoDialog);
@@ -76,7 +70,7 @@ public:
{
MemoDialog->setWindowTitle(QApplication::translate("MemoDialog", "Dialog", nullptr));
label->setText(QApplication::translate("MemoDialog", "Memo", nullptr));
- memoSize->setText(QApplication::translate("MemoDialog", "6 / 512", nullptr));
+ memoSize->setText(QApplication::translate("MemoDialog", "0 / 512", nullptr));
} // retranslateUi
};