DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #20 from DenioD/chat

Browse Source 
Chat
This commit is contained in:
Strider
2020-05-10 11:23:25 +02:00
committed by GitHub
parent 6c4ee63b72 d48a7c64be
commit a672d0a461
3 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/controller.cpp
View File

@@ -889,7 +889,7 @@ void Controller::refreshTransactions() {
txid, txid,
true true
); );
//DataStore::getChatDataStore()->setData(chatModel->generateChatItemID(item), item);
DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item); DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item);
} }
@@ -920,6 +920,7 @@ void Controller::refreshTransactions() {
model->markAddressUsed(address); model->markAddressUsed(address);
QString memo; QString memo;
QString test;
if (!it["memo"].is_null()) { if (!it["memo"].is_null()) {
memo = QString::fromStdString(it["memo"]); memo = QString::fromStdString(it["memo"]);
} }
@@ -939,16 +940,16 @@ void Controller::refreshTransactions() {
QString type; QString type;
QString cid; QString cid;
// int position; // int position;
QString requestZaddr1;
QString requestZaddr; QString requestZaddr;
if (memo.startsWith("{")) { if (memo.startsWith("{")) {
type = memo.mid(75,4); QJsonDocument headermemo = QJsonDocument::fromJson(memo.toUtf8());
cid = memo.mid(14,36);
requestZaddr1 = memo.right(82); cid = headermemo["cid"].toString();
requestZaddr = requestZaddr1.left(78); type = headermemo["t"].toString();
requestZaddr = headermemo["z"].toString();
chatModel->addCid(txid, cid); chatModel->addCid(txid, cid);
chatModel->addrequestZaddr(txid, requestZaddr); chatModel->addrequestZaddr(txid, requestZaddr);
@@ -997,7 +998,7 @@ void Controller::refreshTransactions() {
txid, txid,
false false
); );
//DataStore::getChatDataStore()->setData(chatModel->generateChatItemID(item), item);
DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item); DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item);
} }
} }

4
src/mainwindow.cpp
View File

@@ -908,9 +908,9 @@ void MainWindow::setupTransactionsTab() {
// Set up context menu on transactions tab // Set up context menu on transactions tab
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
if (theme == "dark" || theme == "midnight") { if (theme == "dark" || theme == "midnight") {
ui->listChat->setStyleSheet("background-image: url(res/sdlogo.png) ;background-attachment: fixed ;background-position: center center ;background-repeat: no-repeat;background-size: cover"); 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(res/sdlogo2.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->setResizeMode(QListView::Adjust);
ui->listChat->setWordWrap(true); ui->listChat->setWordWrap(true);

37
src/mainwindow.ui
View File

@@ -10,6 +10,43 @@
<height>779</height> <height>779</height>
</rect> </rect>
</property> </property>
<property name="palette">
<palette>
<active>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>SilentDragonLite</string> <string>SilentDragonLite</string>
</property> </property>