Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-23 03:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Fix misc image scaling hangs' (#54) from tobtoht/feather:img_hang into master

Browse source 
Reviewed-on: https://git.wownero.com/feather/feather/pulls/54
This commit is contained in:
dsc 2020-10-13 13:53:32 +00:00
commit 2ab78022f5
6 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/assets.qrc
View file

@ -23,6 +23,7 @@
<file>assets/images/coldcard.png</file> <file>assets/images/coldcard.png</file>
<file>assets/images/coldcard_unpaired.png</file> <file>assets/images/coldcard_unpaired.png</file>
<file>assets/images/confirmed.png</file> <file>assets/images/confirmed.png</file>
<file>assets/images/confirmed_icon.png</file>
<file>assets/images/confirmed.svg</file> <file>assets/images/confirmed.svg</file>
<file>assets/images/connect.svg</file> <file>assets/images/connect.svg</file>
<file>assets/images/copy.png</file> <file>assets/images/copy.png</file>
@ -30,10 +31,12 @@
<file>assets/images/edit.png</file> <file>assets/images/edit.png</file>
<file>assets/images/exchange.png</file> <file>assets/images/exchange.png</file>
<file>assets/images/expired.png</file> <file>assets/images/expired.png</file>
<file>assets/images/expired_icon.png</file>
<file>assets/images/eye1.png</file> <file>assets/images/eye1.png</file>
<file>assets/images/feather.png</file> <file>assets/images/feather.png</file>
<file>assets/images/file.png</file> <file>assets/images/file.png</file>
<file>assets/images/ghost.png</file> <file>assets/images/ghost.png</file>
<file>assets/images/ghost_icon.png</file>
<file>assets/images/history.png</file> <file>assets/images/history.png</file>
<file>assets/images/info.png</file> <file>assets/images/info.png</file>
<file>assets/images/key.png</file> <file>assets/images/key.png</file>

BIN
src/assets/images/confirmed_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/assets/images/expired_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/assets/images/ghost_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

4
src/model/NodeModel.cpp
View file

@ -8,8 +8,8 @@
NodeModel::NodeModel(unsigned int nodeSource, QObject *parent) NodeModel::NodeModel(unsigned int nodeSource, QObject *parent)
: QAbstractTableModel(parent) : QAbstractTableModel(parent)
, m_nodeSource(nodeSource) , m_nodeSource(nodeSource)
, m_offline(QIcon(":/assets/images/expired.png")) , m_offline(QIcon(":/assets/images/expired_icon.png"))
, m_online(QIcon(":/assets/images/confirmed.png")) , m_online(QIcon(":/assets/images/confirmed_icon.png"))
{ {
} }

12
src/utils/utils.cpp
View file

@ -334,15 +334,15 @@ int Utils::showMessageBox(const QString &windowTitle, const QString &body, bool
msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok);
QPixmap iconWarning = QPixmap(":/assets/images/ghost.png") if(warning) {
.scaled(QSize(48,48), Qt::KeepAspectRatio, Qt::SmoothTransformation); QPixmap iconWarning = QPixmap(":/assets/images/ghost_icon.png");
msgBox.setIconPixmap(iconWarning);
}
else {
QPixmap iconInfo = QPixmap(":/assets/images/info.png") QPixmap iconInfo = QPixmap(":/assets/images/info.png")
.scaled(QSize(48,48), Qt::KeepAspectRatio, Qt::SmoothTransformation); .scaled(QSize(48,48), Qt::KeepAspectRatio, Qt::SmoothTransformation);
if(warning)
msgBox.setIconPixmap(iconWarning);
else
msgBox.setIconPixmap(iconInfo); msgBox.setIconPixmap(iconInfo);
}
return msgBox.exec(); return msgBox.exec();
} }