[Qt] update form files for setting autoDefault explicitly to false

- also fixes indentation in one file (auto fixed by Qt Designer)
- removes several default parameters, which are not needed in the files
- related to #4840 (but not intended as fix for a no-bug)
This commit is contained in:
Philip Kaufmann 2014-09-05 13:54:16 +02:00
parent af9c3b0cff
commit 2605b94d73
9 changed files with 241 additions and 193 deletions

View file

@ -63,6 +63,9 @@
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/add</normaloff>:/icons/add</iconset> <normaloff>:/icons/add</normaloff>:/icons/add</iconset>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -77,6 +80,9 @@
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset> <normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -91,6 +97,9 @@
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -118,6 +127,9 @@
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/export</normaloff>:/icons/export</iconset> <normaloff>:/icons/export</normaloff>:/icons/export</iconset>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -131,6 +143,9 @@
<property name="text"> <property name="text">
<string>C&amp;lose</string> <string>C&amp;lose</string>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

View file

@ -363,6 +363,9 @@
<property name="text"> <property name="text">
<string>(un)select all</string> <string>(un)select all</string>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>

View file

@ -31,8 +31,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QValidatedLineEdit" name="uriEdit"> <widget class="QValidatedLineEdit" name="uriEdit"/>
</widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="selectFileButton"> <widget class="QPushButton" name="selectFileButton">
@ -42,6 +41,9 @@
<property name="text"> <property name="text">
<string notr="true">…</string> <string notr="true">…</string>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

View file

@ -609,6 +609,12 @@
<property name="text"> <property name="text">
<string>&amp;OK</string> <string>&amp;OK</string>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>

View file

@ -12,192 +12,189 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
<item> <item>
<widget class="QFrame" name="frame2"> <widget class="QFrame" name="frame2">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="7" column="2"> <item row="7" column="2">
<widget class="QCheckBox" name="reuseAddress"> <widget class="QCheckBox" name="reuseAddress">
<property name="toolTip"> <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> <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>
<property name="text"> <property name="text">
<string>R&amp;euse an existing receiving address (not recommended)</string> <string>R&amp;euse an existing receiving address (not recommended)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="7" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="toolTip"> <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> <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>
<property name="text"> <property name="text">
<string>&amp;Message:</string> <string>&amp;Message:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>reqMessage</cstring> <cstring>reqMessage</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2"> <item row="4" column="2">
<widget class="QLineEdit" name="reqLabel"> <widget class="QLineEdit" name="reqLabel">
<property name="toolTip"> <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> </property>
</widget> </widget>
</item> </item>
<item row="6" column="2"> <item row="6" column="2">
<widget class="QLineEdit" name="reqMessage"> <widget class="QLineEdit" name="reqMessage">
<property name="toolTip"> <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> <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>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="2" column="2">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</string> <string>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="toolTip"> <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> </property>
<property name="text"> <property name="text">
<string>&amp;Label:</string> <string>&amp;Label:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>reqLabel</cstring> <cstring>reqLabel</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="toolTip"> <property name="toolTip">
<string>An optional amount to request. Leave this empty or zero to not request a specific amount.</string> <string>An optional amount to request. Leave this empty or zero to not request a specific amount.</string>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Amount:</string> <string>&amp;Amount:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>reqAmount</cstring> <cstring>reqAmount</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="2"> <item row="5" column="2">
<widget class="BitcoinAmountField" name="reqAmount"> <widget class="BitcoinAmountField" name="reqAmount">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>An optional amount to request. Leave this empty or zero to not request a specific amount.</string> <string>An optional amount to request. Leave this empty or zero to not request a specific amount.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="2"> <item row="8" column="2">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QPushButton" name="receiveButton"> <widget class="QPushButton" name="receiveButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Request payment</string> <string>&amp;Request payment</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/receiving_addresses</normaloff>:/icons/receiving_addresses</iconset> <normaloff>:/icons/receiving_addresses</normaloff>:/icons/receiving_addresses</iconset>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="clearButton"> <widget class="QPushButton" name="clearButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Clear all fields of the form.</string> <string>Clear all fields of the form.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Clear</string> <string>Clear</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="autoRepeatDelay"> <property name="autoDefault">
<number>300</number> <bool>false</bool>
</property> </property>
<property name="autoDefault"> </widget>
<bool>false</bool> </item>
</property> <item>
</widget> <spacer name="horizontalSpacer">
</item> <property name="orientation">
<item> <enum>Qt::Horizontal</enum>
<spacer name="horizontalSpacer"> </property>
<property name="orientation"> <property name="sizeHint" stdset="0">
<enum>Qt::Horizontal</enum> <size>
</property> <width>40</width>
<property name="sizeHint" stdset="0"> <height>20</height>
<size> </size>
<width>40</width> </property>
<height>20</height> </spacer>
</size> </item>
</property> </layout>
</spacer> </item>
</item> <item row="8" column="0">
</layout> <widget class="QLabel" name="label_7">
</item> <property name="text">
<item row="8" column="0"> <string/>
<widget class="QLabel" name="label_7"> </property>
<property name="text"> </widget>
<string/> </item>
</property> </layout>
</widget> </item>
</item> </layout>
</layout> </widget>
</item>
</layout>
</widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
@ -257,36 +254,42 @@
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QPushButton" name="showRequestButton"> <widget class="QPushButton" name="showRequestButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Show the selected request (does the same as double clicking an entry)</string> <string>Show the selected request (does the same as double clicking an entry)</string>
</property> </property>
<property name="text"> <property name="text">
<string>Show</string> <string>Show</string>
</property> </property>
<property name="enabled">
<bool>false</bool>
</property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/edit</normaloff>:/icons/edit</iconset> <normaloff>:/icons/edit</normaloff>:/icons/edit</iconset>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="removeRequestButton"> <widget class="QPushButton" name="removeRequestButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Remove the selected entries from the list</string> <string>Remove the selected entries from the list</string>
</property> </property>
<property name="text"> <property name="text">
<string>Remove</string> <string>Remove</string>
</property> </property>
<property name="enabled">
<bool>false</bool>
</property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -314,6 +317,7 @@
<class>BitcoinAmountField</class> <class>BitcoinAmountField</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
<header>bitcoinamountfield.h</header> <header>bitcoinamountfield.h</header>
<container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>

View file

@ -74,6 +74,9 @@
<property name="text"> <property name="text">
<string>Copy &amp;URI</string> <string>Copy &amp;URI</string>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -81,6 +84,9 @@
<property name="text"> <property name="text">
<string>Copy &amp;Address</string> <string>Copy &amp;Address</string>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -88,6 +94,9 @@
<property name="text"> <property name="text">
<string>&amp;Save Image...</string> <string>&amp;Save Image...</string>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>

View file

@ -484,6 +484,9 @@
<property name="text"> <property name="text">
<string>&amp;Clear</string> <string>&amp;Clear</string>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

View file

@ -109,6 +109,9 @@
<property name="text"> <property name="text">
<string>Inputs...</string> <string>Inputs...</string>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -674,6 +677,9 @@
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/send</normaloff>:/icons/send</iconset> <normaloff>:/icons/send</normaloff>:/icons/send</iconset>
</property> </property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default"> <property name="default">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -697,9 +703,6 @@
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="autoRepeatDelay">
<number>300</number>
</property>
<property name="autoDefault"> <property name="autoDefault">
<bool>false</bool> <bool>false</bool>
</property> </property>

View file

@ -19,6 +19,9 @@
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tabSignMessage"> <widget class="QWidget" name="tabSignMessage">
<attribute name="title"> <attribute name="title">
<string>&amp;Sign Message</string> <string>&amp;Sign Message</string>