Skip to content

Commit fc738db

Browse files
committed
Merge remote-tracking branch 'origin/pr/258' into pr-264-merge
* origin/pr/258: Last round of review fixes Fix updater tests for new mocks pacify black Review fixes Add config for device attachments to Global Config Change global config tests to use Mock Qubes API Changed VM flowbox for improved UX Pull request description: - improved dark mode - use Mock API for tests - add config for device attachments to Global Config, in particular - devices denied can be configured - auto-attach, ask-to-attach and required auto-attach can be configured requires QubesOS/qubes-core-admin-client#355
2 parents c18c9b0 + b445fbd commit fc738db

85 files changed

Lines changed: 10647 additions & 6359 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ checks:black:
4646
variables:
4747
DIR: .
4848
SKIP_PYLINT: 1
49+
BLACK_ARGS: -l88 -v --diff --color --check

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ notes=FIXME,FIX,XXX,TODO
9191
[FORMAT]
9292

9393
# Maximum number of characters on a single line.
94-
max-line-length=80
94+
max-line-length=88
9595

9696
# Maximum number of lines in a module
9797
max-module-lines=3000

icons/scalable/devices-dark.svg

Lines changed: 1 addition & 0 deletions
Loading

icons/scalable/devices-light.svg

Lines changed: 1 addition & 0 deletions
Loading

icons/scalable/qubes-icon-add.svg

Lines changed: 1 addition & 0 deletions
Loading

icons/scalable/qubes-icon-edit.svg

Lines changed: 5 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

icons/scalable/qubes-unplug.svg

Lines changed: 1 addition & 0 deletions
Loading

qubes_config/global_config.glade

Lines changed: 5886 additions & 3846 deletions
Large diffs are not rendered by default.

qubes_config/global_config/basics_handler.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,7 @@ def save_values(self, values_dict: Dict[str, int]):
331331
"""Wants a dict of 'vm-min-mem': value in MiB and
332332
'dom0-mem-boost': value in MiB"""
333333
# qmemman settings
334-
text_dict = {
335-
key: str(int(value)) + "MiB" for key, value in values_dict.items()
336-
}
334+
text_dict = {key: str(int(value)) + "MiB" for key, value in values_dict.items()}
337335

338336
assert (
339337
len(text_dict) == 2
@@ -502,9 +500,7 @@ def __init__(self, qapp: qubesadmin.Qubes, widget: Gtk.ComboBoxText):
502500
)
503501

504502
def _get_kernel_options(self) -> Dict[str, str]:
505-
kernels = [
506-
kernel.vid for kernel in self.qapp.pools["linux-kernel"].volumes
507-
]
503+
kernels = [kernel.vid for kernel in self.qapp.pools["linux-kernel"].volumes]
508504
kernels = sorted(kernels, key=KernelVersion)
509505
kernels_dict = {kernel: kernel for kernel in kernels}
510506
kernels_dict["(none)"] = None
@@ -666,9 +662,7 @@ def __init__(self, gtk_builder: Gtk.Builder, qapp: qubesadmin.Qubes):
666662
is_bool=False,
667663
)
668664
)
669-
self.handlers.append(
670-
KernelHolder(qapp=self.qapp, widget=self.kernel_combo)
671-
)
665+
self.handlers.append(KernelHolder(qapp=self.qapp, widget=self.kernel_combo))
672666

673667
self.handlers.append(MemoryHandler(gtk_builder))
674668

0 commit comments

Comments
 (0)