Skip to content

Commit 0068e31

Browse files
authored
Add cancel button to setup wizard (#1387)
* Enable cancel button in project setup wizard * Close button changes * Cancel button positioning * Import cleanup
1 parent 28f6bdf commit 0068e31

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

activity_browser/ui/wizards/project_setup_wizard.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
import os
21
import ecoinvent_interface as ei
3-
import bw2io as bi
42
import requests
53
from PySide2 import QtWidgets, QtCore
64

7-
from activity_browser import project_settings
8-
from activity_browser.bwutils.ecoinvent_biosphere_versions.ecospold2biosphereimporter import create_default_biosphere3
95
from activity_browser.ui.threading import ABThread
10-
from activity_browser.mod import bw2data as bd
116
from activity_browser.mod.bw2io import ab_bw2setup
127
from activity_browser.mod.bw2io.ecoinvent import ab_import_ecoinvent_release
138
from activity_browser.utils import sort_semantic_versions
@@ -28,13 +23,15 @@ def __init__(self, parent=None):
2823
self.setWizardStyle(self.ModernStyle)
2924
self.setOption(self.NoCancelButtonOnLastPage)
3025
self.setOption(self.NoBackButtonOnLastPage)
26+
self.setOption(self.NoCancelButton, False)
3127

3228
# setting window options
3329
self.setWindowTitle("Project Setup")
3430
self.setWindowModality(QtCore.Qt.ApplicationModal)
3531
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
3632
self.setWindowFlags(QtCore.Qt.Sheet)
3733
self.setWindowFlag(QtCore.Qt.WindowContextHelpButtonHint, False)
34+
self.setWindowFlag(QtCore.Qt.WindowCloseButtonHint, False)
3835

3936
# initializing and setting all pages
4037
self.setPage(self.choose_setup, ChooseSetupPage(self))
@@ -244,9 +241,6 @@ def __init__(self, parent=None):
244241
self.setLayout(layout)
245242

246243
def initializePage(self):
247-
self.wizard().setWindowFlag(QtCore.Qt.WindowCloseButtonHint, False)
248-
self.wizard().show()
249-
250244
self.wizard().button(QtWidgets.QWizard.BackButton).hide()
251245

252246
if self.wizard().type == "ecoinvent":

0 commit comments

Comments
 (0)