diff --git a/application-sdx.qrc b/application-sdx.qrc new file mode 100644 index 0000000..09a5fd7 --- /dev/null +++ b/application-sdx.qrc @@ -0,0 +1,73 @@ + + + res-drgx/Ubuntu-R.ttf + + + res-drgx/connected.gif + res-drgx/loading.gif + res-drgx/paymentreq.gif + res-drgx/icon.ico + res-drgx/warning.png + res-drgx/verify.png + res-drgx/tx_output.png + res-drgx/tx_mined.png + res-drgx/tx_input.png + res-drgx/transaction_conflicted.png + res-drgx/transaction_abandoned.png + res-drgx/transaction2.png + res-drgx/transaction0.png + res-drgx/synced.png + res-drgx/send.png + res-drgx/remove.png + res-drgx/lock_open.png + res-drgx/tx_inout.png + res-drgx/lock_closed.png + + + res-drgx/tropical-hush.png + res-drgx/tropical-hush-square.png + res-drgx/logobig.gif + res-drgx/silentdragon-animated.gif + res-drgx/silentdragon-animated-dark.gif + res-drgx/silentdragon-animated-startup.gif + res-drgx/silentdragon-animated-startup-dark.gif + + + res-drgx/silentdragon_be.qm + res-drgx/silentdragon_bg.qm + res-drgx/silentdragon_de.qm + res-drgx/silentdragon_es.qm + res-drgx/silentdragon_fi.qm + res-drgx/silentdragon_fil.qm + res-drgx/silentdragon_fr.qm + res-drgx/silentdragon_hr.qm + res-drgx/silentdragon_it.qm + res-drgx/silentdragon_id.qm + res-drgx/silentdragon_nl.qm + res-drgx/silentdragon_pl.qm + res-drgx/silentdragon_pt.qm + res-drgx/silentdragon_ro.qm + res-drgx/silentdragon_ru.qm + res-drgx/silentdragon_sr.qm + res-drgx/silentdragon_tr.qm + res-drgx/silentdragon_uk.qm + res-drgx/silentdragon_zh.qm + + + res-drgx/css/blue.css + res-drgx/css/dark.css + res-drgx/css/default.css + res-drgx/css/light.css + res-drgx/css/midnight.css + + + res-drgx/images/blue/unchecked.png + res-drgx/images/blue/checked.png + res-drgx/images/blue/blue_downArrow.png + res-drgx/images/blue/blue_downArrow_small.png + res-drgx/images/blue/blue_upArrow_small.png + res-drgx/images/blue/blue_leftArrow_small.png + res-drgx/images/blue/blue_rightArrow_small.png + res-drgx/images/blue/blue_qtreeview_selected.png + + diff --git a/application.qrc b/application.qrc index a993923..8003baf 100644 --- a/application.qrc +++ b/application.qrc @@ -1,73 +1,73 @@ - res/Ubuntu-R.ttf + res/Ubuntu-R.ttf - res/connected.gif - res/loading.gif - res/paymentreq.gif - res/icon.ico - res/warning.png - res/verify.png - res/tx_output.png - res/tx_mined.png - res/tx_input.png - res/transaction_conflicted.png - res/transaction_abandoned.png - res/transaction2.png - res/transaction0.png - res/synced.png - res/send.png - res/remove.png - res/lock_open.png - res/tx_inout.png - res/lock_closed.png + res/connected.gif + res/loading.gif + res/paymentreq.gif + res/icon.ico + res/warning.png + res/verify.png + res/tx_output.png + res/tx_mined.png + res/tx_input.png + res/transaction_conflicted.png + res/transaction_abandoned.png + res/transaction2.png + res/transaction0.png + res/synced.png + res/send.png + res/remove.png + res/lock_open.png + res/tx_inout.png + res/lock_closed.png - res/tropical-hush.png - res/tropical-hush-square.png - res/logobig.gif - res/silentdragon-animated.gif - res/silentdragon-animated-dark.gif - res/silentdragon-animated-startup.gif - res/silentdragon-animated-startup-dark.gif + res/tropical-hush.png + res/tropical-hush-square.png + res/logobig.gif + res/silentdragon-animated.gif + res/silentdragon-animated-dark.gif + res/silentdragon-animated-startup.gif + res/silentdragon-animated-startup-dark.gif - res/silentdragon_be.qm - res/silentdragon_bg.qm - res/silentdragon_de.qm - res/silentdragon_es.qm - res/silentdragon_fi.qm - res/silentdragon_fil.qm - res/silentdragon_fr.qm - res/silentdragon_hr.qm - res/silentdragon_it.qm - res/silentdragon_id.qm - res/silentdragon_nl.qm - res/silentdragon_pl.qm - res/silentdragon_pt.qm - res/silentdragon_ro.qm - res/silentdragon_ru.qm - res/silentdragon_sr.qm - res/silentdragon_tr.qm - res/silentdragon_uk.qm - res/silentdragon_zh.qm + res/silentdragon_be.qm + res/silentdragon_bg.qm + res/silentdragon_de.qm + res/silentdragon_es.qm + res/silentdragon_fi.qm + res/silentdragon_fil.qm + res/silentdragon_fr.qm + res/silentdragon_hr.qm + res/silentdragon_it.qm + res/silentdragon_id.qm + res/silentdragon_nl.qm + res/silentdragon_pl.qm + res/silentdragon_pt.qm + res/silentdragon_ro.qm + res/silentdragon_ru.qm + res/silentdragon_sr.qm + res/silentdragon_tr.qm + res/silentdragon_uk.qm + res/silentdragon_zh.qm - res/css/blue.css - res/css/dark.css - res/css/default.css - res/css/light.css - res/css/midnight.css + res/css/blue.css + res/css/dark.css + res/css/default.css + res/css/light.css + res/css/midnight.css - res/images/blue/unchecked.png - res/images/blue/checked.png - res/images/blue/blue_downArrow.png - res/images/blue/blue_downArrow_small.png - res/images/blue/blue_upArrow_small.png - res/images/blue/blue_leftArrow_small.png - res/images/blue/blue_rightArrow_small.png - res/images/blue/blue_qtreeview_selected.png + res/images/blue/unchecked.png + res/images/blue/checked.png + res/images/blue/blue_downArrow.png + res/images/blue/blue_downArrow_small.png + res/images/blue/blue_upArrow_small.png + res/images/blue/blue_leftArrow_small.png + res/images/blue/blue_rightArrow_small.png + res/images/blue/blue_qtreeview_selected.png diff --git a/res-drgx/hush-3.6.0.png b/res-drgx/hush-3.6.0.png index 502bf33..09f1f3a 100644 Binary files a/res-drgx/hush-3.6.0.png and b/res-drgx/hush-3.6.0.png differ diff --git a/res-drgx/hush-dark.png b/res-drgx/hush-dark.png index 9bcb483..0705a3d 100644 Binary files a/res-drgx/hush-dark.png and b/res-drgx/hush-dark.png differ diff --git a/res-drgx/loading.gif b/res-drgx/loading.gif index 891c0f8..32f8d9c 100644 Binary files a/res-drgx/loading.gif and b/res-drgx/loading.gif differ diff --git a/res-drgx/lock_closed.png b/res-drgx/lock_closed.png index 1bd98b2..9717659 100644 Binary files a/res-drgx/lock_closed.png and b/res-drgx/lock_closed.png differ diff --git a/res-drgx/lock_open.png b/res-drgx/lock_open.png index a704513..0b787c6 100644 Binary files a/res-drgx/lock_open.png and b/res-drgx/lock_open.png differ diff --git a/res-drgx/logobig.gif b/res-drgx/logobig.gif index e3a1d57..048e638 100644 Binary files a/res-drgx/logobig.gif and b/res-drgx/logobig.gif differ diff --git a/res-drgx/paymentreq.gif b/res-drgx/paymentreq.gif index 414bd64..efb97f6 100644 Binary files a/res-drgx/paymentreq.gif and b/res-drgx/paymentreq.gif differ diff --git a/res-drgx/remove.png b/res-drgx/remove.png index 8e738d6..eda085c 100644 Binary files a/res-drgx/remove.png and b/res-drgx/remove.png differ diff --git a/res-drgx/send.png b/res-drgx/send.png index ac76cc1..dd7b081 100644 Binary files a/res-drgx/send.png and b/res-drgx/send.png differ diff --git a/res-drgx/silentdragon-animated-startup.gif b/res-drgx/silentdragon-animated-startup.gif index 8e368b2..73c5e3c 100644 Binary files a/res-drgx/silentdragon-animated-startup.gif and b/res-drgx/silentdragon-animated-startup.gif differ diff --git a/res-drgx/synced.png b/res-drgx/synced.png index 5ac28d3..0b76335 100644 Binary files a/res-drgx/synced.png and b/res-drgx/synced.png differ diff --git a/res-drgx/transaction0.png b/res-drgx/transaction0.png index 72c4456..0b7456b 100644 Binary files a/res-drgx/transaction0.png and b/res-drgx/transaction0.png differ diff --git a/res-drgx/transaction2.png b/res-drgx/transaction2.png index 5ac28d3..a848f0d 100644 Binary files a/res-drgx/transaction2.png and b/res-drgx/transaction2.png differ diff --git a/res-drgx/transaction_abandoned.png b/res-drgx/transaction_abandoned.png index 8ca6445..d817291 100644 Binary files a/res-drgx/transaction_abandoned.png and b/res-drgx/transaction_abandoned.png differ diff --git a/res-drgx/transaction_conflicted.png b/res-drgx/transaction_conflicted.png index 55e34de..650da8e 100644 Binary files a/res-drgx/transaction_conflicted.png and b/res-drgx/transaction_conflicted.png differ diff --git a/res-drgx/tropical-hush.png b/res-drgx/tropical-hush.png index d41b15f..c223cea 100644 Binary files a/res-drgx/tropical-hush.png and b/res-drgx/tropical-hush.png differ diff --git a/res-drgx/tx_inout.png b/res-drgx/tx_inout.png index 0a6e72a..e9642bb 100644 Binary files a/res-drgx/tx_inout.png and b/res-drgx/tx_inout.png differ diff --git a/res-drgx/tx_input.png b/res-drgx/tx_input.png index 9e9ee92..1042cf0 100644 Binary files a/res-drgx/tx_input.png and b/res-drgx/tx_input.png differ diff --git a/res-drgx/tx_mined.png b/res-drgx/tx_mined.png index 5a6ef52..925708b 100644 Binary files a/res-drgx/tx_mined.png and b/res-drgx/tx_mined.png differ diff --git a/res-drgx/tx_output.png b/res-drgx/tx_output.png index 6f66ab6..d65f62c 100644 Binary files a/res-drgx/tx_output.png and b/res-drgx/tx_output.png differ diff --git a/res-drgx/verify.png b/res-drgx/verify.png index 8e2cb2c..8b633d6 100644 Binary files a/res-drgx/verify.png and b/res-drgx/verify.png differ diff --git a/res-drgx/warning.png b/res-drgx/warning.png index 6bc5ac7..9576b85 100644 Binary files a/res-drgx/warning.png and b/res-drgx/warning.png differ diff --git a/silentdragonx.pro b/silentdragonx.pro index 991f1fc..21a7451 100644 --- a/silentdragonx.pro +++ b/silentdragonx.pro @@ -28,7 +28,7 @@ mac: LIBS+= -Wl,-dead_strip mac: LIBS+= -Wl,-dead_strip_dylibs mac: LIBS+= -Wl,-bind_at_load -RESOURCES = application.qrc +RESOURCES = application-sdx.qrc MOC_DIR = bin OBJECTS_DIR = bin @@ -154,9 +154,9 @@ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/res-drgx/ -llibsodium -else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/res-drgx/ -llibsodiumd -else:unix: LIBS += -L$$PWD/res-drgx/ -lsodium +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/res/ -llibsodium +else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/res/ -llibsodiumd +else:unix: LIBS += -L$$PWD/res/ -lsodium INCLUDEPATH += $$PWD/res-drgx DEPENDPATH += $$PWD/res-drgx diff --git a/src/bannedpeerstablemodel.cpp b/src/bannedpeerstablemodel.cpp index a4affce..9a9cbcc 100644 --- a/src/bannedpeerstablemodel.cpp +++ b/src/bannedpeerstablemodel.cpp @@ -80,7 +80,7 @@ int BannedPeersTableModel::columnCount(const QModelIndex&) const if (!dat.memo.isEmpty()) { // If the memo is a Payment URI, then show a payment request icon if (dat.memo.startsWith("hush:")) { - QIcon icon(":/icons/res/paymentreq.gif"); + QIcon icon(":/icons/paymentreq.gif"); return QVariant(icon.pixmap(16, 16)); } else { // Return the info pixmap to indicate memo diff --git a/src/connection.cpp b/src/connection.cpp index 695bca7..95d81ec 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -20,7 +20,7 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, RPC* rpc) { d->setWindowFlags(d->windowFlags() & ~(Qt::WindowCloseButtonHint | Qt::WindowContextHelpButtonHint)); connD = new Ui_ConnectionDialog(); connD->setupUi(d); - QMovie *movie1 = new QMovie(":/img/res/silentdragon-animated-startup-dark.gif");; + QMovie *movie1 = new QMovie(":/img/silentdragon-animated-startup-dark.gif");; auto theme = Settings::getInstance()->get_theme_name(); auto size = QSize(512,512); @@ -169,7 +169,7 @@ void ConnectionLoader::createHushConf() { Ui_createHushConf ui; ui.setupUi(&d); - QPixmap logo(":/img/res/tropical-hush-square.png"); + QPixmap logo(":/img/tropical-hush-square.png"); ui.lblTopIcon->setBasePixmap(logo.scaled(512,512, Qt::KeepAspectRatio, Qt::SmoothTransformation)); ui.btnPickDir->setEnabled(false); diff --git a/src/main.cpp b/src/main.cpp index ca3c873..330e863 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -191,18 +191,18 @@ public: QTranslator translator; if(isdragonx) { - translator.load(QString(":/translations/res-drgx/silentdragon_") + locale); + translator.load(QString(":/translations/silentdragon_") + locale); } else { - translator.load(QString(":/translations/res/silentdragon_") + locale); + translator.load(QString(":/translations/silentdragon_") + locale); } a.installTranslator(&translator); - QIcon icon(":/icons/res/icon.ico"); + QIcon icon(":/icons/icon.ico"); QApplication::setWindowIcon(icon); // TODO: update for SD #ifdef Q_OS_LINUX - QFontDatabase::addApplicationFont(":/fonts/res/Ubuntu-R.ttf"); + QFontDatabase::addApplicationFont(":/fonts/Ubuntu-R.ttf"); qApp->setFont(QFont("Ubuntu", 11, QFont::Normal, false)); #endif diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ce05065..daf111d 100755 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -215,7 +215,12 @@ void switchTranslator(QTranslator& translator, const QString& filename) { // load the new translator QString path = QApplication::applicationDirPath(); - path.append("/res/"); + if (isdragonx) { + path.append("/res-drgx/"); + } + else{ + path.append("/res/"); + } qDebug() << __func__ << ": attempting to load " << path + filename; if(translator.load(path + filename)) { qApp->installTranslator(&translator); @@ -327,7 +332,7 @@ void MainWindow::closeEvent(QCloseEvent* event) { void MainWindow::setupStatusBar() { // Status Bar loadingLabel = new QLabel(); - loadingMovie = new QMovie(":/icons/res/loading.gif"); + loadingMovie = new QMovie(":/icons/loading.gif"); loadingMovie->setScaledSize(QSize(32, 16)); loadingMovie->start(); loadingLabel->setAttribute(Qt::WA_NoSystemBackground); @@ -1793,7 +1798,7 @@ void MainWindow::setupPeersTab() { } void MainWindow::setupHushTab() { - QPixmap image(":/img/res/tropical-hush-square.png"); + QPixmap image(":/img/tropical-hush-square.png"); ui->hushlogo->setBasePixmap( image ); // image.scaled(600,600, Qt::KeepAspectRatioByExpanding, Qt::FastTransformation ) ); } /* @@ -2344,7 +2349,7 @@ void MainWindow::slot_change_theme(QString& theme_name) saved_theme_name = "dark"; } - QString filename = ":/css/res/css/" + saved_theme_name +".css"; + QString filename = ":/css/" + saved_theme_name +".css"; QFile qFile(filename); qDebug() << __func__ << ": attempting to open filename=" << filename; if (qFile.open(QFile::ReadOnly)) diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 008acf1..1ae7282 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -15,7 +15,7 @@ - :/icons/res/icon.ico:/icons/res/icon.ico + :/icons/icon.ico:/icons/icon.ico diff --git a/src/peerstablemodel.cpp b/src/peerstablemodel.cpp index 4fc713d..4369146 100644 --- a/src/peerstablemodel.cpp +++ b/src/peerstablemodel.cpp @@ -115,7 +115,7 @@ QVariant PeersTableModel::data(const QModelIndex &index, int role) const if (!dat.memo.isEmpty()) { // If the memo is a Payment URI, then show a payment request icon if (dat.memo.startsWith("hush:")) { - QIcon icon(":/icons/res/paymentreq.gif"); + QIcon icon(":/icons/paymentreq.gif"); return QVariant(icon.pixmap(16, 16)); } else { // Return the info pixmap to indicate memo diff --git a/src/qrcodelabel.cpp b/src/qrcodelabel.cpp index 4bc4ce6..fd16399 100644 --- a/src/qrcodelabel.cpp +++ b/src/qrcodelabel.cpp @@ -51,7 +51,7 @@ QPixmap QRCodeLabel::scaledPixmap() const { } // TODO: Maybe add logo if it doesn't break QR code - requires setting Ecc to HIGH - painter.drawPixmap((w/2)-50, (h/2)-50, 100, 100, QPixmap(":/img/res/logobig.gif")); + painter.drawPixmap((w/2)-50, (h/2)-50, 100, 100, QPixmap(":/img/logobig.gif")); painter.end(); return pm; diff --git a/src/requestdialog.cpp b/src/requestdialog.cpp index 10e26bc..99d5eec 100644 --- a/src/requestdialog.cpp +++ b/src/requestdialog.cpp @@ -41,7 +41,7 @@ void RequestDialog::setupDialog(MainWindow* main, QDialog* d, Ui_RequestDialog* } req->cmbMyAddress->setCurrentText(main->getRPC()->getDefaultSaplingAddress()); - QIcon icon(":/icons/res/paymentreq.gif"); + QIcon icon(":/icons/paymentreq.gif"); req->lblPixmap->setPixmap(icon.pixmap(48, 48)); } diff --git a/src/rpc.cpp b/src/rpc.cpp index e9f4312..78f42cf 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -749,7 +749,7 @@ void RPC::getInfoThenRefresh(bool force) { // TODO: checkmark only when getinfo.synced == true! // Connected, so display checkmark. - QIcon i(":/icons/res/connected.gif"); + QIcon i(":/icons/connected.gif"); main->statusIcon->setPixmap(i.pixmap(16, 16)); static int lastBlock = 0; @@ -1668,9 +1668,9 @@ void RPC::shutdownHushd() { d.setWindowFlags(d.windowFlags() & ~(Qt::WindowCloseButtonHint | Qt::WindowContextHelpButtonHint)); Ui_ConnectionDialog connD; connD.setupUi(&d); - //connD.topIcon->setBasePixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256)); + //connD.topIcon->setBasePixmap(QIcon(":/icons/icon.ico").pixmap(256, 256)); - QMovie *movie1 = new QMovie(":/img/res/silentdragon-animated-dark.gif");; + QMovie *movie1 = new QMovie(":/img/silentdragon-animated-dark.gif");; auto theme = Settings::getInstance()->get_theme_name(); movie1->setScaledSize(QSize(512,512)); connD.topIcon->setMovie(movie1); diff --git a/src/sendtab.cpp b/src/sendtab.cpp index c8f5569..c18dfaf 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -720,7 +720,7 @@ void MainWindow::sendButton() { auto connD = new Ui_ConnectionDialog(); connD->setupUi(d); - QMovie *movie1 = new QMovie(":/img/res/silentdragon-animated-dark.gif");; + QMovie *movie1 = new QMovie(":/img/silentdragon-animated-dark.gif");; auto theme = Settings::getInstance()->get_theme_name(); movie1->setScaledSize(QSize(512,512)); connD->topIcon->setMovie(movie1); diff --git a/src/txtablemodel.cpp b/src/txtablemodel.cpp index b1803c8..667daf0 100644 --- a/src/txtablemodel.cpp +++ b/src/txtablemodel.cpp @@ -199,11 +199,11 @@ int TxTableModel::columnCount(const QModelIndex&) const // If the memo is a Payment URI, then show a payment request icon if(isdragonx) { if (dat.memo.startsWith("drgx:")) { - QIcon icon(":/icons/res-drgx/paymentreq.gif"); + QIcon icon(":/icons/paymentreq.gif"); return QVariant(icon.pixmap(16, 16)); } } else if (dat.memo.startsWith("hush:")) { - QIcon icon(":/icons/res/paymentreq.gif"); + QIcon icon(":/icons/paymentreq.gif"); return QVariant(icon.pixmap(16, 16)); } @@ -216,7 +216,7 @@ int TxTableModel::columnCount(const QModelIndex&) const // Send if(this->getType(index.row()) == "send"){ - QImage image = colorizeIcon(QIcon(":/icons/res/tx_output.png"), color); + QImage image = colorizeIcon(QIcon(":/icons/tx_output.png"), color); QIcon icon; icon.addPixmap(QPixmap::fromImage(image)); return QVariant(icon.pixmap(16, 16)); @@ -225,7 +225,7 @@ int TxTableModel::columnCount(const QModelIndex&) const // Send T->Z - Untested if(this->getType(index.row()) == "send" && !this->getFromAddr(index.row()).startsWith("zs1")){ - QImage image = colorizeIcon(QIcon(":/icons/res/lock_closed.png"), color); + QImage image = colorizeIcon(QIcon(":/icons/lock_closed.png"), color); QIcon icon; icon.addPixmap(QPixmap::fromImage(image)); return QVariant(icon.pixmap(16, 16)); @@ -233,7 +233,7 @@ int TxTableModel::columnCount(const QModelIndex&) const // Receive if(this->getType(index.row()) == "receive"){ - QImage image = colorizeIcon(QIcon(":/icons/res/tx_input.png"), color); + QImage image = colorizeIcon(QIcon(":/icons/tx_input.png"), color); QIcon icon; icon.addPixmap(QPixmap::fromImage(image)); return QVariant(icon.pixmap(16, 16)); @@ -241,7 +241,7 @@ int TxTableModel::columnCount(const QModelIndex&) const // Mined if(this->getType(index.row()) == "generate"){ - QImage image = colorizeIcon(QIcon(":/icons/res/tx_mined.png"), color); + QImage image = colorizeIcon(QIcon(":/icons/tx_mined.png"), color); QIcon icon; icon.addPixmap(QPixmap::fromImage(image)); return QVariant(icon.pixmap(16, 16));