qt: Add PrivateSend tab in OptionsDialog, allow to show/hide PS UI #3717

xdustinface · 2020-09-16T15:38:59Z

Move PrivateSend related settings from Options -> Wallet into a new tab Options -> PrivateSend
Add Enable PrivateSend interface in Options ->Wallet. This checkbox allows to dynamically show/hide the PrivateSend related UI elements all over the place

Before

With this PR

PrivateSend UI hidden	PrivateSend options tab

UdjinM6

Pls see suggestions below

src/qt/forms/optionsdialog.ui

UdjinM6

Pls see below + there is a bug somewhere but I can't figure it out yet. The issue is like that: disable ps features in options, close and reopen the wallet (no ps ui as expected), enable ps in options -> still no ps ui on overview screen, ps tab and tx filters do appear though. If you close and reopen the wallet now ps ui would appear like it should.

src/qt/optionsdialog.cpp

xdustinface · 2020-09-17T16:06:09Z

there is a bug somewhere

Ah right good catch! The PrivateSend UI update timer isn't created/started and the slots aren't connected if the wallet gets started with PrivateSend disabled. Fixing it 👍

https://github.com/dashpay/dash/blob/develop/src/qt/overviewpage.cpp#L310
https://github.com/dashpay/dash/blob/develop/src/qt/overviewpage.cpp#L172

xdustinface · 2020-09-17T18:51:11Z

@UdjinM6 Okaaay, there were even some more things i missed.. like two signal/slot connections weren't correct and whatnot.. see commits starting with 506614d.

Now it instantly updates all UI elements if the checkbox gets toggled.. did only update the "PrivateSend" button of the options instantly before and then only all over the place after you pressed "Ok" in the dialog. It also recovers the previous state properly now if you reject the dialog.

And i included #3715 into 4cdd3ca

PastaPastaPasta · 2020-09-18T03:43:39Z

Why?? We just removed a basically pointless tab, since it made sense to have it under another tab, and yet now we're going to add another "PrivateSend" tab that makes total sense to be under the Wallet tab??

UdjinM6 · 2020-09-18T10:35:59Z

Why?? We just removed a basically pointless tab, since it made sense to have it under another tab, and yet now we're going to add another "PrivateSend" tab that makes total sense to be under the Wallet tab??

I would argue that Wallet tab has too many options already (7 checkboxes and 2 edit fields) and most of them are PS only, adding yet another one "Enable PrivateSend features" would make it look pretty clogged and weird imo. The new Wallet tab has 4 checkboxes and the new PrivateSend tab has 4 checkboxes and 2 edit fields, the later is exactly as for the new Main tab after #3709 on non-mac machines (on mac it's 1 checkbox and 2 edit fields only). If we ever think about exposing more PS options in GUI (and I think it would actually make sense to do) e.g. denoms goals/limits or number of mixing sessions etc. then having a separate tab is the only way to go imo.

PastaPastaPasta · 2020-09-25T02:35:32Z

concept ACK on splitting settings out from inside of wallet. however privatesend must be enabled by default

UdjinM6 · 2020-09-25T16:07:56Z

Needs rebase.

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>

Not longer needed since the page is just not reachable if the button is hidden.

Not only if its enabled on startup..

Other way of connecting the slot with true as parameter didn't work..

src/qt/optionsdialog.cpp

src/qt/optionsmodel.cpp

PastaPastaPasta

Adding the tab resulted in some not great cropping at my maybe default gui settings

PastaPastaPasta · 2020-09-25T18:09:03Z

Starting with default settings made it way worse...

EDIT: It's probably fine to merge as long as we open an issue about this

PastaPastaPasta · 2020-09-25T18:17:43Z

src/qt/forms/optionsdialog.ui

This tooltip needs to wrap onto multiple lines

PastaPastaPasta · 2020-09-25T18:20:09Z

Also, noenableprivatesend gets viewed by gui as enableprivatesend=0 so we probably don't need that change specific to noenableprivatesend

xdustinface · 2020-09-25T19:02:04Z

Also, noenableprivatesend gets viewed by gui as enableprivatesend=0 so we probably don't need that change specific to noenableprivatesend

Reverted and added a linebreak to the tooltip, should be good enough in two lines?

src/qt/optionsdialog.cpp

Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>

UdjinM6 · 2020-09-25T20:03:01Z

Re cropping: an easy fix would be to bump https://github.com/dashpay/dash/blob/develop/src/qt/res/css/general.css#L1257 - 635px worked ok-ish in my case ~~but might need to bump it even more for Windows, smth like 700px or so I guess~~ oh, wait, there is no Window tab anymore 🙈 .

PastaPastaPasta · 2020-09-25T20:10:01Z

Re cropping: an easy fix would be to bump https://github.com/dashpay/dash/blob/develop/src/qt/res/css/general.css#L1257 - 635px worked ok-ish in my case but might need to bump it even more for Windows, smth like 700px or so I guess.

I had to go all the way up to 710px in order to make it work on ubuntu with default gui settings

EDIT: I think this would probably be the easiest fix for now, we can work on making it properly dynamic later

UdjinM6 · 2020-09-26T11:08:14Z

ESC key no longer cancels the changes that were made to ps checkbox, should do smth like 5ea108b88f

Handle all reject reasons not only the cancle button.

xdustinface · 2020-09-26T13:14:35Z

@UdjinM6 good catch 👍 Added 06cdc89 instead which also takes care of other reject reasons like clicking the window's "x" close button.

UdjinM6

ACK

(assuming font issues will be solved via #3734 )

PastaPastaPasta

ACK

…ashpay#3717) * qt: Add PrivateSend tab in OptionsDialog, allow to show/hide PS UI * qt: Decrease height of OptionsDialog * Apply suggestions from code review * qt: Remove obsolete visibility adjustments Not longer needed since the page is just not reachable if the button is hidden. * qt: Make sure PrivateSend related parts are always initialized properly Not only if its enabled on startup.. * qt: Make updatePrivateSendVisibility a slot to fix the signal connection * qt: Fix UI updates on OverviewPage if PrivateSend enabled gets toggled Other way of connecting the slot with true as parameter didn't work.. * qt: Only update and emit the signal for advanced PS UI if required * qt: Update fPrivateSendEnabled in OptionsModel instead of OptionsDialog * qt: Recover the PrivateSend enabled state if OptionsDialog gets rejected * qt: Enable PrivateSend UI by default * qt: Add some brackets * qt: Add a comment * qt: Add a linebreak to the "Enable PrivateSend features" tooltip * qt: Remove obsolete comment * qt: Move comment * qt: Properly reset the previous PS state if OptionsDialog gets rejected Handle all reject reasons not only the cancle button.

…ashpay#3717) * qt: Add PrivateSend tab in OptionsDialog, allow to show/hide PS UI * qt: Decrease height of OptionsDialog * Apply suggestions from code review Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com> * qt: Remove obsolete visibility adjustments Not longer needed since the page is just not reachable if the button is hidden. * qt: Make sure PrivateSend related parts are always initialized properly Not only if its enabled on startup.. * qt: Make updatePrivateSendVisibility a slot to fix the signal connection * qt: Fix UI updates on OverviewPage if PrivateSend enabled gets toggled Other way of connecting the slot with true as parameter didn't work.. * qt: Only update and emit the signal for advanced PS UI if required * qt: Update fPrivateSendEnabled in OptionsModel instead of OptionsDialog * qt: Recover the PrivateSend enabled state if OptionsDialog gets rejected * qt: Enable PrivateSend UI by default * qt: Add some brackets * qt: Add a comment * qt: Add a linebreak to the "Enable PrivateSend features" tooltip * qt: Remove obsolete comment Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com> * qt: Move comment * qt: Properly reset the previous PS state if OptionsDialog gets rejected Handle all reject reasons not only the cancle button. Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com> Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>

xdustinface added this to the 16 milestone Sep 16, 2020

xdustinface added the backport-candidate-16.x label Sep 16, 2020

xdustinface force-pushed the pr-ui-privatesend-options branch from bd6e77d to e711ffb Compare September 16, 2020 16:35

UdjinM6 reviewed Sep 17, 2020

View reviewed changes

src/qt/forms/optionsdialog.ui Outdated Show resolved Hide resolved

src/qt/forms/optionsdialog.ui Outdated Show resolved Hide resolved

UdjinM6 reviewed Sep 17, 2020

View reviewed changes

src/qt/optionsdialog.cpp Outdated Show resolved Hide resolved

xdustinface force-pushed the pr-ui-privatesend-options branch from cb6338e to f03bce9 Compare September 17, 2020 18:48

PastaPastaPasta self-requested a review September 18, 2020 03:45

xdustinface and others added 10 commits September 25, 2020 18:44

qt: Add PrivateSend tab in OptionsDialog, allow to show/hide PS UI

f608fd1

qt: Decrease height of OptionsDialog

30d2e70

Apply suggestions from code review

3445f26

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>

qt: Remove obsolete visibility adjustments

157901e

Not longer needed since the page is just not reachable if the button is hidden.

qt: Make sure PrivateSend related parts are always initialized properly

e65a2e8

Not only if its enabled on startup..

qt: Make updatePrivateSendVisibility a slot to fix the signal connection

6202324

qt: Fix UI updates on OverviewPage if PrivateSend enabled gets toggled

c2b0666

Other way of connecting the slot with true as parameter didn't work..

qt: Only update and emit the signal for advanced PS UI if required

fb187f9

qt: Update fPrivateSendEnabled in OptionsModel instead of OptionsDialog

098fbcb

qt: Recover the PrivateSend enabled state if OptionsDialog gets rejected

bf0c95d

xdustinface force-pushed the pr-ui-privatesend-options branch from f03bce9 to bf0c95d Compare September 25, 2020 16:51

qt: Enable PrivateSend UI by default

684fca9

PastaPastaPasta reviewed Sep 25, 2020

View reviewed changes

src/qt/optionsdialog.cpp Show resolved Hide resolved

PastaPastaPasta reviewed Sep 25, 2020

View reviewed changes

src/qt/optionsmodel.cpp Outdated Show resolved Hide resolved

qt: Add some brackets

384dfb7

PastaPastaPasta reviewed Sep 25, 2020

View reviewed changes

PastaPastaPasta requested changes Sep 25, 2020

View reviewed changes

src/qt/forms/optionsdialog.ui Outdated

Copy link

Member

PastaPastaPasta Sep 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This tooltip needs to wrap onto multiple lines

xdustinface added 2 commits September 25, 2020 20:45

qt: Add a comment

ffe1469

qt: Add a linebreak to the "Enable PrivateSend features" tooltip

5ceb59b

xdustinface force-pushed the pr-ui-privatesend-options branch from 680e85b to 5ceb59b Compare September 25, 2020 19:01

PastaPastaPasta reviewed Sep 25, 2020

View reviewed changes

src/qt/optionsdialog.cpp Outdated Show resolved Hide resolved

xdustinface and others added 2 commits September 25, 2020 21:53

qt: Remove obsolete comment

df62bba

Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>

qt: Move comment

285ccd6

xdustinface mentioned this pull request Sep 25, 2020

qt: Fix font size and scaling issues #3734

Merged

qt: Properly reset the previous PS state if OptionsDialog gets rejected

06cdc89

Handle all reject reasons not only the cancle button.

UdjinM6 approved these changes Sep 26, 2020

View reviewed changes

PastaPastaPasta approved these changes Sep 26, 2020

View reviewed changes

UdjinM6 merged commit 9a9e21c into dashpay:develop Sep 28, 2020

UdjinM6 removed the backport-candidate-16.x label Oct 9, 2020

qt: Add PrivateSend tab in OptionsDialog, allow to show/hide PS UI #3717

qt: Add PrivateSend tab in OptionsDialog, allow to show/hide PS UI #3717

Uh oh!

Conversation

xdustinface commented Sep 16, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Before

With this PR

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

xdustinface commented Sep 17, 2020

Uh oh!

xdustinface commented Sep 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PastaPastaPasta commented Sep 18, 2020

Uh oh!

UdjinM6 commented Sep 18, 2020

Uh oh!

PastaPastaPasta commented Sep 25, 2020

Uh oh!

UdjinM6 commented Sep 25, 2020

Uh oh!

Uh oh!

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta commented Sep 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PastaPastaPasta Sep 25, 2020

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta commented Sep 25, 2020

Uh oh!

xdustinface commented Sep 25, 2020

Uh oh!

Uh oh!

UdjinM6 commented Sep 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PastaPastaPasta commented Sep 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UdjinM6 commented Sep 26, 2020

Uh oh!

xdustinface commented Sep 26, 2020

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

xdustinface commented Sep 16, 2020 •

edited

Loading

xdustinface commented Sep 17, 2020 •

edited

Loading

PastaPastaPasta commented Sep 25, 2020 •

edited

Loading

UdjinM6 commented Sep 25, 2020 •

edited

Loading

PastaPastaPasta commented Sep 25, 2020 •

edited

Loading