Merge pull request #412 from aclist/fix/deck-unfullscreen-dimensions

fix: set explicitly safe dimensions for Steam Deck

dzgui/config/freedesktop.py

@@ -21,7 +21,7 @@ def write_desktop_file(exe_path: Path) -> Path:
     Terminal=false
     Exec={exe_path}
     Name=DZGUI
-    Comment=DayZ server browser and mod manager
+    Comment=dzgui
     Icon={icon}
     Categories=Game"""
 

dzgui/views/components/entry.py

@@ -162,8 +162,7 @@ class APIEntry(Gtk.Box):
         self.entry.connect("icon-release", self._on_icon_release)
         self.entry.connect("activate", self._on_field_activated)
 
-        # TODO: strings
-        self.submit = Gtk.Button(label="Validate")
+        self.submit = Gtk.Button(label="Submit")
         self.submit.set_sensitive(False)
         self.submit.connect("clicked", self._on_submit)
 

dzgui/views/dialogs/wizard.py

@@ -49,11 +49,6 @@ class PageNum(Enum):
     SHORTCUTS = 7
     FINAL = 8
 
-class OptionalPageMixin:
-    """Marks optional pages as advanceable"""
-    def _on_map(self, page: "ScrolledWizardPage") -> None:
-        EMITTER.emit("step_complete")
-
 
 class DescriptionArea(Gtk.Box):
     def __init__(self, text: str):
@@ -96,7 +91,6 @@ class ScrolledWizardPage(Gtk.ScrolledWindow):
             margin_top=50,
             spacing=20,
         )
-
         self.add(self.box)
         self.prog = Progress()
         self.box.pack_end(self.prog, expand=False, fill=False, padding=0)
@@ -221,7 +215,7 @@ class APIValidationPage(ScrolledWizardPage):
         self.spinner.stop()
 
 
-class BMValidationPage(OptionalPageMixin, APIValidationPage):
+class BMValidationPage(APIValidationPage):
     def __init__(self) -> None:
         super().__init__(
             enum=PageNum.BM_API,
@@ -230,7 +224,6 @@ class BMValidationPage(OptionalPageMixin, APIValidationPage):
             link=BM_API_SETUP,
             func=self._validate,
         )
-        self.connect("map", self._on_map)
 
     @call_on_thread("", show_dialog=False)
     def _validate(self, key: str) -> None:
@@ -447,7 +440,8 @@ class Assistant(Gtk.Assistant):
     def __init__(self, is_deck: bool, XDG: "Xdg"):
         super().__init__()
         if is_deck:
-            self.fullscreen()
+            # NOTE: deemed to be "safe" dimensions that exclude taskbar size
+            self.set_default_size(1085, 670)
         else:
             self.set_default_size(1500, 900)
 
@@ -577,6 +571,8 @@ class Assistant(Gtk.Assistant):
 
         # NOTE: disable forward action
         # TODO: use page enums
+        if page == self.page5:
+            return
         if page != self.page1:
             EMITTER.emit("step_pending")
 
@@ -604,7 +600,7 @@ class CheckboxWithLabel(Gtk.Box):
         self.button.set_active(state)
 
 
-class ShortcutCreationPage(OptionalPageMixin, ScrolledWizardPage):
+class ShortcutCreationPage(ScrolledWizardPage):
     def __init__(self, shortcut: Path) -> None:
         super().__init__(
             enum=PageNum.SHORTCUTS,
@@ -647,6 +643,9 @@ class ShortcutCreationPage(OptionalPageMixin, ScrolledWizardPage):
             self.desktop_checkbox.set_active(state)
         self.desktop_checkbox.set_sensitive(state)
 
+    def _on_map(self, page: "ScrolledWizardPage") -> None:
+        EMITTER.emit("step_complete")
+
     def set_steam_path(self, path: Path) -> None:
         self.steam_path = path
 

pyproject.toml

@@ -4,7 +4,7 @@ description = "DayZ server browser and mod manager for Linux"
 authors = [
     {name = "aclist"}
 ]
-version = "7.0.0b18"
+version = "7.0.0b19"
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]
 readme = "README.md"