diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 43f67725d869..90cb220ac09c 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -61,16 +61,6 @@ - - - - &Window - - - true - - - @@ -116,6 +106,36 @@ + + + + Hide the icon from the system tray. + + + &Hide tray icon + + + + + + + Show only a tray icon after minimizing the window. + + + &Minimize to the tray instead of the taskbar + + + + + + + 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. + + + M&inimize on close + + + @@ -214,82 +234,73 @@ - - - Expert + + + Whether to show coin control features or not. + + + Enable coin &control features + + + + + + + Show additional tab listing all your masternodes in first sub-tab<br/>and all masternodes on the network in second sub-tab. + + + Show Masternodes Tab + + + + + + + Show additional information and buttons for PrivateSend on overview screen. + + + Enable advanced PrivateSend interface + + + + + + + If you disable the spending of unconfirmed change, the change from a transaction<br/>cannot be used until that transaction has at least one confirmation.<br/>This also affects how your balance is computed. + + + &Spend unconfirmed change + + + + + + + Show warning dialog when PrivateSend detects that wallet has very low number of keys left. + + + Warn if PrivateSend is running out of keys + + + + + + + Whether to use experimental PrivateSend mode with multiple mixing sessions per block.<br/>Note: You must use this feature carefully.<br/>Make sure you always have recent wallet (auto)backup in a safe place! + + + Enable PrivateSend &multi-session + + + + + + + Show system popups for PrivateSend mixing transactions<br/>just like for all other transaction types. + + + Show popups for PrivateSend transactions - - - - - Whether to show coin control features or not. - - - Enable coin &control features - - - - - - - Show additional tab listing all your masternodes in first sub-tab<br/>and all masternodes on the network in second sub-tab. - - - Show Masternodes Tab - - - - - - - Show additional information and buttons for PrivateSend on overview screen. - - - Enable advanced PrivateSend interface - - - - - - - Show system popups for PrivateSend mixing transactions<br/>just like for all other transaction types. - - - Show popups for PrivateSend transactions - - - - - - - Show warning dialog when PrivateSend detects that wallet has very low number of keys left. - - - Warn if PrivateSend is running out of keys - - - - - - - Whether to use experimental PrivateSend mode with multiple mixing sessions per block.<br/>Note: You must use this feature carefully.<br/>Make sure you always have recent wallet (auto)backup in a safe place! - - - Enable PrivateSend &multi-session - - - - - - - If you disable the spending of unconfirmed change, the change from a transaction<br/>cannot be used until that transaction has at least one confirmation.<br/>This also affects how your balance is computed. - - - &Spend unconfirmed change - - - - @@ -459,13 +470,13 @@ - 55 + 60 0 - 55 + 60 16777215 @@ -509,19 +520,9 @@ Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type. - - - - - - - IPv4 - - Qt::PlainText - @@ -532,19 +533,9 @@ Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type. - - - - - - - IPv6 - - Qt::PlainText - @@ -555,19 +546,9 @@ Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type. - - - - - - - Tor - - Qt::PlainText - @@ -646,13 +627,13 @@ - 55 + 60 0 - 55 + 60 16777215 @@ -691,53 +672,6 @@ - - - - - - Hide the icon from the system tray. - - - &Hide tray icon - - - - - - - Show only a tray icon after minimizing the window. - - - &Minimize to the tray instead of the taskbar - - - - - - - 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. - - - M&inimize on close - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - @@ -912,6 +846,9 @@ https://www.transifex.com/projects/p/dash/ Qt::PlainText + + true + diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 46484aa141ff..cd2f701031ef 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -44,6 +44,13 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) : GUIUtil::disableMacFocusRect(this); +#ifdef Q_OS_MAC + /* Hide some options on Mac */ + ui->hideTrayIcon->hide(); + ui->minimizeToTray->hide(); + ui->minimizeOnClose->hide(); +#endif + /* Main elements init */ ui->databaseCache->setMinimum(nMinDbCache); ui->databaseCache->setMaximum(nMaxDbCache); @@ -80,13 +87,6 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) : pageButtons.addButton(ui->btnWallet, pageButtons.buttons().size()); } pageButtons.addButton(ui->btnNetwork, pageButtons.buttons().size()); -#ifdef Q_OS_MAC - /* remove Window tab on Mac */ - ui->stackedWidgetOptions->removeWidget(ui->pageWindow); - ui->btnWindow->hide(); -#else - pageButtons.addButton(ui->btnWindow, pageButtons.buttons().size()); -#endif pageButtons.addButton(ui->btnDisplay, pageButtons.buttons().size()); pageButtons.addButton(ui->btnAppearance, pageButtons.buttons().size()); @@ -208,6 +208,11 @@ void OptionsDialog::setMapper() { /* Main */ mapper->addMapping(ui->bitcoinAtStartup, OptionsModel::StartAtStartup); +#ifndef Q_OS_MAC + mapper->addMapping(ui->hideTrayIcon, OptionsModel::HideTrayIcon); + mapper->addMapping(ui->minimizeToTray, OptionsModel::MinimizeToTray); + mapper->addMapping(ui->minimizeOnClose, OptionsModel::MinimizeOnClose); +#endif mapper->addMapping(ui->threadsScriptVerif, OptionsModel::ThreadsScriptVerif); mapper->addMapping(ui->databaseCache, OptionsModel::DatabaseCache); @@ -234,13 +239,6 @@ void OptionsDialog::setMapper() mapper->addMapping(ui->proxyIpTor, OptionsModel::ProxyIPTor); mapper->addMapping(ui->proxyPortTor, OptionsModel::ProxyPortTor); - /* Window */ -#ifndef Q_OS_MAC - mapper->addMapping(ui->hideTrayIcon, OptionsModel::HideTrayIcon); - mapper->addMapping(ui->minimizeToTray, OptionsModel::MinimizeToTray); - mapper->addMapping(ui->minimizeOnClose, OptionsModel::MinimizeOnClose); -#endif - /* Display */ mapper->addMapping(ui->digits, OptionsModel::Digits); mapper->addMapping(ui->lang, OptionsModel::Language); diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 13fcae1fefda..bd2b97bf4885 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -478,7 +478,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain, #btnWallet, #btnNetwork, -#btnWindow, #btnDisplay, #btnAppearance, /* Sign/Verify dialog buttons */ @@ -498,7 +497,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:hover:checked, #btnWallet:hover:checked, #btnNetwork:hover:checked, -#btnWindow:hover:checked, #btnDisplay:hover:checked, #btnAppearance:hover:checked, /* Sign/Verify dialog buttons */ @@ -518,7 +516,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:hover:!checked, #btnWallet:hover:!checked, #btnNetwork:hover:!checked, -#btnWindow:hover:!checked, #btnDisplay:hover:!checked, #btnAppearance:hover:!checked, /* Sign/Verify dialog buttons */ @@ -538,7 +535,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:checked, #btnWallet:checked, #btnNetwork:checked, -#btnWindow:checked, #btnDisplay:checked, #btnAppearance:checked, /* Sign/Verify dialog buttons */ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 949d34765780..df8a64b0f2a2 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -621,7 +621,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain, #btnWallet, #btnNetwork, -#btnWindow, #btnDisplay, #btnAppearance, /* Sign/Verify dialog buttons */ @@ -644,7 +643,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:hover:checked, #btnWallet:hover:checked, #btnNetwork:hover:checked, -#btnWindow:hover:checked, #btnDisplay:hover:checked, #btnAppearance:hover:checked, /* Sign/Verify dialog buttons */ @@ -667,7 +665,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:hover:!checked, #btnWallet:hover:!checked, #btnNetwork:hover:!checked, -#btnWindow:hover:!checked, #btnDisplay:hover:!checked, #btnAppearance:hover:!checked, /* Sign/Verify dialog buttons */ @@ -690,7 +687,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:checked, #btnWallet:checked, #btnNetwork:checked, -#btnWindow:checked, #btnDisplay:checked, #btnAppearance:checked, /* Sign/Verify dialog buttons */ @@ -712,7 +708,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:hover:pressed, #btnWallet:hover:pressed, #btnNetwork:hover:pressed, -#btnWindow:hover:pressed, #btnDisplay:hover:pressed, #btnAppearance:hover:pressed, /* Sign/Verify dialog buttons */ @@ -1041,17 +1036,6 @@ QDialog#AppearanceSetup > AppearanceWidget { AppearanceWidget ******************************************************/ -AppearanceWidget #lblSmaller, -AppearanceWidget #lblBigger, -AppearanceWidget #lblBolderNormal, -AppearanceWidget #lblBolderBold, -AppearanceWidget #lblLighterNormal, -AppearanceWidget #lblLighterBold { - /* Exceptional use of font-size here to - avoid changes of the slider postions */ - font-size: 13px; -} - AppearanceWidget #lblTheme, AppearanceWidget #lblFontFamily, AppearanceWidget #lblFontScale, @@ -1071,8 +1055,8 @@ AppearanceWidget #lblFontFamily, AppearanceWidget #lblFontScale, AppearanceWidget #lblFontWeightNormal, AppearanceWidget #lblFontWeightBold { - min-width: 170px; - max-width: 170px; + min-width: 200px; + max-width: 200px; } /****************************************************** @@ -1264,6 +1248,7 @@ OptionsDialog ******************************************************/ QDialog#OptionsDialog { + min-width: 585px; } QDialog#OptionsDialog QValueComboBox, @@ -1300,6 +1285,11 @@ QDialog#OptionsDialog QGroupBox { margin-top: 10px; } +QDialog#OptionsDialog QCheckBox#connectSocksTor, +QDialog#OptionsDialog QLabel#overriddenByCommandLineInfoLabel { + min-width: 550px; +} + /****************************************************** OverviewPage Balances ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index a401b66aacb4..0b270b23d226 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -460,7 +460,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain, #btnWallet, #btnNetwork, -#btnWindow, #btnDisplay, #btnAppearance, /* Sign/Verify dialog buttons */ @@ -480,7 +479,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:hover:checked, #btnWallet:hover:checked, #btnNetwork:hover:checked, -#btnWindow:hover:checked, #btnDisplay:hover:checked, #btnAppearance:hover:checked, /* Sign/Verify dialog buttons */ @@ -500,7 +498,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:hover:!checked, #btnWallet:hover:!checked, #btnNetwork:hover:!checked, -#btnWindow:hover:!checked, #btnDisplay:hover:!checked, #btnAppearance:hover:!checked, /* Sign/Verify dialog buttons */ @@ -520,7 +517,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:checked, #btnWallet:checked, #btnNetwork:checked, -#btnWindow:checked, #btnDisplay:checked, #btnAppearance:checked, /* Sign/Verify dialog buttons */ diff --git a/src/qt/res/css/traditional.css b/src/qt/res/css/traditional.css index a0aea446bf04..cbb42a5ebbb0 100644 --- a/src/qt/res/css/traditional.css +++ b/src/qt/res/css/traditional.css @@ -54,7 +54,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain, #btnWallet, #btnNetwork, -#btnWindow, #btnDisplay, #btnAppearance, /* Sign/Verify dialog buttons */ @@ -78,7 +77,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:hover:checked, #btnWallet:hover:checked, #btnNetwork:hover:checked, -#btnWindow:hover:checked, #btnDisplay:hover:checked, #btnAppearance:hover:checked, /* Sign/Verify dialog buttons */ @@ -101,7 +99,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:hover:!checked, #btnWallet:hover:!checked, #btnNetwork:hover:!checked, -#btnWindow:hover:!checked, #btnDisplay:hover:!checked, #btnAppearance:hover:!checked, /* Sign/Verify dialog buttons */ @@ -124,7 +121,6 @@ QPushButton - Special case, tabbar replacement buttons #btnMain:checked, #btnWallet:checked, #btnNetwork:checked, -#btnWindow:checked, #btnDisplay:checked, #btnAppearance:checked, /* Sign/Verify dialog buttons */ @@ -190,17 +186,6 @@ QDialog#AppearanceSetup > AppearanceWidget { AppearanceWidget ******************************************************/ -AppearanceWidget #lblSmaller, -AppearanceWidget #lblBigger, -AppearanceWidget #lblBolderNormal, -AppearanceWidget #lblBolderBold, -AppearanceWidget #lblLighterNormal, -AppearanceWidget #lblLighterBold { - /* Exceptional use of font-size here to - avoid changes of the slider postions */ - font-size: 13px; -} - AppearanceWidget #lblTheme, AppearanceWidget #lblFontFamily, AppearanceWidget #lblFontScale, @@ -220,8 +205,21 @@ AppearanceWidget #lblFontFamily, AppearanceWidget #lblFontScale, AppearanceWidget #lblFontWeightNormal, AppearanceWidget #lblFontWeightBold { - min-width: 170px; - max-width: 170px; + min-width: 280px; + max-width: 280px; +} + +/****************************************************** +OptionsDialog +******************************************************/ + +QDialog#OptionsDialog { + min-width: 650px; +} + +QDialog#OptionsDialog QCheckBox#connectSocksTor, +QDialog#OptionsDialog QLabel#overriddenByCommandLineInfoLabel { + min-width: 550px; } /******************************************************