StreamController · Core447 · Nov 16, 2024 · Oct 10, 2024 · Oct 15, 2024 · Oct 16, 2024
diff --git a/GtkHelper/GtkHelper.py b/GtkHelper/GtkHelper.py
@@ -201,6 +201,12 @@ def get_deepest_focused_widget_with_attr(start: Gtk.Widget, attr:str) -> Gtk.Wid
     for widget in reversed(get_focused_widgets(start)):
         if hasattr(widget, attr):
             return widget
+
+def better_disconnect(widget: Gtk.Widget, handler: callable):
+    try:
+        widget.disconnect_by_func(handler)
+    except Exception:
+        pass
 
 class EntryDialog(Gtk.ApplicationWindow):
     def __init__(self, parent_window, dialog_title:str, entry_heading:str = "Name:", default_text:str = None, confirm_label:str = "OK", forbid_answers:list[str] = [],

diff --git a/GtkHelper/SearchComboRow.py b/GtkHelper/SearchComboRow.py
@@ -0,0 +1,125 @@
+"""
+Author: t00m
+Year: 2022
+Link: https://discourse.gnome.org/t/example-of-gtk-dropdown-with-search-enabled-without-gtk-expression/12748
+
+Modified by: G4PLS
+
+Modified the Original code to fit the purpose of this application.
+"""
+
+import gi
+
+gi.require_version("Gtk", "4.0")
+gi.require_version("Adw", "1")
+from gi.repository import Gtk, Adw, Gio, GObject
+
+from loguru import logger as log
+
+class SearchComboRowItem(GObject.Object):
+    __gtype_name__ = 'SearchComboRowItem'
+
+    def __init__(self, display_label):
+        super().__init__()
+        self._display_label = display_label
+
+    @GObject.Property
+    def display_label(self):
+        return self._display_label
+
+class SearchComboRow(Adw.PreferencesRow):
+    __gtype_name__ = "SearchComboRow"
+    __gsignals__ = {
+        'item-changed': (GObject.SignalFlags.RUN_FIRST, None, (SearchComboRowItem, int,)),
+    }
+
+    def __init__(self, title: str, use_single_line: bool = False, *args, **kwargs):
+        super().__init__(title=title, *args, **kwargs)
+        self.search_text = '' # Initial search text for widgets
+
+        # Setup DropDown for Widgets
+        ## Create model
+        self.model_widget = Gio.ListStore(item_type=SearchComboRowItem)
+        self.sort_model_widget  = Gtk.SortListModel(model=self.model_widget) # FIXME: Gtk.Sorter?
+        self.filter_model_widget = Gtk.FilterListModel(model=self.sort_model_widget)
+        self.filter_widget = Gtk.CustomFilter.new(self._do_filter_widget_view, self.filter_model_widget)
+        self.filter_model_widget.set_filter(self.filter_widget)
+
+        ## Create factory
+        factory_widget = Gtk.SignalListItemFactory()
+        factory_widget.connect("setup", self._on_factory_widget_setup)
+        factory_widget.connect("bind", self._on_factory_widget_bind)
+
+        ## Create DropDown
+        self.dropdown = Gtk.DropDown(model=self.filter_model_widget, factory=factory_widget)
+        self.dropdown.set_enable_search(True)
+        self.dropdown.connect("notify::selected-item", self._on_selected_widget)
+
+        ## Get SearchEntry
+        search_entry_widget = self._get_search_entry_widget(self.dropdown)
+        search_entry_widget.connect('search-changed', self._on_search_widget_changed)
+
+        # Setup main window
+        if not use_single_line:
+            self.main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=12, hexpand=True, vexpand=False)
+        else:
+            self.main_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=12, hexpand=True, vexpand=False)
+        self.main_box.props.margin_start = 12
+        self.main_box.props.margin_end = 12
+        self.main_box.props.margin_top = 6
+        self.main_box.props.margin_bottom = 6
+
+        self.set_child(self.main_box)
+        self.label = Gtk.Label(label=title, hexpand=True, xalign=0)
+        self.main_box.append(self.label)
+        self.main_box.append(self.dropdown)
+
+    def _get_search_entry_widget(self, dropdown):
+        popover = dropdown.get_last_child()
+        box = popover.get_child()
+        box2 = box.get_first_child()
+        search_entry = box2.get_first_child() # Gtk.SearchEntry
+        return search_entry
+
+    def _on_factory_widget_setup(self, factory, list_item):
+        box = Gtk.Box(spacing=6, orientation=Gtk.Orientation.HORIZONTAL)
+        label = Gtk.Label()
+        box.append(label)
+        list_item.set_child(box)
+
+    def _on_factory_widget_bind(self, factory, list_item):
+        box = list_item.get_child()
+        label = box.get_first_child()
+        widget = list_item.get_item()
+        label.set_text(widget.display_label)
+
+    def _on_selected_widget(self, dropdown, data):
+        selection = dropdown.get_selected_item()
+        index = dropdown.get_selected()
+
+        if selection and index >= 0:
+            self.emit("item-changed", selection, index)
+
+    def _on_search_widget_changed(self, search_entry):
+        self.search_text = search_entry.get_text()
+        self.filter_widget.changed(Gtk.FilterChange.DIFFERENT)
+
+    def _do_filter_widget_view(self, item, filter_list_model):
+        return self.search_text.upper() in item.display_label.upper()
+
+    def populate(self, list: list[SearchComboRowItem], selected_index: int = 0):
+        self.model_widget.remove_all()
+
+        for item in list:
+            self.model_widget.append(item)
+
+        self.dropdown.set_selected(selected_index)
+
+    def set_selected_item(self, index: int):
+        if index < 0:
+            return
+
+        try:
+            self.dropdown.set_selected(index)
+        except Exception as e:
+            log.error(e)
diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ StreamController supports the following Elgato Stream Deck models:
 - Stream Deck XL
 - Stream Deck Pedal
 - Stream Deck Plus
+- Stream Deck Neo (only the normal buttons)
 
 ## Features
 
@@ -75,7 +76,7 @@ StreamController is currently in beta. While core features like actions and page
 
 We welcome contributions! Feel free to open pull requests to improve StreamController.
 
-If you're interested in helping with the development of this app, you can contact me on our [Discord server](https://discord.gg/MSyHM8TN3u) to request write access to our [Dev planning board](https://github.com/orgs/StreamController/projects/2). For mor information see [Dev-Planning-Board](Dev-Planning-Board.md).
+If you're interested in helping with the development of this app, you can contact me on our [Discord server](https://discord.gg/MSyHM8TN3u) to request write access to our [Dev planning board](https://github.com/orgs/StreamController/projects/2). For more information see [Dev-Planning-Board](Dev-Planning-Board.md).
 
 ### Contributors
 

diff --git a/com.core447.StreamController.yml b/com.core447.StreamController.yml
@@ -1,6 +1,6 @@
 id: com.core447.StreamController
 runtime: org.gnome.Platform
-runtime-version: '46'
+runtime-version: '47'
 sdk: org.gnome.Sdk
 command: launch.sh
 
@@ -56,7 +56,7 @@ modules:
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/libpeas.git
-        tag: 2.0.2
+        tag: 2.0.5
 
   - name: libportal
     buildsystem: meson
@@ -70,7 +70,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/flatpak/libportal.git
-        tag: 0.7.1
+        tag: 0.8.1
 
   - name: StreamController
     buildsystem: simple

diff --git a/flatpak/com.core447.StreamController.metainfo.xml b/flatpak/com.core447.StreamController.metainfo.xml
@@ -41,51 +41,99 @@
   <url type="bugtracker">https://github.com/StreamController/StreamController/issues</url>
   <url type="contribute">https://github.com/StreamController/StreamController</url>
   <releases>
+    <release version="1.5.0-beta.7" date="2024-06-28">
+      <description translatable="no">
+        <p>Features:</p>
+        <ul>
+          <li>Add Spanish translations</li>
+          <li>Add option to change the outline color of labels</li>
+          <li>Add default font for labels</li>
+          <li>New option to configure default font</li>
+          <li>Add auto page change for swaywm</li>
+          <li>Add support for screensaver under Cinnamon</li>
+          <li>Add ability to use line breaks in labels</li>
+          <li>Add basic support for the Stream Deck Neo (limited to the normal buttons)</li>
+        </ul>
+
+        <p>Improvements:</p>
+        <ul>
+          <li>Use git to download plugins in dev mode</li>
+          <li>Add link to wiki when no decks are being detected</li>
+          <li>Update dependencies</li>
+        </ul>
 
-    <release version="1.5.0-beta.6" date="2024-07-02">
+        <p>Fixes:</p>
+        <ul>
+          <li>Crash if label is not a string</li>
+          <li>Error launching action backend in terminal</li>
+          <li>Swipes not working for Stream Deck Plus</li>
+          <li>Error when image size is 0</li>
+          <li>Error on X11 when decoding the active window</li>
+          <li>Not blocking action labels and images during screensaver</li>
+          <li>Not reloading page after plugin uninstall</li>
+          <li>Error when XDG_CURRENT_DESKTOP is not set</li>
+          <li>Font weights not stored</li>
+          <li>Removing action not updating input on active page</li>
+          <li>Not always uninstalling plugins correctly</li>
+          <li>Crash when streamdeck-ui has no states key</li>
+          <li>Registering dial and touch event when used to wake up</li>
+          <li>Not loading screen brightness from page</li>
+          <li>Ignoring font styles and weights</li>
+          <li>Decks not always reconnecting</li>
+          <li>Error when renaming page to the same name</li>
+          <li>Keeping old page backups indefinitely</li>
+          <li>Crash when drag and dropping buttons with actions</li>
+          <li>Showing "No decks available" in header when no pages are available</li>
+          <li>No proper background color permission handling</li>
+          <li>Loading action objects of inputs that aren't available on deck</li>
+        </ul>
+      </description>
+    </release>
+
+    <release version="1.5.0-beta.6" date="2024-10-25">
       <description translatable="no">
         <p>Fixes:</p>
-          <ul>
-            <li>Fix: Ignoring choosen brightness for screensaver</li>
-            <li>Fix: Actions cannot change background color</li>
-          </ul>
+        <ul>
+          <li>Fix: Ignoring choosen brightness for screensaver</li>
+          <li>Fix: Actions cannot change background color</li>
+        </ul>
       </description>
-  </release>
-    
+    </release>
+
     <release version="1.5.0-beta.5" date="2024-06-28">
       <description translatable="no">
         <p>Features:</p>
-          <ul>
-            <li>Add option to add custom stores and plugins</li>
-            <li>Add options to control which action should control labels and the image</li>
-            <li>Add state management</li>
-            <li>Add support for the Stream Deck Plus</li>
-            <li>Add key hold event</li>
-            <li>Add EventAssigner</li>
-            <li>Add auto lock support for KDE</li>
-            <li>Create page backups before each launch</li>
-            <li>Add discord link to the onboarding dialog</li>
-          </ul>
-          <p>Improvements:</p>
-          <ul>
-            <li>Improve store caching</li>
-            <li>Improve restore from suspend (beta)</li>
-            <li>Ship icons</li>
-            <li>Improve deck detection after reconnection</li>
-            <li>Show progress bar when installing plugins from the onboarding dialog</li>
-          </ul>
-          <p>Fixes:</p>
-          <ul>
-            <li>Fix: Plugin wide settings get reset on each update</li>
-            <li>Fix: Potential data loss when saving pages</li>
-            <li>Allow change of data path in the settings</li>
-            <li>Fix: Error for non RGB(A) images</li>
-            <li>Fix: Using user .gitconfig</li>
-            <li>Fix: misc bugs</li>
-          </ul>
-      </description>
-  </release>
-  
+        <ul>
+          <li>Add option to add custom stores and plugins</li>
+          <li>Add options to control which action should control labels and the image</li>
+          <li>Add state management</li>
+          <li>Add support for the Stream Deck Plus</li>
+          <li>Add key hold event</li>
+          <li>Add EventAssigner</li>
+          <li>Add auto lock support for KDE</li>
+          <li>Create page backups before each launch</li>
+          <li>Add discord link to the onboarding dialog</li>
+        </ul>
+        <p>Improvements:</p>
+        <ul>
+          <li>Improve store caching</li>
+          <li>Improve restore from suspend (beta)</li>
+          <li>Ship icons</li>
+          <li>Improve deck detection after reconnection</li>
+          <li>Show progress bar when installing plugins from the onboarding dialog</li>
+        </ul>
+        <p>Fixes:</p>
+        <ul>
+          <li>Fix: Plugin wide settings get reset on each update</li>
+          <li>Fix: Potential data loss when saving pages</li>
+          <li>Allow change of data path in the settings</li>
+          <li>Fix: Error for non RGB(A) images</li>
+          <li>Fix: Using user .gitconfig</li>
+          <li>Fix: misc bugs</li>
+        </ul>
+      </description>
+    </release>
+
     <release version="1.5.0-beta.4" date="2024-05-07">
       <description translatable="no">
         <p>Features:</p>
@@ -424,6 +472,7 @@
       <li>Stream Deck XL</li>
       <li>Stream Deck Pedal</li>
       <li>Stream Deck Plus</li>
+      <li>Stream Deck Neo (only the normal buttons)</li>
     </ul>
   </description>
 

diff --git a/globals.py b/globals.py
@@ -111,13 +111,53 @@
 tray_icon: "TrayIcon" = None
 fallback_font: str = find_fallback_font()
 
-app_version: str = "1.5.0-beta.6" # In breaking.feature.fix-state format
+app_version: str = "1.5.0-beta.7" # In breaking.feature.fix-state format
 exact_app_version_check: bool = False
 logs: list[str] = []
 
 release_notes: str = """
-<ul>
-    <li>Fix: Ignoring choosen brightness for screensaver</li>
-    <li>Fix: Actions cannot change background color</li>
-</ul>
-"""
+    <p>Features:</p>
+    <ul>
+        <li>Add Spanish translations</li>
+        <li>Add option to change the outline color of labels</li>
+        <li>Add default font for labels</li>
+        <li>New option to configure default font</li>
+        <li>Add auto page change for swaywm</li>
+        <li>Add support for screensaver under Cinnamon</li>
+        <li>Add ability to use line breaks in labels</li>
+        <li>Add basic support for the Stream Deck Neo (limited to the normal buttons)</li>
+    </ul>
+
+    <p>Improvements:</p>
+    <ul>
+        <li>Use git to download plugins in dev mode</li>
+        <li>Add link to wiki when no decks are being detected</li>
+        <li>Update dependencies</li>
+    </ul>
+
+    <p>Fixes:</p>
+    <ul>
+        <li>Crash if label is not a string</li>
+        <li>Error launching action backend in terminal</li>
+        <li>Swipes not working for Stream Deck Plus</li>
+        <li>Error when image size is 0</li>
+        <li>Error on X11 when decoding the active window</li>
+        <li>Not blocking action labels and images during screensaver</li>
+        <li>Not reloading page after plugin uninstall</li>
+        <li>Error when XDG_CURRENT_DESKTOP is not set</li>
+        <li>Font weights not stored</li>
+        <li>Removing action not updating input on active page</li>
+        <li>Not always uninstalling plugins correctly</li>
+        <li>Crash when streamdeck-ui has no states key</li>
+        <li>Registering dial and touch event when used to wake up</li>
+        <li>Not loading screen brightness from page</li>
+        <li>Ignoring font styles and weights</li>
+        <li>Decks not always reconnecting</li>
+        <li>Error when renaming page to the same name</li>
+        <li>Keeping old page backups indefinitely</li>
+        <li>Crash when drag and dropping buttons with actions</li>
+        <li>Showing "No decks available" in header when no pages are available</li>
+        <li>No proper background color permission handling</li>
+        <li>Loading action objects of inputs that aren't available on deck</li>
+    </ul>
+"""