Merge #258 and #262

.gitlab-ci.yml

@@ -46,3 +46,4 @@ checks:black:
   variables:
     DIR: .
     SKIP_PYLINT: 1
+    BLACK_ARGS: -l88 -v --diff --color --check

.pylintrc

@@ -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

qubes_config/global_config/basics_handler.py

@@ -162,7 +162,7 @@
             new_value = self.model.get_selected()
             setattr(self.trait_holder, self.trait_name, new_value)
 
-    def get_model(self) -> TraitSelector:
+    def get_model(self) -> VMListModeler:
         return self.model
 
 
@@ -208,6 +208,99 @@
         return self.model
 
 
+class PreloadDispvmHandler(AbstractTraitHolder):
+    """Handler for preloaded disposables. Requires SpinButton widgets:
+    'basics_preload_dispvm'"""
+
+    def __init__(
+        self,
+        qapp: qubesadmin.Qubes,
+        widget: Gtk.SpinButton,
+        defdispvm_model: VMListModeler,
+        is_dvm_template: Optional[Callable] = None,
+    ):
+        self.qapp = qapp
+        self.widget = widget
+        self.defdispvm_model = defdispvm_model
+        self.defdispvm_model.connect_change_callback(self.on_defdispvm_changed)
+        self.is_dvm_template = is_dvm_template
+        self.preload_dispvm_adjustment = Gtk.Adjustment()
+        self.preload_dispvm_adjustment.configure(0, 0, 50, 1, 10, 0)
+        self.widget.configure(self.preload_dispvm_adjustment, 0.1, 0)
+        self.widget.set_value(self.get_current_value())
+        self.widget.set_sensitive(bool(self.get_defdispvm_value()))
+
+    def get_defdispvm_value(self):
+        return self.defdispvm_model.get_selected()
+
+    def on_defdispvm_changed(self):
+        value = self.get_defdispvm_value()
+        if value:
+            self.widget.set_sensitive(True)
+            self.widget.set_value(self.get_current_value())
+        else:
+            self.widget.set_value(0)
+            self.widget.set_sensitive(False)
+
+    @staticmethod
+    def get_readable_description() -> str:  # pylint: disable=arguments-differ
+        """Get human-readable description of the widget"""
+        # the pylint: disable above is because pylint does not understand
+        # static methods
+        return _("Number of preloaded disposables from default dispvm")
+
+    def save(self):
+        """Save changes: update system value and mark it as new initial value"""
+        if not self.is_changed():
+            return
+        if not self.get_defdispvm_value():
+            return
+        apply_feature_change(
+            self.qapp.domains["dom0"],
+            "preload-dispvm-max",
+            int(self.widget.get_value()),
+        )
+
+    def reset(self):
+        """Reset selection to the initial value."""
+        if not self.widget.is_sensitive():
+            return
+        self.widget.set_value(self.get_current_value())
+
+    def is_changed(self) -> bool:
+        """Has the user selected something different from the initial value?"""
+        if not self.widget.is_sensitive():
+            return False
+        if int(self.widget.get_value()) != self.get_current_value():
+            return True
+        return False
+
+    def get_unsaved(self):
+        """Get human-readable description of unsaved changes, or
+        empty string if none were found."""
+        if self.is_changed():
+            return self.get_readable_description()
+        return ""
+
+    def get_current_value(self):
+        """This should never be called."""
+        if not self.get_defdispvm_value():
+            return 0
+        if not self.is_dvm_template:
+            return 0
+        return int(
+            get_feature(self.qapp.domains["dom0"], "preload-dispvm-max") or 0
+        )
+
+    def update_current_value(self):
+        """This should never be called."""
+        raise NotImplementedError
+
+    def get_model(self) -> TraitSelector:
+        """This should never be called."""
+        raise NotImplementedError
+
+
 class QMemManHelper:
     """Helper class to handle the ugliness of managing qmemman config."""
 
@@ -238,9 +331,7 @@
         """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
@@ -409,9 +500,7 @@
         )
 
     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
@@ -456,6 +545,9 @@
         self.defdispvm_combo: Gtk.ComboBox = gtk_builder.get_object(
             "basics_defdispvm_combo"
         )
+        self.preload_dispvm_spin: Gtk.SpinButton = gtk_builder.get_object(
+            "basics_preload_dispvm"
+        )
         self.fullscreen_combo: Gtk.ComboBoxText = gtk_builder.get_object(
             "basics_fullscreen_combo"
         )
@@ -513,6 +605,17 @@
                 additional_options=NONE_CATEGORY,
             )
         )
+        defdispvm_model: VMListModeler = self.handlers[
+            -1
+        ].get_model()  # type: ignore
+        self.handlers.append(
+            PreloadDispvmHandler(
+                qapp=self.qapp,
+                widget=self.preload_dispvm_spin,
+                defdispvm_model=defdispvm_model,
+                is_dvm_template=self._default_dispvm_filter,
+            )
+        )
         self.handlers.append(
             FeatureHandler(
                 trait_holder=self.vm,
@@ -559,9 +662,7 @@
                 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))
 

qubes_config/global_config/conflict_handler.py

@@ -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"
         )