Skip to content
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

Allow Quit from Initial Setup #2974

Closed
wants to merge 1 commit into from

Conversation

elsiehupp
Copy link
Member

Fixes #2969.

I've tested this on macOS but not on Linux or Windows.

I'm thinking of adding my code from #2959 that shows and hides the dock icon, as well. (I'll put it in a separate commit so it's easier to test.)

@elsiehupp elsiehupp added the bug label Mar 8, 2021
@elsiehupp
Copy link
Member Author

I went ahead and incorporated the code from #2959. FWIW the code could probably be generalized using the QWinTaskbarButton Class to show and hide the taskbar icon on Windows similarly to how the code currently works on macOS. I don't have a Windows install set up currently, though, so I wouldn't be able to implement and test it in the immediate future. I don't know what's involved in showing and hiding the dock icon on Linus.

@elsiehupp elsiehupp changed the title Make initial setup quit on window closed Allow Quit from Initial Setup Mar 8, 2021
@elsiehupp
Copy link
Member Author

Looking more closely at my screenshots, the "Back" button on the one wizard page is for some reason not aligned with the "Next" and "Cancel" buttons:

image

@elsiehupp elsiehupp marked this pull request as draft March 9, 2021 18:24
@elsiehupp
Copy link
Member Author

I implemented changes so that reject() will only quit the application if there are no accounts set up. I also tried to implement code that would make it so that the "Cancel" button only appears on the first page, but now the "Cancel" Button doesn't seem to be appearing at all.

@elsiehupp
Copy link
Member Author

I also noticed the horrendous kerning in the main title:

Nextcloud WizardQuit horrendous kerning

In particular see the "z" overlapping with the "a" and the huge gap between the "Q" and the "u". What font is this?!?

(And I just noticed the word "Setup" [noun] instead of the phrase "Set up" [verb].)

src/gui/wizard/owncloudwizard.cpp Outdated Show resolved Hide resolved
src/gui/wizard/owncloudwizard.cpp Outdated Show resolved Hide resolved
@elsiehupp elsiehupp requested review from FlexW and removed request for FlexW March 17, 2021 01:23
Copy link
Member

@er-vin er-vin left a comment

Choose a reason for hiding this comment

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

Nice, much more tidy and focused. Much less confusing to review, thanks!

Will probably need grooming the history in that branch though, other than that it looks like it's getting there.

src/gui/wizard/owncloudwizard.cpp Outdated Show resolved Hide resolved
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-2974-3b0f663612d0d932f52c04fc447c62344e7e62be-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

It isn't possible to quit the first-launch wizard (on macOS)
5 participants