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

Merge branch 'chat' of https://github.com/DenioD/SilentDragonLite-1 into chat

Browse Source
This commit is contained in:
DenioD
2020-06-10 17:08:23 +02:00
parent 92e20e1c98 8056fe0e4b
commit 16202b0b66
24 changed files with 351 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
application.qrc
View File

@@ -47,7 +47,6 @@
<file>res/addContactBlack.png</file> <file>res/addContactBlack.png</file>
<file>res/unknownBlack.png</file> <file>res/unknownBlack.png</file>
<file>res/unknownWhite.png</file> <file>res/unknownWhite.png</file>
</qresource> </qresource>
<qresource prefix="/img"> <qresource prefix="/img">
<file>res/hushdlogo.gif</file> <file>res/hushdlogo.gif</file>
@@ -59,21 +58,21 @@
<file>res/loaderwhite.gif</file> <file>res/loaderwhite.gif</file>
</qresource> </qresource>
<qresource prefix="/translations"> <qresource prefix="/translations">
<file>res/silentdragonlite_de.qm</file> <file>res/silentdragonlite_de.qm</file>
<file>res/silentdragonlite_es.qm</file> <file>res/silentdragonlite_es.qm</file>
<file>res/silentdragonlite_fr.qm</file> <file>res/silentdragonlite_fr.qm</file>
<file>res/silentdragonlite_pt.qm</file> <file>res/silentdragonlite_pt.qm</file>
<file>res/silentdragonlite_it.qm</file> <file>res/silentdragonlite_it.qm</file>
<file>res/silentdragonlite_hr.qm</file> <file>res/silentdragonlite_hr.qm</file>
<file>res/silentdragonlite_fa.qm</file> <file>res/silentdragonlite_fa.qm</file>
<file>res/silentdragonlite_id.qm</file> <file>res/silentdragonlite_id.qm</file>
</qresource> </qresource>
<qresource prefix="/css"> <qresource prefix="/css">
<file>res/css/blue.css</file> <file>res/css/Blue.css</file>
<file>res/css/dark.css</file> <file>res/css/Dark.css</file>
<file>res/css/default.css</file> <file>res/css/Default.css</file>
<file>res/css/light.css</file> <file>res/css/Light.css</file>
<file>res/css/midnight.css</file> <file>res/css/Midnight.css</file>
</qresource> </qresource>
<qresource prefix="/images/blue"> <qresource prefix="/images/blue">
<file>res/images/blue/unchecked.png</file> <file>res/images/blue/unchecked.png</file>

0
res/css/blue.css → res/css/Blue.css
View File

0
res/css/dark.css → res/css/Dark.css
View File

0
res/css/default.css → res/css/Default.css
View File

0
res/css/light.css → res/css/Light.css
View File

0
res/css/midnight.css → res/css/Midnight.css
View File

49
src/addressbook.ui
View File

@@ -67,15 +67,28 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;Nickname :&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nickname :&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLineEdit" name="addr"/> <widget class="QLineEdit" name="addr">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
</widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="label"> <widget class="QLineEdit" name="label">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="maxLength"> <property name="maxLength">
<number>25</number> <number>25</number>
</property> </property>
@@ -89,7 +102,14 @@
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLineEdit" name="addr_chat"/> <widget class="QLineEdit" name="addr_chat">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
</widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
@@ -99,10 +119,23 @@
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLineEdit" name="cid"/> <widget class="QLineEdit" name="cid">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
</widget>
</item> </item>
<item row="6" column="1"> <item row="6" column="1">
<widget class="QPushButton" name="addNew"> <widget class="QPushButton" name="addNew">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Add to Address Book</string> <string>Add to Address Book</string>
</property> </property>
@@ -245,12 +278,18 @@
<item row="4" column="1"> <item row="4" column="1">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;Avatar :&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Avatar :&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QPushButton" name="newZaddr"> <widget class="QPushButton" name="newZaddr">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Create a new HushChat zaddr</string> <string>Create a new HushChat zaddr</string>
</property> </property>

10
src/chatmodel.cpp
View File

@@ -101,7 +101,7 @@ void MainWindow::renderContactRequest(){
QString icon; QString icon;
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
icon = ":/icons/res/unknownWhite.png"; icon = ":/icons/res/unknownWhite.png";
}else{ }else{
icon = ":/icons/res/unknownBlack.png"; icon = ":/icons/res/unknownBlack.png";
@@ -587,7 +587,7 @@ void MainWindow::sendChat() {
movie1->setFileName(":/img/res/loaderwhite.gif"); movie1->setFileName(":/img/res/loaderwhite.gif");
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
connect(movie, &QMovie::frameChanged, [=]{ connect(movie, &QMovie::frameChanged, [=]{
ui->sendChatButton->setIcon(movie->currentPixmap()); ui->sendChatButton->setIcon(movie->currentPixmap());
@@ -616,7 +616,7 @@ void MainWindow::sendChat() {
QTimer::singleShot(1000, [=]() { QTimer::singleShot(1000, [=]() {
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
QPixmap send(":/icons/res/send-white.png"); QPixmap send(":/icons/res/send-white.png");
QIcon sendIcon(send); QIcon sendIcon(send);
ui->sendChatButton->setIcon(sendIcon); ui->sendChatButton->setIcon(sendIcon);
@@ -649,7 +649,7 @@ void MainWindow::sendChat() {
movie->stop(); movie->stop();
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
QPixmap send(":/icons/res/send-white.png"); QPixmap send(":/icons/res/send-white.png");
QIcon sendIcon(send); QIcon sendIcon(send);
ui->sendChatButton->setIcon(sendIcon); ui->sendChatButton->setIcon(sendIcon);
@@ -881,7 +881,7 @@ void MainWindow::ContactRequest() {
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif"); QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-dark.gif"); QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-dark.gif");
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
movie2->setScaledSize(QSize(512,512)); movie2->setScaledSize(QSize(512,512));
connD->topIcon->setMovie(movie2); connD->topIcon->setMovie(movie2);
movie2->start(); movie2->start();

2
src/connection.cpp
View File

@@ -23,7 +23,7 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc)
qDebug() << theme << "theme has loaded"; qDebug() << theme << "theme has loaded";
auto size = QSize(512,512); auto size = QSize(512,512);
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");; QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");;
movie2->setScaledSize(size); movie2->setScaledSize(size);
qDebug() << "Animation dark loaded"; qDebug() << "Animation dark loaded";

14
src/connection.ui
View File

@@ -10,9 +10,21 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>512</width> <width>512</width>
<height>513</height> <height>512</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>512</width>
<height>512</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>512</width>
<height>512</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>SilentDragonLite</string> <string>SilentDragonLite</string>
</property> </property>

284
src/contactrequest.ui
View File

@@ -29,9 +29,71 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Send a contact request</string> <string>Send Contact Request</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="6">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<item alignment="Qt::AlignLeft">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Insert a nickname for your contact:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_6">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Choose an avatar for your contact:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="8" column="0" colspan="2"> <item row="8" column="0" colspan="2">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
@@ -39,6 +101,58 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="6">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<item>
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Your HushChat Address:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="newZaddr">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Create New Address</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="5" column="0" colspan="6"> <item row="5" column="0" colspan="6">
<widget class="QLineEdit" name="zaddr"> <widget class="QLineEdit" name="zaddr">
<property name="sizePolicy"> <property name="sizePolicy">
@@ -55,6 +169,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Insert the address of your contact:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="5" alignment="Qt::AlignLeft"> <item row="7" column="0" colspan="5" alignment="Qt::AlignLeft">
<widget class="QLabel" name="myzaddr"> <widget class="QLabel" name="myzaddr">
<property name="minimumSize"> <property name="minimumSize">
@@ -272,6 +393,26 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="11" column="0">
<widget class="QLabel" name="memoSizeChat">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>0/512</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="6">
<widget class="QTextEdit" name="memorequest">
<property name="placeholderText">
<string>Add a memo to your request</string>
</property>
</widget>
</item>
<item row="11" column="3"> <item row="11" column="3">
<widget class="QPushButton" name="cancel"> <widget class="QPushButton" name="cancel">
<property name="sizePolicy"> <property name="sizePolicy">
@@ -310,147 +451,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Insert the address of your contact:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="6">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<item>
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Your HushChat Address:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="newZaddr">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Create New Address</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="0" column="0" colspan="6">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<item alignment="Qt::AlignLeft">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Insert a nickname for your contact:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_6">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Choose an avatar for your contact:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="9" column="0" colspan="6">
<widget class="QTextEdit" name="memorequest">
<property name="placeholderText">
<string>Add a memo to your request</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="memoSizeChat">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>0/512</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

2
src/controller.cpp
View File

@@ -2019,7 +2019,7 @@ void Controller::shutdownhushd()
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
auto size = QSize(512,512); auto size = QSize(512,512);
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");; QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");;
movie2->setScaledSize(size); movie2->setScaledSize(size);
qDebug() << "Animation dark loaded"; qDebug() << "Animation dark loaded";

2
src/hushrequest.ui
View File

@@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Request Payment</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">

16
src/mainwindow.cpp
View File

@@ -66,7 +66,7 @@ MainWindow::MainWindow(QWidget *parent) :
} }
catch (...) catch (...)
{ {
theme_name = "dark"; theme_name = "Dark";
} }
this->slot_change_theme(theme_name); this->slot_change_theme(theme_name);
@@ -386,7 +386,7 @@ void MainWindow::encryptWallet() {
ed.lblPasswordMatch->setText(""); ed.lblPasswordMatch->setText("");
ed.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); ed.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
} else { } else {
ed.lblPasswordMatch->setText(tr("Passphrase don't match or You have entered too few letters (16 minimum)")); //ed.lblPasswordMatch->setText(tr("Passphrase don't match or You have entered too few letters (16 minimum)"));
ed.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); ed.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
} }
@@ -445,7 +445,7 @@ void MainWindow::encryptWallet() {
address.rename(dir.filePath("addresslabels.datBackup")); address.rename(dir.filePath("addresslabels.datBackup"));
QMessageBox::information(this, tr("Wallet Encryption Success"), QMessageBox::information(this, tr("Wallet Encryption Success"),
QString("Successfully encrypt your wallet"), QString("Successfully encrypted your wallet"),
QMessageBox::Ok QMessageBox::Ok
); );
} }
@@ -612,7 +612,7 @@ void MainWindow::removeWalletEncryptionStartUp() {
{ {
QMessageBox::information(this, tr("You have still Plaintextdata on your disk!"), QMessageBox::information(this, tr("You still have plaintext data on your disk!"),
QString("WARNING: Delete it only if you have a backup of your Wallet Seed."), QString("WARNING: Delete it only if you have a backup of your Wallet Seed."),
QMessageBox::Ok QMessageBox::Ok
); );
@@ -1213,10 +1213,10 @@ 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(:/icons/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(:/icons/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);
@@ -1316,7 +1316,7 @@ void MainWindow::setupchatTab() {
/////////////Setting Icons for Chattab and different themes /////////////Setting Icons for Chattab and different themes
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
QPixmap send(":/icons/res/send-white.png"); QPixmap send(":/icons/res/send-white.png");
QIcon sendIcon(send); QIcon sendIcon(send);
ui->sendChatButton->setIcon(sendIcon); ui->sendChatButton->setIcon(sendIcon);
@@ -1955,7 +1955,7 @@ void MainWindow::slot_change_theme(const QString& theme_name)
} }
catch (...) catch (...)
{ {
saved_theme_name = "dark"; saved_theme_name = "Dark";
} }
QFile qFile(":/css/res/css/" + saved_theme_name +".css"); QFile qFile(":/css/res/css/" + saved_theme_name +".css");

2
src/mobileappconnector.ui
View File

@@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Connect Mobile App</string> <string>Mobile Connector App</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="4" column="1" colspan="2"> <item row="4" column="1" colspan="2">

164
src/newwallet.ui
View File

@@ -11,90 +11,17 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Create New SDL Wallet</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="3"> <item row="6" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QRadioButton" name="radioNewWallet">
<property name="text">
<string>Create a new Wallet</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Create a new wallet with a randomly generated seed.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="lblPasswordMatch">
<property name="styleSheet">
<string notr="true">color: red;</string>
</property>
<property name="text">
<string>Passphrase don't match</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QLabel" name="label_5">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;16 letters minimum&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Encryption Passphrase:</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QLineEdit" name="txtPassword">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Confirm Passphrase:</string> <string>Confirm Passphrase:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1" colspan="2"> <item row="6" column="1" colspan="2">
<widget class="QLineEdit" name="txtConfirmPassword"> <widget class="QLineEdit" name="txtConfirmPassword">
<property name="echoMode"> <property name="echoMode">
<enum>QLineEdit::Password</enum> <enum>QLineEdit::Password</enum>
@@ -133,6 +60,91 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="5" column="1" colspan="2">
<widget class="QLineEdit" name="txtPassword">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QRadioButton" name="radioNewWallet">
<property name="text">
<string>Create a new wallet</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Create a new wallet with a randomly generated seed.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Encryption Passphrase:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lblPasswordMatch">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">color: red;</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Passphrase don't match&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;16 letters minimum&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

2
src/recurringdialog.ui
View File

@@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Reccuring Dialog</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">

2
src/recurringmultiple.ui
View File

@@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Recurring Multiple Payments</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="14" column="0" colspan="2"> <item row="14" column="0" colspan="2">

2
src/recurringpayments.ui
View File

@@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Payments</string> <string>Reocurring Payments</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="1"> <item row="0" column="1">

2
src/requestContactDialog.ui
View File

@@ -23,7 +23,7 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Incoming contact request</string> <string>Incoming Contact Request</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="1"> <item row="0" column="1">

2
src/restoreseed.ui
View File

@@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Restore Wallet Seed</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">

2
src/sendtab.cpp
View File

@@ -846,7 +846,7 @@ void MainWindow::sendButton() {
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");; QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");;
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-dark.gif");; QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-dark.gif");;
auto theme = Settings::getInstance()->get_theme_name(); auto theme = Settings::getInstance()->get_theme_name();
if (theme == "dark" || theme == "midnight") { if (theme == "Dark" || theme == "Midnight") {
movie2->setScaledSize(QSize(512,512)); movie2->setScaledSize(QSize(512,512));
connD->topIcon->setMovie(movie2); connD->topIcon->setMovie(movie2);
movie2->start(); movie2->start();

2
src/settings.cpp
View File

@@ -230,7 +230,7 @@ void Settings::set_currency_name(QString currency_name) {
QString Settings::get_theme_name() { QString Settings::get_theme_name() {
// Load from the QT Settings. // Load from the QT Settings.
return QSettings().value("options/theme_name", "dark").toString(); return QSettings().value("options/theme_name", "Dark").toString();
} }
void Settings::set_theme_name(QString theme_name) { void Settings::set_theme_name(QString theme_name) {

36
src/settings.ui
View File

@@ -6,10 +6,28 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>733</width> <width>590</width>
<height>539</height> <height>443</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>590</width>
<height>443</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>590</width>
<height>443</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>
@@ -85,7 +103,7 @@
<rect> <rect>
<x>80</x> <x>80</x>
<y>110</y> <y>110</y>
<width>80</width> <width>111</width>
<height>25</height> <height>25</height>
</rect> </rect>
</property> </property>
@@ -97,27 +115,27 @@
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string>dark</string> <string>Dark</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>default</string> <string>Midnight</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>blue</string> <string>Light</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>light</string> <string>Blue</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>midnight</string> <string>Default</string>
</property> </property>
</item> </item>
</widget> </widget>
@@ -241,7 +259,7 @@
<rect> <rect>
<x>80</x> <x>80</x>
<y>150</y> <y>150</y>
<width>80</width> <width>111</width>
<height>25</height> <height>25</height>
</rect> </rect>
</property> </property>