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.

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

Jump to bottom

Wizard: Minimize the Window instead of hiding it #7922

Merged
merged 1 commit into from
Jun 25, 2020
Merged

Wizard: Minimize the Window instead of hiding it #7922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions changelog/unreleased/7922
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Change: The client hides the window during the authentication process

We changed the confusing behavioir and now minimize ownCloud instead.
This ensures that the window stays accessible.

https://github.com/owncloud/client/pull/7922
8 changes: 4 additions & 4 deletions src/gui/wizard/owncloudoauthcredspage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ void OwncloudOAuthCredsPage::initializePage()
_asyncAuth.reset(new OAuth(ocWizard->account().data(), this));
connect(_asyncAuth.data(), &OAuth::result, this, &OwncloudOAuthCredsPage::asyncAuthResult, Qt::QueuedConnection);
_asyncAuth->startAuthentication();
wizard()->hide();
wizard()->showMinimized();
}

void OCC::OwncloudOAuthCredsPage::cleanupPage()
{
// The next or back button was activated, show the wizard again
wizard()->show();
wizard()->showNormal();
_asyncAuth.reset();
}

Expand All @@ -96,7 +96,7 @@ void OwncloudOAuthCredsPage::asyncAuthResult(OAuth::Result r, const QString &use
case OAuth::Error:
/* Error while getting the access token. (Timeout, or the server did not accept our client credentials */
_ui.errorLabel->show();
wizard()->show();
wizard()->showNormal();
break;
case OAuth::LoggedIn: {
_token = token;
Expand All @@ -117,7 +117,7 @@ int OwncloudOAuthCredsPage::nextId() const

void OwncloudOAuthCredsPage::setConnected()
{
wizard()->show();
wizard()->showNormal();
}

AbstractCredentials *OwncloudOAuthCredsPage::getCredentials() const
Expand Down