hush
/
SilentDragon
9
1
Fork 7
Code Issues 73 Pull Requests 1 Projects Releases 8 Wiki Activity
Browse Source

UI tweaks to send tab

pull/112/head
fekt 2 years ago
parent
26a9788f7f
commit
d3638b3320
5 changed files with 136 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/mainwindow.cpp
  2. 207
      src/mainwindow.ui
  3. 1
      src/rpc.cpp
  4. 52
      src/sendtab.cpp
  5. 1
      src/senttxstore.cpp

8
src/mainwindow.cpp
View File

@ -1666,6 +1666,14 @@ void MainWindow::setupTransactionsTab() {
QGuiApplication::clipboard()->setText(url); QGuiApplication::clipboard()->setText(url);
}); });
/* TODO: Decide whether to use this or not.
menu.addAction(tr("Look for new transactions"), [=] () {
QGuiApplication::clipboard()->setText(addr);
ui->statusBar->showMessage(tr("Looking for new transactions"), 3 * 1000);
rpc->watchTxStatus();
});
*/
// Payment Request // Payment Request
if (!memo.isEmpty() && memo.startsWith("hush:")) { if (!memo.isEmpty() && memo.startsWith("hush:")) {
menu.addAction(tr("View Payment Request"), [=] () { menu.addAction(tr("View Payment Request"), [=] () {

207
src/mainwindow.ui
View File

@ -22,7 +22,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>5</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@ -385,8 +385,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1403</width> <width>1447</width>
<height>619</height> <height>860</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="sendToLayout"> <layout class="QVBoxLayout" name="sendToLayout">
@ -395,33 +395,65 @@
<property name="title"> <property name="title">
<string>Recipient</string> <string>Recipient</string>
</property> </property>
<layout class="QVBoxLayout" name="sendAddressLayout"> <layout class="QGridLayout" name="gridLayout_6">
<item> <item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_12"> <layout class="QHBoxLayout" name="horizontalLayout_20" stretch="0,0">
<item> <property name="spacing">
<widget class="QLabel" name="label_4"> <number>0</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="MemoTxt1">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Address</string> <string/>
</property> </property>
</widget> <property name="alignment">
</item> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<item> </property>
<widget class="QLineEdit" name="Address1"> <property name="wordWrap">
<property name="placeholderText"> <bool>true</bool>
<string>Address</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item alignment="Qt::AlignTop">
<widget class="QPushButton" name="AddressBook1"> <widget class="QPushButton" name="MemoBtn1">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string/>
</property>
<property name="text"> <property name="text">
<string>Address Book</string> <string>Memo</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_13"> <layout class="QHBoxLayout" name="horizontalLayout_13">
<item> <item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
@ -432,6 +464,18 @@
</item> </item>
<item> <item>
<widget class="QLineEdit" name="Amount1"> <widget class="QLineEdit" name="Amount1">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="baseSize"> <property name="baseSize">
<size> <size>
<width>200</width> <width>200</width>
@ -458,6 +502,9 @@
<property name="text"> <property name="text">
<string>Max Available</string> <string>Max Available</string>
</property> </property>
<property name="checkable">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -465,6 +512,9 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
@ -486,36 +536,33 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item> <item>
<widget class="QPushButton" name="MemoBtn1"> <widget class="QLabel" name="label_4">
<property name="enabled"> <property name="text">
<bool>true</bool> <string>Address</string>
</property> </property>
<property name="toolTip"> </widget>
<string/> </item>
<item>
<widget class="QLineEdit" name="Address1">
<property name="placeholderText">
<string>Address</string>
</property> </property>
</widget>
</item>
<item>
<widget class="QPushButton" name="AddressBook1">
<property name="text"> <property name="text">
<string>Memo</string> <string>Address Book</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QLabel" name="MemoTxt1">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -915,7 +962,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_4"> <widget class="QWidget" name="tab_4">
<attribute name="title"> <attribute name="title">
<string>Transactions</string> <string>Transactions</string>
@ -933,15 +979,11 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="peer_tab"> <widget class="QWidget" name="peer_tab">
<attribute name="title"> <attribute name="title">
<string>Peers</string> <string>Peers</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_8"> <layout class="QVBoxLayout" name="verticalLayout_8">
<item> <item>
<widget class="QLabel" name="currentPeersLabel"> <widget class="QLabel" name="currentPeersLabel">
<property name="text"> <property name="text">
@ -951,7 +993,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTableView" name="peersTable"> <widget class="QTableView" name="peersTable">
<property name="selectionMode"> <property name="selectionMode">
@ -961,8 +1002,7 @@
<enum>QAbstractItemView::SelectRows</enum> <enum>QAbstractItemView::SelectRows</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="bannedPeersLabel"> <widget class="QLabel" name="bannedPeersLabel">
<property name="text"> <property name="text">
@ -972,7 +1012,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTableView" name="bannedPeersTable"> <widget class="QTableView" name="bannedPeersTable">
<property name="selectionMode"> <property name="selectionMode">
@ -982,24 +1021,9 @@
<enum>QAbstractItemView::SelectRows</enum> <enum>QAbstractItemView::SelectRows</enum>
</property> </property>
</widget> </widget>
</item>
<!--
<widget class="QLabel" name="recentlyDisconnectedPeers">
<property name="text">
<string>
Looking For Recently Disconnected Peers ...
</string>
</property>
</widget>
</item> </item>
-->
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_6"> <widget class="QWidget" name="tab_6">
<attribute name="title"> <attribute name="title">
<string>Market</string> <string>Market</string>
@ -1082,42 +1106,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<!--
<widget class="QWidget" name="chat_tab">
<attribute name="title">
<string>Chat</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<widget class="QListView" name="contactsView"/>
</item>
<item row="1" column="1">
<widget class="QTextEdit" name="textEdit"/>
</item>
<item row="0" column="1">
<widget class="QListView" name="chatView"/>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Send</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>New HushChat</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
-->
<widget class="QWidget" name="tab_5"> <widget class="QWidget" name="tab_5">
<attribute name="title"> <attribute name="title">
<string>hushd</string> <string>hushd</string>
@ -1148,9 +1136,9 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout_51"> <layout class="QGridLayout" name="gridLayout_51">
<item row="5" column="0" colspan="3"> <item row="5" column="0" colspan="3">
<widget class="QLabel" name="mining"> <widget class="QLabel" name="label_14">
<property name="text"> <property name="text">
<string></string> <string>You are currently not mining</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1244,15 +1232,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<!--
<item row="10" column="0">
<widget class="QLabel" name="kmdversionlabel">
<property name="text">
<string>KMD Version</string>
</property>
</widget>
</item>
-->
<item row="10" column="2"> <item row="10" column="2">
<widget class="QLabel" name="kmdversion"> <widget class="QLabel" name="kmdversion">
<property name="text"> <property name="text">
@ -1456,7 +1435,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="20" column="0"> <item row="20" column="0">
<widget class="QLabel" name="chaintxcountlabel"> <widget class="QLabel" name="chaintxcountlabel">
<property name="text"> <property name="text">
@ -1478,7 +1456,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="21" column="0"> <item row="21" column="0">
<widget class="QLabel" name="tlssupportlabel"> <widget class="QLabel" name="tlssupportlabel">
<property name="text"> <property name="text">
@ -1500,7 +1477,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="3" column="2">
<widget class="QLabel" name="solrate"> <widget class="QLabel" name="solrate">
<property name="text"> <property name="text">
@ -1587,7 +1563,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1487</width> <width>1487</width>
<height>42</height> <height>30</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@ -1764,7 +1740,6 @@
<tabstop>Amount1</tabstop> <tabstop>Amount1</tabstop>
<tabstop>Max1</tabstop> <tabstop>Max1</tabstop>
<tabstop>AddressBook1</tabstop> <tabstop>AddressBook1</tabstop>
<tabstop>MemoBtn1</tabstop>
<tabstop>addAddressButton</tabstop> <tabstop>addAddressButton</tabstop>
<tabstop>sendTransactionButton</tabstop> <tabstop>sendTransactionButton</tabstop>
<tabstop>cancelSendButton</tabstop> <tabstop>cancelSendButton</tabstop>

1
src/rpc.cpp
View File

@ -1050,6 +1050,7 @@ void RPC::refreshTransactions() {
} }
// Update model data, which updates the table view // Update model data, which updates the table view
qDebug() << "refreshTransactions";
transactionsTableModel->addTData(txdata); transactionsTableModel->addTData(txdata);
}); });
} }

52
src/sendtab.cpp
View File

@ -14,7 +14,7 @@
void MainWindow::setupSendTab() { void MainWindow::setupSendTab() {
// Create the validator for send to/amount fields // Create the validator for send to/amount fields
amtValidator = new QRegExpValidator(QRegExp("[0-9]{0,8}\\.?[0-9]{0,8}")); amtValidator = new QRegExpValidator(QRegExp("[0-9]{0,9}\\.?[0-9]{0,8}"));
ui->Amount1->setValidator(amtValidator); ui->Amount1->setValidator(amtValidator);
@ -251,51 +251,69 @@ void MainWindow::addAddressSection() {
Amount1->setPlaceholderText(tr("Amount")); Amount1->setPlaceholderText(tr("Amount"));
Amount1->setObjectName(QString("Amount") % QString::number(itemNumber)); Amount1->setObjectName(QString("Amount") % QString::number(itemNumber));
Amount1->setBaseSize(QSize(200, 0)); Amount1->setBaseSize(QSize(200, 0));
Amount1->setAlignment(Qt::AlignRight); Amount1->setMinimumWidth(200);
Amount1->setSizePolicy(QSizePolicy ::Preferred , QSizePolicy ::Preferred );
Amount1->setAlignment(Qt::AlignRight);
// Create the validator for send to/amount fields // Create the validator for send to/amount fields
Amount1->setValidator(amtValidator); Amount1->setValidator(amtValidator);
QObject::connect(Amount1, &QLineEdit::textChanged, [=] (auto text) { QObject::connect(Amount1, &QLineEdit::textChanged, [=] (auto text) {
this->amountChanged(itemNumber, text); this->amountChanged(itemNumber, text);
}); });
horizontalLayout_13->addWidget(Amount1); horizontalLayout_13->addWidget(Amount1);
auto AmtUSD1 = new QLabel(verticalGroupBox); auto AmtUSD1 = new QLabel(verticalGroupBox);
AmtUSD1->setObjectName(QString("AmtUSD") % QString::number(itemNumber)); AmtUSD1->setObjectName(QString("AmtUSD") % QString::number(itemNumber));
horizontalLayout_13->addWidget(AmtUSD1); horizontalLayout_13->addWidget(AmtUSD1);
/* TODO: Fix so it updates amount on correct recipient row...or just remove. Added for UI consistency.
auto Max1 = new QCheckBox(verticalGroupBox);
Max1->setText(tr("Max Available"));
// Connect Max Available checkbox
QObject::connect(Max1, &QCheckBox::stateChanged, [=] () {
this->maxAmountChecked(Max1->checkState());
});
horizontalLayout_13->addWidget(Max1);
*/
auto horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); auto horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalLayout_13->addItem(horizontalSpacer_4); horizontalLayout_13->addItem(horizontalSpacer_4);
auto MemoBtn1 = new QPushButton(verticalGroupBox);
MemoBtn1->setObjectName(QString("MemoBtn") % QString::number(itemNumber));
MemoBtn1->setText(tr("Memo"));
// Connect Memo Clicked button
QObject::connect(MemoBtn1, &QPushButton::clicked, [=] () {
this->memoButtonClicked(itemNumber);
});
horizontalLayout_13->addWidget(MemoBtn1);
setMemoEnabled(itemNumber, false);
auto FileBtn = new QPushButton(verticalGroupBox); auto FileBtn = new QPushButton(verticalGroupBox);
FileBtn->setObjectName(QString("FileBtn") % QString::number(itemNumber)); FileBtn->setObjectName(QString("FileBtn") % QString::number(itemNumber));
FileBtn->setText(tr("File Upload")); FileBtn->setText(tr("Upload File"));
// Connect File Upload button // Connect File Upload button
QObject::connect(FileBtn, &QPushButton::clicked, [=] () { QObject::connect(FileBtn, &QPushButton::clicked, [=] () {
this->fileUploadButtonClicked(itemNumber); this->fileUploadButtonClicked(itemNumber);
}); });
horizontalLayout_13->addWidget(FileBtn); horizontalLayout_13->addWidget(FileBtn);
sendAddressLayout->addLayout(horizontalLayout_13); sendAddressLayout->addLayout(horizontalLayout_13);
auto horizontalLayout_20 = new QHBoxLayout();
horizontalLayout_20->setSpacing(6);
horizontalLayout_20->setAlignment(Qt::AlignTop);
auto MemoTxt1 = new QLabel(verticalGroupBox); auto MemoTxt1 = new QLabel(verticalGroupBox);
MemoTxt1->setObjectName(QString("MemoTxt") % QString::number(itemNumber)); MemoTxt1->setObjectName(QString("MemoTxt") % QString::number(itemNumber));
MemoTxt1->setSizePolicy(QSizePolicy ::MinimumExpanding , QSizePolicy ::MinimumExpanding );
QFont font1 = Address1->font(); QFont font1 = Address1->font();
font1.setPointSize(font1.pointSize()-1); font1.setPointSize(font1.pointSize()-1);
MemoTxt1->setFont(font1); MemoTxt1->setFont(font1);
MemoTxt1->setWordWrap(true); MemoTxt1->setWordWrap(true);
sendAddressLayout->addWidget(MemoTxt1); horizontalLayout_20->addWidget(MemoTxt1, 0, Qt::AlignTop);
auto MemoBtn1 = new QPushButton(verticalGroupBox);
MemoBtn1->setObjectName(QString("MemoBtn") % QString::number(itemNumber));
MemoBtn1->setText(tr("Memo"));
// Connect Memo Clicked button
QObject::connect(MemoBtn1, &QPushButton::clicked, [=] () {
this->memoButtonClicked(itemNumber);
});
horizontalLayout_20->addWidget(MemoBtn1, 0, Qt::AlignTop);
setMemoEnabled(itemNumber, false);
sendAddressLayout->addLayout(horizontalLayout_20);
ui->sendToLayout->insertWidget(itemNumber-1, verticalGroupBox); ui->sendToLayout->insertWidget(itemNumber-1, verticalGroupBox);

1
src/senttxstore.cpp
View File

@ -14,6 +14,7 @@ QString SentTxStore::writeableFile() {
if (Settings::getInstance()->isTestnet()) { if (Settings::getInstance()->isTestnet()) {
return dir.filePath("testnet-" % filename); return dir.filePath("testnet-" % filename);
} else { } else {
qDebug() << "senttxstore file = " + dir.filePath(filename);
return dir.filePath(filename); return dir.filePath(filename);
} }
} }

Write Preview
Loading…
Cancel
Save