diff --git a/data/gtk.css b/data/gtk.css index 469b262..15e6fb9 100644 --- a/data/gtk.css +++ b/data/gtk.css @@ -1,8 +1,20 @@ -.bg-texture { +#content_stack { box-shadow:inset 4px 4px 10px rgba(0,0,0,0.3); background-image:url('noise-texture.png'); } +#port_spinner { + background:none; + margin-top:-13px; +} +#port_spinner text { + padding-left: 0; +} + +#server_stack_sidebar { + background-color:alpha(@theme_bg_color, 1); +} + .no-bg { background:none; } @@ -18,13 +30,13 @@ font-weight:bold; } -revealer.sidebar > * { +#cover_info_revealer { background-color:alpha(@theme_bg_color, 0.8); box-shadow:0 0 10px @theme_bg_color; - margin-left:20px + margin-left:20px; } -revealer.sidebar scale mark indicator { +#cover_info_revealer scale mark indicator { margin-right:5px; } @@ -53,3 +65,6 @@ iconview.view.selection:selected:focus { iconview.view.selection:hover { -gtk-icon-effect:none; } +gridview child { + padding: 1px; +} diff --git a/data/ui/connection-panel.ui b/data/ui/connection-panel.ui index f388d43..de6bf0c 100644 --- a/data/ui/connection-panel.ui +++ b/data/ui/connection-panel.ui @@ -1,182 +1,86 @@ - - - - - 1024 - 9999 - 6600 - 1 - 100 - - diff --git a/data/ui/cover-panel.ui b/data/ui/cover-panel.ui index 304d9d0..5516676 100644 --- a/data/ui/cover-panel.ui +++ b/data/ui/cover-panel.ui @@ -1,199 +1,159 @@ - - - + + + diff --git a/data/ui/cover-toolbar.ui b/data/ui/cover-toolbar.ui deleted file mode 100644 index 7d3fcdd..0000000 --- a/data/ui/cover-toolbar.ui +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - diff --git a/data/ui/library-toolbar.ui b/data/ui/library-toolbar.ui deleted file mode 100644 index 97cad01..0000000 --- a/data/ui/library-toolbar.ui +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - 100 - 1000 - 150 - 1 - 10 - - - False - - - True - False - vertical - - - 350 - True - True - grid_adjustment - False - -1 - 0 - 0 - False - - - - - True - True - 0 - - - - - gtk-refresh - True - True - True - none - True - - - - False - True - 1 - - - - - True - False - vertical - - - True - False - vertical - - - False - True - 0 - - - - - True - False - Sort - - - False - True - 1 - - - - - sort by artist - True - True - False - True - sort_year - - - - False - True - 2 - - - - - sort by title - True - True - False - True - sort_year - - - - False - True - 3 - - - - - sort by year - True - True - False - True - True - - - - False - True - 4 - - - - - gtk-sort-descending - True - True - False - True - True - True - - - - False - True - 5 - - - - - False - True - 2 - - - - - - - diff --git a/data/ui/playlist-panel.ui b/data/ui/playlist-panel.ui index 9ee8b7a..ac139fe 100644 --- a/data/ui/playlist-panel.ui +++ b/data/ui/playlist-panel.ui @@ -1,194 +1,180 @@ - - - diff --git a/data/ui/playlist-toolbar.ui b/data/ui/playlist-toolbar.ui deleted file mode 100644 index 843625c..0000000 --- a/data/ui/playlist-toolbar.ui +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - diff --git a/data/ui/server-panel.ui b/data/ui/server-panel.ui index 333919d..91ffe99 100644 --- a/data/ui/server-panel.ui +++ b/data/ui/server-panel.ui @@ -1,547 +1,326 @@ - - - diff --git a/data/ui/server-toolbar.ui b/data/ui/server-toolbar.ui deleted file mode 100644 index c1857a4..0000000 --- a/data/ui/server-toolbar.ui +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/data/ui/window.ui b/data/ui/window.ui index 5e24217..420be73 100644 --- a/data/ui/window.ui +++ b/data/ui/window.ui @@ -1,229 +1,74 @@ - - - diff --git a/data/xyz.suruatoel.mcg.gresource.xml b/data/xyz.suruatoel.mcg.gresource.xml index 9ebd10e..1710bac 100644 --- a/data/xyz.suruatoel.mcg.gresource.xml +++ b/data/xyz.suruatoel.mcg.gresource.xml @@ -9,13 +9,9 @@ ui/shortcuts-dialog.ui ui/connection-panel.ui ui/album-headerbar.ui - ui/server-toolbar.ui ui/server-panel.ui - ui/cover-toolbar.ui ui/cover-panel.ui - ui/playlist-toolbar.ui ui/playlist-panel.ui - ui/library-toolbar.ui ui/library-panel.ui diff --git a/src/albumheaderbar.py b/src/albumheaderbar.py index 1c3e892..ab6607a 100644 --- a/src/albumheaderbar.py +++ b/src/albumheaderbar.py @@ -2,15 +2,16 @@ import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') +gi.require_version('Adw', '1') -from gi.repository import Gtk, GObject +from gi.repository import Gtk, GObject, Adw @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/album-headerbar.ui') -class AlbumHeaderbar(Gtk.HeaderBar): +class AlbumHeaderbar(Adw.Bin): __gtype_name__ = 'McgAlbumHeaderbar' __gsignals__ = { 'close': (GObject.SIGNAL_RUN_FIRST, None, ()) diff --git a/src/application.py b/src/application.py index c9f18e6..cb5b863 100644 --- a/src/application.py +++ b/src/application.py @@ -5,8 +5,9 @@ import logging import urllib import gi -gi.require_version('Gtk', '3.0') -from gi.repository import Gio, Gtk, Gdk, GLib +gi.require_version('Gtk', '4.0') +gi.require_version('Adw', '1') +from gi.repository import Gio, Gtk, Gdk, GLib, Adw from .window import Window from .infodialog import InfoDialog @@ -38,6 +39,7 @@ class Application(Gtk.Application): self._load_css() self._setup_actions() self._load_appmenu() + self._setup_adw() def do_activate(self): @@ -70,15 +72,15 @@ class Application(Gtk.Application): def _set_default_settings(self): - settings = Gtk.Settings.get_default() - settings.set_property('gtk-application-prefer-dark-theme', True) + style_manager = Adw.StyleManager.get_default() + style_manager.set_color_scheme(Adw.ColorScheme.PREFER_DARK) def _load_css(self): styleProvider = Gtk.CssProvider() styleProvider.load_from_resource(self._get_resource_path('gtk.css')) - Gtk.StyleContext.add_provider_for_screen( - Gdk.Screen.get_default(), + Gtk.StyleContext.add_provider_for_display( + Gdk.Display.get_default(), styleProvider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION ) @@ -102,3 +104,15 @@ class Application(Gtk.Application): def _get_resource_path(self, path): return "/{}/{}".format(Application.ID.replace('.', '/'), path) + + + def _setup_adw(self): + Adw.HeaderBar() + Adw.ViewSwitcherTitle() + Adw.ViewSwitcherBar() + Adw.ViewStackPage() + Adw.ToastOverlay() + Adw.StatusPage() + Adw.Flap() + Adw.EntryRow() + Adw.PasswordEntryRow() diff --git a/src/connectionpanel.py b/src/connectionpanel.py index 1ba5f7e..9d5cd63 100644 --- a/src/connectionpanel.py +++ b/src/connectionpanel.py @@ -2,9 +2,11 @@ import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') +gi.require_version('Adw', '1') +import locale -from gi.repository import Gtk, GObject +from gi.repository import Gtk, Gio, GObject, Adw from mcg.zeroconf import ZeroconfProvider @@ -12,56 +14,58 @@ from mcg.zeroconf import ZeroconfProvider @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/connection-panel.ui') -class ConnectionPanel(Gtk.Box): +class ConnectionPanel(Adw.Bin): __gtype_name__ = 'McgConnectionPanel' __gsignals__ = { 'connection-changed': (GObject.SIGNAL_RUN_FIRST, None, (str, int, str)) } # Widgets + toolbar = Gtk.Template.Child() zeroconf_list = Gtk.Template.Child() - host_entry = Gtk.Template.Child() + host_row = Gtk.Template.Child() port_spinner = Gtk.Template.Child() - password_entry = Gtk.Template.Child() + password_row = Gtk.Template.Child() - def __init__(self): - super().__init__() - self._services = Gtk.ListStore(str, str, int) - self._profile = None - - # Zeroconf - self.zeroconf_list.set_model(self._services) - renderer = Gtk.CellRendererText() - column = Gtk.TreeViewColumn("Zeroconf", renderer, text=0) - self.zeroconf_list.append_column(column) + def __init__(self, **kwargs): + super().__init__(**kwargs) # Zeroconf provider self._zeroconf_provider = ZeroconfProvider() self._zeroconf_provider.connect_signal(ZeroconfProvider.SIGNAL_SERVICE_NEW, self.on_new_service) + def get_toolbar(self): + return self.toolbar + + + def set_selected(self, selected): + pass + + def on_new_service(self, service): name, host, port = service - self._services.append([name, host, port]) + + row_button = Gtk.Button() + row_button.set_label(locale.gettext("use")) + row_button.connect("clicked", self.on_service_selected, host, port) + + row = Adw.ActionRow() + row.set_title(name) + row.set_subtitle("{} ({})".format(host, port)) + row.add_suffix(row_button) + + self.zeroconf_list.insert(row, -1) + + + def on_service_selected(self, widget, host, port): + self.set_host(host) + self.set_port(port) @Gtk.Template.Callback() - def on_service_selected(self, selection): - model, treeiter = selection.get_selected() - if treeiter != None: - service = model[treeiter] - self.set_host(service[1]) - self.set_port(service[2]) - - - @Gtk.Template.Callback() - def on_zeroconf_list_outfocused(self, widget, event): - self.zeroconf_list.get_selection().unselect_all() - - - @Gtk.Template.Callback() - def on_host_entry_outfocused(self, widget, event): + def on_host_entry_apply(self, widget): self._call_back() @@ -70,17 +74,12 @@ class ConnectionPanel(Gtk.Box): self._call_back() - @Gtk.Template.Callback() - def on_password_entry_outfocused(self, widget, event): - self._call_back() - - def set_host(self, host): - self.host_entry.set_text(host) + self.host_row.set_text(host) def get_host(self): - return self.host_entry.get_text() + return self.host_row.get_text() def set_port(self, port): @@ -94,11 +93,11 @@ class ConnectionPanel(Gtk.Box): def set_password(self, password): if password is None: password = "" - self.password_entry.set_text(password) + self.password_row.set_text(password) def get_password(self): - if self.password_entry.get_text() == "": + if self.password_row.get_text() == "": return None else: return self.password_entry.get_text() diff --git a/src/coverpanel.py b/src/coverpanel.py index 102b69c..27e1e7a 100644 --- a/src/coverpanel.py +++ b/src/coverpanel.py @@ -2,7 +2,7 @@ import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') import logging import math @@ -13,27 +13,6 @@ from mcg.utils import Utils -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/cover-toolbar.ui') -class CoverToolbar(Gtk.ButtonBox): - __gtype_name__ = 'McgCoverToolbar' - __gsignals__ = { - 'fullscreen': (GObject.SIGNAL_RUN_FIRST, None, ()) - } - - # Widgets - fullscreen_button = Gtk.Template.Child() - - - def __init__(self): - super().__init__() - - - def set_fullscreen_sensitive(self, sensitive): - self.fullscreen_button.set_sensitive(sensitive) - - - - @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/cover-panel.ui') class CoverPanel(Gtk.Overlay): __gtype_name__ = 'McgCoverPanel' @@ -44,9 +23,13 @@ class CoverPanel(Gtk.Overlay): } # Widgets + # Toolbar + toolbar = Gtk.Template.Child() + fullscreen_button = Gtk.Template.Child() # Cover cover_stack = Gtk.Template.Child() cover_spinner = Gtk.Template.Child() + cover_default = Gtk.Template.Child() cover_scroll = Gtk.Template.Child() cover_box = Gtk.Template.Child() cover_image = Gtk.Template.Child() @@ -61,22 +44,20 @@ class CoverPanel(Gtk.Overlay): - def __init__(self): - super().__init__() + def __init__(self, **kwargs): + super().__init__(**kwargs) self._current_album = None self._current_cover_album = None self._cover_pixbuf = None self._timer = None self._properties = {} - self._icon_theme = Gtk.IconTheme.get_default() + self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default()) self._fullscreened = False - self._is_selected = False self._current_size = None self._cover_pixbuf = self._get_default_image() # Widgets - self._toolbar = CoverToolbar() self.cover_stack.set_visible_child(self.cover_scroll) # Initial actions @@ -84,11 +65,11 @@ class CoverPanel(Gtk.Overlay): def get_toolbar(self): - return self._toolbar + return self.toolbar def set_selected(self, selected): - self._is_selected = selected + pass @Gtk.Template.Callback() @@ -97,10 +78,9 @@ class CoverPanel(Gtk.Overlay): self.emit('toggle-fullscreen') - @Gtk.Template.Callback() - def on_cover_size_allocate(self, widget, allocation): + def set_width(self, width): GObject.idle_add(self._resize_image) - self.cover_info_scroll.set_max_content_width(allocation.width // 2) + self.cover_info_scroll.set_max_content_width(width // 2) @Gtk.Template.Callback() @@ -144,7 +124,7 @@ class CoverPanel(Gtk.Overlay): # Set current album self._current_album = album self._enable_tracklist() - self._toolbar.set_fullscreen_sensitive(self._current_album is not None) + self.fullscreen_button.set_sensitive(self._current_album is not None) def set_play(self, pos, time): @@ -186,7 +166,7 @@ class CoverPanel(Gtk.Overlay): self._cover_pixbuf = Utils.load_pixbuf(data) except Exception as e: self._logger.exception("Failed to set albumart") - self._cover_pixbuf = self._get_default_image() + self._cover_pixbuf = None else: # Reset image self._cover_pixbuf = self._get_default_image() @@ -236,8 +216,11 @@ class CoverPanel(Gtk.Overlay): def _show_image(self): - self._resize_image() - self.cover_stack.set_visible_child(self.cover_scroll) + if self._cover_pixbuf: + self._resize_image() + self.cover_stack.set_visible_child(self.cover_scroll) + else: + self.cover_stack.set_visible_child(self.cover_default) self.cover_spinner.stop() @@ -245,12 +228,14 @@ class CoverPanel(Gtk.Overlay): """Diese Methode skaliert das geladene Bild aus dem Pixelpuffer auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse """ - # Get size - size = self.cover_scroll.get_allocation() + size_width = self.cover_stack.get_size(Gtk.Orientation.HORIZONTAL) + size_height = self.cover_stack.get_size(Gtk.Orientation.HORIZONTAL) # Abort if size is the same - if self._current_size and size.width == self._current_size.width and size.height == self._current_size.height: - return - self._current_size = size + if self._current_size: + current_width, current_height = self._current_size + if size_width == current_width and size_height == current_height: + return + self._current_size = (size_width, size_height,) # Get pixelbuffer pixbuf = self._cover_pixbuf @@ -259,8 +244,8 @@ class CoverPanel(Gtk.Overlay): return # Skalierungswert für Breite und Höhe ermitteln - ratioW = float(size.width) / float(pixbuf.get_width()) - ratioH = float(size.height) / float(pixbuf.get_height()) + ratioW = float(size_width) / float(pixbuf.get_width()) + ratioH = float(size_height) / float(pixbuf.get_height()) # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren ratio = min(ratioW, ratioH) ratio = min(ratio, 1) @@ -269,15 +254,5 @@ class CoverPanel(Gtk.Overlay): height = int(math.floor(pixbuf.get_height()*ratio)) if width <= 0 or height <= 0: return - # Pixelpuffer auf Oberfläche zeichnen - self.cover_image.set_allocation(self.cover_scroll.get_allocation()) self.cover_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER)) self.cover_image.show() - - - def _get_default_image(self): - return self._icon_theme.load_icon( - Utils.STOCK_ICON_DEFAULT, - 512, - Gtk.IconLookupFlags.FORCE_SVG & Gtk.IconLookupFlags.FORCE_SIZE - ) diff --git a/src/librarypanel.py b/src/librarypanel.py index 48b5342..4937cfe 100644 --- a/src/librarypanel.py +++ b/src/librarypanel.py @@ -2,25 +2,27 @@ import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') +gi.require_version('Adw', '1') import locale import logging import math import threading -from gi.repository import Gtk, GObject, GdkPixbuf +from gi.repository import Gtk, Gdk, GObject, GdkPixbuf, Gio, Adw from mcg import client from mcg.albumheaderbar import AlbumHeaderbar from mcg.utils import SortOrder from mcg.utils import Utils +from mcg.utils import GridItem -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-toolbar.ui') -class LibraryToolbar(Gtk.ButtonBox): - __gtype_name__ = 'McgLibraryToolbar' +@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-panel.ui') +class LibraryPanel(Adw.Bin): + __gtype_name__ = 'McgLibraryPanel' __gsignals__ = { 'select': (GObject.SIGNAL_RUN_FIRST, None, (bool,)), 'toggle-search': (GObject.SIGNAL_RUN_FIRST, None, (bool,)), @@ -32,6 +34,10 @@ class LibraryToolbar(Gtk.ButtonBox): } # Widgets + panel_standalone = Gtk.Template.Child() + actionbar_revealer = Gtk.Template.Child() + # Toolbar + toolbar = Gtk.Template.Child() select_button = Gtk.Template.Child() toolbar_search_bar = Gtk.Template.Child() toolbar_popover = Gtk.Template.Child() @@ -40,100 +46,6 @@ class LibraryToolbar(Gtk.ButtonBox): sort_title = Gtk.Template.Child() sort_year = Gtk.Template.Child() grid_scale = Gtk.Template.Child() - - - def __init__(self, item_size): - super().__init__() - - # Toolbar menu - self.grid_scale.set_value(item_size) - self._toolbar_sort_buttons = { - SortOrder.ARTIST: self.sort_artist, - SortOrder.TITLE: self.sort_title, - SortOrder.YEAR: self.sort_year - } - - - @Gtk.Template.Callback() - def on_select_toggled(self, widget): - self.emit('select', widget.get_active()) - - - @Gtk.Template.Callback() - def on_search_toggled(self, widget): - self.emit('toggle-search', widget.get_active()) - - - @Gtk.Template.Callback() - def on_update_clicked(self, widget): - self.emit('update') - - - @Gtk.Template.Callback() - def on_grid_scale_change(self, widget, scroll, value): - self.emit('start-scale', value) - - - @Gtk.Template.Callback() - def on_grid_scale_changed(self, widget, event): - self.emit('end-scale', self.grid_scale.get_value()) - self.toolbar_popover.popdown() - - - @Gtk.Template.Callback() - def on_sort_toggled(self, widget): - if widget.get_active(): - sort = [key for key, value in self._toolbar_sort_buttons.items() if value is widget][0] - self.emit('sort', sort) - - - @Gtk.Template.Callback() - def on_sort_order_toggled(self, button): - if button.get_active(): - sort_type = Gtk.SortType.DESCENDING - else: - sort_type = Gtk.SortType.ASCENDING - self.emit('sort-type', sort_type) - - - def get_grid_scale(self): - return self.grid_scale - - - def is_search_active(self): - return self.toolbar_search_bar.get_active() - - - def set_search_active(self, active): - self.toolbar_search_bar.set_active(active) - - - def exit_selection(self): - self.select_button.set_active(False) - - - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-panel.ui') -class LibraryPanel(Gtk.Stack): - __gtype_name__ = 'McgLibraryPanel' - __gsignals__ = { - 'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()), - 'close-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()), - 'update': (GObject.SIGNAL_RUN_FIRST, None, ()), - 'play': (GObject.SIGNAL_RUN_FIRST, None, (str,)), - 'queue': (GObject.SIGNAL_RUN_FIRST, None, (str,)), - 'queue-multiple': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)), - 'item-size-changed': (GObject.SIGNAL_RUN_FIRST, None, (int,)), - 'sort-order-changed': (GObject.SIGNAL_RUN_FIRST, None, (int,)), - 'sort-type-changed': (GObject.SIGNAL_RUN_FIRST, None, (Gtk.SortType,)), - 'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)) - } - - - # Widgets - panel_standalone = Gtk.Template.Child() - actionbar_revealer = Gtk.Template.Child() # Filter/search bar filter_bar = Gtk.Template.Child() filter_entry = Gtk.Template.Child() @@ -152,8 +64,8 @@ class LibraryPanel(Gtk.Stack): standalone_image = Gtk.Template.Child() - def __init__(self, client): - super().__init__() + def __init__(self, client, **kwargs): + super().__init__(**kwargs) self._logger = logging.getLogger(__name__) self._client = client self._buttons = {} @@ -167,7 +79,7 @@ class LibraryPanel(Gtk.Stack): self._old_ranges = {} self._library_lock = threading.Lock() self._library_stop = threading.Event() - self._icon_theme = Gtk.IconTheme.get_default() + self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default()) self._standalone_pixbuf = None self._selected_albums = [] self._allocation = (0, 0) @@ -188,11 +100,8 @@ class LibraryPanel(Gtk.Stack): # Progress Bar self.progress_image.set_from_pixbuf(self._get_default_image()) # Library Grid: Model - self._library_grid_model = Gtk.ListStore(GdkPixbuf.Pixbuf, str, str) - self._library_grid_model.set_sort_func(2, self.compare_albums, self._sort_order) - self._library_grid_model.set_sort_column_id(2, self._sort_type) - self._library_grid_filter = self._library_grid_model.filter_new() - self._library_grid_filter.set_visible_func(self.on_filter_visible) + self._library_grid_model = Gio.ListStore() + self._library_grid_selection = Gtk.MultiSelection.new(self._library_grid_model) # Library Grid self.library_grid.set_model(self._library_grid_filter) self.library_grid.set_pixbuf_column(0) @@ -205,7 +114,7 @@ class LibraryPanel(Gtk.Stack): def get_toolbar(self): - return self._toolbar + return self.toolbar def set_selected(self, selected): @@ -218,17 +127,17 @@ class LibraryPanel(Gtk.Stack): if new_allocation == self._allocation: return self._allocation = new_allocation - self._toolbar.get_grid_scale().clear_marks() + self.grid_scale.clear_marks() width = widget.get_allocation().width - lower = int(self._toolbar.get_grid_scale().get_adjustment().get_lower()) - upper = int(self._toolbar.get_grid_scale().get_adjustment().get_upper()) + lower = int(self.grid_scale.get_adjustment().get_lower()) + upper = int(self.grid_scale.get_adjustment().get_upper()) countMin = max(int(width / upper), 1) countMax = max(int(width / lower), 1) for index in range(countMin, countMax): pixel = int(width / index) pixel = pixel - (2 * int(pixel / 100)) - self._toolbar.get_grid_scale().add_mark( + self.grid_scale.add_mark( pixel, Gtk.PositionType.BOTTOM, None @@ -256,7 +165,7 @@ class LibraryPanel(Gtk.Stack): def on_toolbar_scale(self, widget, value): size = math.floor(value) - range = self._toolbar.get_grid_scale().get_adjustment() + range = self.grid_scale.get_adjustment() if size < range.get_lower() or size > range.get_upper(): return self._item_size = size @@ -266,7 +175,7 @@ class LibraryPanel(Gtk.Stack): def on_toolbar_scaled(self, widget, value): size = round(value) - range = self._toolbar.get_grid_scale().get_adjustment() + range = self.grid_scale.get_adjustment() if size < range.get_lower() or size > range.get_upper(): return False self.emit('item-size-changed', size) @@ -286,8 +195,8 @@ class LibraryPanel(Gtk.Stack): @Gtk.Template.Callback() def on_filter_bar_notify(self, widget, value): - if self._toolbar.is_search_active() is not self.filter_bar.get_search_mode(): - self._toolbar.set_search_active(self.filter_bar.get_search_mode()) + if self.toolbar_search_bar.get_active() is not self.filter_bar.get_search_mode(): + self.toolbar_search_bar.set_active(self.filter_bar.get_search_mode()) @Gtk.Template.Callback() @@ -377,7 +286,7 @@ class LibraryPanel(Gtk.Stack): def set_item_size(self, item_size): if self._item_size != item_size: self._item_size = item_size - self._toolbar.get_grid_scale().set_value(item_size) + self.grid_scale.set_value(item_size) self._redraw() @@ -496,23 +405,17 @@ class LibraryPanel(Gtk.Stack): except Exception as e: self._logger.exception("Failed to load albumart") if pixbuf is None: - pixbuf = self._icon_theme.load_icon( + pixbuf = self._icon_theme.lookup_icon( Utils.STOCK_ICON_DEFAULT, + None, self._item_size, - Gtk.IconLookupFlags.FORCE_SVG & Gtk.IconLookupFlags.FORCE_SIZE + self._item_size, + Gtk.TextDirection.LTR, + Gtk.IconLookupFlags.FORCE_SYMBOLIC ) if pixbuf is not None: self._grid_pixbufs[album.get_id()] = pixbuf - self._library_grid_model.append([ - pixbuf, - GObject.markup_escape_text("\n".join([ - album.get_title(), - ', '.join(album.get_dates()), - Utils.create_artists_label(album), - Utils.create_length_label(album) - ])), - album_id - ]) + self._library_grid_model.append(GridItem(album, pixbuf)) i += 1 GObject.idle_add(self.progress_bar.set_fraction, i/n) @@ -632,12 +535,11 @@ class LibraryPanel(Gtk.Stack): def _get_default_image(self): - return self._icon_theme.load_icon( + return self._icon_theme.lookup_icon( Utils.STOCK_ICON_DEFAULT, + None, 512, - Gtk.IconLookupFlags.FORCE_SVG & Gtk.IconLookupFlags.FORCE_SIZE + 512, + Gtk.TextDirection.LTR, + Gtk.IconLookupFlags.FORCE_SYMBOLIC ) - - - - diff --git a/src/main.py b/src/main.py index d1b5a53..39e5be5 100644 --- a/src/main.py +++ b/src/main.py @@ -1,6 +1,4 @@ import sys -import gi -gi.require_version('Gtk', '3.0') from .application import Application diff --git a/src/playlistpanel.py b/src/playlistpanel.py index a268233..b601dcd 100644 --- a/src/playlistpanel.py +++ b/src/playlistpanel.py @@ -2,56 +2,24 @@ import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') +gi.require_version('Adw', '1') import logging import math import threading -from gi.repository import Gtk, GObject, GdkPixbuf +from gi.repository import Gtk, Gdk, Gio, GObject, GdkPixbuf, Adw from mcg import client from mcg.albumheaderbar import AlbumHeaderbar from mcg.utils import Utils - - - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/playlist-toolbar.ui') -class PlaylistToolbar(Gtk.ButtonBox): - __gtype_name__ = 'McgPlaylistToolbar' - __gsignals__ = { - 'select': (GObject.SIGNAL_RUN_FIRST, None, (bool,)), - 'clear-playlist': (GObject.SIGNAL_RUN_FIRST, None, ()) - } - - # Widgets - playlist_clear_button = Gtk.Template.Child() - select_button = Gtk.Template.Child() - - - def __init__(self): - super().__init__() - - - @Gtk.Template.Callback() - def on_select_toggled(self, widget): - self.emit('select', widget.get_active()) - - - @Gtk.Template.Callback() - def on_clear_clicked(self, widget): - if widget is self.playlist_clear_button: - self.emit('clear-playlist') - - - def exit_selection(self): - self.select_button.set_active(False) +from mcg.utils import GridItem @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/playlist-panel.ui') -class PlaylistPanel(Gtk.Stack): +class PlaylistPanel(Adw.Bin): __gtype_name__ = 'McgPlaylistPanel' __gsignals__ = { 'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()), @@ -67,6 +35,10 @@ class PlaylistPanel(Gtk.Stack): # Widgets panel_standalone = Gtk.Template.Child() actionbar_revealer = Gtk.Template.Child() + # Toolbar + toolbar = Gtk.Template.Child() + playlist_clear_button = Gtk.Template.Child() + select_button = Gtk.Template.Child() # Playlist Grid playlist_grid = Gtk.Template.Child() # Action bar (normal) @@ -79,8 +51,8 @@ class PlaylistPanel(Gtk.Stack): standalone_image = Gtk.Template.Child() - def __init__(self, client): - GObject.GObject.__init__(self) + def __init__(self, client, **kwargs): + super().__init__(**kwargs) self._client = client self._host = None self._item_size = 150 @@ -88,7 +60,7 @@ class PlaylistPanel(Gtk.Stack): self._playlist_albums = None self._playlist_lock = threading.Lock() self._playlist_stop = threading.Event() - self._icon_theme = Gtk.IconTheme.get_default() + self._icon_theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default()) self._standalone_pixbuf = None self._selected_albums = [] self._is_selected = False @@ -101,12 +73,10 @@ class PlaylistPanel(Gtk.Stack): self._headerbar_standalone = AlbumHeaderbar() self._headerbar_standalone.connect('close', self.on_headerbar_close_clicked) # Playlist Grid: Model - self._playlist_grid_model = Gtk.ListStore(GdkPixbuf.Pixbuf, str, str) + self._playlist_grid_model = Gio.ListStore() + self._playlist_grid_selection = Gtk.MultiSelection.new(self._playlist_grid_model) # Playlist Grid - self.playlist_grid.set_model(self._playlist_grid_model) - self.playlist_grid.set_pixbuf_column(0) - self.playlist_grid.set_text_column(-1) - self.playlist_grid.set_tooltip_column(1) + self.playlist_grid.set_model(self._playlist_grid_selection) def get_headerbar_standalone(self): @@ -114,7 +84,7 @@ class PlaylistPanel(Gtk.Stack): def get_toolbar(self): - return self._toolbar + return self.toolbar def set_selected(self, selected): @@ -137,13 +107,13 @@ class PlaylistPanel(Gtk.Stack): @Gtk.Template.Callback() - def on_playlist_grid_clicked(self, widget, path): + def on_playlist_grid_clicked(self, widget, position): # Get selected album - iter = self._playlist_grid_model.get_iter(path) - hash = self._playlist_grid_model.get_value(iter, 2) - album = self._playlist_albums[hash] + item = self._playlist_grid_model.get_item(position) + album = item.get_album() + id = album.get_id() self._selected_albums = [album] - self.emit('albumart', hash) + self.emit('albumart', id) # Show standalone album if widget.get_selection_mode() == Gtk.SelectionMode.SINGLE: @@ -248,10 +218,7 @@ class PlaylistPanel(Gtk.Stack): self._playlist_albums = {} for album in playlist: self._playlist_albums[album.get_id()] = album - self.playlist_grid.set_model(None) - self.playlist_grid.freeze_child_notify() - self._playlist_grid_model.clear() - GObject.idle_add(self.playlist_grid.set_item_padding, size / 100) + self._playlist_grid_model.remove_all() cache = client.MCGCache(host, size) for album in playlist: @@ -265,29 +232,22 @@ class PlaylistPanel(Gtk.Stack): except Exception: self._logger.exception("Failed to load albumart") if pixbuf is None: - pixbuf = self._icon_theme.load_icon( + pixbuf = self._icon_theme.lookup_icon( Utils.STOCK_ICON_DEFAULT, + None, self._item_size, - Gtk.IconLookupFlags.FORCE_SVG & Gtk.IconLookupFlags.FORCE_SIZE + self._item_size, + Gtk.TextDirection.LTR, + Gtk.IconLookupFlags.FORCE_SYMBOLIC ) if pixbuf is not None: - self._playlist_grid_model.append([ - pixbuf, - GObject.markup_escape_text("\n".join([ - album.get_title(), - ', '.join(album.get_dates()), - Utils.create_artists_label(album), - Utils.create_length_label(album) - ])), - album.get_id() - ]) + self._playlist_grid_model.append(GridItem(album, pixbuf)) if self._playlist_stop.is_set(): self._playlist_lock.release() return - self.playlist_grid.set_model(self._playlist_grid_model) - self.playlist_grid.thaw_child_notify() + self.playlist_grid.set_model(self._playlist_grid_selection) # TODO why set_columns()? #self.playlist_grid.set_columns(len(playlist)) self._playlist_lock.release() @@ -342,12 +302,11 @@ class PlaylistPanel(Gtk.Stack): def _get_default_image(self): - return self._icon_theme.load_icon( + return self._icon_theme.lookup_icon( Utils.STOCK_ICON_DEFAULT, + None, 512, - Gtk.IconLookupFlags.FORCE_SVG & Gtk.IconLookupFlags.FORCE_SIZE + 512, + Gtk.TextDirection.LTR, + Gtk.IconLookupFlags.FORCE_SYMBOLIC ) - - - - diff --git a/src/serverpanel.py b/src/serverpanel.py index 22f3836..75c3628 100644 --- a/src/serverpanel.py +++ b/src/serverpanel.py @@ -2,32 +2,23 @@ import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') +gi.require_version('Adw', '1') -from gi.repository import Gtk, GObject - - - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/server-toolbar.ui') -class ServerToolbar(Gtk.ButtonBox): - __gtype_name__ = 'McgServerToolbar' - - - def __init__(self): - super().__init__() +from gi.repository import Gtk, Adw, GObject @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/server-panel.ui') -class ServerPanel(Gtk.Box): +class ServerPanel(Adw.Bin): __gtype_name__ = 'McgServerPanel' __gsignals__ = { 'change-output-device': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,bool,)), } # Widgets + toolbar = Gtk.Template.Child() # Status widgets status_file = Gtk.Template.Child() status_audio = Gtk.Template.Child() @@ -44,14 +35,13 @@ class ServerPanel(Gtk.Box): output_devices = Gtk.Template.Child() - def __init__(self): - super().__init__() + def __init__(self, **kwargs): + super().__init__(**kwargs) self._none_label = "" self._output_buttons = {} self._is_selected = False # Widgets - self._toolbar = ServerToolbar() self._none_label = self.status_file.get_label() @@ -60,7 +50,7 @@ class ServerPanel(Gtk.Box): def get_toolbar(self): - return self._toolbar + return self.toolbar def on_output_device_toggled(self, widget, device): @@ -115,13 +105,12 @@ class ServerPanel(Gtk.Box): self._output_buttons[device.get_id()].set_active(device.is_enabled()) self._output_buttons[device.get_id()].thaw_notify() else: - button = Gtk.CheckButton(device.get_name()) + button = Gtk.CheckButton.new_with_label(device.get_name()) if device.is_enabled(): button.set_active(True) handler = button.connect('toggled', self.on_output_device_toggled, device) self.output_devices.insert(button, -1) self._output_buttons[device.get_id()] = button - self.output_devices.show_all() # Remove devices for id in self._output_buttons.keys(): diff --git a/src/utils.py b/src/utils.py index 713c85c..f5ad22e 100644 --- a/src/utils.py +++ b/src/utils.py @@ -2,13 +2,13 @@ import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') import hashlib import locale import os import urllib -from gi.repository import GdkPixbuf +from gi.repository import Gdk, GdkPixbuf, GObject @@ -86,3 +86,29 @@ class SortOrder: ARTIST = 0 TITLE = 1 YEAR = 2 + + + + +class GridItem(GObject.GObject): + __gtype_name__ = "GridItem" + + tooltip = GObject.Property(type=str, default=None) + cover = GObject.Property(type=Gdk.Paintable, default=None) + + + def __init__(self, album, cover): + super().__init__() + self._album = album + if cover: + self.cover = Gdk.Texture.new_for_pixbuf(cover) + self.tooltip = GObject.markup_escape_text("\n".join([ + album.get_title(), + ', '.join(album.get_dates()), + Utils.create_artists_label(album), + Utils.create_length_label(album) + ])) + + + def get_album(self): + return self._album diff --git a/src/window.py b/src/window.py index c0dd46c..d9dbcea 100644 --- a/src/window.py +++ b/src/window.py @@ -2,7 +2,8 @@ import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') +gi.require_version('Adw', '1') try: import keyring use_keyring = True @@ -11,7 +12,7 @@ except: import locale import logging -from gi.repository import Gtk, Gdk, GObject, GLib, Gio +from gi.repository import Gtk, Adw, Gdk, GObject, GLib, Gio from . import client from .shortcutsdialog import ShortcutsDialog @@ -43,7 +44,7 @@ class WindowState(GObject.Object): @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/window.ui') -class Window(Gtk.ApplicationWindow): +class Window(Adw.ApplicationWindow): __gtype_name__ = 'McgAppWindow' SETTING_HOST = 'host' SETTING_PORT = 'port' @@ -70,27 +71,27 @@ class Window(Gtk.ApplicationWindow): headerbar_button_playpause = Gtk.Template.Child() headerbar_button_volume = Gtk.Template.Child() # Infobar - info_revealer = Gtk.Template.Child() - info_bar = Gtk.Template.Child() - info_label = Gtk.Template.Child() + info_toast = Gtk.Template.Child() - def __init__(self, app, title, settings): - super().__init__() + def __init__(self, app, title, settings, **kwargs): + super().__init__(**kwargs) self.set_application(app) self.set_title(title) self._settings = settings self._panels = [] self._mcg = client.Client() self._state = WindowState() - self._changing_volume = False self._setting_volume = False + self._headerbar_connection_button_active = True + self._headerbar_playpause_button_active = True # Help/Shortcuts dialog self.set_help_overlay(ShortcutsDialog()) # Login screen self._connection_panel = ConnectionPanel() + self._panels.append(self._connection_panel) # Server panel self._server_panel = ServerPanel() self._panels.append(self._server_panel) @@ -108,19 +109,19 @@ class Window(Gtk.ApplicationWindow): self._library_panel.connect('close-standalone', self.on_panel_close_standalone) self._panels.append(self._library_panel) # Stack - self.content_stack.add(self._connection_panel) + self.content_stack.add_child(self._connection_panel) self.panel_stack.add_titled(self._server_panel, 'server-panel', locale.gettext("Server")) - self.panel_stack.add_titled(self._cover_panel, 'cover-panel', locale.gettext("Cover")) + self.panel_stack.add_titled_with_icon(self._cover_panel, 'cover-panel', locale.gettext("Cover"), "image-x-generic-symbolic") self.panel_stack.add_titled(self._playlist_panel, 'playlist-panel', locale.gettext("Playlist")) self.panel_stack.add_titled(self._library_panel, 'library-panel', locale.gettext("Library")) # Header self._playlist_panel.get_headerbar_standalone().connect('close', self.on_panel_close_standalone) self._library_panel.get_headerbar_standalone().connect('close', self.on_panel_close_standalone) # Toolbar stack - self.toolbar_stack.add(self._server_panel.get_toolbar()) - self.toolbar_stack.add(self._cover_panel.get_toolbar()) - self.toolbar_stack.add(self._playlist_panel.get_toolbar()) - self.toolbar_stack.add(self._library_panel.get_toolbar()) + self.toolbar_stack.add_child(self._server_panel.get_toolbar()) + self.toolbar_stack.add_child(self._cover_panel.get_toolbar()) + self.toolbar_stack.add_child(self._playlist_panel.get_toolbar()) + self.toolbar_stack.add_child(self._library_panel.get_toolbar()) # Properties self._set_headerbar_sensitive(False, False) @@ -134,6 +135,9 @@ class Window(Gtk.ApplicationWindow): self._library_panel.set_sort_type(self._settings.get_boolean(Window.SETTING_SORT_TYPE)) # Signals + self.connect("notify::default-width", self.on_resize) + self.connect("notify::maximized", self.on_maximized) + self.connect("notify::fullscreened", self.on_fullscreened) self._connection_panel.connect('connection-changed', self.on_connection_panel_connection_changed) self.panel_stack.connect('notify::visible-child', self.on_stack_switched) self._server_panel.connect('change-output-device', self.on_server_panel_output_device_changed) @@ -176,7 +180,6 @@ class Window(Gtk.ApplicationWindow): self.set_default_size(self._state.width, self._state.height) if self._state.get_property(WindowState.IS_MAXIMIZED): self.maximize() - self.show_all() self.content_stack.set_visible_child(self._connection_panel) if self._settings.get_boolean(Window.SETTING_CONNECTED): self._connect() @@ -228,7 +231,7 @@ class Window(Gtk.ApplicationWindow): def on_menu_toggle_fullscreen(self, action, value): - self.panel_stack.set_visible_child(self._cover_panel) + self.panel_stack.set_visible_child(self.cover_panel_page) if not self._state.get_property(WindowState.IS_FULLSCREENED): self.fullscreen() else: @@ -236,52 +239,36 @@ class Window(Gtk.ApplicationWindow): def on_menu_search_library(self, action, value): - self.panel_stack.set_visible_child(self._library_panel) + self.panel_stack.set_visible_child(self.library_panel_page) self._library_panel.show_search() # Window callbacks - @Gtk.Template.Callback() def on_resize(self, widget, event): - if not self._state.get_property(WindowState.IS_MAXIMIZED): - size = self.get_size() - self._state.set_property(WindowState.WIDTH, size.width) - self._state.set_property(WindowState.HEIGHT, size.height) + width = self.get_size(Gtk.Orientation.HORIZONTAL) + height = self.get_size(Gtk.Orientation.VERTICAL) + if width > 0: + self._cover_panel.set_width(width) + if not self._state.get_property(WindowState.IS_MAXIMIZED): + self._state.set_property(WindowState.WIDTH, width) + self._state.set_property(WindowState.HEIGHT, height) - @Gtk.Template.Callback() - def on_state(self, widget, state): - self._state.set_property(WindowState.IS_MAXIMIZED, (state.new_window_state & Gdk.WindowState.MAXIMIZED > 0)) - self._fullscreen((state.new_window_state & Gdk.WindowState.FULLSCREEN > 0)) + def on_maximized(self, widget, maximized): + self._state.set_property(WindowState.IS_MAXIMIZED, maximized is True) + + + def on_fullscreened(self, widget, fullscreened): + self._fullscreen(fullscreened is True) # HeaderBar callbacks - @Gtk.Template.Callback() - def on_headerbar_connection_active_notify(self, widget, status): - self._connect() - - @Gtk.Template.Callback() def on_headerbar_connection_state_set(self, widget, state): - return True - - - @Gtk.Template.Callback() - def on_headerbar_volume_press(self, widget, active): - self._changing_volume = active - - - @Gtk.Template.Callback() - def on_headerbar_volume_release(self, widget, active): - self._changing_volume = active - - - @Gtk.Template.Callback() - def on_headerbar_playpause_toggled(self, widget): - self._mcg.playpause() - self._mcg.get_status() + if self._headerbar_connection_button_active: + self._connect() @Gtk.Template.Callback() @@ -290,17 +277,11 @@ class Window(Gtk.ApplicationWindow): self._mcg.set_volume(int(value*100)) - # Infobar callback - @Gtk.Template.Callback() - def on_info_bar_close(self, *args): - self.info_revealer.set_reveal_child(False) - - - @Gtk.Template.Callback() - def on_info_bar_response(self, widget, response): - self.info_revealer.set_reveal_child(False) - + def on_headerbar_playpause_toggled(self, widget): + if self._headerbar_playpause_button_active: + self._mcg.playpause() + self._mcg.get_status() # Panel callbacks @@ -310,13 +291,13 @@ class Window(Gtk.ApplicationWindow): self._save_visible_panel() self._set_menu_visible_panel() for panel in self._panels: - panel.set_selected(panel == self.panel_stack.get_visible_child()) GObject.idle_add( self.panel_stack.child_set_property, self.panel_stack.get_visible_child(), 'needs-attention', False ) + panel.set_selected(panel == self.panel_stack.get_visible_child()) def on_panel_open_standalone(self, panel): self.set_titlebar(panel.get_headerbar_standalone()) @@ -450,9 +431,7 @@ class Window(Gtk.ApplicationWindow): # Status self._server_panel.set_status(file, audio, bitrate, error) # Error - if error is None: - self.info_revealer.set_reveal_child(False) - else: + if error: self._show_error(error) @@ -593,58 +572,39 @@ class Window(Gtk.ApplicationWindow): def _set_play(self): - self.headerbar_button_playpause.handler_block_by_func( - self.on_headerbar_playpause_toggled - ) + self._headerbar_playpause_button_active = False self.headerbar_button_playpause.set_active(True) - self.headerbar_button_playpause.handler_unblock_by_func( - self.on_headerbar_playpause_toggled - ) + self._headerbar_playpause_button_active = True def _set_pause(self): - self.headerbar_button_playpause.handler_block_by_func( - self.on_headerbar_playpause_toggled - ) + self._headerbar_playpause_button_active = False self.headerbar_button_playpause.set_active(False) - self.headerbar_button_playpause.handler_unblock_by_func( - self.on_headerbar_playpause_toggled - ) + self._headerbar_playpause_button_active = True def _set_volume(self, volume): if volume >= 0: self.headerbar_button_volume.set_visible(True) - if not self._changing_volume: - self._setting_volume = True - self.headerbar_button_volume.set_value(volume / 100) - self._setting_volume = False + self._setting_volume = True + self.headerbar_button_volume.set_value(volume / 100) + self._setting_volume = False else: self.headerbar_button_volume.set_visible(False) def _headerbar_connected(self): - self.headerbar_button_connect.handler_block_by_func( - self.on_headerbar_connection_active_notify - ) + self._headerbar_connection_button_active = False self.headerbar_button_connect.set_active(True) self.headerbar_button_connect.set_state(True) - self.headerbar_button_connect.handler_unblock_by_func( - self.on_headerbar_connection_active_notify - ) - self.headerbar_title_stack.set_visible_child(self.headerbar_panel_switcher) + self._headerbar_connection_button_active = True def _headerbar_disconnected(self): - self.headerbar_button_connect.handler_block_by_func( - self.on_headerbar_connection_active_notify - ) + self._headerbar_connection_button_active = False self.headerbar_button_connect.set_active(False) self.headerbar_button_connect.set_state(False) - self.headerbar_button_connect.handler_unblock_by_func( - self.on_headerbar_connection_active_notify - ) - self.headerbar_title_stack.set_visible_child(self.headerbar_connection_label) + self._headerbar_connection_button_active = True def _set_headerbar_sensitive(self, sensitive, connecting): @@ -655,6 +615,4 @@ class Window(Gtk.ApplicationWindow): def _show_error(self, message): - self.info_bar.set_message_type(Gtk.MessageType.ERROR) - self.info_label.set_text(message) - self.info_revealer.set_reveal_child(True) + self.info_toast.add_toast(Adw.Toast.new(message))