Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ checks:black:
variables:
DIR: .
SKIP_PYLINT: 1
BLACK_ARGS: -l88 -v --diff --color --check
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ notes=FIXME,FIX,XXX,TODO
[FORMAT]

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

# Maximum number of lines in a module
max-module-lines=3000
Expand Down
1 change: 1 addition & 0 deletions icons/scalable/devices-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/scalable/devices-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/scalable/qubes-icon-add.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions icons/scalable/qubes-icon-edit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions icons/scalable/qubes-icon-remove.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/scalable/qubes-unplug.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10,058 changes: 6,049 additions & 4,009 deletions qubes_config/global_config.glade

Large diffs are not rendered by default.

12 changes: 3 additions & 9 deletions qubes_config/global_config/basics_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,7 @@ def save_values(self, values_dict: Dict[str, int]):
"""Wants a dict of 'vm-min-mem': value in MiB and
'dom0-mem-boost': value in MiB"""
# qmemman settings
text_dict = {
key: str(int(value)) + "MiB" for key, value in values_dict.items()
}
text_dict = {key: str(int(value)) + "MiB" for key, value in values_dict.items()}

assert (
len(text_dict) == 2
Expand Down Expand Up @@ -409,9 +407,7 @@ def __init__(self, qapp: qubesadmin.Qubes, widget: Gtk.ComboBoxText):
)

def _get_kernel_options(self) -> Dict[str, str]:
kernels = [
kernel.vid for kernel in self.qapp.pools["linux-kernel"].volumes
]
kernels = [kernel.vid for kernel in self.qapp.pools["linux-kernel"].volumes]
kernels = sorted(kernels, key=KernelVersion)
kernels_dict = {kernel: kernel for kernel in kernels}
kernels_dict["(none)"] = None
Expand Down Expand Up @@ -559,9 +555,7 @@ def __init__(self, gtk_builder: Gtk.Builder, qapp: qubesadmin.Qubes):
is_bool=False,
)
)
self.handlers.append(
KernelHolder(qapp=self.qapp, widget=self.kernel_combo)
)
self.handlers.append(KernelHolder(qapp=self.qapp, widget=self.kernel_combo))

self.handlers.append(MemoryHandler(gtk_builder))

Expand Down
4 changes: 1 addition & 3 deletions qubes_config/global_config/conflict_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@ def __init__(
self.own_file_name = own_file_name
self.policy_manager = policy_manager

self.problem_box: Gtk.Box = gtk_builder.get_object(
f"{prefix}_problem_box"
)
self.problem_box: Gtk.Box = gtk_builder.get_object(f"{prefix}_problem_box")
self.problem_list: Gtk.ListBox = gtk_builder.get_object(
f"{prefix}_problem_files_list"
)
Expand Down
Loading