Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
Merge Wallet
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
8
Issues
8
List
Boards
Labels
Milestones
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Merge
Merge Wallet
Commits
ce72a9f7
Commit
ce72a9f7
authored
Apr 20, 2019
by
Aviator
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT - Fixes the PNG not displayed in the bottom right for units
parent
be3f2bb1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
src/qt/bitcoinunits.cpp
src/qt/bitcoinunits.cpp
+2
-2
src/qt/merge.qrc
src/qt/merge.qrc
+6
-6
No files found.
src/qt/bitcoinunits.cpp
View file @
ce72a9f7
...
...
@@ -44,9 +44,9 @@ QString BitcoinUnits::id(int unit)
case
MERGE
:
return
QString
(
"MERGE"
);
case
mMERGE
:
return
QString
(
"m
merge
"
);
return
QString
(
"m
MERGE
"
);
case
uMERGE
:
return
QString
::
fromUtf8
(
"u
merge
"
);
return
QString
::
fromUtf8
(
"u
MERGE
"
);
default:
return
QString
(
"???"
);
}
...
...
src/qt/merge.qrc
View file @
ce72a9f7
...
...
@@ -37,12 +37,12 @@
<file alias="tx_input">res/icons/tx_input.png</file>
<file alias="tx_output">res/icons/tx_output.png</file>
<file alias="tx_inout">res/icons/tx_inout.png</file>
<file alias="unit_
merge
">res/icons/unit_merge.png</file>
<file alias="unit_m
merge
">res/icons/unit_mmerge.png</file>
<file alias="unit_u
merge
">res/icons/unit_umerge.png</file>
<file alias="unit_t
merge
">res/icons/unit_tmerge.png</file>
<file alias="unit_tm
merge
">res/icons/unit_tmmerge.png</file>
<file alias="unit_tu
merge
">res/icons/unit_tumerge.png</file>
<file alias="unit_
MERGE
">res/icons/unit_merge.png</file>
<file alias="unit_m
MERGE
">res/icons/unit_mmerge.png</file>
<file alias="unit_u
MERGE
">res/icons/unit_umerge.png</file>
<file alias="unit_t
MERGE
">res/icons/unit_tmerge.png</file>
<file alias="unit_tm
MERGE
">res/icons/unit_tmmerge.png</file>
<file alias="unit_tu
MERGE
">res/icons/unit_tumerge.png</file>
<file alias="lock_closed">res/icons/lock_closed.png</file>
<file alias="lock_open">res/icons/lock_open.png</file>
<file alias="key">res/icons/key.png</file>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment