Skip to content

Commit 98166a0

Browse files
committed
Merge remote-tracking branch 'origin/pr/258'
* 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 387c2c8 + b445fbd commit 98166a0

File tree

85 files changed

+10811
-6525
lines changed

Some content is hidden

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

85 files changed

+10811
-6525
lines changed

.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: 6049 additions & 4009 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
@@ -238,9 +238,7 @@ def save_values(self, values_dict: Dict[str, int]):
238238
"""Wants a dict of 'vm-min-mem': value in MiB and
239239
'dom0-mem-boost': value in MiB"""
240240
# qmemman settings
241-
text_dict = {
242-
key: str(int(value)) + "MiB" for key, value in values_dict.items()
243-
}
241+
text_dict = {key: str(int(value)) + "MiB" for key, value in values_dict.items()}
244242

245243
assert (
246244
len(text_dict) == 2
@@ -409,9 +407,7 @@ def __init__(self, qapp: qubesadmin.Qubes, widget: Gtk.ComboBoxText):
409407
)
410408

411409
def _get_kernel_options(self) -> Dict[str, str]:
412-
kernels = [
413-
kernel.vid for kernel in self.qapp.pools["linux-kernel"].volumes
414-
]
410+
kernels = [kernel.vid for kernel in self.qapp.pools["linux-kernel"].volumes]
415411
kernels = sorted(kernels, key=KernelVersion)
416412
kernels_dict = {kernel: kernel for kernel in kernels}
417413
kernels_dict["(none)"] = None
@@ -559,9 +555,7 @@ def __init__(self, gtk_builder: Gtk.Builder, qapp: qubesadmin.Qubes):
559555
is_bool=False,
560556
)
561557
)
562-
self.handlers.append(
563-
KernelHolder(qapp=self.qapp, widget=self.kernel_combo)
564-
)
558+
self.handlers.append(KernelHolder(qapp=self.qapp, widget=self.kernel_combo))
565559

566560
self.handlers.append(MemoryHandler(gtk_builder))
567561

0 commit comments

Comments
 (0)