aboutsummaryrefslogtreecommitdiff
path: root/src/qt/forms
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-10-18 19:42:40 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2013-10-25 13:25:25 +0200
commit70b14636cd60529c87b2cc61516f5d1bf49299a5 (patch)
treed2bec1b1e3fa9991320b4e062ffe82a40193e68f /src/qt/forms
parent33a2febf5de0c7bd73c0ea409584487bd9995643 (diff)
qt: general polish after adding new receive flow
- We no longer have an address book, but "address lists", update message accordingly - Add tooltips here and there - Clarify text on buttons - add Copy Address button to receive request dialog
Diffstat (limited to 'src/qt/forms')
-rw-r--r--src/qt/forms/addressbookpage.ui18
-rw-r--r--src/qt/forms/editaddressdialog.ui4
-rw-r--r--src/qt/forms/receivecoinsdialog.ui22
-rw-r--r--src/qt/forms/receiverequestdialog.ui82
-rw-r--r--src/qt/forms/sendcoinsentry.ui5
-rw-r--r--src/qt/forms/signverifymessagedialog.ui6
6 files changed, 100 insertions, 37 deletions
diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui
index 9edaf74023..5a92a455b1 100644
--- a/src/qt/forms/addressbookpage.ui
+++ b/src/qt/forms/addressbookpage.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string></string>
+ <string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -60,7 +60,7 @@
<string>Create a new address</string>
</property>
<property name="text">
- <string>&amp;New Address</string>
+ <string>&amp;New</string>
</property>
<property name="icon">
<iconset resource="../bitcoin.qrc">
@@ -74,7 +74,7 @@
<string>Copy the currently selected address to the system clipboard</string>
</property>
<property name="text">
- <string>&amp;Copy Address</string>
+ <string>&amp;Copy</string>
</property>
<property name="icon">
<iconset resource="../bitcoin.qrc">
@@ -124,15 +124,9 @@
</widget>
</item>
<item>
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Ok</set>
+ <widget class="QPushButton" name="closeButton">
+ <property name="text">
+ <string>C&amp;lose</string>
</property>
</widget>
</item>
diff --git a/src/qt/forms/editaddressdialog.ui b/src/qt/forms/editaddressdialog.ui
index b4a4c1b1e9..8ff3805226 100644
--- a/src/qt/forms/editaddressdialog.ui
+++ b/src/qt/forms/editaddressdialog.ui
@@ -32,7 +32,7 @@
<item row="0" column="1">
<widget class="QLineEdit" name="labelEdit">
<property name="toolTip">
- <string>The label associated with this address book entry</string>
+ <string>The label associated with this address list entry</string>
</property>
</widget>
</item>
@@ -49,7 +49,7 @@
<item row="1" column="1">
<widget class="QLineEdit" name="addressEdit">
<property name="toolTip">
- <string>The address associated with this address book entry. This can only be modified for sending addresses.</string>
+ <string>The address associated with this address list entry. This can only be modified for sending addresses.</string>
</property>
</widget>
</item>
diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui
index a5946883bd..e01a23b9c4 100644
--- a/src/qt/forms/receivecoinsdialog.ui
+++ b/src/qt/forms/receivecoinsdialog.ui
@@ -30,13 +30,16 @@
</widget>
</item>
<item row="3" column="1">
- <widget class="BitcoinAmountField" name="reqAmount" native="true">
+ <widget class="BitcoinAmountField" name="reqAmount">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
+ <property name="toolTip">
+ <string>The amount to request</string>
+ </property>
</widget>
</item>
<item row="4" column="0">
@@ -50,7 +53,11 @@
</widget>
</item>
<item row="4" column="1">
- <widget class="QLineEdit" name="reqLabel"/>
+ <widget class="QLineEdit" name="reqLabel">
+ <property name="toolTip">
+ <string>The label to associate with the receiving address</string>
+ </property>
+ </widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_3">
@@ -63,7 +70,11 @@
</widget>
</item>
<item row="5" column="1">
- <widget class="QLineEdit" name="reqMessage"/>
+ <widget class="QLineEdit" name="reqMessage">
+ <property name="toolTip">
+ <string>The message to attach to payment request</string>
+ </property>
+ </widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_4">
@@ -74,8 +85,11 @@
</item>
<item row="6" column="1">
<widget class="QCheckBox" name="reuseAddress">
+ <property name="toolTip">
+ <string>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</string>
+ </property>
<property name="text">
- <string>R&amp;euse an existing receiving address</string>
+ <string>R&amp;euse an existing receiving address (not recommended)</string>
</property>
</widget>
</item>
diff --git a/src/qt/forms/receiverequestdialog.ui b/src/qt/forms/receiverequestdialog.ui
index fc0d10b4e4..d7724ef915 100644
--- a/src/qt/forms/receiverequestdialog.ui
+++ b/src/qt/forms/receiverequestdialog.ui
@@ -28,6 +28,9 @@
<height>300</height>
</size>
</property>
+ <property name="toolTip">
+ <string>QR Code</string>
+ </property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
@@ -53,6 +56,12 @@
<height>50</height>
</size>
</property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
<property name="tabChangesFocus">
<bool>true</bool>
</property>
@@ -64,22 +73,16 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<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>
+ <widget class="QPushButton" name="btnCopyURI">
+ <property name="text">
+ <string>Copy &amp;URI</string>
</property>
- </spacer>
+ </widget>
</item>
<item>
- <widget class="QPushButton" name="btnCopyURI">
+ <widget class="QPushButton" name="btnCopyAddress">
<property name="text">
- <string>Copy &amp;URI</string>
+ <string>Copy &amp;Address</string>
</property>
</widget>
</item>
@@ -97,6 +100,26 @@
</property>
</widget>
</item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <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="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
@@ -109,5 +132,38 @@
</customwidget>
</customwidgets>
<resources/>
- <connections/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>ReceiveRequestDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>452</x>
+ <y>573</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>243</x>
+ <y>298</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>ReceiveRequestDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>452</x>
+ <y>573</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>243</x>
+ <y>298</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
</ui>
diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui
index 5c6afd6c71..db742d633d 100644
--- a/src/qt/forms/sendcoinsentry.ui
+++ b/src/qt/forms/sendcoinsentry.ui
@@ -87,7 +87,7 @@
<item>
<widget class="QToolButton" name="addressBookButton">
<property name="toolTip">
- <string>Choose address from address book</string>
+ <string>Choose previously used address</string>
</property>
<property name="text">
<string/>
@@ -137,7 +137,7 @@
<item row="4" column="1">
<widget class="QValidatedLineEdit" name="addAsLabel">
<property name="toolTip">
- <string>Enter a label for this address to add it to your address book</string>
+ <string>Enter a label for this address to add it to the list of used addresses</string>
</property>
</widget>
</item>
@@ -674,7 +674,6 @@
<class>BitcoinAmountField</class>
<extends>QLineEdit</extends>
<header>bitcoinamountfield.h</header>
- <container>1</container>
</customwidget>
<customwidget>
<class>QValidatedLineEdit</class>
diff --git a/src/qt/forms/signverifymessagedialog.ui b/src/qt/forms/signverifymessagedialog.ui
index 279b2a5052..16cc6c2ea1 100644
--- a/src/qt/forms/signverifymessagedialog.ui
+++ b/src/qt/forms/signverifymessagedialog.ui
@@ -20,7 +20,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<widget class="QWidget" name="tabSignMessage">
<attribute name="title">
@@ -58,7 +58,7 @@
<item>
<widget class="QPushButton" name="addressBookButton_SM">
<property name="toolTip">
- <string>Choose an address from the address book</string>
+ <string>Choose previously used address</string>
</property>
<property name="text">
<string/>
@@ -271,7 +271,7 @@
<item>
<widget class="QPushButton" name="addressBookButton_VM">
<property name="toolTip">
- <string>Choose an address from the address book</string>
+ <string>Choose previously used address</string>
</property>
<property name="text">
<string/>