diff options
Diffstat (limited to 'src/qt/forms')
| -rw-r--r-- | src/qt/forms/editaddressdialog.ui | 9 | ||||
| -rw-r--r-- | src/qt/forms/receivecoinsdialog.ui | 82 | ||||
| -rw-r--r-- | src/qt/forms/sendcoinsdialog.ui | 84 | ||||
| -rw-r--r-- | src/qt/forms/sendcoinsentry.ui | 2 | ||||
| -rw-r--r-- | src/qt/forms/signverifymessagedialog.ui | 6 |
5 files changed, 112 insertions, 71 deletions
diff --git a/src/qt/forms/editaddressdialog.ui b/src/qt/forms/editaddressdialog.ui index 915b3679a1..c1aea36338 100644 --- a/src/qt/forms/editaddressdialog.ui +++ b/src/qt/forms/editaddressdialog.ui @@ -47,7 +47,7 @@ </widget> </item> <item row="1" column="1"> - <widget class="QLineEdit" name="addressEdit"> + <widget class="QValidatedLineEdit" name="addressEdit"> <property name="toolTip"> <string>The address associated with this address list entry. This can only be modified for sending addresses.</string> </property> @@ -67,6 +67,13 @@ </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>QValidatedLineEdit</class> + <extends>QLineEdit</extends> + <header>qvalidatedlineedit.h</header> + </customwidget> + </customwidgets> <resources/> <connections> <connection> diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui index e93636ea5f..3e1a8bccc7 100644 --- a/src/qt/forms/receivecoinsdialog.ui +++ b/src/qt/forms/receivecoinsdialog.ui @@ -10,8 +10,23 @@ <height>364</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1"> <item> + <widget class="QFrame" name="frame2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> <layout class="QGridLayout" name="gridLayout"> <item row="7" column="2"> <widget class="QCheckBox" name="reuseAddress"> @@ -32,6 +47,9 @@ </item> <item row="6" column="0"> <widget class="QLabel" name="label_3"> + <property name="toolTip"> + <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</string> + </property> <property name="text"> <string>&Message:</string> </property> @@ -46,7 +64,7 @@ <item row="4" column="2"> <widget class="QLineEdit" name="reqLabel"> <property name="toolTip"> - <string>An optional label to associate with the new receiving address</string> + <string>An optional label to associate with the new receiving address.</string> </property> </widget> </item> @@ -66,6 +84,9 @@ </item> <item row="4" column="0"> <widget class="QLabel" name="label_2"> + <property name="toolTip"> + <string>An optional label to associate with the new receiving address.</string> + </property> <property name="text"> <string>&Label:</string> </property> @@ -79,6 +100,9 @@ </item> <item row="5" column="0"> <widget class="QLabel" name="label"> + <property name="toolTip"> + <string>An optional amount to request. Leave this empty or zero to not request a specific amount.</string> + </property> <property name="text"> <string>&Amount:</string> </property> @@ -103,11 +127,26 @@ </property> </widget> </item> - </layout> - </item> - <item> + <item row="8" column="2"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> + <widget class="QPushButton" name="receiveButton"> + <property name="minimumSize"> + <size> + <width>150</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string>&Request payment</string> + </property> + <property name="icon"> + <iconset resource="../bitcoin.qrc"> + <normaloff>:/icons/receiving_addresses</normaloff>:/icons/receiving_addresses</iconset> + </property> + </widget> + </item> + <item> <widget class="QPushButton" name="clearButton"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> @@ -146,25 +185,20 @@ </property> </spacer> </item> - <item> - <widget class="QPushButton" name="receiveButton"> - <property name="minimumSize"> - <size> - <width>150</width> - <height>0</height> - </size> - </property> + </layout> + </item> + <item row="8" column="0"> + <widget class="QLabel" name="label_7"> <property name="text"> - <string>&Request payment</string> - </property> - <property name="icon"> - <iconset resource="../bitcoin.qrc"> - <normaloff>:/icons/receiving_addresses</normaloff>:/icons/receiving_addresses</iconset> + <string/> </property> </widget> </item> </layout> </item> + </layout> + </widget> + </item> <item> <spacer name="verticalSpacer_2"> <property name="orientation"> @@ -173,7 +207,7 @@ <property name="sizeHint" stdset="0"> <size> <width>20</width> - <height>40</height> + <height>10</height> </size> </property> </spacer> @@ -202,12 +236,18 @@ </font> </property> <property name="text"> - <string>Requested payments</string> + <string>Requested payments history</string> </property> </widget> </item> <item> <widget class="QTableView" name="recentRequestsView"> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> + <property name="tabKeyNavigation"> + <bool>false</bool> + </property> <property name="sortingEnabled"> <bool>true</bool> </property> @@ -275,8 +315,8 @@ <tabstop>reqAmount</tabstop> <tabstop>reqMessage</tabstop> <tabstop>reuseAddress</tabstop> - <tabstop>clearButton</tabstop> <tabstop>receiveButton</tabstop> + <tabstop>clearButton</tabstop> <tabstop>recentRequestsView</tabstop> <tabstop>showRequestButton</tabstop> <tabstop>removeRequestButton</tabstop> diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index db8271b016..95f3294adb 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -657,19 +657,25 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QPushButton" name="addButton"> + <widget class="QPushButton" name="sendButton"> + <property name="minimumSize"> + <size> + <width>150</width> + <height>0</height> + </size> + </property> <property name="toolTip"> - <string>Send to multiple recipients at once</string> + <string>Confirm the send action</string> </property> <property name="text"> - <string>Add &Recipient</string> + <string>S&end</string> </property> <property name="icon"> <iconset resource="../bitcoin.qrc"> - <normaloff>:/icons/add</normaloff>:/icons/add</iconset> + <normaloff>:/icons/send</normaloff>:/icons/send</iconset> </property> - <property name="autoDefault"> - <bool>false</bool> + <property name="default"> + <bool>true</bool> </property> </widget> </item> @@ -700,6 +706,36 @@ </widget> </item> <item> + <widget class="QPushButton" name="addButton"> + <property name="toolTip"> + <string>Send to multiple recipients at once</string> + </property> + <property name="text"> + <string>Add &Recipient</string> + </property> + <property name="icon"> + <iconset resource="../bitcoin.qrc"> + <normaloff>:/icons/add</normaloff>:/icons/add</iconset> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> <layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="spacing"> <number>3</number> @@ -726,42 +762,6 @@ </item> </layout> </item> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="sendButton"> - <property name="minimumSize"> - <size> - <width>150</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Confirm the send action</string> - </property> - <property name="text"> - <string>S&end</string> - </property> - <property name="icon"> - <iconset resource="../bitcoin.qrc"> - <normaloff>:/icons/send</normaloff>:/icons/send</iconset> - </property> - <property name="default"> - <bool>true</bool> - </property> - </widget> - </item> </layout> </item> </layout> diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index 76039ce52a..e77de0d9b8 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -154,7 +154,7 @@ <item row="3" column="1"> <widget class="QLabel" name="messageTextLabel"> <property name="toolTip"> - <string>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</string> + <string>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</string> </property> <property name="textFormat"> <enum>Qt::PlainText</enum> diff --git a/src/qt/forms/signverifymessagedialog.ui b/src/qt/forms/signverifymessagedialog.ui index 989522bb58..aa271b4f2a 100644 --- a/src/qt/forms/signverifymessagedialog.ui +++ b/src/qt/forms/signverifymessagedialog.ui @@ -47,9 +47,6 @@ <property name="toolTip"> <string>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string> </property> - <property name="maxLength"> - <number>34</number> - </property> </widget> </item> <item> @@ -260,9 +257,6 @@ <property name="toolTip"> <string>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string> </property> - <property name="maxLength"> - <number>34</number> - </property> </widget> </item> <item> |