mirror
/
vorta
mirror of https://github.com/borgbase/vorta
1
0
Fork 0
Code Issues Releases Wiki Activity

Reuse existing window when bringing to front. (#674)

This commit is contained in:
Manu 2020-10-03 14:27:31 +08:00 committed by GitHub
parent 1599f3adb0
commit 364d401b39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/vorta/application.py
View File

@ -88,7 +88,8 @@ class VortaApp(QtSingleApplication):
self.backup_progress_event.emit(translate('messages', msg['message']))
def open_main_window_action(self):
self.main_window = MainWindow(self)
if not self._main_window_exists():
self.main_window = MainWindow(self)
self.main_window.show()
self.main_window.raise_()

4
tests/conftest.py
View File

@ -8,7 +8,7 @@ from unittest.mock import MagicMock
import vorta
from vorta.models import (RepoModel, RepoPassword, BackupProfileModel, SourceFileModel,
SettingsModel, ArchiveModel, WifiSettingModel, EventLogModel, SchemaVersion)
from vorta.views.main_window import MainWindow
models = [RepoModel, RepoPassword, BackupProfileModel, SourceFileModel,
SettingsModel, ArchiveModel, WifiSettingModel, EventLogModel, SchemaVersion]
@ -40,7 +40,7 @@ def init_db(qapp):
source_dir = SourceFileModel(dir='/tmp/another', repo=new_repo)
source_dir.save()
qapp.open_main_window_action()
qapp.main_window = MainWindow(qapp) # Re-open main window to apply mock data in UI
@pytest.fixture(scope='session', autouse=True)