Strider
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with
54 additions and
44 deletions
-
application.qrc
-
BIN
res/Elsa.png
-
src/addressbook.ui
-
src/chatmodel.cpp
-
src/contactrequest.ui
-
src/controller.cpp
-
src/mainwindow.cpp
-
src/mainwindow.h
-
src/mainwindow.ui
|
|
@ -22,10 +22,10 @@ |
|
|
|
<file>res/Garfield.png</file> |
|
|
|
<file>res/Pinguin.png</file> |
|
|
|
<file>res/Stag.png</file> |
|
|
|
<file>res/Elsa.png</file> |
|
|
|
</qresource> |
|
|
|
<qresource prefix="/img"> |
|
|
|
<file>res/hushdlogo.gif</file> |
|
|
|
<file>res/logobig.gif</file> |
|
|
|
<file>res/silentdragonlite-animated.gif</file> |
|
|
|
<file>res/silentdragonlite-animated-dark.gif</file> |
|
|
|
<file>res/silentdragonlite-animated-startup.gif</file> |
|
|
|
Width:
|
Height:
|
Size: 92 KiB
|
|
|
@ -73,6 +73,16 @@ |
|
|
|
</iconset> |
|
|
|
</property> |
|
|
|
</item> |
|
|
|
<item> |
|
|
|
<property name="text"> |
|
|
|
<string>Elsa</string> |
|
|
|
</property> |
|
|
|
<property name="icon"> |
|
|
|
<iconset> |
|
|
|
<normalon>:/icons/res/Elsa.png</normalon> |
|
|
|
</iconset> |
|
|
|
</property> |
|
|
|
</item> |
|
|
|
<item> |
|
|
|
<property name="text"> |
|
|
|
<string>Denio</string> |
|
|
|
|
|
@ -228,12 +228,13 @@ Tx MainWindow::createTxFromChatPage() { |
|
|
|
|
|
|
|
QString hmemo= createHeaderMemo(type,cid,myAddr); |
|
|
|
QString memo = ui->memoTxtChat->toPlainText().trimmed(); |
|
|
|
|
|
|
|
|
|
|
|
// ui->memoSizeChat->setLenDisplayLabel();// Todo -> activate lendisplay for chat
|
|
|
|
|
|
|
|
tx.toAddrs.push_back(ToFields{addr, amt, hmemo}) ; |
|
|
|
|
|
|
|
// ui->memoSizeChat->setLenDisplayLabel();// Todo -> activate lendisplay for chat
|
|
|
|
tx.toAddrs.push_back(ToFields{addr, amt, memo}); |
|
|
|
tx.toAddrs.push_back(ToFields{addr, amt, hmemo}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
qDebug() << "pushback chattx"; |
|
|
|
} } |
|
|
@ -472,9 +473,9 @@ Tx MainWindow::createTxForSafeContactRequest() { |
|
|
|
QString hmemo= createHeaderMemo(type,cid,myAddr); |
|
|
|
QString memo = ui->memoTxtChat->toPlainText().trimmed(); |
|
|
|
|
|
|
|
|
|
|
|
tx.toAddrs.push_back(ToFields{addr, amt, hmemo}); |
|
|
|
tx.toAddrs.push_back(ToFields{addr, amt, memo}); |
|
|
|
tx.toAddrs.push_back(ToFields{addr, amt, hmemo}); |
|
|
|
|
|
|
|
|
|
|
|
qDebug() << "pushback chattx"; |
|
|
|
|
|
|
|
|
|
@ -28,7 +28,7 @@ |
|
|
|
</property> |
|
|
|
</widget> |
|
|
|
</item> |
|
|
|
<item row="1" column="1" colspan="2"> |
|
|
|
<item row="1" column="1"> |
|
|
|
<widget class="QComboBox" name="comboBoxAvatar"> |
|
|
|
<item> |
|
|
|
<property name="text"> |
|
|
@ -36,7 +36,17 @@ |
|
|
|
</property> |
|
|
|
<property name="icon"> |
|
|
|
<iconset> |
|
|
|
<activeon>:/icons/res/Hirsch.png</activeon> |
|
|
|
<activeon>:/icons/res/Stag.png</activeon> |
|
|
|
</iconset> |
|
|
|
</property> |
|
|
|
</item> |
|
|
|
<item> |
|
|
|
<property name="text"> |
|
|
|
<string>Elsa</string> |
|
|
|
</property> |
|
|
|
<property name="icon"> |
|
|
|
<iconset> |
|
|
|
<normalon>:/icons/res/Elsa.png</normalon> |
|
|
|
</iconset> |
|
|
|
</property> |
|
|
|
</item> |
|
|
@ -162,7 +172,7 @@ |
|
|
|
</property> |
|
|
|
</widget> |
|
|
|
</item> |
|
|
|
<item row="4" column="0" colspan="3"> |
|
|
|
<item row="4" column="0"> |
|
|
|
<widget class="QLineEdit" name="zaddr"/> |
|
|
|
</item> |
|
|
|
<item row="5" column="0"> |
|
|
@ -172,12 +182,8 @@ |
|
|
|
</property> |
|
|
|
</widget> |
|
|
|
</item> |
|
|
|
<item row="6" column="0" colspan="3"> |
|
|
|
<widget class="QLabel" name="myzaddr"> |
|
|
|
<property name="text"> |
|
|
|
<string/> |
|
|
|
</property> |
|
|
|
</widget> |
|
|
|
<item row="6" column="0"> |
|
|
|
<widget class="QLineEdit" name="myzaddr"/> |
|
|
|
</item> |
|
|
|
<item row="7" column="0"> |
|
|
|
<widget class="QLabel" name="label_5"> |
|
|
|
|
|
@ -882,7 +882,7 @@ void Controller::refreshTransactions() { |
|
|
|
|
|
|
|
QString cid; |
|
|
|
QString contact; |
|
|
|
|
|
|
|
|
|
|
|
for(auto &c : AddressBook::getInstance()->getAllAddressLabels()) |
|
|
|
{ |
|
|
|
if (ui->contactNameMemo->text().trimmed() == c.getName()) { |
|
|
@ -894,7 +894,7 @@ void Controller::refreshTransactions() { |
|
|
|
contact = c.getName(); |
|
|
|
}else{ contact = "";} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ChatItem item = ChatItem( |
|
|
|
datetime, |
|
|
|
address, |
|
|
@ -906,6 +906,7 @@ void Controller::refreshTransactions() { |
|
|
|
); |
|
|
|
chatModel->addMessage(item); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
@ -918,11 +919,9 @@ void Controller::refreshTransactions() { |
|
|
|
QList<QString> addresses; |
|
|
|
for (auto item : items) { |
|
|
|
// Concat all the addresses
|
|
|
|
if (item.amount == 0) { |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
|
|
|
|
addresses.push_back(item.address); } |
|
|
|
addresses.push_back(item.address); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
@ -932,6 +931,7 @@ void Controller::refreshTransactions() { |
|
|
|
txdata.push_back(TransactionItem{ |
|
|
|
"send", datetime, address, txid,confirmations, items |
|
|
|
}); |
|
|
|
|
|
|
|
} else { |
|
|
|
// Incoming Transaction
|
|
|
|
address = (it["address"].is_null() ? "" : QString::fromStdString(it["address"])); |
|
|
|
|
|
@ -40,7 +40,7 @@ MainWindow::MainWindow(QWidget *parent) : |
|
|
|
|
|
|
|
|
|
|
|
ui->setupUi(this); |
|
|
|
ui->request->setChecked(true); |
|
|
|
ui->request->setChecked(false); |
|
|
|
logger = new Logger(this, QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite-wallet.log")); |
|
|
|
ui->memoTxtChat->setAutoFillBackground(false); |
|
|
|
ui->memoTxtChat->setPlaceholderText("Send Message"); |
|
|
@ -1077,10 +1077,6 @@ void ChatMemoEdit::setMaxLen(int len) { |
|
|
|
updateDisplay(); |
|
|
|
} |
|
|
|
|
|
|
|
void ChatMemoEdit::setLenDisplayLabel(QLabel* label_40) { |
|
|
|
this->lenDisplayLabel = label_40; |
|
|
|
} |
|
|
|
|
|
|
|
void ChatMemoEdit::setSendChatButton(QPushButton* button) { |
|
|
|
this->sendChatButton = button; |
|
|
|
} |
|
|
|
|
|
@ -93,6 +93,7 @@ private: |
|
|
|
void setupBalancesTab(); |
|
|
|
void setuphushdTab(); |
|
|
|
void setupchatTab(); |
|
|
|
void setLenDisplayLabel(QLabel* label); |
|
|
|
|
|
|
|
void updateContacts(); |
|
|
|
void updateChat(); |
|
|
@ -168,7 +169,7 @@ public: |
|
|
|
ChatMemoEdit(QWidget* parent); |
|
|
|
|
|
|
|
void setMaxLen(int len); |
|
|
|
void setLenDisplayLabel(QLabel* label_40); |
|
|
|
|
|
|
|
void setSendChatButton(QPushButton* button); |
|
|
|
void includeReplyTo(QString replyToAddress); |
|
|
|
void updateDisplay(); |
|
|
|
|
|
@ -1337,6 +1337,18 @@ |
|
|
|
<height>601</height> |
|
|
|
</rect> |
|
|
|
</property> |
|
|
|
<property name="mouseTracking"> |
|
|
|
<bool>true</bool> |
|
|
|
</property> |
|
|
|
<property name="editTriggers"> |
|
|
|
<set>QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set> |
|
|
|
</property> |
|
|
|
<property name="alternatingRowColors"> |
|
|
|
<bool>false</bool> |
|
|
|
</property> |
|
|
|
<property name="selectionMode"> |
|
|
|
<enum>QAbstractItemView::SingleSelection</enum> |
|
|
|
</property> |
|
|
|
</widget> |
|
|
|
<widget class="QLabel" name="label_39"> |
|
|
|
<property name="geometry"> |
|
|
@ -1364,22 +1376,6 @@ |
|
|
|
<string notr="true">font: 11pt "Noto Color Emoji";</string> |
|
|
|
</property> |
|
|
|
</widget> |
|
|
|
<widget class="QLabel" name="memoSizeChat"> |
|
|
|
<property name="geometry"> |
|
|
|
<rect> |
|
|
|
<x>1190</x> |
|
|
|
<y>650</y> |
|
|
|
<width>47</width> |
|
|
|
<height>17</height> |
|
|
|
</rect> |
|
|
|
</property> |
|
|
|
<property name="text"> |
|
|
|
<string notr="true">0 / 512</string> |
|
|
|
</property> |
|
|
|
<property name="alignment"> |
|
|
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |
|
|
|
</property> |
|
|
|
</widget> |
|
|
|
<widget class="QLabel" name="contactNameMemo"> |
|
|
|
<property name="geometry"> |
|
|
|
<rect> |
|
|
|