allAddresses;
+
+ allAddresses = getRPC()->getModel()->getAllZAddresses();
+ QString depositzaddr = allAddresses[1];
+ deposithush.qrcodeDisplayDeposit->setQrcodeString(depositzaddr);
+ deposithush.zaddr->setText(depositzaddr);
+
+ QObject::connect(deposithush.CopyAddress, &QPushButton::clicked, [=](){
+
+ QGuiApplication::clipboard()->setText(depositzaddr);
+ ui->statusBar->showMessage(tr("Copied to clipboard"), 3 * 1000);
+
+ });
+
+
+
+ dialog.exec();
+
+
+
+
+ });
// Setup context menu on balances tab
@@ -878,6 +1221,7 @@ void MainWindow::setupBalancesTab() {
menu.exec(ui->balancesTable->viewport()->mapToGlobal(pos));
});
+
}
void MainWindow::setuphushdTab() {
@@ -899,8 +1243,22 @@ void MainWindow::setupTransactionsTab() {
});
// Set up context menu on transactions tab
+ auto theme = Settings::getInstance()->get_theme_name();
+ if (theme == "Dark" || theme == "Midnight") {
+ ui->listChat->setStyleSheet("background-image: url(:/icons/res/sdlogo.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;background-size: cover");
+ }
+ if (theme == "Default") {ui->listChat->setStyleSheet("background-image: url(:/icons/res/sdlogo2.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;background-size: cover");}
+
+ ui->listChat->setResizeMode(QListView::Adjust);
+ ui->listChat->setWordWrap(true);
+ ui->listChat->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+ ui->listChat->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ ui->listChat->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ ui->listChat->setMinimumSize(200,350);
+ ui->listChat->setItemDelegate(new ListViewDelegate());
+ ui->listChat->show();
+
ui->transactionsTable->setContextMenuPolicy(Qt::CustomContextMenu);
-
// Table right click
QObject::connect(ui->transactionsTable, &QTableView::customContextMenuRequested, [=] (QPoint pos) {
QModelIndex index = ui->transactionsTable->indexAt(pos);
@@ -974,13 +1332,263 @@ void MainWindow::setupTransactionsTab() {
qApp->processEvents();
// Click the memo button
- this->memoButtonClicked(1, true);
+ this->memoButtonClicked(1, true);
});
}
}
menu.exec(ui->transactionsTable->viewport()->mapToGlobal(pos));
});
+
+}
+
+void MainWindow::setupchatTab() {
+
+ /////////////Setting Icons for Chattab and different themes
+
+ auto theme = Settings::getInstance()->get_theme_name();
+ if (theme == "Dark" || theme == "Midnight") {
+ QPixmap send(":/icons/res/send-white.png");
+ QIcon sendIcon(send);
+ ui->sendChatButton->setIcon(sendIcon);
+
+ QPixmap notification(":/icons/res/requestWhite.png");
+ QIcon notificationIcon(notification);
+ ui->pushContact->setIcon(notificationIcon);
+
+ QPixmap addContact(":/icons/res/addContactWhite.png");
+ QIcon addContactIcon(addContact);
+ ui->safeContactRequest->setIcon(addContactIcon);
+
+ QPixmap newAddr(":/icons/res/getAddrWhite.png");
+ QIcon addnewAddrIcon(newAddr);
+ ui->givemeZaddr->setIcon(addnewAddrIcon);
+
+ ui->memoTxtChat->setTextColor("White");
+
+ }else{
+
+ QPixmap send(":/icons/res/sendBlack.png");
+ QIcon sendIcon(send);
+ ui->sendChatButton->setIcon(sendIcon);
+
+ QPixmap notification(":/icons/res/requestBlack.png");
+ QIcon notificationIcon(notification);
+ ui->pushContact->setIcon(notificationIcon);
+
+ QPixmap addContact(":/icons/res/addContactBlack.png");
+ QIcon addContactIcon(addContact);
+ ui->safeContactRequest->setIcon(addContactIcon);
+
+ QPixmap newAddr(":/icons/res/getAddrBlack.png");
+ QIcon addnewAddrIcon(newAddr);
+ ui->givemeZaddr->setIcon(addnewAddrIcon);
+
+ ui->memoTxtChat->setTextColor("Black");
+ }
+
+ QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::sendChat);
+ QObject::connect(ui->safeContactRequest, &QPushButton::clicked, this, &MainWindow::addContact);
+ QObject::connect(ui->pushContact, &QPushButton::clicked, this , &MainWindow::renderContactRequest);
+
+ ui->contactNameMemo->setText("");
+
+ /////Copy Chatmessages
+
+ QMenu* contextMenuChat;
+ QAction* copymessage;
+ QAction* viewexplorer;
+ QAction* copytxid;
+ contextMenuChat = new QMenu(ui->listChat);
+ copymessage = new QAction("Copy message to clipboard",contextMenuChat);
+ viewexplorer = new QAction("View on block explorer",contextMenuChat);
+ copytxid = new QAction("Copy txid to clipboard ",contextMenuChat);
+
+ QObject::connect(ui->listContactWidget, &QTableView::clicked, [=] () {
+
+ ui->listChat->setContextMenuPolicy(Qt::ActionsContextMenu);
+ ui->listChat->addAction(copymessage);
+ ui->listChat->addAction(viewexplorer);
+ ui->listChat->addAction(copytxid);
+
+ QObject::connect(copymessage, &QAction::triggered, [=] {
+
+
+ QModelIndex index = ui->listChat->currentIndex();
+ QString memo_chat = index.data(Qt::DisplayRole).toString();
+ QClipboard *clipboard = QGuiApplication::clipboard();
+ int startPos = memo_chat.indexOf("") + 3;
+ int endPos = memo_chat.indexOf("
");
+ int length = endPos - startPos;
+ QString copymemo = memo_chat.mid(startPos, length);
+
+ clipboard->setText(copymemo);
+ ui->statusBar->showMessage(tr("Copied message to clipboard"), 3 * 1000);
+
+});
+ QObject::connect(copytxid, &QAction::triggered, [=] {
+
+ QModelIndex index = ui->listChat->currentIndex();
+ QString memo_chat = index.data(Qt::DisplayRole).toString();
+ QClipboard *clipboard = QGuiApplication::clipboard();
+
+ int startPos = memo_chat.indexOf("") + 3;
+ int endPos = memo_chat.indexOf("
");
+ int length = endPos - startPos;
+ QString copymemo = memo_chat.mid(startPos, length);
+ int startPosT = memo_chat.indexOf("") + 7;
+ int endPosT = memo_chat.indexOf("");
+ int lengthT = endPosT - startPosT;
+
+ QString time = memo_chat.mid(startPosT, lengthT);
+
+ for (auto &c : DataStore::getChatDataStore()->getAllRawChatItems()){
+
+ if (c.second.getMemo() == copymemo)
+ {
+ int timestamp = c.second.getTimestamp();
+ QDateTime myDateTime;
+ QString lock;
+ myDateTime.setTime_t(timestamp);
+ QString timestamphtml = myDateTime.toString("yyyy-MM-dd hh:mm");
+
+ if(timestamphtml == time)
+
+ {
+ clipboard->setText(c.second.getTxid());
+ ui->statusBar->showMessage(tr("Copied Txid to clipboard"), 3 * 1000);
+ }else{}
+
+ }
+
+}
+
+});
+
+ QObject::connect(viewexplorer, &QAction::triggered, [=] {
+
+ QModelIndex index = ui->listChat->currentIndex();
+ QString memo_chat = index.data(Qt::DisplayRole).toString();
+
+ int startPos = memo_chat.indexOf("") + 3;
+ int endPos = memo_chat.indexOf("
");
+ int length = endPos - startPos;
+ QString copymemo = memo_chat.mid(startPos, length);
+ int startPosT = memo_chat.indexOf("") + 7;
+ int endPosT = memo_chat.indexOf("");
+ int lengthT = endPosT - startPosT;
+
+ QString time = memo_chat.mid(startPosT, lengthT);
+
+ for (auto &c : DataStore::getChatDataStore()->getAllRawChatItems()){
+
+ if (c.second.getMemo() == copymemo)
+ {
+ int timestamp = c.second.getTimestamp();
+ QDateTime myDateTime;
+ QString lock;
+ myDateTime.setTime_t(timestamp);
+ QString timestamphtml = myDateTime.toString("yyyy-MM-dd hh:mm");
+
+ if(timestamphtml == time)
+
+ {
+
+ Settings::openTxInExplorer(c.second.getTxid());
+
+ }else{}
+
+ }
+
+}
+});
+
+});
+
+///////// Add contextmenu
+ QMenu* contextMenu;
+ QAction* requestAction;
+ QAction* editAction;
+ QAction* HushAction;
+ QAction* requestHushAction;
+ QAction* subatomicAction;
+ contextMenu = new QMenu(ui->listContactWidget);
+ requestAction = new QAction("Send a contact request - coming soon",contextMenu);
+ editAction = new QAction("Delete this contact",contextMenu);
+ HushAction = new QAction("Send a friend some Hush - coming soon",contextMenu);
+ requestHushAction = new QAction("Request some Hush - coming soon",contextMenu);
+ subatomicAction = new QAction("Make a subatomic swap with a friend- coming soon",contextMenu);
+
+
+///////// Set selected Zaddr for Chat with click
+
+ QObject::connect(ui->listContactWidget, &QTableView::clicked, [=] () {
+
+ ui->listContactWidget->setContextMenuPolicy(Qt::ActionsContextMenu);
+ ui->listContactWidget->addAction(requestAction);
+ ui->listContactWidget->addAction(editAction);
+ ui->listContactWidget->addAction(HushAction);
+ ui->listContactWidget->addAction(requestHushAction);
+ ui->listContactWidget->addAction(subatomicAction);
+
+ QObject::connect(requestHushAction, &QAction::triggered, [=]() {
+ QModelIndex index = ui->listContactWidget->currentIndex();
+ QString label_contact = index.data(Qt::DisplayRole).toString();
+
+ for(auto &p : AddressBook::getInstance()->getAllAddressLabels())
+ if (label_contact == p.getName()) {
+ ui->contactNameMemo->setText(p.getName());
+ rpc->refresh(true);
+
+ }
+ MainWindow::showRequesthush();
+
+ });
+
+ QObject::connect(editAction, &QAction::triggered, [=]() {
+ QModelIndex index = ui->listContactWidget->currentIndex();
+ QString label_contact = index.data(Qt::DisplayRole).toString();
+
+ for(auto &p : AddressBook::getInstance()->getAllAddressLabels())
+ if (label_contact == p.getName()) {
+
+ QString label1 = p.getName();
+ QString addr = p.getPartnerAddress();
+ QString myzaddr = p.getMyAddress();
+ QString cid = p.getCid();
+ QString avatar = p.getAvatar();
+
+
+ AddressBook::getInstance()->removeAddressLabel(label1, addr, myzaddr, cid,avatar);
+ rpc->refreshContacts(
+ ui->listContactWidget);
+ rpc->refresh(true);
+ }
+ });
+
+ QModelIndex index = ui->listContactWidget->currentIndex();
+ QString label_contact = index.data(Qt::DisplayRole).toString();
+
+ for(auto &p : AddressBook::getInstance()->getAllAddressLabels())
+ if (label_contact == p.getName()) {
+ ui->contactNameMemo->setText(p.getName());
+ rpc->refresh(true);
+
+ }
+ });
+
+ui->memoTxtChat->setLenDisplayLabelChat(ui->memoSizeChat);
+}
+
+void MainWindow::updateChat()
+{
+ rpc->refreshChat(ui->listChat,ui->memoSizeChat);
+ rpc->refresh(true);
+}
+
+void MainWindow::updateContacts()
+{
+
}
void MainWindow::addNewZaddr(bool sapling) {
@@ -1214,6 +1822,7 @@ void MainWindow::setupReceiveTab() {
// Receive tab add/update label
QObject::connect(ui->rcvUpdateLabel, &QPushButton::clicked, [=]() {
QString addr = ui->listReceiveAddresses->currentText();
+
if (addr.isEmpty())
return;
@@ -1227,7 +1836,7 @@ void MainWindow::setupReceiveTab() {
if (!curLabel.isEmpty() && label.isEmpty()) {
info = "Removed Label '" % curLabel % "'";
- AddressBook::getInstance()->removeAddressLabel(curLabel, addr);
+ AddressBook::getInstance()->removeAddressLabel(curLabel, addr, "", "","" );
}
else if (!curLabel.isEmpty() && !label.isEmpty()) {
info = "Updated Label '" % curLabel % "' to '" % label % "'";
@@ -1235,7 +1844,7 @@ void MainWindow::setupReceiveTab() {
}
else if (curLabel.isEmpty() && !label.isEmpty()) {
info = "Added Label '" % label % "'";
- AddressBook::getInstance()->addAddressLabel(label, addr);
+ AddressBook::getInstance()->addAddressLabel(label, addr, "", "", "");
}
// Update labels everywhere on the UI
@@ -1285,7 +1894,7 @@ void MainWindow::updateTAddrCombo(bool checked) {
auto allTaddrs = this->rpc->getModel()->getAllTAddresses();
QSet labels;
for (auto p : AddressBook::getInstance()->getAllAddressLabels()) {
- labels.insert(p.second);
+ labels.insert(p.getPartnerAddress());
}
std::for_each(allTaddrs.begin(), allTaddrs.end(), [=, &addrs] (auto& taddr) {
// If the address is in the address book, add it.
@@ -1377,7 +1986,7 @@ void MainWindow::slot_change_theme(const QString& theme_name)
}
catch (...)
{
- saved_theme_name = "default";
+ saved_theme_name = "Dark";
}
QFile qFile(":/css/res/css/" + saved_theme_name +".css");
@@ -1406,3 +2015,17 @@ MainWindow::~MainWindow()
delete wsserver;
delete wormhole;
}
+void MainWindow::on_givemeZaddr_clicked()
+{
+
+ bool sapling = true;
+ rpc->createNewZaddr(sapling, [=] (json reply) {
+ QString hushchataddr = QString::fromStdString(reply.get()[0]);
+ QClipboard *zaddr_Clipboard = QApplication::clipboard();
+ zaddr_Clipboard ->setText(hushchataddr);
+ QMessageBox::information(this, "Your new HushChat address was copied to your clipboard!",hushchataddr);
+ ui->listReceiveAddresses->insertItem(0, hushchataddr);
+ ui->listReceiveAddresses->setCurrentIndex(0);
+
+ });
+}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 50f833a..62ff3f3 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -5,12 +5,14 @@
#include "logger.h"
#include "recurring.h"
+#include "firsttimewizard.h"
// Forward declare to break circular dependency.
class Controller;
class Settings;
class WSServer;
class WormholeClient;
+class ChatModel;
using json = nlohmann::json;
@@ -47,18 +49,32 @@ public:
QRegExpValidator* getAmountValidator() { return amtValidator; }
QString doSendTxValidations(Tx tx);
+ QString doSendChatTxValidations(Tx tx);
+ QString doSendRequestTxValidations(Tx tx);
+ QString getCid();
+ QString getPassword();
+ std::map pubkeyMap;
+ QString getPubkeyByAddress(QString requestZaddr);
+ void setPassword(QString Password);
+ void addPubkey(QString requestZaddr, QString pubkey);
+
+
+
void replaceWormholeClient(WormholeClient* newClient);
bool isWebsocketListening();
void createWebsocket(QString wormholecode);
void stopWebsocket();
-
+ void saveContact();
+ void saveandsendContact();
+ void showRequesthush();
+
void balancesReady();
void payhushURI(QString uri = "", QString myAddr = "");
void updateLabels();
void updateTAddrCombo(bool checked);
-
+
// Disable recurring on mainnet
void disableRecurring();
@@ -71,37 +87,68 @@ public:
QLabel* statusIcon;
QLabel* loadingLabel;
QWidget* hushdtab;
+ //ChatItem* currentChatItem;
+
Logger* logger;
void doClose();
+ void doClosePw();
+ QString createHeaderMemo(QString type, QString cid, QString zaddr,QString headerbytes,QString publickey, int version, int headerNumber);
public slots:
void slot_change_theme(const QString& themeName);
void slot_change_currency(const QString& currencyName);
+
-private:
+private slots:
+
+
+ void on_givemeZaddr_clicked();
+
+private:
+
+ bool fileExists(QString path);
void closeEvent(QCloseEvent* event);
+ void closeEventpw(QCloseEvent* event);
+ QString _password;
+
void setupSendTab();
void setupTransactionsTab();
void setupReceiveTab();
void setupBalancesTab();
void setuphushdTab();
+ void setupchatTab();
+ void renderContactRequest();
+
+ void updateContacts();
+ void updateChat();
void setupSettingsModal();
void setupStatusBar();
void clearSendForm();
+
Tx createTxFromSendPage();
bool confirmTx(Tx tx, RecurringPaymentInfo* rpi);
+ Tx createTxFromChatPage();
+ Tx createTxForSafeContactRequest();
+
+
void encryptWallet();
void removeWalletEncryption();
+ void removeWalletEncryptionStartUp();
void cancelButton();
void sendButton();
+ void sendChat();
+ void addContact();
+ void ContactRequest();
+
+
void addAddressSection();
void maxAmountChecked(int checked);
@@ -131,13 +178,18 @@ private:
void restoreSavedStates();
bool eventFilter(QObject *object, QEvent *event);
+
+
+
bool uiPaymentsReady = false;
QString pendingURIPayment;
WSServer* wsserver = nullptr;
WormholeClient* wormhole = nullptr;
+
Controller* rpc = nullptr;
+
QCompleter* labelCompleter = nullptr;
QRegExpValidator* amtValidator = nullptr;
QRegExpValidator* feesValidator = nullptr;
@@ -147,4 +199,21 @@ private:
QMovie* loadingMovie;
};
+class ChatMemoEdit : public QTextEdit
+{
+public:
+ ChatMemoEdit(QWidget* parent);
+
+ void setMaxLenChat(int len);
+ void setLenDisplayLabelChat(QLabel* label);
+ void SetSendChatButton(QPushButton* button);
+ void updateDisplayChat();
+
+private:
+ int maxlenchat = 235;
+ QLabel* lenDisplayLabelchat = nullptr;
+ QPushButton* sendChatButton = nullptr;
+};
+
+
#endif // MAINWINDOW_H
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index d7caf5d..8471227 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -10,6 +10,43 @@
779
+
+
+
+
+
+
+ 0
+ 0
+ 0
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 0
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 0
+
+
+
+
+
+
SilentDragonLite
@@ -18,11 +55,11 @@
:/icons/res/icon.ico:/icons/res/icon.ico
-
- -
+
+
-
- 0
+ 2
@@ -47,181 +84,184 @@
-
-
+
-
-
-
-
-
-
-
- 0
- 0
-
-
-
- Shielded
-
-
-
- -
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
- Notarized
-
-
-
- -
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
- Transparent
-
-
-
- -
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 75
- true
-
-
-
- Total
-
-
-
- -
-
-
-
- 75
- true
-
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
- -
-
-
- color:red;
-
-
- Your node is still syncing, balances may not be updated.
-
-
- true
-
-
-
- -
-
+
0
0
-
- color: red;
-
- Some transactions are not yet confirmed. Balances may change.
-
-
- true
+ Shielded
-
-
-
- Qt::Vertical
+
+
+
-
-
- 20
- 40
-
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Notarized
+
+
+
+ -
+
+
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Transparent
+
+
+
+ -
+
+
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ Total
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ -
+
+
+ color:red;
+
+
+ Your node is still syncing, balances may not be updated.
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ color: red;
+
+
+ Some transactions are not yet confirmed. Balances may change.
+
+
+ true
+
+
+
+ -
+
+
+ Deposit Hush
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 383
+
+
+
+
@@ -389,7 +429,7 @@
0
0
1226
- 504
+ 493
@@ -574,33 +614,6 @@
-
-
-
-
-
- Recurring payment
-
-
-
- -
-
-
- Every month, starting 12-May-2012, for 6 payments
-
-
-
- -
-
-
- Edit Schedule
-
-
- false
-
-
- false
-
-
-
-
@@ -1324,6 +1337,443 @@
+
+
+ HushChat
+
+
+ -
+
+
-
+
+
+ QLayout::SetDefaultConstraint
+
+
+ 0
+
+
+ 0
+
+
+ 15
+
+
-
+
+
+
+ 51
+ 51
+
+
+
+
+ 51
+ 51
+
+
+
+
+ 100
+ 0
+
+
+
+ Incoming contact request
+
+
+ false
+
+
+
+
+
+
+ :/icons/res/requestBlack.png:/icons/res/requestBlack.png
+
+
+
+ 50
+ 45
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 51
+ 51
+
+
+
+
+ 51
+ 51
+
+
+
+
+ 100
+ 0
+
+
+
+ Add a new contact
+
+
+
+
+
+
+ :/icons/res/addContactBlack.png
+
+
+
+
+ 50
+ 45
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 51
+ 51
+
+
+
+
+ 51
+ 51
+
+
+
+ Get a new Address
+
+
+
+
+
+
+ :/icons/res/getAddrBlack.png:/icons/res/getAddrBlack.png
+
+
+
+ 50
+ 45
+
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Preferred
+
+
+
+ 100
+ 20
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 300
+ 0
+
+
+
+ <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Contactlist</span></p></body></html>
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ true
+
+
+ QAbstractItemView::NoEditTriggers
+
+
+ false
+
+
+ false
+
+
+ QAbstractItemView::SingleSelection
+
+
+ QAbstractItemView::SelectItems
+
+
+
+
+
+ -
+
+
+ QLayout::SetDefaultConstraint
+
+
-
+
+
+ QLayout::SetDefaultConstraint
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p align="center"><span style=" font-weight:600;">Contact Name :</span></p></body></html>
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ <html><head/><body><p align="center"><br/></p></body></html>
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::NoFocus
+
+
+ The locks shows you the status of the message. Red lock = unconfirmed, green lock = min. 1 confirmations, orange lock = message is notarized
+
+
+ Qt::ScrollBarAsNeeded
+
+
+ Qt::ScrollBarAsNeeded
+
+
+ QAbstractScrollArea::AdjustToContents
+
+
+ true
+
+
+ QAbstractItemView::NoEditTriggers
+
+
+ false
+
+
+ QAbstractItemView::DragOnly
+
+
+ Qt::IgnoreAction
+
+
+ QAbstractItemView::NoSelection
+
+
+ QAbstractItemView::ScrollPerItem
+
+
+ QListView::Snap
+
+
+ QListView::TopToBottom
+
+
+ QListView::Adjust
+
+
+ QListView::SinglePass
+
+
+ 0
+
+
+ false
+
+
+ true
+
+
+ true
+
+
+
+ -
+
+
+ QLayout::SetDefaultConstraint
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ font: 11pt "Noto Color Emoji";
+
+
+ QTextEdit::AutoNone
+
+
+ QTextEdit::WidgetWidth
+
+
+ 600
+
+
+ false
+
+
+ Qt::TextEditorInteraction
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 100
+ 0
+
+
+
+ false
+
+
+
+
+
+
+ :/icons/res/sendBlack.png
+
+
+
+
+ 50
+ 49
+
+
+
+ false
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ QFrame::Sunken
+
+
+ 0 / 235
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+
+
+
+
+
+
@@ -1509,6 +1959,11 @@
QLabel
+
+ ChatMemoEdit
+ QTextEdit
+
+
Address1
diff --git a/src/memodialog.ui b/src/memodialog.ui
index 1c144e0..d365221 100644
--- a/src/memodialog.ui
+++ b/src/memodialog.ui
@@ -74,7 +74,7 @@
MemoEdit
QPlainTextEdit
-
+
diff --git a/src/mobileappconnector.ui b/src/mobileappconnector.ui
index 9412c37..823a497 100644
--- a/src/mobileappconnector.ui
+++ b/src/mobileappconnector.ui
@@ -11,7 +11,7 @@
- Connect Mobile App
+ Mobile Connector App
-
diff --git a/src/newseed.ui b/src/newseed.ui
index ed5d9ae..7657542 100644
--- a/src/newseed.ui
+++ b/src/newseed.ui
@@ -6,15 +6,15 @@
0
0
- 400
- 300
+ 427
+ 416
Form
-
-
+
-
This is your new wallet's seed phrase. PLEASE BACK IT UP SECURELY.
@@ -24,17 +24,7 @@
- -
-
-
- The seed phrase is the only way to restore the wallet. If you forget the seed phrase, THERE IS NO WAY TO RESTORE YOUR WALLET AND THE FUNDS in it
-
-
- true
-
-
-
- -
+
-
@@ -56,6 +46,16 @@
+ -
+
+
+ The seed phrase is the only way to restore the wallet. If you forget the seed phrase, THERE IS NO WAY TO RESTORE YOUR WALLET AND THE FUNDS in it
+
+
+ true
+
+
+
diff --git a/src/newwallet.ui b/src/newwallet.ui
index 9cf34c5..9f1e76c 100644
--- a/src/newwallet.ui
+++ b/src/newwallet.ui
@@ -6,15 +6,29 @@
0
0
- 400
- 300
+ 437
+ 381
- Form
+ Create New SDL Wallet
- -
+
-
+
+
+ Confirm Passphrase:
+
+
+
+ -
+
+
+ QLineEdit::Password
+
+
+
+ -
@@ -46,7 +60,14 @@
- -
+
-
+
+
+ QLineEdit::Password
+
+
+
+ -
@@ -61,7 +82,7 @@
-
- Create a new Wallet
+ Create a new wallet
@@ -78,6 +99,52 @@
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Encryption Passphrase:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ color: red;
+
+
+ <html><head/><body><p><span style=" font-style:italic;">Passphrase don't match</span></p></body></html>
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p><span style=" font-style:italic;">16 letters minimum</span></p></body></html>
+
+
+
diff --git a/src/recurringdialog.ui b/src/recurringdialog.ui
index fbe26e6..6e53279 100644
--- a/src/recurringdialog.ui
+++ b/src/recurringdialog.ui
@@ -11,7 +11,7 @@
- Dialog
+ Reccuring Dialog
-
diff --git a/src/recurringmultiple.ui b/src/recurringmultiple.ui
index b895ecb..e7a41ca 100644
--- a/src/recurringmultiple.ui
+++ b/src/recurringmultiple.ui
@@ -11,7 +11,7 @@
- Dialog
+ Recurring Multiple Payments
-
diff --git a/src/recurringpayments.ui b/src/recurringpayments.ui
index 3874370..839fe73 100644
--- a/src/recurringpayments.ui
+++ b/src/recurringpayments.ui
@@ -11,7 +11,7 @@
- Payments
+ Reocurring Payments
-
diff --git a/src/removeencryption.ui b/src/removeencryption.ui
new file mode 100644
index 0000000..2194997
--- /dev/null
+++ b/src/removeencryption.ui
@@ -0,0 +1,175 @@
+
+
+ removeencryption
+
+
+
+ 0
+ 0
+ 400
+ 300
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 400
+ 300
+
+
+
+
+ 400
+ 300
+
+
+
+ Decrypt Your Wallet
+
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ <html><head/><body><p><span style=" font-size:14pt; color:#ef2929;">WARNING:</span> If you remove your wallet.dat encryption, all your transactions and contacts are plaintext on disk!<br/><br/>Messages sent and received are always encrypted.</p></body></html>
+
+
+ Qt::AlignCenter
+
+
+ true
+
+
+
+ -
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p><span style=" font-style:italic;">16 letters minimum</span></p></body></html>
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+ -
+
+
+ Encryption Passphrase:
+
+
+
+ -
+
+
+ Confirm Passphrase:
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ color: red;
+
+
+ <html><head/><body><p><span style=" font-style:italic;">Passphrase don't match</span></p></body></html>
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ removeencryption
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ removeencryption
+ close()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/requestContactDialog.ui b/src/requestContactDialog.ui
new file mode 100644
index 0000000..76e904a
--- /dev/null
+++ b/src/requestContactDialog.ui
@@ -0,0 +1,473 @@
+
+
+ requestDialog
+
+
+
+ 0
+ 0
+ 850
+ 495
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 850
+ 495
+
+
+
+ Incoming Contact Request
+
+
+ -
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Memo of the request</span></p></body></html>
+
+
+
+ -
+
+
+
+ 500
+ 231
+
+
+
+ Qt::ScrollBarAlwaysOff
+
+
+ Qt::ScrollBarAlwaysOff
+
+
+ QAbstractScrollArea::AdjustToContents
+
+
+ QAbstractItemView::NoEditTriggers
+
+
+ QListView::Adjust
+
+
+ 0
+
+
+ false
+
+
+ true
+
+
+
+ -
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Open requests</span></p></body></html>
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 225
+ 190
+
+
+
+ true
+
+
+ QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked
+
+
+ false
+
+
+ QAbstractItemView::SingleSelection
+
+
+
+ -
+
+
+
+ 351
+ 25
+
+
+
+
+ 351
+ 25
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Request from:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 25
+
+
+
+ 25
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Add New Contact
+
+
+ false
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p>Choose an avatar for your contact:</p></body></html>
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ My Zaddr:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 100
+ 0
+
+
+
+ Cancel
+
+
+ false
+
+
+ false
+
+
+
+ -
+
+
+
+ 106
+ 25
+
+
+
+
+ 106
+ 25
+
+
+
-
+
+ SDLogo
+
+
+
+ :/icons/res/SDLogo.png
+
+
+
+ -
+
+ Duke
+
+
+
+ :/icons/res/Duke.png
+
+
+
+ -
+
+ Denio
+
+
+
+ :/icons/res/Denio.png
+
+
+
+ -
+
+ Berg
+
+
+
+ :/icons/res/Berg.png
+
+
+
+ -
+
+ Sharpee
+
+
+
+ :/icons/res/Sharpee.png
+
+
+
+ -
+
+ Elsa
+
+
+
+ :/icons/res/Elsa.png
+
+
+
+ -
+
+ Yoda
+
+
+
+ :/icons/res/Yoda.png
+
+
+
+ -
+
+ Garfield
+
+
+
+ :/icons/res/Garfield.png
+
+
+
+ -
+
+ Snoopy
+
+
+
+ :/icons/res/Snoopy.png
+
+
+
+ -
+
+ Popey
+
+
+
+ :/icons/res/Popey.png
+
+
+
+ -
+
+ Pinguin
+
+
+
+ :/icons/res/Pinguin.png
+
+
+
+ -
+
+ Mickey
+
+
+
+ :/icons/res/Mickey.png
+
+
+
+ -
+
+ Stag
+
+
+
+ :/icons/res/Stag.png
+
+
+
+
+
+ -
+
+
+
+ 225
+ 231
+
+
+
+ true
+
+
+ QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked
+
+
+ false
+
+
+ QAbstractItemView::SingleSelection
+
+
+
+ -
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Recently closed requests</span></p></body></html>
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Details of the request</span></p></body></html>
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Give a Nickname:
+
+
+
+ -
+
+
+
+ 351
+ 25
+
+
+
+
+ 351
+ 25
+
+
+
+
+
+
+
+
+
+ cancel
+ clicked()
+ requestDialog
+ reject()
+
+
+ 339
+ 482
+
+
+ 505
+ 251
+
+
+
+
+
diff --git a/src/requestdialog.ui b/src/requestdialog.ui
index 952f780..f12e3e6 100644
--- a/src/requestdialog.ui
+++ b/src/requestdialog.ui
@@ -14,9 +14,124 @@
Payment Request
+ -
+
+
+
+
+
+
+ -
+
+
+ Request From
+
+
+
+ -
+
+
+ The recipient will see this address in the "to" field when they pay your request.
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ TextLabel
+
+
+ Qt::AlignCenter
+
+
+
-
+ -
+
+
+
+
+
+
+ -
+
+
+ color: red;
+
+
+
+
+
+
+ -
+
+
+ Memo
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ 0 / 235
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Amount USD
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
-
-
@@ -41,65 +156,13 @@
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
+
-
+
- Request From
+ Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a hush payment URI. The memo will be included in the transaction when the address pays you.
-
-
- -
-
-
- My Address
-
-
-
- -
-
-
- color: red;
-
-
-
-
-
-
- -
-
-
- Amount in
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
- -
-
-
-
+
+ true
@@ -119,20 +182,20 @@
- -
-
-
- Qt::Horizontal
+
-
+
+
+ My Address
- -
-
-
-
- 0
- 0
-
+
-
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
@@ -146,83 +209,20 @@
- -
-
+
-
+
+
+ Amount in
+
+
+
+ -
+
Qt::Horizontal
- -
-
-
- The recipient will see this address in the "to" field when they pay your request.
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- 0 / 512
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Amount USD
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Memo
-
-
-
- -
-
-
- TextLabel
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Request payment from a Sapling address. You'll send a hush 0.0001 transaction to the address with a hush payment URI. The memo will be included in the transaction when the address pays you.
-
-
- true
-
-
-
diff --git a/src/restoreseed.ui b/src/restoreseed.ui
index 9cc2b3f..64bd43f 100644
--- a/src/restoreseed.ui
+++ b/src/restoreseed.ui
@@ -11,7 +11,7 @@
- Form
+ Restore Wallet Seed
-
diff --git a/src/sendtab.cpp b/src/sendtab.cpp
index 3fc5510..7e21261 100644
--- a/src/sendtab.cpp
+++ b/src/sendtab.cpp
@@ -13,7 +13,7 @@ using json = nlohmann::json;
void MainWindow::setupSendTab() {
// 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,8}\\.?[0-9]{0,8}"));
ui->Amount1->setValidator(amtValidator);
@@ -35,14 +35,14 @@ void MainWindow::setupSendTab() {
});
// The first Memo button
- QObject::connect(ui->MemoBtn1, &QPushButton::clicked, [=] () {
+ QObject::connect(ui->MemoBtn1, &QPushButton::clicked, [=] () {
this->memoButtonClicked(1);
});
setMemoEnabled(1, false);
-
+
// This is the damnest thing ever. If we do AddressBook::readFromStorage() directly, the whole file
// doesn't get read. It needs to run in a timer after everything has finished to be able to read
- // the file properly.
+ // the file properly.
QTimer::singleShot(2000, [=]() { updateLabelsAutoComplete(); });
// The first address book button
@@ -84,7 +84,7 @@ void MainWindow::setupSendTab() {
ui->lblMinerFeeUSD->setText(fee.toDecimalAUDString());
}
});
- ui->minerFeeAmt->setText(Settings::getMinerFee().toDecimalString());
+ ui->minerFeeAmt->setText(Settings::getMinerFee().toDecimalString());
// Set up focus enter to set fees
QObject::connect(ui->tabWidget, &QTabWidget::currentChanged, [=] (int pos) {
@@ -123,13 +123,13 @@ void MainWindow::setupSendTab() {
} else if (Settings::getInstance()->get_currency_name() == "AUD") {
QString feeUSD = CAmount::fromDecimalString(txt).toDecimalAUDString();
ui->lblMinerFeeUSD->setText(feeUSD);
- }
+ }
}
});
-
+
//Fees validator
- feesValidator = new QRegExpValidator(QRegExp("[0-9]{0,8}\\.?[0-9]{0,8}"));
+ feesValidator = new QRegExpValidator(QRegExp("[0-9]{0,8}\\.?[0-9]{0,8}"));
ui->minerFeeAmt->setValidator(feesValidator);
// Font for the first Memo label
@@ -138,9 +138,9 @@ void MainWindow::setupSendTab() {
ui->MemoTxt1->setFont(f);
// Recurring button
- QObject::connect(ui->chkRecurring, &QCheckBox::stateChanged, [=] (int checked) {
+ /*QObject::connect(ui->chkRecurring, &QCheckBox::stateChanged, [=] (int checked) {
if (checked) {
- ui->btnRecurSchedule->setEnabled(true);
+ ui->btnRecurSchedule->setEnabled(true);
// If this is the first time the button is checked, open the edit schedule dialog
if (sendTxRecurringInfo == nullptr) {
@@ -150,66 +150,66 @@ void MainWindow::setupSendTab() {
ui->btnRecurSchedule->setEnabled(false);
ui->lblRecurDesc->setText("");
}
- });
+ });*/
// Recurring schedule button
- QObject::connect(ui->btnRecurSchedule, &QPushButton::clicked, this, &MainWindow::editSchedule);
+ // QObject::connect(ui->btnRecurSchedule, &QPushButton::clicked, this, &MainWindow::editSchedule);
// Set the default state for the whole page
clearSendForm();
}
void MainWindow::disableRecurring() {
- if (!Settings::getInstance()->isTestnet()) {
+/* if (!Settings::getInstance()->isTestnet()) {
ui->chkRecurring->setVisible(false);
ui->chkRecurring->setEnabled(false);
ui->btnRecurSchedule->setVisible(false);
ui->btnRecurSchedule->setEnabled(false);
- ui->action_Recurring_Payments->setVisible(false);
- }
+ ui->action_Recurring_Payments->setVisible(false);*/
+ // }
}
void MainWindow::editSchedule() {
// Only on testnet for now
if (!Settings::getInstance()->isTestnet()) {
- QMessageBox::critical(this, "Not Supported yet",
+ QMessageBox::critical(this, "Not Supported yet",
"Recurring payments are only supported on Testnet for now.", QMessageBox::Ok);
return;
}
// Check to see that recurring payments are not selected when there are 2 or more addresses
if (ui->sendToWidgets->children().size()-1 > 2) {
- QMessageBox::critical(this, tr("Cannot support multiple addresses"),
+ QMessageBox::critical(this, tr("Cannot support multiple addresses"),
tr("Recurring payments doesn't currently support multiple addresses"), QMessageBox::Ok);
return;
}
// Open the edit schedule dialog
- auto recurringInfo = Recurring::getInstance()->getNewRecurringFromTx(this, this,
- createTxFromSendPage(), this->sendTxRecurringInfo);
- if (recurringInfo == nullptr) {
- // User pressed cancel.
+ // auto recurringInfo = Recurring::getInstance()->getNewRecurringFromTx(this, this,
+ // createTxFromSendPage(), this->sendTxRecurringInfo);
+ // if (recurringInfo == nullptr) {
+ // User pressed cancel.
// If there is no existing recurring info, uncheck the recurring box
- if (sendTxRecurringInfo == nullptr) {
- ui->chkRecurring->setCheckState(Qt::Unchecked);
- }
- }
- else {
- delete this->sendTxRecurringInfo;
+ // if (sendTxRecurringInfo == nullptr) {
+ // ui->chkRecurring->setCheckState(Qt::Unchecked);
+ // }
+ // }
+ // else {
+ // delete this->sendTxRecurringInfo;
- this->sendTxRecurringInfo = recurringInfo;
- ui->lblRecurDesc->setText(recurringInfo->getScheduleDescription());
- }
+ // this->sendTxRecurringInfo = recurringInfo;
+ // ui->lblRecurDesc->setText(recurringInfo->getScheduleDescription());
+ //}
}
void MainWindow::updateLabelsAutoComplete() {
QList list;
auto labels = AddressBook::getInstance()->getAllAddressLabels();
-
+
std::transform(labels.begin(), labels.end(), std::back_inserter(list), [=] (auto la) -> QString {
- return la.first % "/" % la.second;
+ return la.getName() % "/" % la.getPartnerAddress();
});
-
+
delete labelCompleter;
labelCompleter = new QCompleter(list, this);
labelCompleter->setCaseSensitivity(Qt::CaseInsensitive);
@@ -221,7 +221,7 @@ void MainWindow::updateLabelsAutoComplete() {
}
}
-
+
void MainWindow::addAddressSection() {
int itemNumber = ui->sendToWidgets->children().size() - 1;
@@ -239,7 +239,7 @@ void MainWindow::addAddressSection() {
horizontalLayout_12->addWidget(label_4);
auto Address1 = new QLineEdit(verticalGroupBox);
- Address1->setObjectName(QString("Address") % QString::number(itemNumber));
+ Address1->setObjectName(QString("Address") % QString::number(itemNumber));
Address1->setPlaceholderText(tr("Address"));
QObject::connect(Address1, &QLineEdit::textChanged, [=] (auto text) {
this->addressChanged(itemNumber, text);
@@ -261,16 +261,16 @@ void MainWindow::addAddressSection() {
auto horizontalLayout_13 = new QHBoxLayout();
horizontalLayout_13->setSpacing(6);
-
+
auto label_6 = new QLabel(verticalGroupBox);
label_6->setText(tr("Amount"));
horizontalLayout_13->addWidget(label_6);
auto Amount1 = new QLineEdit(verticalGroupBox);
- Amount1->setPlaceholderText(tr("Amount"));
- Amount1->setObjectName(QString("Amount") % QString::number(itemNumber));
+ Amount1->setPlaceholderText(tr("Amount"));
+ Amount1->setObjectName(QString("Amount") % QString::number(itemNumber));
Amount1->setBaseSize(QSize(200, 0));
- Amount1->setAlignment(Qt::AlignRight);
+ Amount1->setAlignment(Qt::AlignRight);
// Create the validator for send to/amount fields
Amount1->setValidator(amtValidator);
@@ -281,7 +281,7 @@ void MainWindow::addAddressSection() {
horizontalLayout_13->addWidget(Amount1);
auto AmtUSD1 = new QLabel(verticalGroupBox);
- AmtUSD1->setObjectName(QString("AmtUSD") % QString::number(itemNumber));
+ AmtUSD1->setObjectName(QString("AmtUSD") % QString::number(itemNumber));
horizontalLayout_13->addWidget(AmtUSD1);
auto horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -289,7 +289,7 @@ void MainWindow::addAddressSection() {
auto MemoBtn1 = new QPushButton(verticalGroupBox);
MemoBtn1->setObjectName(QString("MemoBtn") % QString::number(itemNumber));
- MemoBtn1->setText(tr("Memo"));
+ MemoBtn1->setText(tr("Memo"));
// Connect Memo Clicked button
QObject::connect(MemoBtn1, &QPushButton::clicked, [=] () {
this->memoButtonClicked(itemNumber);
@@ -307,24 +307,24 @@ void MainWindow::addAddressSection() {
MemoTxt1->setWordWrap(true);
sendAddressLayout->addWidget(MemoTxt1);
- ui->sendToLayout->insertWidget(itemNumber-1, verticalGroupBox);
+ ui->sendToLayout->insertWidget(itemNumber-1, verticalGroupBox);
// Disable recurring payments if a address section is added, since recurring payments
// aren't supported for more than 1 address
- delete sendTxRecurringInfo;
- sendTxRecurringInfo = nullptr;
- ui->lblRecurDesc->setText("");
- ui->chkRecurring->setChecked(false);
- ui->chkRecurring->setEnabled(false);
+ // delete sendTxRecurringInfo;
+ // sendTxRecurringInfo = nullptr;
+ // ui->lblRecurDesc->setText("");
+ // ui->chkRecurring->setChecked(false);
+ // ui->chkRecurring->setEnabled(false);
// Set focus into the address
Address1->setFocus();
// Delay the call to scroll to allow the scroll window to adjust
- QTimer::singleShot(10, [=] () {ui->sendToScrollArea->ensureWidgetVisible(ui->addAddressButton);});
+ QTimer::singleShot(10, [=] () {ui->sendToScrollArea->ensureWidgetVisible(ui->addAddressButton);});
}
-void MainWindow::addressChanged(int itemNumber, const QString& text) {
+void MainWindow::addressChanged(int itemNumber, const QString& text) {
auto addr = AddressBook::addressFromAddressLabel(text);
setMemoEnabled(itemNumber, Settings::isZAddress(addr));
}
@@ -358,10 +358,10 @@ void MainWindow::amountChanged(int item, const QString& text) {
}
// If there is a recurring payment, update the info there as well
- if (sendTxRecurringInfo != nullptr) {
- Recurring::getInstance()->updateInfoWithTx(sendTxRecurringInfo, createTxFromSendPage());
- ui->lblRecurDesc->setText(sendTxRecurringInfo->getScheduleDescription());
- }
+ //if (sendTxRecurringInfo != nullptr) {
+ // Recurring::getInstance()->updateInfoWithTx(sendTxRecurringInfo, createTxFromSendPage());
+ // ui->lblRecurDesc->setText(sendTxRecurringInfo->getScheduleDescription());
+ // }
}
void MainWindow::setMemoEnabled(int number, bool enabled) {
@@ -377,15 +377,15 @@ void MainWindow::setMemoEnabled(int number, bool enabled) {
void MainWindow::memoButtonClicked(int number, bool includeReplyTo) {
// Memos can only be used with zAddrs. So check that first
- auto addr = ui->sendToWidgets->findChild(QString("Address") + QString::number(number));
- if (! Settings::isZAddress(AddressBook::addressFromAddressLabel(addr->text()))) {
- QMessageBox msg(QMessageBox::Critical, tr("Memos can only be used with z-addresses"),
- tr("The memo field can only be used with a z-address.\n") + addr->text() + tr("\ndoesn't look like a z-address"),
- QMessageBox::Ok, this);
+ // auto addr = ui->sendToWidgets->findChild(QString("Address") + QString::number(number));
+ //if (! Settings::isZAddress(AddressBook::addressFromAddressLabel(addr->text()))) {
+ // QMessageBox msg(QMessageBox::Critical, tr("Memos can only be used with z-addresses"),
+ // tr("The memo field can only be used with a z-address.\n") + addr->text() + tr("\ndoesn't look like a z-address"),
+ // QMessageBox::Ok, this);
- msg.exec();
- return;
- }
+ // msg.exec();
+ // return;
+ // }
// Get the current memo if it exists
auto memoTxt = ui->sendToWidgets->findChild(QString("MemoTxt") + QString::number(number));
@@ -428,7 +428,7 @@ void MainWindow::memoButtonClicked(int number, bool includeReplyTo) {
void MainWindow::clearSendForm() {
// The last one is a spacer, so ignore that
- int totalItems = ui->sendToWidgets->children().size() - 2;
+ int totalItems = ui->sendToWidgets->children().size() - 2;
// Clear the first recipient fields
auto addr = ui->sendToWidgets->findChild(QString("Address1"));
@@ -451,43 +451,43 @@ void MainWindow::clearSendForm() {
// Start the deletion after the first item, since we want to keep 1 send field there all there
for (int i=1; i < totalItems; i++) {
auto addressGroupBox = ui->sendToWidgets->findChild(QString("AddressGroupBox") % QString::number(i+1));
-
+
delete addressGroupBox;
- }
+ }
// Reset the recurring button
if (Settings::getInstance()->isTestnet()) {
- ui->chkRecurring->setEnabled(true);
- }
+ // ui->chkRecurring->setEnabled(true);
+ }
- ui->chkRecurring->setCheckState(Qt::Unchecked);
- ui->btnRecurSchedule->setEnabled(false);
- ui->lblRecurDesc->setText("");
- delete sendTxRecurringInfo;
- sendTxRecurringInfo = nullptr;
+ // ui->chkRecurring->setCheckState(Qt::Unchecked);
+ // ui->btnRecurSchedule->setEnabled(false);
+ // ui->lblRecurDesc->setText("");
+ // delete sendTxRecurringInfo;
+ // sendTxRecurringInfo = nullptr;
}
void MainWindow::maxAmountChecked(int checked) {
if (checked == Qt::Checked) {
ui->Amount1->setReadOnly(true);
if (rpc == nullptr) return;
-
+
// Calculate maximum amount
CAmount sumAllAmounts;
// Calculate all other amounts
- int totalItems = ui->sendToWidgets->children().size() - 2; // The last one is a spacer, so ignore that
+ int totalItems = ui->sendToWidgets->children().size() - 2; // The last one is a spacer, so ignore that
// Start counting the sum skipping the first one, because the MAX button is on the first one, and we don't
- // want to include it in the sum.
+ // want to include it in the sum.
for (int i=1; i < totalItems; i++) {
auto amt = ui->sendToWidgets->findChild(QString("Amount") % QString::number(i+1));
sumAllAmounts = sumAllAmounts + CAmount::fromDecimalString(amt->text());
}
sumAllAmounts = sumAllAmounts + Settings::getMinerFee();
-
+
auto maxamount = rpc->getModel()->getAvailableBalance() - sumAllAmounts;
maxamount = (maxamount < 0) ? CAmount::fromqint64(0): maxamount;
-
+
ui->Amount1->setText(maxamount.toDecimalString());
} else if (checked == Qt::Unchecked) {
// Just remove the readonly part, don't change the content
@@ -495,61 +495,61 @@ void MainWindow::maxAmountChecked(int checked) {
}
}
-// Create a Tx from the current state of the send page.
+// Create a Tx from the current state of the send page.
Tx MainWindow::createTxFromSendPage() {
Tx tx;
// For each addr/amt in the sendTo tab
- int totalItems = ui->sendToWidgets->children().size() - 2; // The last one is a spacer, so ignore that
+ int totalItems = ui->sendToWidgets->children().size() - 2; // The last one is a spacer, so ignore that
CAmount totalAmt;
for (int i=0; i < totalItems; i++) {
QString addr = ui->sendToWidgets->findChild(QString("Address") % QString::number(i+1))->text().trimmed();
-
+
// Remove label if it exists
addr = AddressBook::addressFromAddressLabel(addr);
// QString dustamt = "0";
QString amtStr = ui->sendToWidgets->findChild(QString("Amount") % QString::number(i+1))->text().trimmed();
if (amtStr.isEmpty()) {
amtStr = "-1";; // The user didn't specify an amount
- }
+ }
bool ok;
CAmount amt;
-
-
+
+
// Make sure it parses
amtStr.toDouble(&ok);
if (!ok) {
amt = CAmount::fromqint64(-1);
-
+
} else {
amt = CAmount::fromDecimalString(amtStr);
totalAmt = totalAmt + amt;
-
+
}
-
+
QString memo = ui->sendToWidgets->findChild(QString("MemoTxt") % QString::number(i+1))->text().trimmed();
-
-
+
+
tx.toAddrs.push_back( ToFields{addr, amt, memo} );
-
-
+
+
}
-
+
tx.fee = Settings::getMinerFee();
-
+
return tx;
}
bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
- // Function to split the address to make it easier to read.
- // Split it into chunks of 4 chars.
+ // Function to split the address to make it easier to read.
+ // Split it into chunks of 4 chars.
auto fnSplitAddressForWrap = [=] (const QString& a) -> QString {
if (Settings::isTAddress(a))
return a;
@@ -601,8 +601,8 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
delete confirm.sendToAddrs->findChild("labelMinerFee");
delete confirm.sendToAddrs->findChild("minerFee");
delete confirm.sendToAddrs->findChild("minerFeeUSD");
-
- // For each addr/amt/memo, construct the JSON and also build the confirm dialog box
+
+ // For each addr/amt/memo, construct the JSON and also build the confirm dialog box
int row = 0;
CAmount totalSpending;
@@ -632,7 +632,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
AmtUSD->setText(toAddr.amount.toDecimalUSDString());
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
- confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
+ confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
// Amount (EUR)
} else if (Settings::getInstance()->get_currency_name() == "EUR") {
@@ -640,7 +640,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
AmtUSD->setText(toAddr.amount.toDecimalEURString());
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
- confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
+ confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
// Amount (BTC)
} else if (Settings::getInstance()->get_currency_name() == "BTC") {
@@ -648,7 +648,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
AmtUSD->setText(toAddr.amount.toDecimalBTCString());
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
- confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
+ confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
// Amount (CNY)
} else if (Settings::getInstance()->get_currency_name() == "CNY") {
@@ -656,7 +656,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
AmtUSD->setText(toAddr.amount.toDecimalCNYString());
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
- confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
+ confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
// Amount (RUB)
} else if (Settings::getInstance()->get_currency_name() == "RUB") {
@@ -664,7 +664,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
AmtUSD->setText(toAddr.amount.toDecimalRUBString());
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
- confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
+ confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
// Amount (CAD)
} else if (Settings::getInstance()->get_currency_name() == "CAD") {
@@ -672,7 +672,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
AmtUSD->setText(toAddr.amount.toDecimalCADString());
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
- confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
+ confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
// Amount (SGD)
} else if (Settings::getInstance()->get_currency_name() == "SGD") {
@@ -680,7 +680,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
AmtUSD->setText(toAddr.amount.toDecimalSGDString());
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
- confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
+ confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
// Amount (CHF)
} else if (Settings::getInstance()->get_currency_name() == "CHF") {
@@ -688,7 +688,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
AmtUSD->setText(toAddr.amount.toDecimalCHFString());
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
- confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
+ confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
// Amount (INR)
} else if (Settings::getInstance()->get_currency_name() == "INR") {
@@ -696,7 +696,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
AmtUSD->setText(toAddr.amount.toDecimalINRString());
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
- confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
+ confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
// Amount (GBP)
} else if (Settings::getInstance()->get_currency_name() == "GBP") {
@@ -704,7 +704,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
AmtUSD->setText(toAddr.amount.toDecimalGBPString());
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
- confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
+ confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
// Amount (AUD)
} else if (Settings::getInstance()->get_currency_name() == "AUD") {
@@ -712,7 +712,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
AmtUSD->setText(toAddr.amount.toDecimalAUDString());
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
- confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
+ confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1);
}
// Memo
if (Settings::isZAddress(toAddr.addr) && !toAddr.memo.isEmpty()) {
@@ -798,10 +798,10 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
// Syncing warning
confirm.syncingWarning->setVisible(Settings::getInstance()->isSyncing());
-
+
// Show the dialog and submit it if the user confirms
- return d.exec() == QDialog::Accepted;
+ return d.exec() == QDialog::Accepted;
}
// Send button clicked
@@ -824,9 +824,9 @@ void MainWindow::sendButton() {
}
// Show a dialog to confirm the Tx
- if (confirmTx(tx, sendTxRecurringInfo)) {
- // If this is a recurring payment, save the hash so we can
- // update the payment if it submits.
+ if (confirmTx(tx, sendTxRecurringInfo)) {
+ // If this is a recurring payment, save the hash so we can
+ // update the payment if it submits.
QString recurringPaymentHash;
// Recurring payments are enabled only if there is exactly 1 destination address.
@@ -843,8 +843,18 @@ void MainWindow::sendButton() {
auto d = new QDialog(this);
auto connD = new Ui_ConnectionDialog();
connD->setupUi(d);
- QPixmap logo(":/img/res/logobig.gif");
- connD->topIcon->setBasePixmap(logo.scaled(256, 256, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+ QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");;
+ QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-dark.gif");;
+ auto theme = Settings::getInstance()->get_theme_name();
+ if (theme == "Dark" || theme == "Midnight") {
+ movie2->setScaledSize(QSize(512,512));
+ connD->topIcon->setMovie(movie2);
+ movie2->start();
+ } else {
+ movie1->setScaledSize(QSize(512,512));
+ connD->topIcon->setMovie(movie1);
+ movie1->start();
+ }
connD->status->setText(tr("Please wait..."));
connD->statusDetail->setText(tr("Computing your transaction"));
@@ -852,8 +862,8 @@ void MainWindow::sendButton() {
d->show();
// And send the Tx
- rpc->executeTransaction(tx,
- [=] (QString txid) {
+ rpc->executeTransaction(tx,
+ [=] (QString txid) {
ui->statusBar->showMessage(Settings::txidStatusMessage + " " + txid);
connD->status->setText(tr("Done!"));
@@ -868,40 +878,40 @@ void MainWindow::sendButton() {
// And switch to the balances tab
ui->tabWidget->setCurrentIndex(0);
});
-
+
// Force a UI update so we get the unconfirmed Tx
rpc->refresh(true);
// If this was a recurring payment, update the payment with the info
if (!recurringPaymentHash.isEmpty()) {
// Since this is the send button payment, this is the first payment
- Recurring::getInstance()->updatePaymentItem(recurringPaymentHash, 0,
+ Recurring::getInstance()->updatePaymentItem(recurringPaymentHash, 0,
txid, "", PaymentStatus::COMPLETED);
}
},
// Errored out
[=] (QString opid, QString errStr) {
ui->statusBar->showMessage(QObject::tr(" Tx ") % opid % QObject::tr(" failed"), 15 * 1000);
-
+
d->accept();
d->close();
delete connD;
delete d;
if (!opid.isEmpty())
- errStr = QObject::tr("The transaction with id ") % opid % QObject::tr(" failed. The error was") + ":\n\n" + errStr;
+ errStr = QObject::tr("The transaction with id ") % opid % QObject::tr(" failed. The error was") + ":\n\n" + errStr;
// If this was a recurring payment, update the payment with the failure
if (!recurringPaymentHash.isEmpty()) {
// Since this is the send button payment, this is the first payment
- Recurring::getInstance()->updatePaymentItem(recurringPaymentHash, 0,
- "", errStr, PaymentStatus::ERROR);
- }
+ Recurring::getInstance()->updatePaymentItem(recurringPaymentHash, 0,
+ "", errStr, PaymentStatus::ERROR);
+ }
- QMessageBox::critical(this, QObject::tr("Transaction Error"), errStr, QMessageBox::Ok);
+ QMessageBox::critical(this, QObject::tr("Transaction Error"), errStr, QMessageBox::Ok);
}
);
- }
+ }
}
QString MainWindow::doSendTxValidations(Tx tx) {
@@ -915,7 +925,7 @@ QString MainWindow::doSendTxValidations(Tx tx) {
}
// This technically shouldn't be possible, but issue #62 seems to have discovered a bug
- // somewhere, so just add a check to make sure.
+ // somewhere, so just add a check to make sure.
if (toAddr.amount.toqint64() < 0) {
return QString(tr("Amount for address '%1' is invalid!").arg(toAddr.addr));
}
@@ -927,7 +937,7 @@ QString MainWindow::doSendTxValidations(Tx tx) {
auto available = rpc->getModel()->getAvailableBalance();
if (available < total) {
- return tr("Not enough available funds to send this transaction\n\nHave: %1\nNeed: %2\n\nNote: Funds need 5 confirmations before they can be spent")
+ return tr("Not enough available funds to send this transaction\n\nHave: %1\nNeed: %2\n\nNote: Funds need 1 confirmations before they can be spent")
.arg(available.toDecimalhushString(), total.toDecimalhushString());
}
@@ -937,4 +947,3 @@ QString MainWindow::doSendTxValidations(Tx tx) {
void MainWindow::cancelButton() {
clearSendForm();
}
-
diff --git a/src/settings.cpp b/src/settings.cpp
index fbfb1cb..fd47f76 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -225,16 +225,12 @@ QString Settings::get_currency_name() {
}
void Settings::set_currency_name(QString currency_name) {
- QSettings().setValue("options/currency_name", currency_name);
-
-
-
+ QSettings().setValue("options/currency_name", currency_name);
}
-
QString Settings::get_theme_name() {
// Load from the QT Settings.
- return QSettings().value("options/theme_name", false).toString();
+ return QSettings().value("options/theme_name", "Dark").toString();
}
void Settings::set_theme_name(QString theme_name) {
@@ -242,6 +238,9 @@ void Settings::set_theme_name(QString theme_name) {
}
+
+
+
//=================================
// Static Stuff
//=================================
@@ -303,7 +302,7 @@ QString Settings::getDonationAddr() {
if (Settings::getInstance()->isTestnet())
return "ztestsaplingXXX";
else
- return "zs1kwp3h4rwz76zfqzmwqqextq696kndtjskg4fzc80l9ygfal4hchcsst83ua8tjwzzy9nja7v5rr";
+ return "zs1fq9f7vg797qaeac9lyx0njyjmjg4w7m60hwq6lhyhvdcqltl5hdkm8vwx9cxy60ehuuz2x49jxt";
}
diff --git a/src/settings.h b/src/settings.h
index a917d67..c598369 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -67,6 +67,8 @@ public:
void set_currency_name(QString currency_name);
+
+
bool isSaplingActive();
void setZECPrice(double p) { ZECPrice = p; }
diff --git a/src/settings.ui b/src/settings.ui
index 419509c..57620e5 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -6,10 +6,28 @@
0
0
- 733
- 539
+ 590
+ 443
+
+
+ 0
+ 0
+
+
+
+
+ 590
+ 443
+
+
+
+
+ 590
+ 443
+
+
Settings
@@ -85,7 +103,7 @@
80
110
- 80
+ 111
25
@@ -97,22 +115,27 @@
-
- default
+ Dark
-
- blue
+ Midnight
-
- light
+ Light
-
- dark
+ Blue
+
+
+ -
+
+ Default
@@ -236,7 +259,7 @@
80
150
- 80
+ 111
25
diff --git a/src/startupencryption.ui b/src/startupencryption.ui
new file mode 100644
index 0000000..963d2f0
--- /dev/null
+++ b/src/startupencryption.ui
@@ -0,0 +1,129 @@
+
+
+ startup
+
+
+
+ 0
+ 0
+ 400
+ 177
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 400
+ 177
+
+
+
+
+ 400
+ 177
+
+
+
+ SDL Startup Decryption
+
+
+ -
+
+
+ <html><head/><body><p>If you have forgotten your passphrase, restore your wallet with your seed!</p></body></html>
+
+
+ Qt::AlignCenter
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Encryption Passphrase:
+
+
+
+ -
+
+
+
+ 0
+ 25
+
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ startup
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ startup
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/version.h b/src/version.h
index f3c7693..875d8ab 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.2.2"
+#define APP_VERSION "1.3-Chat-Alpha"