hush
/
SilentDragon
9
1
Fork 7
Code Issues 73 Pull Requests 1 Projects Releases 8 Wiki Activity
Browse Source

Resource changes for DragonX

pull/112/head
fekt 1 year ago
parent
32b08ff83a
commit
31b549e0e3
36 changed files with 166 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 73
      application-sdx.qrc
  2. 118
      application.qrc
  3. BIN
      res-drgx/hush-3.6.0.png
  4. BIN
      res-drgx/hush-dark.png
  5. BIN
      res-drgx/loading.gif
  6. BIN
      res-drgx/lock_closed.png
  7. BIN
      res-drgx/lock_open.png
  8. BIN
      res-drgx/logobig.gif
  9. BIN
      res-drgx/paymentreq.gif
  10. BIN
      res-drgx/remove.png
  11. BIN
      res-drgx/send.png
  12. BIN
      res-drgx/silentdragon-animated-startup.gif
  13. BIN
      res-drgx/synced.png
  14. BIN
      res-drgx/transaction0.png
  15. BIN
      res-drgx/transaction2.png
  16. BIN
      res-drgx/transaction_abandoned.png
  17. BIN
      res-drgx/transaction_conflicted.png
  18. BIN
      res-drgx/tropical-hush.png
  19. BIN
      res-drgx/tx_inout.png
  20. BIN
      res-drgx/tx_input.png
  21. BIN
      res-drgx/tx_mined.png
  22. BIN
      res-drgx/tx_output.png
  23. BIN
      res-drgx/verify.png
  24. BIN
      res-drgx/warning.png
  25. 8
      silentdragonx.pro
  26. 2
      src/bannedpeerstablemodel.cpp
  27. 4
      src/connection.cpp
  28. 8
      src/main.cpp
  29. 13
      src/mainwindow.cpp
  30. 2
      src/mainwindow.ui
  31. 2
      src/peerstablemodel.cpp
  32. 2
      src/qrcodelabel.cpp
  33. 2
      src/requestdialog.cpp
  34. 6
      src/rpc.cpp
  35. 2
      src/sendtab.cpp
  36. 12
      src/txtablemodel.cpp

73
application-sdx.qrc
View File

@ -0,0 +1,73 @@
<RCC>
<qresource prefix="/fonts">
<file alias="Ubuntu-R.ttf">res-drgx/Ubuntu-R.ttf</file>
</qresource>
<qresource prefix="/icons">
<file alias="connected.gif">res-drgx/connected.gif</file>
<file alias="loading.gif">res-drgx/loading.gif</file>
<file alias="paymentreq.gif">res-drgx/paymentreq.gif</file>
<file alias="icon.ico">res-drgx/icon.ico</file>
<file alias="warning.png">res-drgx/warning.png</file>
<file alias="verify.png">res-drgx/verify.png</file>
<file alias="tx_output.png">res-drgx/tx_output.png</file>
<file alias="tx_mined.png">res-drgx/tx_mined.png</file>
<file alias="tx_input.png">res-drgx/tx_input.png</file>
<file alias="transaction_conflicted.png">res-drgx/transaction_conflicted.png</file>
<file alias="transaction_abandoned.png">res-drgx/transaction_abandoned.png</file>
<file alias="transaction2.png">res-drgx/transaction2.png</file>
<file alias="transaction0.png">res-drgx/transaction0.png</file>
<file alias="synced.png">res-drgx/synced.png</file>
<file alias="send.png">res-drgx/send.png</file>
<file alias="remove.png">res-drgx/remove.png</file>
<file alias="lock_open.png">res-drgx/lock_open.png</file>
<file alias="tx_inout.png">res-drgx/tx_inout.png</file>
<file alias="lock_closed.png">res-drgx/lock_closed.png</file>
</qresource>
<qresource prefix="/img">
<file alias="tropical-hush.png">res-drgx/tropical-hush.png</file>
<file alias="tropical-hush-square.png">res-drgx/tropical-hush-square.png</file>
<file alias="logobig.gif">res-drgx/logobig.gif</file>
<file alias="silentdragon-animated.gif">res-drgx/silentdragon-animated.gif</file>
<file alias="silentdragon-animated-dark.gif">res-drgx/silentdragon-animated-dark.gif</file>
<file alias="silentdragon-animated-startup.gif">res-drgx/silentdragon-animated-startup.gif</file>
<file alias="silentdragon-animated-startup-dark.gif">res-drgx/silentdragon-animated-startup-dark.gif</file>
</qresource>
<qresource prefix="/translations">
<file alias="silentdragon_be.qm">res-drgx/silentdragon_be.qm</file>
<file alias="silentdragon_bg.qm">res-drgx/silentdragon_bg.qm</file>
<file alias="silentdragon_de.qm">res-drgx/silentdragon_de.qm</file>
<file alias="silentdragon_es.qm">res-drgx/silentdragon_es.qm</file>
<file alias="silentdragon_fi.qm">res-drgx/silentdragon_fi.qm</file>
<file alias="silentdragon_fil.qm">res-drgx/silentdragon_fil.qm</file>
<file alias="silentdragon_fr.qm">res-drgx/silentdragon_fr.qm</file>
<file alias="silentdragon_hr.qm">res-drgx/silentdragon_hr.qm</file>
<file alias="silentdragon_it.qm">res-drgx/silentdragon_it.qm</file>
<file alias="silentdragon_id.qm">res-drgx/silentdragon_id.qm</file>
<file alias="silentdragon_nl.qm">res-drgx/silentdragon_nl.qm</file>
<file alias="silentdragon_pl.qm">res-drgx/silentdragon_pl.qm</file>
<file alias="silentdragon_pt.qm">res-drgx/silentdragon_pt.qm</file>
<file alias="silentdragon_ro.qm">res-drgx/silentdragon_ro.qm</file>
<file alias="silentdragon_ru.qm">res-drgx/silentdragon_ru.qm</file>
<file alias="silentdragon_sr.qm">res-drgx/silentdragon_sr.qm</file>
<file alias="silentdragon_tr.qm">res-drgx/silentdragon_tr.qm</file>
<file alias="silentdragon_uk.qm">res-drgx/silentdragon_uk.qm</file>
<file alias="silentdragon_zh.qm">res-drgx/silentdragon_zh.qm</file>
</qresource>
<qresource prefix="/css">
<file alias="blue.css">res-drgx/css/blue.css</file>
<file alias="dark.css">res-drgx/css/dark.css</file>
<file alias="default.css">res-drgx/css/default.css</file>
<file alias="light.css">res-drgx/css/light.css</file>
<file alias="midnight.css">res-drgx/css/midnight.css</file>
</qresource>
<qresource prefix="/images/blue">
<file alias="unchecked.png">res-drgx/images/blue/unchecked.png</file>
<file alias="checked.png">res-drgx/images/blue/checked.png</file>
<file alias="blue_downArrow.png">res-drgx/images/blue/blue_downArrow.png</file>
<file alias="blue_downArrow_small.png">res-drgx/images/blue/blue_downArrow_small.png</file>
<file alias="blue_upArrow_small.png">res-drgx/images/blue/blue_upArrow_small.png</file>
<file alias="blue_leftArrow_small.png">res-drgx/images/blue/blue_leftArrow_small.png</file>
<file alias="blue_rightArrow_small.png">res-drgx/images/blue/blue_rightArrow_small.png</file>
<file alias="blue_qtreeview_selected.png">res-drgx/images/blue/blue_qtreeview_selected.png</file>
</qresource>
</RCC>

118
application.qrc
View File

@ -1,73 +1,73 @@
<RCC>
<qresource prefix="/fonts">
<file>res/Ubuntu-R.ttf</file>
<file alias="Ubuntu-R.ttf">res/Ubuntu-R.ttf</file>
</qresource>
<qresource prefix="/icons">
<file>res/connected.gif</file>
<file>res/loading.gif</file>
<file>res/paymentreq.gif</file>
<file>res/icon.ico</file>
<file>res/warning.png</file>
<file>res/verify.png</file>
<file>res/tx_output.png</file>
<file>res/tx_mined.png</file>
<file>res/tx_input.png</file>
<file>res/transaction_conflicted.png</file>
<file>res/transaction_abandoned.png</file>
<file>res/transaction2.png</file>
<file>res/transaction0.png</file>
<file>res/synced.png</file>
<file>res/send.png</file>
<file>res/remove.png</file>
<file>res/lock_open.png</file>
<file>res/tx_inout.png</file>
<file>res/lock_closed.png</file>
<file alias="connected.gif">res/connected.gif</file>
<file alias="loading.gif">res/loading.gif</file>
<file alias="paymentreq.gif">res/paymentreq.gif</file>
<file alias="icon.ico">res/icon.ico</file>
<file alias="warning.png">res/warning.png</file>
<file alias="verify.png">res/verify.png</file>
<file alias="tx_output.png">res/tx_output.png</file>
<file alias="tx_mined.png">res/tx_mined.png</file>
<file alias="tx_input.png">res/tx_input.png</file>
<file alias="transaction_conflicted.png">res/transaction_conflicted.png</file>
<file alias="transaction_abandoned.png">res/transaction_abandoned.png</file>
<file alias="transaction2.png">res/transaction2.png</file>
<file alias="transaction0.png">res/transaction0.png</file>
<file alias="synced.png">res/synced.png</file>
<file alias="send.png">res/send.png</file>
<file alias="remove.png">res/remove.png</file>
<file alias="lock_open.png">res/lock_open.png</file>
<file alias="tx_inout.png">res/tx_inout.png</file>
<file alias="lock_closed.png">res/lock_closed.png</file>
</qresource>
<qresource prefix="/img">
<file>res/tropical-hush.png</file>
<file>res/tropical-hush-square.png</file>
<file>res/logobig.gif</file>
<file>res/silentdragon-animated.gif</file>
<file>res/silentdragon-animated-dark.gif</file>
<file>res/silentdragon-animated-startup.gif</file>
<file>res/silentdragon-animated-startup-dark.gif</file>
<file alias="tropical-hush.png">res/tropical-hush.png</file>
<file alias="tropical-hush-square.png">res/tropical-hush-square.png</file>
<file alias="logobig.gif">res/logobig.gif</file>
<file alias="silentdragon-animated.gif">res/silentdragon-animated.gif</file>
<file alias="silentdragon-animated-dark.gif">res/silentdragon-animated-dark.gif</file>
<file alias="silentdragon-animated-startup.gif">res/silentdragon-animated-startup.gif</file>
<file alias="silentdragon-animated-startup-dark.gif">res/silentdragon-animated-startup-dark.gif</file>
</qresource>
<qresource prefix="/translations">
<file>res/silentdragon_be.qm</file>
<file>res/silentdragon_bg.qm</file>
<file>res/silentdragon_de.qm</file>
<file>res/silentdragon_es.qm</file>
<file>res/silentdragon_fi.qm</file>
<file>res/silentdragon_fil.qm</file>
<file>res/silentdragon_fr.qm</file>
<file>res/silentdragon_hr.qm</file>
<file>res/silentdragon_it.qm</file>
<file>res/silentdragon_id.qm</file>
<file>res/silentdragon_nl.qm</file>
<file>res/silentdragon_pl.qm</file>
<file>res/silentdragon_pt.qm</file>
<file>res/silentdragon_ro.qm</file>
<file>res/silentdragon_ru.qm</file>
<file>res/silentdragon_sr.qm</file>
<file>res/silentdragon_tr.qm</file>
<file>res/silentdragon_uk.qm</file>
<file>res/silentdragon_zh.qm</file>
<file alias="silentdragon_be.qm">res/silentdragon_be.qm</file>
<file alias="silentdragon_bg.qm">res/silentdragon_bg.qm</file>
<file alias="silentdragon_de.qm">res/silentdragon_de.qm</file>
<file alias="silentdragon_es.qm">res/silentdragon_es.qm</file>
<file alias="silentdragon_fi.qm">res/silentdragon_fi.qm</file>
<file alias="silentdragon_fil.qm">res/silentdragon_fil.qm</file>
<file alias="silentdragon_fr.qm">res/silentdragon_fr.qm</file>
<file alias="silentdragon_hr.qm">res/silentdragon_hr.qm</file>
<file alias="silentdragon_it.qm">res/silentdragon_it.qm</file>
<file alias="silentdragon_id.qm">res/silentdragon_id.qm</file>
<file alias="silentdragon_nl.qm">res/silentdragon_nl.qm</file>
<file alias="silentdragon_pl.qm">res/silentdragon_pl.qm</file>
<file alias="silentdragon_pt.qm">res/silentdragon_pt.qm</file>
<file alias="silentdragon_ro.qm">res/silentdragon_ro.qm</file>
<file alias="silentdragon_ru.qm">res/silentdragon_ru.qm</file>
<file alias="silentdragon_sr.qm">res/silentdragon_sr.qm</file>
<file alias="silentdragon_tr.qm">res/silentdragon_tr.qm</file>
<file alias="silentdragon_uk.qm">res/silentdragon_uk.qm</file>
<file alias="silentdragon_zh.qm">res/silentdragon_zh.qm</file>
</qresource>
<qresource prefix="/css">
<file>res/css/blue.css</file>
<file>res/css/dark.css</file>
<file>res/css/default.css</file>
<file>res/css/light.css</file>
<file>res/css/midnight.css</file>
<file alias="blue.css">res/css/blue.css</file>
<file alias="dark.css">res/css/dark.css</file>
<file alias="default.css">res/css/default.css</file>
<file alias="light.css">res/css/light.css</file>
<file alias="midnight.css">res/css/midnight.css</file>
</qresource>
<qresource prefix="/images/blue">
<file>res/images/blue/unchecked.png</file>
<file>res/images/blue/checked.png</file>
<file>res/images/blue/blue_downArrow.png</file>
<file>res/images/blue/blue_downArrow_small.png</file>
<file>res/images/blue/blue_upArrow_small.png</file>
<file>res/images/blue/blue_leftArrow_small.png</file>
<file>res/images/blue/blue_rightArrow_small.png</file>
<file>res/images/blue/blue_qtreeview_selected.png</file>
<file alias="unchecked.png">res/images/blue/unchecked.png</file>
<file alias="checked.png">res/images/blue/checked.png</file>
<file alias="blue_downArrow.png">res/images/blue/blue_downArrow.png</file>
<file alias="blue_downArrow_small.png">res/images/blue/blue_downArrow_small.png</file>
<file alias="blue_upArrow_small.png">res/images/blue/blue_upArrow_small.png</file>
<file alias="blue_leftArrow_small.png">res/images/blue/blue_leftArrow_small.png</file>
<file alias="blue_rightArrow_small.png">res/images/blue/blue_rightArrow_small.png</file>
<file alias="blue_qtreeview_selected.png">res/images/blue/blue_qtreeview_selected.png</file>
</qresource>
</RCC>

BIN
res-drgx/hush-3.6.0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
res-drgx/hush-dark.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 57 KiB

BIN
res-drgx/loading.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 802 B

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
res-drgx/lock_closed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
res-drgx/lock_open.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
res-drgx/logobig.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
res-drgx/paymentreq.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
res-drgx/remove.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
res-drgx/send.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
res-drgx/silentdragon-animated-startup.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.6 MiB

BIN
res-drgx/synced.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
res-drgx/transaction0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
res-drgx/transaction2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

BIN
res-drgx/transaction_abandoned.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
res-drgx/transaction_conflicted.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
res-drgx/tropical-hush.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 42 KiB

BIN
res-drgx/tx_inout.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
res-drgx/tx_input.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
res-drgx/tx_mined.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
res-drgx/tx_output.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
res-drgx/verify.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
res-drgx/warning.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 15 KiB

8
silentdragonx.pro
View File

@ -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

2
src/bannedpeerstablemodel.cpp
View File

@ -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

4
src/connection.cpp
View File

@ -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);

8
src/main.cpp
View File

@ -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

13
src/mainwindow.cpp
View File

@ -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))

2
src/mainwindow.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../application.qrc">
<normaloff>:/icons/res/icon.ico</normaloff>:/icons/res/icon.ico</iconset>
<normaloff>:/icons/icon.ico</normaloff>:/icons/icon.ico</iconset>
</property>
<widget class="QWidget" name="centralWidget">
<layout class="QGridLayout" name="gridLayout_3">

2
src/peerstablemodel.cpp
View File

@ -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

2
src/qrcodelabel.cpp
View File

@ -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;

2
src/requestdialog.cpp
View File

@ -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));
}

6
src/rpc.cpp
View File

@ -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);

2
src/sendtab.cpp
View File

@ -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);

12
src/txtablemodel.cpp
View File

@ -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));

Write Preview
Loading…
Cancel
Save