Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed GUI Restore tool bug

Browse Source 
GUI Restore tool was unable to open file selection dialog in dom0.

fixes QubesOS/qubes-issues#3701
This commit is contained in:
Marta Marczykowska-Górecka 2018-03-15 00:18:43 +01:00
parent e1aca0a393
commit 7117892f4b
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qubesmanager/backup_utils.py
View File

@ -19,6 +19,8 @@
# #
# #
import re import re
import socket
from PyQt4 import QtGui # pylint: disable=import-error from PyQt4 import QtGui # pylint: disable=import-error
from PyQt4 import QtCore # pylint: disable=import-error from PyQt4 import QtCore # pylint: disable=import-error
@ -67,18 +69,29 @@ def select_path_button_clicked(dialog, select_file=False, read_only=False):
:return: :return:
""" """
backup_location = str(dialog.dir_line_edit.text()) backup_location = str(dialog.dir_line_edit.text())
file_dialog = QtGui.QFileDialog()
file_dialog.setReadOnly(True)
new_path = None new_path = None
new_appvm = str(dialog.appvm_combobox.currentText()) new_appvm = str(dialog.appvm_combobox.currentText())
vm = dialog.qubes_app.domains[new_appvm] vm = dialog.qubes_app.domains[new_appvm]
try: try:
new_path = utils.get_path_from_vm( if vm.name == socket.gethostname():
vm, file_dialog = QtGui.QFileDialog()
"qubes.SelectFile" if select_file file_dialog.setReadOnly(True)
else "qubes.SelectDirectory")
if select_file:
file_dialog_function = file_dialog.getOpenFileName
else:
file_dialog_function = file_dialog.getExistingDirectory
new_path = file_dialog_function(
dialog,
dialog.tr("Select backup location."),
backup_location if backup_location else '/')
else:
new_path = utils.get_path_from_vm(
vm,
"qubes.SelectFile" if select_file
else "qubes.SelectDirectory")
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
if not read_only: if not read_only:
QtGui.QMessageBox.warning( QtGui.QMessageBox.warning(