-
Notifications
You must be signed in to change notification settings - Fork 816
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.
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
Display the content of the login dialog correct #2989
Conversation
@FlexW I am fine code-wise. Let's see what @jancborchardt says design-wise. Maybe you need to attach screenshots with "before" and "after", so it is easier for Jan to get what's changed. Regarding this |
@allexzander A bit more context from my side would be helpful I guess;) From tinkering around with the wizard I discovered that these methods were originally introduced to have the wizard react to dark/light theme changes. As we don't use such functionality at the moment and I'm unsure if we ever will, it would be better in my opinion to just remove this functionality and make the |
I agree with @FlexW it was on my list of things to try to can at some point. I don't think it's the best way to do the light/dark thing. You probably want to set a palette or a style on the application object and let the corresponding events trickle down everywhere. There's a proper Qt mechanism for that. |
@@ -156,8 +156,8 @@ void WebFlowCredentials::askFromUser() { | |||
_askDialog->setUrl(url); | |||
} | |||
|
|||
QString msg = tr("You have been logged out of %1 as user %2. Please login again") | |||
.arg(_account->displayName(), _user); | |||
QString msg = tr("You have been logged out of %1 as user %2. Please login again.") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor wording fixes :)
- We don’t need to show "username@cloud.example.com as user username" since that duplicates the username. Just "You have been logged out of cloud.example.com as user username." is enough.
- Second sentence "Please log in again.", "log in" separate.
Yep, I’m not sure what has changed – the text "You have been logged out …" is new to me, and I’m not sure it is even useful to show at all? Cause it’s not really saying why it happened, so I wonder if we can just cut it? (Regarding dark/light theme support, yeah eventually we should do that too. But not a priority :) And the grey-ish background is Windows default, right? |
/rebase |
This adjustment is necessary because of the changes of the new account wizard that were introduced with: e0b7ef1 Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
6d27de1
to
ff7932b
Compare
@jancborchardt Yes, the background is the default from Windows. The text was there before. I will merge that pull request and open a follow-up issue to correct that wording or drop it. |
AppImage file: Nextcloud-PR-2989-ff7932bb54cd83d8028325f0f82e19ae346447e4-x86_64.AppImage |
This adjustment is necessary because of the changes of the new account
wizard that were introduced with:
e0b7ef1
Signed-off-by: Felix Weilbach felix.weilbach@nextcloud.com
This is how the dialog looks with the fix:
https://cloud.nextcloud.com/s/9WEr7ZcxYrFPWAi
@jancborchardt Your input on this is would be valuable:) Is the dialog ok?
General note:
Maybe we should start to refactor the wizard a bit and remove these
void customizeStyle()
methods. They are not used at the moment and problems like the one this pr fixes right now would not exist.