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

new Button Design, only for darkmode atm

Browse Source
This commit is contained in:
DenioD
2020-05-06 16:54:15 +02:00
parent 5ff2d1ba47
commit 6991743b5f
13 changed files with 151 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controller.cpp
View File

@@ -874,7 +874,7 @@ void Controller::refreshTransactions() {
if (address == c.getPartnerAddress()){
contact = c.getName();
}else{ contact = "";}
}
ChatItem item = ChatItem(
datetime,
@@ -889,7 +889,7 @@ void Controller::refreshTransactions() {
);
chatModel->addMessage(item);
}
items.push_back(TransactionItemDetail{address, amount, memo});
total_amount = total_amount + amount;
@@ -980,7 +980,7 @@ void Controller::refreshTransactions() {
contact = c.getName();
}else{ contact = "";}
}
ChatItem item = ChatItem(
datetime,
address,
@@ -994,7 +994,7 @@ void Controller::refreshTransactions() {
);
chatModel->addMessage(item);
}
}
}

18
src/mainwindow.cpp
View File

@@ -1013,12 +1013,12 @@ void MainWindow::setupchatTab() {
// if (ui->request->isChecked()) {
QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::ContactRequest);
// QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::ContactRequest);
// qDebug() <<ui->request->isChecked()->text();
// }else{
// QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::sendChatButton);
QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::sendChatButton);
// }
@@ -1048,20 +1048,6 @@ void MainWindow::setupchatTab() {
}
/*
void MainWindow::setChatItem(ChatItem * item)
{
this->currentChatItem = item;
}
ChatItem* MainWindow::getChatItem()
{
return this->currentChatItem;
}*/
ChatMemoEdit::ChatMemoEdit(QWidget* parent) : QPlainTextEdit(parent) {
QObject::connect(this, &QPlainTextEdit::textChanged, this, &ChatMemoEdit::updateDisplay);
}

121
src/mainwindow.ui
View File

@@ -1332,9 +1332,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>40</y>
<y>90</y>
<width>341</width>
<height>601</height>
<height>551</height>
</rect>
</property>
<property name="mouseTracking">
@@ -1354,7 +1354,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<y>60</y>
<width>341</width>
<height>20</height>
</rect>
@@ -1392,32 +1392,10 @@
<widget class="QPushButton" name="sendChatButton">
<property name="geometry">
<rect>
<x>720</x>
<y>640</y>
<width>114</width>
<height>25</height>
</rect>
</property>
<property name="baseSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Send</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
<widget class="QPushButton" name="safeContactRequest">
<property name="geometry">
<rect>
<x>0</x>
<y>640</y>
<x>1170</x>
<y>560</y>
<width>91</width>
<height>25</height>
<height>81</height>
</rect>
</property>
<property name="baseSize">
@@ -1426,11 +1404,28 @@
<height>0</height>
</size>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string>Add contact</string>
<string/>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/res/send-new-white.png</normalon>
</iconset>
</property>
<property name="iconSize">
<size>
<width>61</width>
<height>62</height>
</size>
</property>
<property name="default">
<bool>false</bool>
</property>
<property name="flat">
<bool>false</bool>
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="contactNameMemo_3">
@@ -1484,7 +1479,7 @@
<property name="geometry">
<rect>
<x>340</x>
<y>650</y>
<y>640</y>
<width>261</width>
<height>23</height>
</rect>
@@ -1493,17 +1488,71 @@
<string>Is this message a contact request?</string>
</property>
</widget>
<widget class="QPushButton" name="safeContactRequest">
<property name="geometry">
<rect>
<x>90</x>
<y>0</y>
<width>71</width>
<height>61</height>
</rect>
</property>
<property name="baseSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../application.qrc">
<normaloff>:/icons/res/add_contact.png</normaloff>:/icons/res/add_contact.png</iconset>
</property>
<property name="iconSize">
<size>
<width>43</width>
<height>49</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="pushContact">
<property name="geometry">
<rect>
<x>110</x>
<y>640</y>
<width>191</width>
<height>25</height>
<x>170</x>
<y>0</y>
<width>71</width>
<height>61</height>
</rect>
</property>
<property name="baseSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string>Incoming contact request</string>
<string/>
</property>
<property name="icon">
<iconset resource="../application.qrc">
<normaloff>:/icons/res/notification.png</normaloff>:/icons/res/notification.png</iconset>
</property>
<property name="iconSize">
<size>
<width>43</width>
<height>49</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</widget>