diff options
Diffstat (limited to 'src/qt/forms')
-rw-r--r-- | src/qt/forms/addressbookpage.ui | 6 | ||||
-rw-r--r-- | src/qt/forms/coincontroldialog.ui | 155 | ||||
-rw-r--r-- | src/qt/forms/optionsdialog.ui | 76 | ||||
-rw-r--r-- | src/qt/forms/overviewpage.ui | 4 | ||||
-rw-r--r-- | src/qt/forms/receivecoinsdialog.ui | 6 | ||||
-rw-r--r-- | src/qt/forms/sendcoinsdialog.ui | 12 |
6 files changed, 137 insertions, 122 deletions
diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui index 49221f41c1..f40c446050 100644 --- a/src/qt/forms/addressbookpage.ui +++ b/src/qt/forms/addressbookpage.ui @@ -122,6 +122,12 @@ </item> <item> <widget class="QPushButton" name="closeButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text"> <string>C&lose</string> </property> diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui index e4faa312d4..cd1c0ffa18 100644 --- a/src/qt/forms/coincontroldialog.ui +++ b/src/qt/forms/coincontroldialog.ui @@ -346,83 +346,77 @@ <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <widget class="QWidget" name="horizontalLayoutWidget"> - <property name="geometry"> - <rect> - <x>10</x> - <y>0</y> - <width>781</width> - <height>41</height> - </rect> - </property> - <layout class="QHBoxLayout" name="horizontalLayoutPanel" stretch="0,0,0,0,0"> - <property name="spacing"> - <number>14</number> - </property> - <item> - <widget class="QPushButton" name="pushButtonSelectAll"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>(un)select all</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="radioTreeMode"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Tree mode</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="radioListMode"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>List mode</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="labelLocked"> - <property name="text"> - <string notr="true">(1 locked)</string> - </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> - </layout> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <layout class="QHBoxLayout" name="horizontalLayoutPanel" stretch="0,0,0,0,0"> + <property name="spacing"> + <number>14</number> + </property> + <item> + <widget class="QPushButton" name="pushButtonSelectAll"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>(un)select all</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="radioTreeMode"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Tree mode</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="radioListMode"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>List mode</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="labelLocked"> + <property name="text"> + <string notr="true">(1 locked)</string> + </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> + </layout> + </item> + </layout> </widget> </item> <item> @@ -434,7 +428,7 @@ <bool>false</bool> </property> <property name="columnCount"> - <number>11</number> + <number>12</number> </property> <attribute name="headerShowSortIndicator" stdset="0"> <bool>true</bool> @@ -500,6 +494,11 @@ <string/> </property> </column> + <column> + <property name="text"> + <string/> + </property> + </column> </widget> </item> <item> diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index b4a9f1f580..36b070f1c8 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -53,17 +53,7 @@ </widget> </item> <item> - <widget class="QSpinBox" name="databaseCache"> - <property name="toolTip"> - <string>Set database cache size in megabytes (default: 25)</string> - </property> - <property name="maximum"> - <number>1024</number> - </property> - <property name="value"> - <number>25</number> - </property> - </widget> + <widget class="QSpinBox" name="databaseCache"/> </item> <item> <widget class="QLabel" name="databaseCacheUnitLabel"> @@ -152,7 +142,7 @@ <attribute name="title"> <string>W&allet</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout_Network"> + <layout class="QVBoxLayout" name="verticalLayout_Wallet"> <item> <widget class="QLabel" name="transactionFeeInfoLabel"> <property name="text"> @@ -167,7 +157,7 @@ </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_1_Main"> + <layout class="QHBoxLayout" name="horizontalLayout_1_Wallet"> <item> <widget class="QLabel" name="transactionFeeLabel"> <property name="text"> @@ -185,7 +175,7 @@ <widget class="BitcoinAmountField" name="transactionFee"/> </item> <item> - <spacer name="horizontalSpacer_1_Main"> + <spacer name="horizontalSpacer_1_Wallet"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -200,24 +190,7 @@ </layout> </item> <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</string> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="spendZeroConfChange"> - <property name="text"> - <string>Spend unconfirmed change (experts only)</string> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer"> + <spacer name="verticalSpacer_Wallet"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> @@ -229,6 +202,35 @@ </property> </spacer> </item> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Expert</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QCheckBox" name="coinControlFeatures"> + <property name="toolTip"> + <string>Whether to show coin control features or not.</string> + </property> + <property name="text"> + <string>Enable coin &control features</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="spendZeroConfChange"> + <property name="toolTip"> + <string>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</string> + </property> + <property name="text"> + <string>&Spend unconfirmed change</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> </layout> </widget> <widget class="QWidget" name="tabNetwork"> @@ -476,16 +478,6 @@ </widget> </item> <item> - <widget class="QCheckBox" name="coinControlFeatures"> - <property name="toolTip"> - <string>Whether to show coin control features or not.</string> - </property> - <property name="text"> - <string>Display coin &control features (experts only)</string> - </property> - </widget> - </item> - <item> <spacer name="verticalSpacer_Display"> <property name="orientation"> <enum>Qt::Vertical</enum> diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index d1ca969431..e662912781 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -105,7 +105,7 @@ <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> - <string>Confirmed:</string> + <string>Available:</string> </property> </widget> </item> @@ -137,7 +137,7 @@ <item row="1" column="0"> <widget class="QLabel" name="label_3"> <property name="text"> - <string>Unconfirmed:</string> + <string>Pending:</string> </property> </widget> </item> diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui index 3e1a8bccc7..e1a0a28f81 100644 --- a/src/qt/forms/receivecoinsdialog.ui +++ b/src/qt/forms/receivecoinsdialog.ui @@ -263,6 +263,9 @@ <property name="text"> <string>Show</string> </property> + <property name="enabled"> + <bool>false</bool> + </property> <property name="icon"> <iconset resource="../bitcoin.qrc"> <normaloff>:/icons/edit</normaloff>:/icons/edit</iconset> @@ -277,6 +280,9 @@ <property name="text"> <string>Remove</string> </property> + <property name="enabled"> + <bool>false</bool> + </property> <property name="icon"> <iconset resource="../bitcoin.qrc"> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 95f3294adb..4cb1670c79 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -742,6 +742,12 @@ </property> <item> <widget class="QLabel" name="label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text"> <string>Balance:</string> </property> @@ -749,6 +755,12 @@ </item> <item> <widget class="QLabel" name="labelBalance"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="cursor"> <cursorShape>IBeamCursor</cursorShape> </property> |