~comcloudway/melon

b942e97a727c7c49625600e9ee9694cb11fba0a1 — Jakob Meier 7 months ago b2c148e
Fixed server browse window breakpoint
3 files changed, 9 insertions(+), 3 deletions(-)

M main.py
M melon/browse/server.py
M melon/window.py
M main.py => main.py +3 -1
@@ 2,7 2,7 @@ import sys
import gi
gi.require_version('Gtk', '4.0')
gi.require_version('Adw', '1')
from gi.repository import Gtk, Adw, Gio
from gi.repository import Gtk, Adw, Gio, GLib

from melon.window import MainWindow
from melon.models import init_db


@@ 11,6 11,8 @@ from melon.servers.utils import get_server_instance, load_server, get_servers_li
class MyApp(Adw.Application):
    def __init__(self, **kwargs):
        super().__init__(**kwargs)
        # set name
        GLib.set_application_name("Melon")
        # initialize db
        init_db()
        # this has to wait till the db is initialized

M melon/browse/server.py => melon/browse/server.py +5 -1
@@ 136,7 136,7 @@ class BrowseServerScreen(Adw.NavigationPage):
                return
        url = self.instance.get_external_url()
        Gtk.UriLauncher.new(uri=url).launch()
    def __init__(self, id, *args, **kwargs):
    def __init__(self, id, window=None, *args, **kwargs):
        super().__init__(*args, **kwargs)
        server = get_servers_list()[id]
        self.set_title(server["name"])


@@ 171,3 171,7 @@ class BrowseServerScreen(Adw.NavigationPage):
        self.toolbar_view.set_content(self.view_stack)
        self.toolbar_view.add_bottom_bar(self.bottom_bar)
        self.set_child(self.toolbar_view)

        if not window is None:
            window.breakpoint.add_setter(self.header_bar, "title-widget", Gtk.Box())
            window.breakpoint.add_setter(self.bottom_bar, "reveal", True)

M melon/window.py => melon/window.py +1 -1
@@ 28,7 28,7 @@ class MainWindow(Adw.ApplicationWindow):
    def open_server_browse(self, action, prefs):
        # manually convert GLib.Variant to value
        id = prefs[:]
        self.view.push(BrowseServerScreen(id))
        self.view.push(BrowseServerScreen(id, window=self))
    def open_channel_browse(self, action, prefs):
        plugin = prefs[0]
        id = prefs[1]