Skip to content

Commit

Permalink
Add minimize/maximize buttons to manager tools
Browse files Browse the repository at this point in the history
  • Loading branch information
marmarta committed Feb 2, 2023
1 parent bafa70f commit 4b712e9
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 6 deletions.
6 changes: 5 additions & 1 deletion qubesmanager/backup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from qubesadmin import exc
from qubesadmin import utils as admin_utils

from PyQt5 import QtCore, QtWidgets, QtGui # pylint: disable=import-error
from PyQt5 import QtCore, QtWidgets, QtGui, Qt # pylint: disable=import-error
from . import ui_backupdlg # pylint: disable=no-name-in-module
from . import multiselectwidget

Expand Down Expand Up @@ -80,6 +80,10 @@ def __init__(self, qt_app, qubes_app, dispatcher, parent=None):

self.setupUi(self)

self.setWindowFlags(self.windowFlags() |
Qt.Qt.WindowMaximizeButtonHint |
Qt.Qt.WindowMinimizeButtonHint)

self.progress_status.text = self.tr("Backup in progress...")
self.dir_line_edit.setReadOnly(False)

Expand Down
5 changes: 4 additions & 1 deletion qubesmanager/bootfromdevice.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import subprocess
from . import utils
from . import ui_bootfromdevice # pylint: disable=no-name-in-module
from PyQt5 import QtWidgets, QtGui # pylint: disable=import-error
from PyQt5 import QtWidgets, QtGui, Qt # pylint: disable=import-error
from qubesadmin import tools
from qubesadmin import exc
from qubesadmin.tools import qvm_start
Expand All @@ -41,6 +41,9 @@ def __init__(self, vm, qapp, qubesapp=None, parent=None, new_vm=False):
self.setupUi(self)
self.setWindowTitle(
self.tr("Boot {vm} from device").format(vm=self.vm))
self.setWindowFlags(self.windowFlags() |
Qt.Qt.WindowMaximizeButtonHint |
Qt.Qt.WindowMinimizeButtonHint)

self.buttonBox.accepted.connect(self.save_and_apply)
self.buttonBox.rejected.connect(self.reject)
Expand Down
6 changes: 5 additions & 1 deletion qubesmanager/global_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import sys
import subprocess
import pkg_resources
from PyQt5 import QtWidgets, QtCore, QtGui # pylint: disable=import-error
from PyQt5 import QtWidgets, QtCore, QtGui, Qt # pylint: disable=import-error

from qubesadmin.utils import parse_size
from qubesadmin import exc
Expand Down Expand Up @@ -82,6 +82,10 @@ def __init__(self, app, qubes_app, parent=None):
self.buttonBox.accepted.connect(self.save_and_apply)
self.buttonBox.rejected.connect(self.reject)

self.setWindowFlags(self.windowFlags() |
Qt.Qt.WindowMaximizeButtonHint |
Qt.Qt.WindowMinimizeButtonHint)

self.__init_ux()

self.__init_system_defaults__()
Expand Down
5 changes: 4 additions & 1 deletion qubesmanager/log_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import sys
import os
from functools import partial
from PyQt5 import QtWidgets # pylint: disable=import-error
from PyQt5 import QtWidgets, Qt # pylint: disable=import-error
from qubesadmin import Qubes
from . import ui_logdlg # pylint: disable=no-name-in-module
from . import clipboard
Expand All @@ -42,6 +42,9 @@ def __init__(self, app, logfiles, parent=None):
self.displayed_text = ""

self.setupUi(self)
self.setWindowFlags(self.windowFlags() |
Qt.Qt.WindowMaximizeButtonHint |
Qt.Qt.WindowMinimizeButtonHint)

self.copy_to_qubes_clipboard.clicked.connect(
self.copy_to_clipboard_triggered)
Expand Down
5 changes: 4 additions & 1 deletion qubesmanager/restore.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#
#

from PyQt5 import QtCore, QtWidgets, QtGui # pylint: disable=import-error
from PyQt5 import QtCore, QtWidgets, QtGui, Qt # pylint: disable=import-error
import os
import os.path
import logging
Expand Down Expand Up @@ -74,6 +74,9 @@ def __init__(self, qt_app, qubes_app, parent=None):

self.qt_app = qt_app
self.qubes_app = qubes_app
self.setWindowFlags(self.windowFlags() |
Qt.Qt.WindowMaximizeButtonHint |
Qt.Qt.WindowMinimizeButtonHint)

self.vms_to_restore = None
self.func_output = []
Expand Down
5 changes: 4 additions & 1 deletion qubesmanager/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

from .appmenu_select import AppmenuSelectManager
from . import firewall
from PyQt5 import QtCore, QtWidgets, QtGui # pylint: disable=import-error
from PyQt5 import QtCore, QtWidgets, QtGui, Qt # pylint: disable=import-error

from . import ui_settingsdlg # pylint: disable=no-name-in-module

Expand Down Expand Up @@ -151,6 +151,9 @@ def __init__(self, vm, init_page="basic", qapp=None, qubesapp=None,

self.setupUi(self)
self.setWindowTitle(self.tr("Settings: {vm}").format(vm=self.vm.name))
self.setWindowFlags(self.windowFlags() |
Qt.Qt.WindowMaximizeButtonHint |
Qt.Qt.WindowMinimizeButtonHint)
if init_page in self.tabs_indices:
idx = self.tabs_indices[init_page]
assert idx in range(self.tabWidget.count())
Expand Down

0 comments on commit 4b712e9

Please sign in to comment.