Last round of review fixes

Author: marmarta

qubes_config/global_config.glade

@@ -509,6 +509,7 @@ def run_for_new(self, new_row_function: Callable) -> DevPolicyRow:
         self._init_check(self.no_strict_check, False, False, "not selected")
         self._init_check(self.port_check, False, False, "not selected")
 
+        self.dev_combo.set_active_id(None)
         self.unknown_box.set_visible(False)
         self.qube_handler.reset()
         self.validate()
@@ -989,7 +990,7 @@ def __init__(
             prefix="devices_auto",
             device_policy_manager=self.device_manager,
             classes=["block", "mic", "usb"],
-            assignment_filter=self._filter_required,
+            assignment_filter=self._filter_auto,
             edit_dialog_class=AutoDeviceDialog,
         )
         self.required_devices_handler = AttachmentHandler(
@@ -998,7 +999,7 @@ def __init__(
             prefix="devices_required",
             device_policy_manager=self.device_manager,
             classes=["block", "pci"],
-            assignment_filter=self._filter_auto,
+            assignment_filter=self._filter_required,
             edit_dialog_class=RequiredDeviceDialog,
         )
 

qubes_config/global_config/device_attachments.py

@@ -25,7 +25,7 @@
 
 import gi
 
-from ..widgets.gtk_utils import ask_question
+from ..widgets.gtk_utils import ask_question, resize_window_to_reasonable
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
@@ -146,6 +146,11 @@ def __init__(
         self.ok_button.connect("clicked", self._save_changes)
         self.cancel_button.connect("clicked", self._cancel)
 
+        self.dialog.connect("size-allocate", self._resize_window)
+
+    def _resize_window(self, *_args):
+        resize_window_to_reasonable(self.dialog)
+
     def _cancel(self, *_args):
         if self.remove_on_cancel and self.current_row:
             self.current_row.get_parent().remove(self.current_row)
@@ -176,6 +181,7 @@ def run_for_new(self, new_row_function: Callable) -> DevPolicyRow:
         self.remove_on_cancel = True
 
         self.dialog.show()
+        self._resize_window()
 
         return new_row
 
@@ -185,6 +191,7 @@ def run_for_existing(self, row: DevPolicyRow):
         self.validate()
         self.remove_on_cancel = False
         self.dialog.show()
+        self._resize_window()
 
     def validate(self, *_args):
         """Connect this function to any events that should trigger

qubes_config/global_config/device_widgets.py

@@ -35,6 +35,7 @@
     show_dialog_with_icon,
     load_theme,
     is_theme_light,
+    resize_window_to_reasonable,
 )
 from ..widgets.gtk_widgets import ProgressBarDialog, ViewportHandler
 from ..widgets.utils import open_url_in_disposable
@@ -58,7 +59,7 @@
 import gi
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GLib, GObject, Gio, Gdk
+from gi.repository import Gtk, GLib, GObject, Gio
 
 logger = logging.getLogger("qubes-global-config")
 
@@ -299,27 +300,7 @@ def do_activate(self, *args, **kwargs):
         self.perform_setup()
         assert self.main_window
         self.main_window.show()
-        # resize to screen size
-        if (
-            self.main_window.get_allocated_width()
-            > self.main_window.get_screen().get_width()
-        ):
-            width = int(self.main_window.get_screen().get_width() * 0.9)
-        else:
-            # try to have at least 1100 pixels
-            width = min(int(self.main_window.get_screen().get_width() * 0.9), 1100)
-        if (
-            self.main_window.get_allocated_height()
-            > self.main_window.get_screen().get_height() * 0.9
-        ):
-            height = int(self.main_window.get_screen().get_height() * 0.9)
-        else:
-            height = self.main_window.get_allocated_height()
-        self.main_window.resize(width, height)
-        self.main_window.set_position(Gtk.WindowPosition.CENTER_ALWAYS)
-        self.main_window.set_gravity(Gdk.Gravity.CENTER)
-        self.main_window.move(0, 0)
-        self.main_window.set_position(Gtk.WindowPosition.CENTER)
+        resize_window_to_reasonable(self.main_window)
 
         # open at specified location
         if self.open_at:

qubes_config/global_config/global_config.py

@@ -138,6 +138,8 @@ def __init__(
             filter_function=filter_function,
         )
 
+        self.add_qube_model.connect_change_callback(self._check_for_add_validity)
+
         self.flowbox.set_sort_func(self._sort_flowbox)
         self.placeholder = PlaceholderText()
         self.flowbox.add(self.placeholder)
@@ -151,6 +153,12 @@ def __init__(
         self.add_button.connect("clicked", self._add_confirm_clicked)
         self.flowbox.connect("child-removed", self._vm_removed)
 
+    def _check_for_add_validity(self, *_args):
+        if self.add_qube_model.get_selected() is None:
+            self.add_button.set_sensitive(False)
+        else:
+            self.add_button.set_sensitive(True)
+
     @staticmethod
     def _sort_flowbox(child_1, child_2):
         vm_1 = str(child_1)

qubes_config/global_config/vm_flowbox.py

@@ -275,3 +275,22 @@ def copy_to_global_clipboard(text: str):
             source.write("dom0")
         with open(XEVENT, "w", encoding="ascii") as timestamp:
             timestamp.write(str(Gtk.get_current_event_time()))
+
+
+def resize_window_to_reasonable(window: Gtk.Window, min_width: int = 1100):
+    """Make sure the provided window is visible and does not exceed available screen
+    space."""
+    if window.get_allocated_width() > window.get_screen().get_width():
+        width = int(window.get_screen().get_width() * 0.9)
+    else:
+        # try to have at least min_width pixels
+        width = min(int(window.get_screen().get_width() * 0.9), min_width)
+    if window.get_allocated_height() > window.get_screen().get_height() * 0.9:
+        height = int(window.get_screen().get_height() * 0.9)
+    else:
+        height = window.get_allocated_height()
+    window.resize(width, height)
+    window.set_position(Gtk.WindowPosition.CENTER_ALWAYS)
+    window.set_gravity(Gdk.Gravity.CENTER)
+    window.move(0, 0)
+    window.set_position(Gtk.WindowPosition.CENTER)