diff options
| -rw-r--r-- | doc/assets-attribution.txt | 3 | ||||
| -rw-r--r-- | src/qt/bitcoin.qrc | 2 | ||||
| -rw-r--r-- | src/qt/bitcoingui.cpp | 2 | ||||
| -rw-r--r-- | src/qt/forms/sendcoinsdialog.ui | 108 | ||||
| -rw-r--r-- | src/qt/res/icons/editcopy.png | bin | 0 -> 879 bytes | |||
| -rw-r--r-- | src/qt/res/icons/editpaste.png | bin | 0 -> 1458 bytes |
6 files changed, 71 insertions, 44 deletions
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index 623a5027ca..b3c9c7c7aa 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -26,7 +26,8 @@ Site: https://forum.bitcoin.org/index.php?topic=15276.0 License: You are free to do with these icons as you wish, including selling, copying, modifying etc. -Icon: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png +Icon: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png, + src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png Designer: http://www.everaldo.com Icon Pack: Crystal SVG License: LGPL diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 3d4a3e163b..663eb4869d 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -19,6 +19,8 @@ <file alias="transaction_5">res/icons/clock5.png</file> <file alias="options">res/icons/configure.png</file> <file alias="receiving_addresses">res/icons/receive.png</file> + <file alias="editpaste">res/icons/editpaste.png</file> + <file alias="editcopy">res/icons/editcopy.png</file> </qresource> <qresource prefix="/images"> <file alias="about">res/images/about.png</file> diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index ed09ac9c3e..1b4e13c420 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -93,7 +93,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): hbox_balance->addSpacing(5);/* Add some spacing between the label and the text */ labelBalance = new QLabel(); - labelBalance->setFont(QFont("Monospace")); + labelBalance->setFont(QFont("Monospace", -1, QFont::Bold)); labelBalance->setToolTip(tr("Your current balance")); hbox_balance->addWidget(labelBalance); hbox_balance->addStretch(1); diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 46c71456af..3212424896 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>736</width> - <height>149</height> + <height>193</height> </rect> </property> <property name="windowTitle"> @@ -16,10 +16,70 @@ <layout class="QVBoxLayout" name="verticalLayout"> <item> <layout class="QGridLayout" name="gridLayout"> + <item row="3" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="spacing"> + <number>0</number> + </property> + <item> + <widget class="QLineEdit" name="payTo"> + <property name="toolTip"> + <string>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string> + </property> + <property name="maxLength"> + <number>34</number> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="addressBookButton"> + <property name="toolTip"> + <string>Look up adress in address book</string> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../bitcoin.qrc"> + <normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset> + </property> + <property name="shortcut"> + <string>Alt+A</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + <property name="flat"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pasteButton"> + <property name="toolTip"> + <string>Paste address from system clipboard</string> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../bitcoin.qrc"> + <normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset> + </property> + <property name="shortcut"> + <string>Alt+P</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> <item row="5" column="0"> <widget class="QLabel" name="label"> <property name="text"> - <string>&Amount:</string> + <string>A&mount:</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> @@ -42,42 +102,6 @@ </property> </widget> </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="payTo"> - <property name="toolTip"> - <string>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string> - </property> - <property name="maxLength"> - <number>34</number> - </property> - </widget> - </item> - <item row="3" column="2"> - <widget class="QPushButton" name="pasteButton"> - <property name="toolTip"> - <string>Paste address from system clipboard</string> - </property> - <property name="text"> - <string>&Paste</string> - </property> - <property name="autoDefault"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="3" column="3"> - <widget class="QPushButton" name="addressBookButton"> - <property name="toolTip"> - <string>Look up adress in address book</string> - </property> - <property name="text"> - <string>Address &Book...</string> - </property> - <property name="autoDefault"> - <bool>false</bool> - </property> - </widget> - </item> <item row="2" column="1"> <widget class="QLabel" name="label_3"> <property name="font"> @@ -91,7 +115,7 @@ </widget> </item> <item row="5" column="1"> - <widget class="BitcoinAmountField" name="payAmount" native="true"/> + <widget class="BitcoinAmountField" name="payAmount"/> </item> <item row="4" column="1"> <layout class="QHBoxLayout" name="horizontalLayout_2"> @@ -101,7 +125,7 @@ <string>Add specified destination address to address book</string> </property> <property name="text"> - <string>Add to address book as</string> + <string>A&dd to address book as</string> </property> </widget> </item> @@ -187,7 +211,7 @@ <customwidgets> <customwidget> <class>BitcoinAmountField</class> - <extends>QWidget</extends> + <extends>QLineEdit</extends> <header>bitcoinamountfield.h</header> <container>1</container> </customwidget> @@ -197,8 +221,8 @@ <tabstop>addToAddressBook</tabstop> <tabstop>addAsLabel</tabstop> <tabstop>payAmount</tabstop> - <tabstop>pasteButton</tabstop> <tabstop>addressBookButton</tabstop> + <tabstop>pasteButton</tabstop> <tabstop>sendButton</tabstop> <tabstop>buttonBox</tabstop> </tabstops> diff --git a/src/qt/res/icons/editcopy.png b/src/qt/res/icons/editcopy.png Binary files differnew file mode 100644 index 0000000000..f882aa2ad8 --- /dev/null +++ b/src/qt/res/icons/editcopy.png diff --git a/src/qt/res/icons/editpaste.png b/src/qt/res/icons/editpaste.png Binary files differnew file mode 100644 index 0000000000..a192060bdd --- /dev/null +++ b/src/qt/res/icons/editpaste.png |
