Skip to content

qt: Finetune Options Dialog #3709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 7 commits into from
Sep 18, 2020
Merged

qt: Finetune Options Dialog #3709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
254a800
Fix proxy port ui elements
UdjinM6 Sep 14, 2020
4e7b433
Fix fake net checkboxes
UdjinM6 Sep 14, 2020
ea0b846
Fix active options label by enabling text wrapping
UdjinM6 Sep 14, 2020
e95e1aa
Fix options dialog resizing when font size is changed
UdjinM6 Sep 14, 2020
86f79f5
Move "Window" tab options into "Main" tab, drop "Window" tab
UdjinM6 Sep 15, 2020
6ce7634
Shrink min sizes a bit
UdjinM6 Sep 15, 2020
e6deb78
qt: Drop the surrounding QGroupBox in Options -> Wallet
xdustinface Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
269 changes: 103 additions & 166 deletions src/qt/forms/optionsdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnWindow">
<property name="text">
<string>&amp;Window</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnDisplay">
<property name="text">
Expand Down Expand Up @@ -116,6 +106,36 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="hideTrayIcon">
<property name="toolTip">
<string>Hide the icon from the system tray.</string>
</property>
<property name="text">
<string>&amp;Hide tray icon</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="minimizeToTray">
<property name="toolTip">
<string>Show only a tray icon after minimizing the window.</string>
</property>
<property name="text">
<string>&amp;Minimize to the tray instead of the taskbar</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="minimizeOnClose">
<property name="toolTip">
<string>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</string>
</property>
<property name="text">
<string>M&amp;inimize on close</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2_Main">
<item>
Expand Down Expand Up @@ -214,82 +234,73 @@
<widget class="QWidget" name="pageWallet">
<layout class="QVBoxLayout" name="verticalLayout_Wallet">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Expert</string>
<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 &amp;control features</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showMasternodesTab">
<property name="toolTip">
<string>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</string>
</property>
<property name="text">
<string>Show Masternodes Tab</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showAdvancedPSUI">
<property name="toolTip">
<string>Show additional information and buttons for PrivateSend on overview screen.</string>
</property>
<property name="text">
<string>Enable advanced PrivateSend interface</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&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</string>
</property>
<property name="text">
<string>&amp;Spend unconfirmed change</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="lowKeysWarning">
<property name="toolTip">
<string>Show warning dialog when PrivateSend detects that wallet has very low number of keys left.</string>
</property>
<property name="text">
<string>Warn if PrivateSend is running out of keys</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="privateSendMultiSession">
<property name="toolTip">
<string>Whether to use experimental PrivateSend mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</string>
</property>
<property name="text">
<string>Enable PrivateSend &amp;multi-session</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showPrivateSendPopups">
<property name="toolTip">
<string>Show system popups for PrivateSend mixing transactions&lt;br/&gt;just like for all other transaction types.</string>
</property>
<property name="text">
<string>Show popups for PrivateSend transactions</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 &amp;control features</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showMasternodesTab">
<property name="toolTip">
<string>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</string>
</property>
<property name="text">
<string>Show Masternodes Tab</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showAdvancedPSUI">
<property name="toolTip">
<string>Show additional information and buttons for PrivateSend on overview screen.</string>
</property>
<property name="text">
<string>Enable advanced PrivateSend interface</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showPrivateSendPopups">
<property name="toolTip">
<string>Show system popups for PrivateSend mixing transactions&lt;br/&gt;just like for all other transaction types.</string>
</property>
<property name="text">
<string>Show popups for PrivateSend transactions</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="lowKeysWarning">
<property name="toolTip">
<string>Show warning dialog when PrivateSend detects that wallet has very low number of keys left.</string>
</property>
<property name="text">
<string>Warn if PrivateSend is running out of keys</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="privateSendMultiSession">
<property name="toolTip">
<string>Whether to use experimental PrivateSend mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</string>
</property>
<property name="text">
<string>Enable PrivateSend &amp;multi-session</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&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</string>
</property>
<property name="text">
<string>&amp;Spend unconfirmed change</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
Expand Down Expand Up @@ -459,13 +470,13 @@
<widget class="QLineEdit" name="proxyPort">
<property name="minimumSize">
<size>
<width>55</width>
<width>60</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>55</width>
<width>60</width>
<height>16777215</height>
</size>
</property>
Expand Down Expand Up @@ -509,19 +520,9 @@
<property name="toolTip">
<string>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="proxyReachIPv4Label">
<property name="text">
<string>IPv4</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
<item>
Expand All @@ -532,19 +533,9 @@
<property name="toolTip">
<string>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="proxyReachIPv6Label">
<property name="text">
<string>IPv6</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
<item>
Expand All @@ -555,19 +546,9 @@
<property name="toolTip">
<string>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="proxyReachTorLabel">
<property name="text">
<string>Tor</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget>
</item>
<item>
Expand Down Expand Up @@ -646,13 +627,13 @@
<widget class="QLineEdit" name="proxyPortTor">
<property name="minimumSize">
<size>
<width>55</width>
<width>60</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>55</width>
<width>60</width>
<height>16777215</height>
</size>
</property>
Expand Down Expand Up @@ -691,53 +672,6 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="pageWindow">
<layout class="QVBoxLayout" name="verticalLayout_Window">
<item>
<widget class="QCheckBox" name="hideTrayIcon">
<property name="toolTip">
<string>Hide the icon from the system tray.</string>
</property>
<property name="text">
<string>&amp;Hide tray icon</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="minimizeToTray">
<property name="toolTip">
<string>Show only a tray icon after minimizing the window.</string>
</property>
<property name="text">
<string>&amp;Minimize to the tray instead of the taskbar</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="minimizeOnClose">
<property name="toolTip">
<string>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</string>
</property>
<property name="text">
<string>M&amp;inimize on close</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_Window">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="pageDisplay">
<layout class="QVBoxLayout" name="verticalLayout_Display">
<item>
Expand Down Expand Up @@ -912,6 +846,9 @@ https://www.transifex.com/projects/p/dash/</string>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
Expand Down
Loading