Skip to content

Commit

Permalink
Insure that login dialog is shown _after_ the cloud projects dialog i…
Browse files Browse the repository at this point in the history
…s visible to avoid confusing Qt and OS
  • Loading branch information
nirvn committed Nov 18, 2023
1 parent e25fe61 commit 0d65f5a
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions qfieldsync/gui/cloud_projects_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,20 +121,6 @@ def __init__(

self.update_welcome_label()

if self.network_manager.has_token():
self.show_projects()
self.show()
self.createButton.setEnabled(True)
else:
CloudLoginDialog.show_auth_dialog(
self.network_manager,
lambda: self.on_auth_accepted(),
lambda: self.close(),
parent=self,
)
self.hide()
self.createButton.setEnabled(False)

self.use_current_project_directory_action = QAction(
QIcon(), self.tr("Use Current Project Directory")
)
Expand Down Expand Up @@ -175,13 +161,28 @@ def __init__(
)
self.deleteButton.setEnabled(False)

self.show()

if self.network_manager.has_token():
self.show_projects()
self.createButton.setEnabled(True)
else:
CloudLoginDialog.show_auth_dialog(
self.network_manager,
lambda: self.on_auth_accepted(),
lambda: self.close(),
parent=self,
)
self.createButton.setEnabled(False)

self.projectsStack.setCurrentWidget(self.projectsListPage)
self.createProjectWidget = CloudCreateProjectWidget(
iface,
self.network_manager,
QgsProject.instance(),
self,
)

self.projectCreatePage.layout().addWidget(self.createProjectWidget)
self.createProjectWidget.finished.connect(
lambda project_id: self.on_create_project_finished(project_id)
Expand Down

0 comments on commit 0d65f5a

Please sign in to comment.