@@ -12,6 +12,10 @@
|
|||||||
<qresource prefix="/img">
|
<qresource prefix="/img">
|
||||||
<file>res/hushdlogo.gif</file>
|
<file>res/hushdlogo.gif</file>
|
||||||
<file>res/logobig.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>
|
||||||
|
<file>res/silentdragonlite-animated-startup-dark.gif</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/translations">
|
<qresource prefix="/translations">
|
||||||
<file>res/silentdragonlite_de.qm</file>
|
<file>res/silentdragonlite_de.qm</file>
|
||||||
@@ -27,6 +31,7 @@
|
|||||||
<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>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/images/blue">
|
<qresource prefix="/images/blue">
|
||||||
<file>res/images/blue/unchecked.png</file>
|
<file>res/images/blue/unchecked.png</file>
|
||||||
|
|||||||
139
res/css/midnight.css
Normal file
139
res/css/midnight.css
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
/*
|
||||||
|
Theme: Midnight Qt
|
||||||
|
Version: 1.0.2
|
||||||
|
Reference: https://doc.qt.io/qt-5/stylesheet-reference.html
|
||||||
|
|
||||||
|
Author: Charles Sharpe
|
||||||
|
Date: Apr. 23, 2020
|
||||||
|
Website: https://www.csharpe.me
|
||||||
|
License: https://opensource.org/licenses/MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
QWidget, QMainWindow, QMenuBar, QMenu, QDialog, QTabWidget, QTableView, QTableView::item, QScrollArea, QGroupBox, QPlainTextEdit, QLineEdit, QLabel, MainWindow
|
||||||
|
{
|
||||||
|
background-color: #111;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
QPushButton {
|
||||||
|
padding: 10px 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
QPushButton:hover {
|
||||||
|
background: #222;
|
||||||
|
}
|
||||||
|
|
||||||
|
QLineEdit, QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked {
|
||||||
|
background: #222;
|
||||||
|
border: 1px solid #333;
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
QLineEdit {
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
QLineEdit:focus {
|
||||||
|
border: 1px solid #9d8400;
|
||||||
|
}
|
||||||
|
|
||||||
|
QWidget QLabel {
|
||||||
|
font-size: 11pt;
|
||||||
|
}
|
||||||
|
|
||||||
|
QWidget QCheckBox {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
QTabWidget QTabBar::tab {
|
||||||
|
min-height: 15px;
|
||||||
|
padding: 15px 25px;
|
||||||
|
border: 1px ridge #222;
|
||||||
|
left: 1px; /* Fix 1px alignment */
|
||||||
|
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #333, stop: 1 #111);
|
||||||
|
}
|
||||||
|
|
||||||
|
QTabWidget QTabBar::tab:selected {
|
||||||
|
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #555, stop: 1 #111);
|
||||||
|
color:#fff;
|
||||||
|
border: 1px ridge #222;
|
||||||
|
border-bottom: 0px; /* Overwrites border-bottom */
|
||||||
|
}
|
||||||
|
|
||||||
|
QTabWidget QTabBar::tab:hover {
|
||||||
|
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #555, stop: 1 #111);
|
||||||
|
}
|
||||||
|
|
||||||
|
QHeaderView { /* Table Header */
|
||||||
|
background-color:#111;
|
||||||
|
}
|
||||||
|
|
||||||
|
QHeaderView::section { /* Table Header Sections */
|
||||||
|
qproperty-alignment:center;
|
||||||
|
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #333, stop: 1 #111);
|
||||||
|
color:#fff;
|
||||||
|
min-height:25px;
|
||||||
|
font-weight:bold;
|
||||||
|
font-size:12px;
|
||||||
|
outline:0;
|
||||||
|
border:1px ridge #222;
|
||||||
|
padding: 2px 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
QHeaderView::section:last {
|
||||||
|
border-right: 0px ridge #222;
|
||||||
|
}
|
||||||
|
|
||||||
|
QScrollArea {
|
||||||
|
background:transparent;
|
||||||
|
border:0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */
|
||||||
|
background:#111;
|
||||||
|
}
|
||||||
|
|
||||||
|
QTableView::item { /* Table Item */
|
||||||
|
background-color:#111;
|
||||||
|
border:1px solid #222;
|
||||||
|
font-size:12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
QTableView::item:selected { /* Table Item Selected */
|
||||||
|
background-color:#fff;
|
||||||
|
color:#000;
|
||||||
|
}
|
||||||
|
|
||||||
|
QMenuBar {
|
||||||
|
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #222, stop: 1 #111);
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
QMenuBar::item {
|
||||||
|
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #222, stop: 1 #111);
|
||||||
|
color: #fff;
|
||||||
|
padding: 5px 7px;
|
||||||
|
margin: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
QMenuBar::item:selected {
|
||||||
|
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #333, stop: 1 #111);
|
||||||
|
}
|
||||||
|
|
||||||
|
QMenu {
|
||||||
|
border:1px solid #222;
|
||||||
|
}
|
||||||
|
|
||||||
|
QMenu::item {
|
||||||
|
padding: 7px 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
QMenu::item:selected {
|
||||||
|
background: #222;
|
||||||
|
}
|
||||||
|
|
||||||
|
QMenu::separator {
|
||||||
|
height: 1px;
|
||||||
|
margin: 3px 7px 3px 7px; /* space at ends of separator */
|
||||||
|
background: #222;
|
||||||
|
}
|
||||||
BIN
res/silentdragonlite-animated-dark.gif
Normal file
BIN
res/silentdragonlite-animated-dark.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 406 KiB |
BIN
res/silentdragonlite-animated-startup-dark.gif
Normal file
BIN
res/silentdragonlite-animated-startup-dark.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 MiB |
BIN
res/silentdragonlite-animated-startup.gif
Normal file
BIN
res/silentdragonlite-animated-startup.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1015 KiB |
BIN
res/silentdragonlite-animated.gif
Normal file
BIN
res/silentdragonlite-animated.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 406 KiB |
@@ -142,16 +142,15 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target)
|
|||||||
bool sapling = true;
|
bool sapling = true;
|
||||||
rpc->createNewZaddr(sapling, [=] (json reply) {
|
rpc->createNewZaddr(sapling, [=] (json reply) {
|
||||||
QString myAddr = QString::fromStdString(reply.get<json::array_t>()[0]);
|
QString myAddr = QString::fromStdString(reply.get<json::array_t>()[0]);
|
||||||
// QString myAddr = "zs1flslqurcnummsw37mfxkhx6d7uwpevlc78cdjyqrgng7357t8f3stm9fneeqtuupfnrt7f933a9";
|
|
||||||
QString message = QString("New Chat Address for your partner: ") + myAddr;
|
QString message = QString("New Chat Address for your partner: ") + myAddr;
|
||||||
|
QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces);
|
||||||
|
|
||||||
parent->ui->listReceiveAddresses->insertItem(0, myAddr);
|
parent->ui->listReceiveAddresses->insertItem(0, myAddr);
|
||||||
parent->ui->listReceiveAddresses->setCurrentIndex(0);
|
parent->ui->listReceiveAddresses->setCurrentIndex(0);
|
||||||
// ab.addr_chat->setText(myAddr);
|
|
||||||
qDebug() << "new generated myAddr" << myAddr;
|
qDebug() << "new generated myAddr" << myAddr;
|
||||||
//
|
ab.cid->setText(cid);
|
||||||
ab.addr_chat->setText(myAddr);
|
ab.addr_chat->setText(myAddr);
|
||||||
// AddressBook::getInstance()->addAddressLabel(newLabel, ab.addr->text(), myAddr, cid);
|
|
||||||
});
|
});
|
||||||
model.updateUi(); //todo fix updating gui after adding
|
model.updateUi(); //todo fix updating gui after adding
|
||||||
rpc->refresh(true);
|
rpc->refresh(true);
|
||||||
@@ -168,8 +167,6 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target)
|
|||||||
auto addr = ab.addr->text().trimmed();
|
auto addr = ab.addr->text().trimmed();
|
||||||
auto myAddr = ab.addr_chat->text().trimmed();
|
auto myAddr = ab.addr_chat->text().trimmed();
|
||||||
QString newLabel = ab.label->text();
|
QString newLabel = ab.label->text();
|
||||||
// QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces);
|
|
||||||
|
|
||||||
QString cid = ab.cid->text();
|
QString cid = ab.cid->text();
|
||||||
|
|
||||||
if (addr.isEmpty() || newLabel.isEmpty())
|
if (addr.isEmpty() || newLabel.isEmpty())
|
||||||
|
|||||||
@@ -27,9 +27,23 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QLabel" name="label_2">
|
||||||
|
<property name="text">
|
||||||
|
<string>Nickname</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLineEdit" name="addr"/>
|
<widget class="QLineEdit" name="addr"/>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QLineEdit" name="label">
|
||||||
|
<property name="maxLength">
|
||||||
|
<number>40</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
<widget class="QLabel" name="label_3">
|
<widget class="QLabel" name="label_3">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -41,20 +55,13 @@
|
|||||||
<widget class="QLineEdit" name="addr_chat"/>
|
<widget class="QLineEdit" name="addr_chat"/>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="0">
|
<item row="4" column="0">
|
||||||
<widget class="QLabel" name="label_2">
|
<widget class="QLabel" name="label_4">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Label</string>
|
<string><html><head/><body><p>Conversation ID (editable):</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="0">
|
<item row="5" column="0">
|
||||||
<widget class="QLineEdit" name="label">
|
|
||||||
<property name="maxLength">
|
|
||||||
<number>40</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="0">
|
|
||||||
<widget class="QLineEdit" name="cid"/>
|
<widget class="QLineEdit" name="cid"/>
|
||||||
</item>
|
</item>
|
||||||
<item row="6" column="1">
|
<item row="6" column="1">
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ void ChatModel::clear()
|
|||||||
void ChatModel::addMessage(ChatItem item)
|
void ChatModel::addMessage(ChatItem item)
|
||||||
{
|
{
|
||||||
QString key = this->generateChatItemID(item);
|
QString key = this->generateChatItemID(item);
|
||||||
qDebug() << "inserting chatitem with id: " << key;
|
// qDebug() << "inserting chatitem with id: " << key;
|
||||||
this->chatItems[key] = item;
|
this->chatItems[key] = item;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,20 +129,34 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListWidget *view)
|
|||||||
|
|
||||||
if ((ui->MyZaddr->text().trimmed() == c.second.getAddress()) && (c.second.getMemo().startsWith("{") == false) && (c.second.getMemo().isEmpty() == false)){
|
if ((ui->MyZaddr->text().trimmed() == c.second.getAddress()) && (c.second.getMemo().startsWith("{") == false) && (c.second.getMemo().isEmpty() == false)){
|
||||||
for(auto &p : AddressBook::getInstance()->getAllAddressLabels()){
|
for(auto &p : AddressBook::getInstance()->getAllAddressLabels()){
|
||||||
if (p.getCid() == c.second.getCid()){
|
|
||||||
line += QString("<") + "verified" + QString("> :\n");}
|
if ((ui->checkBox->isChecked() == true) && (p.getCid() != c.second.getCid()))
|
||||||
}
|
{
|
||||||
|
|
||||||
|
|
||||||
|
}else{
|
||||||
|
|
||||||
|
// line+= QString("[") + "Warning. Not verified!" + QString("]");
|
||||||
|
|
||||||
|
|
||||||
line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") + QString("] ");
|
line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") + QString("] ");
|
||||||
line += QString("<") + QString("incoming") + QString("> :\n");
|
line += QString("<") + QString("incoming") + QString("> :\n");
|
||||||
line += QString(c.second.getMemo()) + QString("\n");
|
line += QString(c.second.getMemo()) + QString("\n");
|
||||||
view->addItem(line);
|
view->addItem(line);
|
||||||
line ="";
|
line ="";
|
||||||
}else{}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ChatModel::addCid(QString tx, QString cid)
|
void ChatModel::addCid(QString tx, QString cid)
|
||||||
{
|
{
|
||||||
this->cidMap[tx] = cid;
|
this->cidMap[tx] = cid;
|
||||||
@@ -152,7 +166,7 @@ QString ChatModel::getCidByTx(QString tx)
|
|||||||
{
|
{
|
||||||
for(auto& pair : this->cidMap)
|
for(auto& pair : this->cidMap)
|
||||||
{
|
{
|
||||||
qDebug() << "TXID=" << pair.first << " CID=" << pair.second;
|
// qDebug() << "TXID=" << pair.first << " CID=" << pair.second;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this->cidMap.count(tx) > 0)
|
if(this->cidMap.count(tx) > 0)
|
||||||
@@ -233,7 +247,7 @@ Tx MainWindow::createTxFromChatPage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::sendChatButton() {
|
void MainWindow::sendChatButton() {
|
||||||
////////////////////////////Todo: Check if its a zaddr//////////
|
////////////////////////////Todo: Check if a Contact is selected//////////
|
||||||
|
|
||||||
// Create a Tx from the values on the send tab. Note that this Tx object
|
// Create a Tx from the values on the send tab. Note that this Tx object
|
||||||
// might not be valid yet.
|
// might not be valid yet.
|
||||||
@@ -241,17 +255,17 @@ void MainWindow::sendChatButton() {
|
|||||||
// Memos can only be used with zAddrs. So check that first
|
// Memos can only be used with zAddrs. So check that first
|
||||||
// for(auto &c : AddressBook::getInstance()->getAllAddressLabels())
|
// for(auto &c : AddressBook::getInstance()->getAllAddressLabels())
|
||||||
|
|
||||||
// if (ui->ContactZaddr->text().trimmed() == c.getName()) {
|
if (ui->ContactZaddr->text().trimmed().isEmpty() || ui->memoTxtChat->toPlainText().trimmed().isEmpty()) {
|
||||||
|
|
||||||
// auto addr = "";
|
// auto addr = "";
|
||||||
// if (! Settings::isZAddress(AddressBook::addressFromAddressLabel(addr->text()))) {
|
// if (! Settings::isZAddress(AddressBook::addressFromAddressLabel(addr->text()))) {
|
||||||
// QMessageBox msg(QMessageBox::Critical, tr("Memos can only be used with z-addresses"),
|
QMessageBox msg(QMessageBox::Critical, tr("You have to select a contact and insert a Memo"),
|
||||||
// tr("The memo field can only be used with a z-address.\n") + addr->text() + tr("\ndoesn't look like a z-address"),
|
tr("You have selected no Contact from Contactlist,\n") + tr("\nor your Memo is empty"),
|
||||||
// QMessageBox::Ok, this);
|
QMessageBox::Ok, this);
|
||||||
|
|
||||||
// msg.exec();
|
msg.exec();
|
||||||
// return;
|
return;
|
||||||
// }
|
}
|
||||||
|
|
||||||
Tx tx = createTxFromChatPage();
|
Tx tx = createTxFromChatPage();
|
||||||
|
|
||||||
@@ -273,8 +287,18 @@ void MainWindow::sendChatButton() {
|
|||||||
auto d = new QDialog(this);
|
auto d = new QDialog(this);
|
||||||
auto connD = new Ui_ConnectionDialog();
|
auto connD = new Ui_ConnectionDialog();
|
||||||
connD->setupUi(d);
|
connD->setupUi(d);
|
||||||
QPixmap logo(":/img/res/logobig.gif");
|
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");;
|
||||||
connD->topIcon->setBasePixmap(logo.scaled(256, 256, Qt::KeepAspectRatio, Qt::SmoothTransformation));
|
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->status->setText(tr("Please wait..."));
|
||||||
connD->statusDetail->setText(tr("Your Message will be send"));
|
connD->statusDetail->setText(tr("Your Message will be send"));
|
||||||
|
|||||||
@@ -14,18 +14,30 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc)
|
|||||||
{
|
{
|
||||||
this->main = main;
|
this->main = main;
|
||||||
this->rpc = rpc;
|
this->rpc = rpc;
|
||||||
|
|
||||||
d = new QDialog(main);
|
d = new QDialog(main);
|
||||||
connD = new Ui_ConnectionDialog();
|
connD = new Ui_ConnectionDialog();
|
||||||
connD->setupUi(d);
|
connD->setupUi(d);
|
||||||
QPixmap logo(":/img/res/logobig.gif");
|
|
||||||
connD->topIcon->setBasePixmap(
|
auto theme = Settings::getInstance()->get_theme_name();
|
||||||
logo.scaled(
|
qDebug() << theme << "theme has loaded";
|
||||||
256,
|
auto size = QSize(512,512);
|
||||||
256,
|
|
||||||
Qt::KeepAspectRatio,
|
if (theme == "dark" || theme == "midnight") {
|
||||||
Qt::SmoothTransformation
|
QMovie *movie2 = new QMovie(":/img/res/silentdragonlite-animated-startup-dark.gif");;
|
||||||
)
|
movie2->setScaledSize(size);
|
||||||
);
|
qDebug() << "Animation dark loaded";
|
||||||
|
connD->topIcon->setMovie(movie2);
|
||||||
|
movie2->start();
|
||||||
|
} else {
|
||||||
|
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated-startup.gif");;
|
||||||
|
movie1->setScaledSize(size);
|
||||||
|
qDebug() << "Animation light loaded";
|
||||||
|
connD->topIcon->setMovie(movie1);
|
||||||
|
movie1->start();
|
||||||
|
}
|
||||||
|
main->logger->write("Set animation");
|
||||||
|
qDebug() << "Set animation";
|
||||||
isSyncing = new QAtomicInteger<bool>();
|
isSyncing = new QAtomicInteger<bool>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,8 +9,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>513</width>
|
<width>512</width>
|
||||||
<height>201</height>
|
<height>513</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="FilledIconLabel" name="topIcon">
|
<widget class="QLabel" name="topIcon">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="status">
|
<widget class="QLabel" name="status">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Starting Up</string>
|
<string>The Dragon Awakens...</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
@@ -84,13 +84,6 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<customwidgets>
|
|
||||||
<customwidget>
|
|
||||||
<class>FilledIconLabel</class>
|
|
||||||
<extends>QLabel</extends>
|
|
||||||
<header>fillediconlabel.h</header>
|
|
||||||
</customwidget>
|
|
||||||
</customwidgets>
|
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
|||||||
@@ -966,7 +966,7 @@ void Controller::refreshTransactions() {
|
|||||||
cid, // we have to set the cid here, its included in the headermemo
|
cid, // we have to set the cid here, its included in the headermemo
|
||||||
txid
|
txid
|
||||||
);
|
);
|
||||||
qDebug()<< "Message CID: " << cid;
|
// qDebug()<< "Message CID: " << cid;
|
||||||
chatModel->addMessage(item);
|
chatModel->addMessage(item);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1006,7 +1006,6 @@ void Controller::refreshChat(QListWidget *listWidget)
|
|||||||
|
|
||||||
void Controller::refreshContacts(QListWidget *listWidget)
|
void Controller::refreshContacts(QListWidget *listWidget)
|
||||||
{
|
{
|
||||||
qDebug() << "Called Controller::refreshContacts(QListWidget *listWidget)";
|
|
||||||
contactModel->renderContactList(listWidget);
|
contactModel->renderContactList(listWidget);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1571,7 +1570,7 @@ void Controller::shutdownhushd()
|
|||||||
QDialog d(main);
|
QDialog d(main);
|
||||||
Ui_ConnectionDialog connD;
|
Ui_ConnectionDialog connD;
|
||||||
connD.setupUi(&d);
|
connD.setupUi(&d);
|
||||||
connD.topIcon->setBasePixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256));
|
connD.topIcon->setPixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256));
|
||||||
connD.status->setText(QObject::tr("Please wait for SilentDragonLite to exit"));
|
connD.status->setText(QObject::tr("Please wait for SilentDragonLite to exit"));
|
||||||
connD.statusDetail->setText(QObject::tr("Waiting for hushd to exit"));
|
connD.statusDetail->setText(QObject::tr("Waiting for hushd to exit"));
|
||||||
bool finished = false;
|
bool finished = false;
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
|
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
ui->checkBox->setChecked(true);
|
||||||
logger = new Logger(this, QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite-wallet.log"));
|
logger = new Logger(this, QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("silentdragonlite-wallet.log"));
|
||||||
|
|
||||||
// Status Bar
|
// Status Bar
|
||||||
|
|||||||
@@ -18,8 +18,8 @@
|
|||||||
<normaloff>:/icons/res/icon.ico</normaloff>:/icons/res/icon.ico</iconset>
|
<normaloff>:/icons/res/icon.ico</normaloff>:/icons/res/icon.ico</iconset>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="centralWidget">
|
<widget class="QWidget" name="centralWidget">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_18">
|
<layout class="QFormLayout" name="formLayout">
|
||||||
<item>
|
<item row="0" column="0" colspan="2">
|
||||||
<widget class="QTabWidget" name="tabWidget">
|
<widget class="QTabWidget" name="tabWidget">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>5</number>
|
<number>5</number>
|
||||||
@@ -389,7 +389,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1226</width>
|
<width>1226</width>
|
||||||
<height>504</height>
|
<height>488</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="sendToLayout">
|
<layout class="QVBoxLayout" name="sendToLayout">
|
||||||
@@ -1332,17 +1332,17 @@
|
|||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>80</y>
|
<y>40</y>
|
||||||
<width>341</width>
|
<width>341</width>
|
||||||
<height>561</height>
|
<height>551</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QLabel" name="label_39">
|
<widget class="QLabel" name="label_39">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>6</x>
|
<x>0</x>
|
||||||
<y>40</y>
|
<y>0</y>
|
||||||
<width>311</width>
|
<width>311</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
</rect>
|
</rect>
|
||||||
@@ -1351,25 +1351,12 @@
|
|||||||
<string><html><head/><body><p align="center">Hushchat Contactlist</p></body></html></string>
|
<string><html><head/><body><p align="center">Hushchat Contactlist</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QLabel" name="label_40">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>400</x>
|
|
||||||
<y>410</y>
|
|
||||||
<width>331</width>
|
|
||||||
<height>17</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Memo</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="MemoEdit" name="memoTxtChat">
|
<widget class="MemoEdit" name="memoTxtChat">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>340</x>
|
<x>340</x>
|
||||||
<y>510</y>
|
<y>410</y>
|
||||||
<width>901</width>
|
<width>921</width>
|
||||||
<height>128</height>
|
<height>128</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
@@ -1377,8 +1364,8 @@
|
|||||||
<widget class="QLabel" name="memoSizeChat">
|
<widget class="QLabel" name="memoSizeChat">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>1180</x>
|
<x>1200</x>
|
||||||
<y>460</y>
|
<y>540</y>
|
||||||
<width>47</width>
|
<width>47</width>
|
||||||
<height>17</height>
|
<height>17</height>
|
||||||
</rect>
|
</rect>
|
||||||
@@ -1393,9 +1380,9 @@
|
|||||||
<widget class="QLabel" name="contactNameMemo">
|
<widget class="QLabel" name="contactNameMemo">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>720</x>
|
<x>450</x>
|
||||||
<y>50</y>
|
<y>20</y>
|
||||||
<width>481</width>
|
<width>161</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
@@ -1410,7 +1397,7 @@
|
|||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>340</x>
|
<x>340</x>
|
||||||
<y>80</y>
|
<y>40</y>
|
||||||
<width>921</width>
|
<width>921</width>
|
||||||
<height>371</height>
|
<height>371</height>
|
||||||
</rect>
|
</rect>
|
||||||
@@ -1432,7 +1419,7 @@
|
|||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>1130</x>
|
<x>1130</x>
|
||||||
<y>650</y>
|
<y>590</y>
|
||||||
<width>114</width>
|
<width>114</width>
|
||||||
<height>25</height>
|
<height>25</height>
|
||||||
</rect>
|
</rect>
|
||||||
@@ -1453,21 +1440,21 @@
|
|||||||
<widget class="QLabel" name="label_42">
|
<widget class="QLabel" name="label_42">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>340</x>
|
<x>350</x>
|
||||||
<y>460</y>
|
<y>550</y>
|
||||||
<width>67</width>
|
<width>81</width>
|
||||||
<height>17</height>
|
<height>17</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p>Send to :</p></body></html></string>
|
<string>Send To :</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QLabel" name="ContactName">
|
<widget class="QLabel" name="ContactName">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>340</x>
|
<x>350</x>
|
||||||
<y>490</y>
|
<y>580</y>
|
||||||
<width>81</width>
|
<width>81</width>
|
||||||
<height>17</height>
|
<height>17</height>
|
||||||
</rect>
|
</rect>
|
||||||
@@ -1480,7 +1467,7 @@
|
|||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>420</x>
|
<x>420</x>
|
||||||
<y>460</y>
|
<y>550</y>
|
||||||
<width>691</width>
|
<width>691</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
</rect>
|
</rect>
|
||||||
@@ -1492,8 +1479,8 @@
|
|||||||
<widget class="QPushButton" name="safeContactRequest">
|
<widget class="QPushButton" name="safeContactRequest">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>943</x>
|
<x>50</x>
|
||||||
<y>20</y>
|
<y>600</y>
|
||||||
<width>211</width>
|
<width>211</width>
|
||||||
<height>25</height>
|
<height>25</height>
|
||||||
</rect>
|
</rect>
|
||||||
@@ -1515,7 +1502,7 @@
|
|||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>420</x>
|
<x>420</x>
|
||||||
<y>490</y>
|
<y>580</y>
|
||||||
<width>691</width>
|
<width>691</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
</rect>
|
</rect>
|
||||||
@@ -1527,8 +1514,8 @@
|
|||||||
<widget class="QLabel" name="contactCid">
|
<widget class="QLabel" name="contactCid">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>870</x>
|
<x>720</x>
|
||||||
<y>90</y>
|
<y>20</y>
|
||||||
<width>331</width>
|
<width>331</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
</rect>
|
</rect>
|
||||||
@@ -1537,6 +1524,45 @@
|
|||||||
<string><html><head/><body><p align="center"><br/></p></body></html></string>
|
<string><html><head/><body><p align="center"><br/></p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
|
<widget class="QLabel" name="contactNameMemo_2">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>590</x>
|
||||||
|
<y>20</y>
|
||||||
|
<width>131</width>
|
||||||
|
<height>20</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string><html><head/><body><p align="center">Conversation ID:</p></body></html></string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
<widget class="QCheckBox" name="checkBox">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>980</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>271</width>
|
||||||
|
<height>23</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Render only authenticated messages</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
<widget class="QLabel" name="contactNameMemo_3">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>340</x>
|
||||||
|
<y>20</y>
|
||||||
|
<width>111</width>
|
||||||
|
<height>20</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string><html><head/><body><p align="center">Contact Name:</p></body></html></string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -843,8 +843,18 @@ void MainWindow::sendButton() {
|
|||||||
auto d = new QDialog(this);
|
auto d = new QDialog(this);
|
||||||
auto connD = new Ui_ConnectionDialog();
|
auto connD = new Ui_ConnectionDialog();
|
||||||
connD->setupUi(d);
|
connD->setupUi(d);
|
||||||
QPixmap logo(":/img/res/logobig.gif");
|
QMovie *movie1 = new QMovie(":/img/res/silentdragonlite-animated.gif");;
|
||||||
connD->topIcon->setBasePixmap(logo.scaled(256, 256, Qt::KeepAspectRatio, Qt::SmoothTransformation));
|
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->status->setText(tr("Please wait..."));
|
||||||
connD->statusDetail->setText(tr("Computing your transaction"));
|
connD->statusDetail->setText(tr("Computing your transaction"));
|
||||||
@@ -937,4 +947,3 @@ QString MainWindow::doSendTxValidations(Tx tx) {
|
|||||||
void MainWindow::cancelButton() {
|
void MainWindow::cancelButton() {
|
||||||
clearSendForm();
|
clearSendForm();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -115,6 +115,11 @@
|
|||||||
<string>dark</string>
|
<string>dark</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>midnight</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QCheckBox" name="chkFetchPrices">
|
<widget class="QCheckBox" name="chkFetchPrices">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
|
|||||||
Reference in New Issue
Block a user