diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-05-05 02:34:36 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-05-05 02:34:36 -0700 |
| commit | bdef43dde7d7650e3c941890c15dbcc1823c99bd (patch) | |
| tree | 39822125f09eb3c1642d904f785386862727526d | |
| parent | 4c9183e8bb6dc3faf80e301cf07c2d4d3abff405 (diff) | |
| parent | e400258bf0fe0e869692780590ce9fa0444b3b67 (diff) | |
Merge pull request #1200 from laanwj/2012_05_moveicon
simplified qrcode icon that scales gracefully to 16x16
| -rw-r--r-- | src/qt/bitcoin.qrc | 2 | ||||
| -rw-r--r-- | src/qt/forms/addressbookpage.ui | 2 | ||||
| -rw-r--r-- | src/qt/res/icons/qrcode.png | bin | 0 -> 237 bytes | |||
| -rw-r--r-- | src/qt/res/images/qrcode.png | bin | 5993 -> 0 bytes |
4 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index e631a65155..e696170312 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -38,11 +38,11 @@ <file alias="lock_open">res/icons/lock_open.png</file> <file alias="key">res/icons/key.png</file> <file alias="filesave">res/icons/filesave.png</file> + <file alias="qrcode">res/icons/qrcode.png</file> </qresource> <qresource prefix="/images"> <file alias="about">res/images/about.png</file> <file alias="splash">res/images/splash2.jpg</file> - <file alias="qrcode">res/images/qrcode.png</file> </qresource> <qresource prefix="/movies"> <file alias="update_spinner">res/movies/update_spinner.mng</file> diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui index b31a9ce997..3ccebd40d9 100644 --- a/src/qt/forms/addressbookpage.ui +++ b/src/qt/forms/addressbookpage.ui @@ -86,7 +86,7 @@ </property> <property name="icon"> <iconset resource="../bitcoin.qrc"> - <normaloff>:/images/qrcode</normaloff>:/images/qrcode</iconset> + <normaloff>:/icons/qrcode</normaloff>:/icons/qrcode</iconset> </property> </widget> </item> diff --git a/src/qt/res/icons/qrcode.png b/src/qt/res/icons/qrcode.png Binary files differnew file mode 100644 index 0000000000..a8d97174b3 --- /dev/null +++ b/src/qt/res/icons/qrcode.png diff --git a/src/qt/res/images/qrcode.png b/src/qt/res/images/qrcode.png Binary files differdeleted file mode 100644 index c89a49bbce..0000000000 --- a/src/qt/res/images/qrcode.png +++ /dev/null |
