diff --git a/data/gtk.css b/data/gtk.css
index 469b262..1b361de 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,17 @@
font-weight:bold;
}
-revealer.sidebar > * {
- background-color:alpha(@theme_bg_color, 0.8);
- box-shadow:0 0 10px @theme_bg_color;
- margin-left:20px
+window.fullscreen #cover_box {
+ background: black;
}
-revealer.sidebar scale mark indicator {
+#cover_info_revealer {
+ background-color:alpha(@theme_bg_color, 0.8);
+ box-shadow:0 0 10px @theme_bg_color;
+ margin-left:20px;
+}
+
+#cover_info_revealer scale mark indicator {
margin-right:5px;
}
@@ -32,24 +48,13 @@ actionbar {
background-color:@theme_unfocused_bg_color;
}
-/* Icon View in regular mode */
-iconview.view:selected,
-iconview.view:selected:focus {
- background-color:@theme_selected_bg_color;
+gridview child {
+ padding: 1px;
}
-iconview.view:hover {
- -gtk-icon-effect:highlight;
+gridview.selection child {
+ opacity: 0.5;
}
-
-/* Icon View in selection mode */
-iconview.view.selection {
- -gtk-icon-effect:dim;
-}
-iconview.view.selection:selected,
-iconview.view.selection:selected:focus {
- background-color:@theme_selected_bg_color;
- -gtk-icon-effect:highlight;
-}
-iconview.view.selection:hover {
- -gtk-icon-effect:none;
+gridview.selection child:hover,
+gridview.selection child:selected {
+ opacity: 1;
}
diff --git a/data/ui/album-headerbar.ui b/data/ui/album-headerbar.ui
index 76ade01..376c07c 100644
--- a/data/ui/album-headerbar.ui
+++ b/data/ui/album-headerbar.ui
@@ -1,8 +1,10 @@
-
-
-
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 @@
-
-
-
-
-
- True
- False
- vertical
-
-
-
-
- True
- False
- 0
-
-
-
+
diff --git a/data/ui/cover-panel.ui b/data/ui/cover-panel.ui
index 304d9d0..c4557f2 100644
--- a/data/ui/cover-panel.ui
+++ b/data/ui/cover-panel.ui
@@ -1,199 +1,159 @@
-
-
-
- True
- False
-
-
-
- -1
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
-
-
-
- True
- False
- 6
- end
-
-
-
- False
- False
- 0
- True
-
-
-
-
diff --git a/data/ui/gtk.menu.ui b/data/ui/gtk.menu.ui
deleted file mode 100644
index b944502..0000000
--- a/data/ui/gtk.menu.ui
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
diff --git a/data/ui/info-dialog.ui b/data/ui/info-dialog.ui
deleted file mode 100644
index bdd14f2..0000000
--- a/data/ui/info-dialog.ui
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
- False
- False
- True
- center
- dialog
- center
- CoverGrid
- 3.2.1
- CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks.
- http://www.suruatoel.xyz/codes/mcg
- xyz.suruatoel.mcg
- gpl-3-0
-
-
-
-
-
diff --git a/data/ui/library-panel.ui b/data/ui/library-panel.ui
index 0e499d9..3ac79a7 100644
--- a/data/ui/library-panel.ui
+++ b/data/ui/library-panel.ui
@@ -1,303 +1,339 @@
-
-
-
- True
- False
- slide-left-right
-
-
-
-
- False
- True
- 3
-
-
-
-
- page0
- page0
-
-
-
-
-
- True
- True
- 0
-
+
+
+
+
-
-
-
- page1
- page1
- 1
-
-
-
+
diff --git a/data/ui/library-toolbar.ui b/data/ui/library-toolbar.ui
deleted file mode 100644
index aabcc8f..0000000
--- a/data/ui/library-toolbar.ui
+++ /dev/null
@@ -1,248 +0,0 @@
-
-
-
-
-
-
-
- True
- False
- 6
- end
-
-
-
- False
- False
- 0
- True
-
-
-
-
-
- False
- False
- 1
- True
-
-
-
-
-
- False
- False
- 2
- True
-
-
-
-
diff --git a/data/ui/playlist-panel.ui b/data/ui/playlist-panel.ui
index 9ee8b7a..8796afc 100644
--- a/data/ui/playlist-panel.ui
+++ b/data/ui/playlist-panel.ui
@@ -1,194 +1,182 @@
-
-
-
- True
- False
- slide-left-right
-
-
-
-
- False
- True
- end
- 1
-
-
-
-
- page2
- page2
-
-
-
-
-
- True
- True
- 0
-
+
+
+
-
-
- False
- True
- 1
-
+
-
-
- page1
- page1
- 1
-
-
-
+
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 @@
-
-
-
-
-
- True
- False
- 6
- end
-
-
-
- False
- False
- 0
- True
-
-
-
-
-
- False
- False
- 1
- True
-
-
-
-
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 @@
-
-
-
- True
- False
-
-
-
- False
- True
- 0
-
-
-
-
+
+
-
-
-
- page2
- Audio Devices
- 2
-
-
-
-
- True
- True
- 1
-
-
-
+
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 @@
-
-
-
-
-
- True
- False
- vertical
- start
-
-
-
-
-
diff --git a/data/ui/shortcuts-dialog.ui b/data/ui/shortcuts-dialog.ui
index 8109201..279c992 100644
--- a/data/ui/shortcuts-dialog.ui
+++ b/data/ui/shortcuts-dialog.ui
@@ -1,9 +1,10 @@
-
+
+
- True
+ 1
diff --git a/data/xyz.suruatoel.mcg.gresource.xml b/data/xyz.suruatoel.mcg.gresource.xml
index 9ebd10e..243d7d3 100644
--- a/data/xyz.suruatoel.mcg.gresource.xml
+++ b/data/xyz.suruatoel.mcg.gresource.xml
@@ -4,18 +4,15 @@
gtk.css
noise-texture.png
ui/window.ui
+
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..5665b55 100644
--- a/src/application.py
+++ b/src/application.py
@@ -5,11 +5,12 @@ 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
+#from .infodialog import InfoDialog
@@ -25,9 +26,18 @@ class Application(Gtk.Application):
self._window = None
self._info_dialog = None
self._verbosity = logging.WARNING
- #self.create_action('quit', self.quit, ['q'])
- #self.create_action('about', self.on_about_action)
- #self.create_action('preferences', self.on_preferences_action)
+ self.set_accels_for_action('window.close', ['q'])
+ self.set_accels_for_action('win.show-help-overlay', ['k'])
+ self.set_accels_for_action('app.info', ['i'])
+ self.set_accels_for_action('win.connect', ['c'])
+ self.set_accels_for_action('win.play', ['p'])
+ self.set_accels_for_action('win.clear-playlist', ['r'])
+ self.set_accels_for_action('win.toggle-fullscreen', ['F11'])
+ self.set_accels_for_action('win.search-library', ['f'])
+ self.set_accels_for_action('win.panel("0")', ['KP_1'])
+ self.set_accels_for_action('win.panel("1")', ['KP_2'])
+ self.set_accels_for_action('win.panel("2")', ['KP_3'])
+ self.set_accels_for_action('win.panel("3")', ['KP_4'])
def do_startup(self):
@@ -37,7 +47,7 @@ class Application(Gtk.Application):
self._set_default_settings()
self._load_css()
self._setup_actions()
- self._load_appmenu()
+ self._setup_adw()
def do_activate(self):
@@ -48,10 +58,15 @@ class Application(Gtk.Application):
def on_menu_info(self, action, value):
- if not self._info_dialog:
- self._info_dialog = InfoDialog()
- self._info_dialog.run()
- self._info_dialog.hide()
+ self._info_dialog = Adw.AboutDialog()
+ self._info_dialog.set_application_icon("xyz.suruatoel.mcg")
+ self._info_dialog.set_application_name("CoverGrid")
+ self._info_dialog.set_version("3.2.1")
+ self._info_dialog.set_comments("CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks.")
+ self._info_dialog.set_website("https://www.suruatoel.xyz/codes/mcg")
+ self._info_dialog.set_license_type(Gtk.License.GPL_3_0)
+ self._info_dialog.set_issue_url("https://git.suruatoel.xyz/coderkun/mcg")
+ self._info_dialog.present()
def on_menu_quit(self, action, value):
@@ -70,15 +85,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
)
@@ -93,12 +108,18 @@ class Application(Gtk.Application):
self.add_action(action)
- def _load_appmenu(self):
- builder = Gtk.Builder()
- builder.set_translation_domain(Application.DOMAIN)
- builder.add_from_resource(self._get_resource_path('ui/gtk.menu.ui'))
- self.set_app_menu(builder.get_object('app-menu'))
-
-
def _get_resource_path(self, path):
return "/{}/{}".format(Application.ID.replace('.', '/'), path)
+
+
+ def _setup_adw(self):
+ Adw.HeaderBar()
+ Adw.ToolbarView()
+ Adw.ViewSwitcherTitle()
+ Adw.ViewSwitcherBar()
+ Adw.ViewStackPage()
+ Adw.ToastOverlay()
+ Adw.StatusPage()
+ Adw.Flap()
+ Adw.EntryRow()
+ Adw.PasswordEntryRow()
diff --git a/src/client.py b/src/client.py
index 5cc0b11..43de37c 100644
--- a/src/client.py
+++ b/src/client.py
@@ -1121,7 +1121,7 @@ class MCGAlbum:
return True
- def compare(album1, album2, criterion=None):
+ def compare(album1, album2, criterion=None, reverse=False):
if criterion == None:
criterion = SortOrder.TITLE
if criterion == SortOrder.ARTIST:
@@ -1133,20 +1133,22 @@ class MCGAlbum:
elif criterion == SortOrder.MODIFIED:
value_function = "get_last_modified"
+ reverseMultiplier = -1 if reverse else 1
+
value1 = getattr(album1, value_function)()
value2 = getattr(album2, value_function)()
if value1 is None and value2 is None:
return 0
elif value1 is None:
- return -1
+ return -1 * reverseMultiplier
elif value2 is None:
- return 1
+ return 1 * reverseMultiplier
if value1 < value2:
- return -1
+ return -1 * reverseMultiplier
elif value1 == value2:
return 0
else:
- return 1
+ return 1 * reverseMultiplier
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..e221c7d 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,57 +44,61 @@ 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()
+ #self._cover_pixbuf = self._get_default_image()
# Widgets
- self._toolbar = CoverToolbar()
self.cover_stack.set_visible_child(self.cover_scroll)
# Initial actions
GObject.idle_add(self._enable_tracklist)
+ # Click handler for image
+ clickController = Gtk.GestureClick()
+ clickController.connect('pressed', self.on_cover_box_pressed)
+ self.cover_box.add_controller(clickController)
+
+ # Button controller for songs scale
+ buttonController = Gtk.GestureClick()
+ buttonController.connect('pressed', self.on_songs_scale_pressed)
+ buttonController.connect('unpaired-release', self.on_songs_scale_released)
+ self.songs_scale.add_controller(buttonController)
+
def get_toolbar(self):
- return self._toolbar
+ return self.toolbar
def set_selected(self, selected):
- self._is_selected = selected
+ pass
- @Gtk.Template.Callback()
- def on_cover_box_pressed(self, widget, event):
- if self._current_album and event.type == Gdk.EventType._2BUTTON_PRESS:
+ def on_cover_box_pressed(self, widget, npress, x, y):
+ if self._current_album and npress == 2:
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()
- def on_songs_start_change(self, widget, event):
+ def on_songs_scale_pressed(self, widget, npress, x, y):
if self._timer:
GObject.source_remove(self._timer)
self._timer = None
-
- @Gtk.Template.Callback()
- def on_songs_change(self, widget, event):
+ def on_songs_scale_released(self, widget, x, y, npress, sequence):
value = int(self.songs_scale.get_value())
time = self._current_album.get_length()
tracks = self._current_album.get_tracks()
@@ -144,7 +131,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):
@@ -168,13 +155,12 @@ class CoverPanel(Gtk.Overlay):
def set_fullscreen(self, active):
if active:
self.info_revealer.set_reveal_child(False)
- self.cover_box.override_background_color(Gtk.StateFlags.NORMAL, Gdk.RGBA(0, 0, 0, 1))
GObject.idle_add(self._resize_image)
self._fullscreened = True
else:
self._fullscreened = False
- self.info_revealer.set_reveal_child(True)
- self.cover_box.override_background_color(Gtk.StateFlags.NORMAL, Gdk.RGBA(0, 0, 0, 0))
+ if self._current_album:
+ self.info_revealer.set_reveal_child(True)
GObject.idle_add(self._resize_image)
@@ -186,10 +172,10 @@ 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()
+ self._cover_pixbuf = None
self._current_size = None
self._current_cover_album = album
# Show image
@@ -222,7 +208,8 @@ class CoverPanel(Gtk.Overlay):
def _enable_tracklist(self):
if self._current_album:
# enable
- self.info_revealer.set_reveal_child(True)
+ if not self._fullscreened:
+ self.info_revealer.set_reveal_child(True)
else:
# disable
self.info_revealer.set_reveal_child(False)
@@ -236,8 +223,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()
@@ -246,11 +236,14 @@ class CoverPanel(Gtk.Overlay):
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 +252,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 +262,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/infodialog.py b/src/infodialog.py
deleted file mode 100644
index f6421e6..0000000
--- a/src/infodialog.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-
-import gi
-gi.require_version('Gtk', '3.0')
-import logging
-
-from gi.repository import Gtk, GdkPixbuf
-
-
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/info-dialog.ui')
-class InfoDialog(Gtk.AboutDialog):
- __gtype_name__ = 'McgInfoDialog'
diff --git a/src/librarypanel.py b/src/librarypanel.py
index 938d0fe..5feec0c 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -2,135 +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
-
-
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-toolbar.ui')
-class LibraryToolbar(Gtk.ButtonBox):
- __gtype_name__ = 'McgLibraryToolbar'
- __gsignals__ = {
- 'select': (GObject.SIGNAL_RUN_FIRST, None, (bool,)),
- 'toggle-search': (GObject.SIGNAL_RUN_FIRST, None, (bool,)),
- 'update': (GObject.SIGNAL_RUN_FIRST, None, ()),
- 'start-scale': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
- 'end-scale': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
- 'sort': (GObject.SIGNAL_RUN_FIRST, None, (int,)),
- 'sort-type': (GObject.SIGNAL_RUN_FIRST, None, (Gtk.SortType,))
- }
-
- # Widgets
- select_button = Gtk.Template.Child()
- toolbar_search_bar = Gtk.Template.Child()
- toolbar_popover = Gtk.Template.Child()
- toolbar_sort_order_button = Gtk.Template.Child()
- sort_artist = Gtk.Template.Child()
- sort_title = Gtk.Template.Child()
- sort_year = Gtk.Template.Child()
- sort_modified = 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,
- SortOrder.MODIFIED: self.sort_modified
- }
-
-
- @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)
-
-
- def set_sort_order(self, sort):
- button = self._toolbar_sort_buttons[sort]
- if button and not button.get_active():
- button.set_active(True)
-
-
- def set_sort_type(self, sort_type):
- if sort_type:
- self.toolbar_sort_order_button.set_active(True)
- else:
- self.toolbar_sort_order_button.set_active(False)
+from mcg.utils import GridItem
+from mcg.utils import SearchFilter
@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-panel.ui')
-class LibraryPanel(Gtk.Stack):
+class LibraryPanel(Adw.Bin):
__gtype_name__ = 'McgLibraryPanel'
__gsignals__ = {
'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()),
@@ -141,14 +33,27 @@ class LibraryPanel(Gtk.Stack):
'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,))
+ 'sort-type-changed': (GObject.SIGNAL_RUN_FIRST, None, (bool,)),
+ 'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
}
# Widgets
+ library_stack = Gtk.Template.Child()
+ panel_normal = Gtk.Template.Child()
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()
+ toolbar_sort_order_button = Gtk.Template.Child()
+ sort_artist = Gtk.Template.Child()
+ sort_title = Gtk.Template.Child()
+ sort_year = Gtk.Template.Child()
+ sort_modified = Gtk.Template.Child()
+ grid_scale = Gtk.Template.Child()
# Filter/search bar
filter_bar = Gtk.Template.Child()
filter_entry = Gtk.Template.Child()
@@ -160,6 +65,9 @@ class LibraryPanel(Gtk.Stack):
scroll = Gtk.Template.Child()
# Library Grid
library_grid = Gtk.Template.Child()
+ # Action bar (normal)
+ actionbar = Gtk.Template.Child()
+ actionbar_standalone = Gtk.Template.Child()
# Standalone Image
standalone_stack = Gtk.Template.Child()
standalone_spinner = Gtk.Template.Child()
@@ -167,52 +75,51 @@ 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 = {}
self._albums = None
self._host = "localhost"
- self._filter_string = ""
self._item_size = 150
self._sort_order = SortOrder.YEAR
self._sort_type = Gtk.SortType.DESCENDING
self._grid_pixbufs = {}
+ self._grid_width = 0
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)
self._is_selected = False
# Widgets
- self._toolbar = LibraryToolbar(self._item_size)
- self._toolbar.connect('select', self.on_toolbar_select)
- self._toolbar.connect('toggle-search', self.on_toolbar_toggle_search)
- self._toolbar.connect('update', self.on_toolbar_update)
- self._toolbar.connect('start-scale', self.on_toolbar_scale)
- self._toolbar.connect('end-scale', self.on_toolbar_scaled)
- self._toolbar.connect('sort', self.on_toolbar_sort)
- self._toolbar.connect('sort-type', self.on_toolbar_sort_type)
# Header bar
self._headerbar_standalone = AlbumHeaderbar()
self._headerbar_standalone.connect('close', self.on_standalone_close_clicked)
- # 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_filter = Gtk.FilterListModel()
+ self._library_grid_filter.set_model(self._library_grid_model)
+ self._library_grid_selection_multi = Gtk.MultiSelection.new(self._library_grid_filter)
+ self._library_grid_selection_single = Gtk.SingleSelection.new(self._library_grid_filter)
# Library Grid
- self.library_grid.set_model(self._library_grid_filter)
- self.library_grid.set_pixbuf_column(0)
- self.library_grid.set_text_column(-1)
- self.library_grid.set_tooltip_column(1)
+ self.library_grid.set_model(self._library_grid_selection_single)
+ # Toolbar menu
+ self.grid_scale.set_value(self._item_size)
+ self._toolbar_sort_buttons = {
+ SortOrder.ARTIST: self.sort_artist,
+ SortOrder.TITLE: self.sort_title,
+ SortOrder.YEAR: self.sort_year,
+ SortOrder.MODIFIED: self.sort_modified
+ }
+
+ # Button controller for grid scale
+ buttonController = Gtk.GestureClick()
+ buttonController.connect('unpaired-release', self.on_grid_scale_released)
+ self.grid_scale.add_controller(buttonController)
def get_headerbar_standalone(self):
@@ -220,7 +127,7 @@ class LibraryPanel(Gtk.Stack):
def get_toolbar(self):
- return self._toolbar
+ return self.toolbar
def set_selected(self, selected):
@@ -228,101 +135,83 @@ class LibraryPanel(Gtk.Stack):
@Gtk.Template.Callback()
- def on_resize(self, widget, event):
- new_allocation = (widget.get_allocation().width, widget.get_allocation().height)
- if new_allocation == self._allocation:
- return
- self._allocation = new_allocation
- self._toolbar.get_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())
- 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(
- pixel,
- Gtk.PositionType.BOTTOM,
- None
- )
-
-
- def on_toolbar_toggle_search(self, widget, active):
- self.filter_bar.set_search_mode(active)
-
-
- def on_toolbar_select(self, widget, active):
- if active:
+ def on_select_toggled(self, widget):
+ if self.select_button.get_active():
self.actionbar_revealer.set_reveal_child(True)
- self.library_grid.set_selection_mode(Gtk.SelectionMode.MULTIPLE)
+ self.library_grid.set_model(self._library_grid_selection_multi)
+ self.library_grid.set_single_click_activate(False)
self.library_grid.get_style_context().add_class(Utils.CSS_SELECTION)
else:
self.actionbar_revealer.set_reveal_child(False)
- self.library_grid.set_selection_mode(Gtk.SelectionMode.SINGLE)
+ self.library_grid.set_model(self._library_grid_selection_single)
+ self.library_grid.set_single_click_activate(True)
self.library_grid.get_style_context().remove_class(Utils.CSS_SELECTION)
- def on_toolbar_update(self, widget):
+ @Gtk.Template.Callback()
+ def on_update_clicked(self, widget):
self.emit('update')
- def on_toolbar_scale(self, widget, value):
- size = math.floor(value)
- range = self._toolbar.get_grid_scale().get_adjustment()
+ def on_grid_scale_released(self, widget, x, y, npress, sequence):
+ size = math.floor(self.grid_scale.get_value())
+ range = self.grid_scale.get_adjustment()
if size < range.get_lower() or size > range.get_upper():
return
self._item_size = size
- GObject.idle_add(self.library_grid.set_item_padding, size / 100)
- GObject.idle_add(self._set_widget_grid_size, self.library_grid, size, True)
-
-
- def on_toolbar_scaled(self, widget, value):
- size = round(value)
- range = self._toolbar.get_grid_scale().get_adjustment()
- if size < range.get_lower() or size > range.get_upper():
- return False
self.emit('item-size-changed', size)
self._redraw()
- return False
-
-
- def on_toolbar_sort(self, widget, sort):
- self._change_sort(sort)
-
-
- def on_toolbar_sort_type(self, widget, sort_type):
- self._sort_type = sort_type
- self._library_grid_model.set_sort_column_id(2, sort_type)
- self.emit('sort-type-changed', sort_type)
+ GObject.idle_add(self.toolbar_popover.popdown)
@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())
+ def on_grid_scale_changed(self, widget):
+ size = math.floor(self.grid_scale.get_value())
+ range = widget.get_adjustment()
+ if size < range.get_lower() or size > range.get_upper():
+ return
+ self._set_widget_grid_size(self.library_grid, size, True)
+
+
+ @Gtk.Template.Callback()
+ def on_sort_toggled(self, widget):
+ if widget.get_active():
+ self._sort_order = [key for key, value in self._toolbar_sort_buttons.items() if value is widget][0]
+ self._sort_grid_model()
+ self.emit('sort-order-changed', self._sort_order)
+
+
+ @Gtk.Template.Callback()
+ def on_sort_order_toggled(self, button):
+ if button.get_active():
+ self._sort_type = Gtk.SortType.DESCENDING
+ else:
+ self._sort_type = Gtk.SortType.ASCENDING
+ self._sort_grid_model()
+ self.emit('sort-type-changed', button.get_active())
+
+
+ def set_size(self, width, height):
+ self._set_marks()
+ self._resize_standalone_image()
@Gtk.Template.Callback()
def on_filter_entry_changed(self, widget):
- self._filter_string = self.filter_entry.get_text()
- GObject.idle_add(self._library_grid_filter.refilter)
+ self._library_grid_filter.set_filter(SearchFilter(self.filter_entry.get_text()))
@Gtk.Template.Callback()
- def on_library_grid_clicked(self, widget, path):
+ def on_library_grid_clicked(self, widget, position):
# Get selected album
- path = self._library_grid_filter.convert_path_to_child_path(path)
- iter = self._library_grid_model.get_iter(path)
- id = self._library_grid_model.get_value(iter, 2)
- album = self._albums[id]
+ item = self._library_grid_filter.get_item(position)
+ album = item.get_album()
+ id = album.get_id()
self._selected_albums = [album]
self.emit('albumart', id)
# Show standalone album
- if widget.get_selection_mode() == Gtk.SelectionMode.SINGLE:
+ if widget.get_model() == self._library_grid_selection_single:
# Set labels
self._headerbar_standalone.set_album(album)
@@ -334,39 +223,15 @@ class LibraryPanel(Gtk.Stack):
self.standalone_spinner.start()
- @Gtk.Template.Callback()
- def on_library_grid_selection_changed(self, widget):
- self._selected_albums = []
- for path in widget.get_selected_items():
- path = self._library_grid_filter.convert_path_to_child_path(path)
- iter = self._library_grid_model.get_iter(path)
- id = self._library_grid_model.get_value(iter, 2)
- self._selected_albums.insert(0, self._albums[id])
-
-
- def on_filter_visible(self, model, iter, data):
- id = model.get_value(iter, 2)
- if not id in self._albums.keys():
- return
- album = self._albums[id]
- return album.filter(self._filter_string)
-
-
@Gtk.Template.Callback()
def on_selection_cancel_clicked(self, widget):
- self._toolbar.exit_selection()
+ self.select_button.set_active(False)
@Gtk.Template.Callback()
def on_selection_add_clicked(self, widget):
- ids = [album.get_id() for album in self._selected_albums]
- self.emit('queue-multiple', ids)
- self._toolbar.exit_selection()
-
-
- @Gtk.Template.Callback()
- def on_standalone_scroll_size_allocate(self, widget, allocation):
- self._resize_standalone_image()
+ self.emit('queue-multiple', self._get_selected_albums())
+ self.select_button.set_active(False)
@Gtk.Template.Callback()
@@ -392,7 +257,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()
@@ -401,26 +266,21 @@ class LibraryPanel(Gtk.Stack):
def set_sort_order(self, sort):
- if self._sort_order != sort:
- self._toolbar.set_sort_order(sort)
- self._sort_order = sort
- self._library_grid_model.set_sort_func(2, self.compare_albums, self._sort_order)
-
-
- def get_sort_order(self):
- return self._sort_order
+ button = self._toolbar_sort_buttons[sort]
+ if button:
+ self._sort_order = [key for key, value in self._toolbar_sort_buttons.items() if value is button][0]
+ if not button.get_active():
+ button.set_active(True)
+ self._sort_grid_model()
def set_sort_type(self, sort_type):
- if self._sort_type != sort_type:
- self._toolbar.set_sort_type(sort_type)
- if sort_type:
- sort_type_gtk = Gtk.SortType.DESCENDING
- else:
- sort_type_gtk = Gtk.SortType.ASCENDING
- if self._sort_type != sort_type_gtk:
- self._sort_type = sort_type_gtk
- self._library_grid_model.set_sort_column_id(2, sort_type)
+ sort_type_gtk = Gtk.SortType.DESCENDING if sort_type else Gtk.SortType.ASCENDING
+
+ if sort_type_gtk != self._sort_type:
+ self._sort_type = sort_type_gtk
+ self.toolbar_sort_order_button.set_active(sort_type)
+ self._sort_grid_model()
def get_sort_type(self):
@@ -456,26 +316,20 @@ class LibraryPanel(Gtk.Stack):
GObject.idle_add(self._show_image)
- def compare_albums(self, model, row1, row2, criterion):
- id1 = model.get_value(row1, 2)
- id2 = model.get_value(row2, 2)
+ def _sort_grid_model(self):
+ GObject.idle_add(self._library_grid_model.sort, self._grid_model_compare_func, self._sort_order, self._sort_type)
- if not id1 or not id2:
- return
- return client.MCGAlbum.compare(self._albums[id1], self._albums[id2], criterion)
+
+ def _grid_model_compare_func(self, item1, item2, criterion, order):
+ return client.MCGAlbum.compare(item1.get_album(), item2.get_album(), criterion, (order == Gtk.SortType.DESCENDING))
def stop_threads(self):
self._library_stop.set()
- def _change_sort(self, sort):
- self._sort_order = sort
- self._library_grid_model.set_sort_func(2, self.compare_albums, sort)
- self.emit('sort-order-changed', sort)
-
-
def _set_albums(self, host, albums, size):
+ """
if not self._is_selected and albums != self._albums:
GObject.idle_add(
self.get_parent().child_set_property,
@@ -483,15 +337,15 @@ class LibraryPanel(Gtk.Stack):
'needs-attention',
True
)
+ """
self._library_lock.acquire()
- self._library_stop.clear()
self._albums = albums
+ stack_transition_type = self.stack.get_transition_type()
+ GObject.idle_add(self.stack.set_transition_type, Gtk.StackTransitionType.NONE)
GObject.idle_add(self.stack.set_visible_child, self.progress_box)
GObject.idle_add(self.progress_bar.set_fraction, 0.0)
- GObject.idle_add(self.library_grid.set_item_padding, size / 100)
- self.library_grid.set_model(None)
- self.library_grid.freeze_child_notify()
- self._library_grid_model.clear()
+ GObject.idle_add(self.stack.set_transition_type, stack_transition_type)
+ GObject.idle_add(self._library_grid_model.remove_all)
i = 0
n = len(albums)
@@ -506,38 +360,27 @@ class LibraryPanel(Gtk.Stack):
# Exception is handled by client
pass
except Exception as e:
- self._logger.exception("Failed to load albumart")
+ self._logger.exception("Failed to load albumart", e)
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
- ])
+ GObject.idle_add(self._library_grid_model.append, GridItem(album, pixbuf))
i += 1
GObject.idle_add(self.progress_bar.set_fraction, i/n)
GObject.idle_add(self.progress_bar.set_text, locale.gettext("Loading images"))
- if self._library_stop.is_set():
- self._library_lock.release()
- return
- self.library_grid.set_model(self._library_grid_filter)
- self.library_grid.thaw_child_notify()
- self.library_grid.set_item_width(-1)
self._library_lock.release()
- self.stack.set_visible_child(self.scroll)
+ GObject.idle_add(self.stack.set_visible_child, self.scroll)
+ self._sort_grid_model()
def _set_widget_grid_size(self, grid_widget, size, vertical):
@@ -548,50 +391,31 @@ class LibraryPanel(Gtk.Stack):
def _set_widget_grid_size_thread(self, grid_widget, size, vertical):
self._library_lock.acquire()
self._library_stop.clear()
- grid_filter = grid_widget.get_model()
- grid_model = grid_filter.get_model()
-
- # get old_range
- grid_widget_id = id(grid_widget)
- if grid_widget_id not in self._old_ranges or self._old_ranges[grid_widget_id] is None:
- self._old_ranges[grid_widget_id] = range(0, len(grid_filter))
- old_range = self._old_ranges[grid_widget_id]
- old_start = len(old_range) > 0 and old_range[0] or 0
- old_end = len(old_range) > 0 and old_range[len(old_range)-1] + 1 or 0
-
- # calculate visible range
- w = (grid_widget.get_allocation().width // size) + (vertical and 0 or 1)
- h = (grid_widget.get_allocation().height // size) + (vertical and 1 or 0)
- c = w * h
- vis_range = grid_widget.get_visible_range()
- if vis_range is None:
+ if size == self._item_size:
self._library_lock.release()
return
- (vis_start,), (vis_end,) = vis_range
- vis_end = min(vis_start + c, len(grid_filter))
- vis_range = range(vis_start, vis_end)
-
- # set pixbuf
- cur_start = min(old_start, vis_start)
- cur_end = max(old_end, vis_end)
- cur_range = range(cur_start, cur_end)
- for index in cur_range:
- iter = grid_filter.convert_iter_to_child_iter(grid_filter[index].iter)
- if index in vis_range:
- album_id = grid_model.get_value(iter, 2)
- pixbuf = self._grid_pixbufs[album_id]
+ for i in range(self._library_grid_model.get_n_items()):
+ grid_item = self._library_grid_model.get_item(i)
+ album_id = grid_item.get_album().get_id()
+
+ pixbuf = self._grid_pixbufs[album_id]
+ if pixbuf is not None:
pixbuf = pixbuf.scale_simple(size, size, GdkPixbuf.InterpType.NEAREST)
else:
- pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, False, 8, 1, 1)
- grid_model.set_value(iter, 0, pixbuf)
+ pixbuf = self._icon_theme.lookup_icon(
+ Utils.STOCK_ICON_DEFAULT,
+ None,
+ size,
+ size,
+ Gtk.TextDirection.LTR,
+ Gtk.IconLookupFlags.FORCE_SYMBOLIC
+ )
+ GObject.idle_add(grid_item.set_cover, pixbuf)
if self._library_stop.is_set():
self._library_lock.release()
return
- self._old_ranges[grid_widget_id] = vis_range
- grid_widget.set_item_width(size)
-
self._library_lock.release()
@@ -606,13 +430,34 @@ class LibraryPanel(Gtk.Stack):
self.set_albums(self._host, self._albums)
+ def _set_marks(self):
+ width = self.scroll.get_width()
+ if width == self._grid_width:
+ return
+ self._grid_width = width
+ self.grid_scale.clear_marks()
+
+ 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.grid_scale.add_mark(
+ pixel,
+ Gtk.PositionType.BOTTOM,
+ None
+ )
+
+
def _open_standalone(self):
- self.set_visible_child(self.panel_standalone)
+ self.library_stack.set_visible_child(self.panel_standalone)
self.emit('open-standalone')
def _close_standalone(self):
- self.set_visible_child(self.get_children()[0])
+ self.library_stack.set_visible_child(self.panel_normal)
self.emit('close-standalone')
@@ -620,15 +465,19 @@ class LibraryPanel(Gtk.Stack):
"""Diese Methode skaliert das geladene Bild aus dem Pixelpuffer
auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse
"""
+ # Get size
+ size_width = self.standalone_stack.get_width()
+ size_height = self.standalone_stack.get_height()
+
+ # Get pixelbuffer
pixbuf = self._standalone_pixbuf
- size = self.standalone_scroll.get_allocation()
# Check pixelbuffer
if pixbuf is None:
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)
@@ -638,18 +487,24 @@ class LibraryPanel(Gtk.Stack):
if width <= 0 or height <= 0:
return
# Pixelpuffer auf Oberfläche zeichnen
- self.standalone_image.set_allocation(self.standalone_scroll.get_allocation())
self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
self.standalone_image.show()
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
)
-
-
+ def _get_selected_albums(self):
+ albums = []
+ for i in range(self.library_grid.get_model().get_n_items()):
+ if self.library_grid.get_model().is_selected(i):
+ albums.append(self.library_grid.get_model().get_item(i).get_album())
+ return albums
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/meson.build b/src/meson.build
index 2ea68ea..d30b1c7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -25,7 +25,6 @@ mcg_sources = [
'client.py',
'connectionpanel.py',
'coverpanel.py',
- 'infodialog.py',
'librarypanel.py',
'playlistpanel.py',
'serverpanel.py',
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index a268233..f9f77ce 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, ()),
@@ -60,13 +28,19 @@ class PlaylistPanel(Gtk.Stack):
'remove-album': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
'remove-multiple-albums': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
'play': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT,)),
- 'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,))
+ 'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str,)),
}
# Widgets
+ playlist_stack = Gtk.Template.Child()
+ panel_normal = Gtk.Template.Child()
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 +53,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,25 +62,21 @@ 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
# Widgets
- self._toolbar = PlaylistToolbar()
- self._toolbar.connect('select', self.on_toolbar_select)
- self._toolbar.connect('clear-playlist', self.on_toolbar_clear)
# Header bar
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_multi = Gtk.MultiSelection.new(self._playlist_grid_model)
+ self._playlist_grid_selection_single = Gtk.SingleSelection.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_single)
def get_headerbar_standalone(self):
@@ -114,39 +84,43 @@ class PlaylistPanel(Gtk.Stack):
def get_toolbar(self):
- return self._toolbar
+ return self.toolbar
def set_selected(self, selected):
self._is_selected = selected
- def on_toolbar_select(self, widget, active):
- if active:
+ @Gtk.Template.Callback()
+ def on_select_toggled(self, widget):
+ if self.select_button.get_active():
self.actionbar_revealer.set_reveal_child(True)
- self.playlist_grid.set_selection_mode(Gtk.SelectionMode.MULTIPLE)
+ self.playlist_grid.set_model(self._playlist_grid_selection_multi)
+ self.playlist_grid.set_single_click_activate(False)
self.playlist_grid.get_style_context().add_class(Utils.CSS_SELECTION)
else:
self.actionbar_revealer.set_reveal_child(False)
- self.playlist_grid.set_selection_mode(Gtk.SelectionMode.SINGLE)
+ self.playlist_grid.set_model(self._playlist_grid_selection_single)
+ self.playlist_grid.set_single_click_activate(True)
self.playlist_grid.get_style_context().remove_class(Utils.CSS_SELECTION)
- def on_toolbar_clear(self, widget):
+ @Gtk.Template.Callback()
+ def on_clear_clicked(self, widget):
self.emit('clear-playlist')
@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:
+ if widget.get_model() == self._playlist_grid_selection_single:
# Set labels
self._headerbar_standalone.set_album(album)
@@ -158,29 +132,15 @@ class PlaylistPanel(Gtk.Stack):
self.standalone_spinner.start()
- @Gtk.Template.Callback()
- def on_playlist_grid_selection_changed(self, widget):
- self._selected_albums = []
- for path in widget.get_selected_items():
- iter = self._playlist_grid_model.get_iter(path)
- hash = self._playlist_grid_model.get_value(iter, 2)
- self._selected_albums.append(self._playlist_albums[hash])
-
-
@Gtk.Template.Callback()
def on_selection_cancel_clicked(self, widget):
- self._toolbar.exit_selection()
+ self.select_button.set_active(False)
@Gtk.Template.Callback()
def on_selection_remove_clicked(self, widget):
- self.emit('remove-multiple-albums', self._selected_albums)
- self._toolbar.exit_selection()
-
-
- @Gtk.Template.Callback()
- def on_standalone_scroll_size_allocate(self, widget, allocation):
- self._resize_standalone_image()
+ self.emit('remove-multiple-albums', self._get_selected_albums())
+ self.select_button.set_active(False)
def on_headerbar_close_clicked(self, widget):
@@ -189,16 +149,20 @@ class PlaylistPanel(Gtk.Stack):
@Gtk.Template.Callback()
def on_standalone_remove_clicked(self, widget):
- self.emit('remove-album', self._selected_albums[0])
+ self.emit('remove-album', self._get_selected_albums()[0])
self._close_standalone()
@Gtk.Template.Callback()
def on_standalone_play_clicked(self, widget):
- self.emit('play', self._selected_albums[0])
+ self.emit('play', self._get_selected_albums()[0])
self._close_standalone()
+ def set_size(self, width, height):
+ self._resize_standalone_image()
+
+
def set_item_size(self, item_size):
if self._item_size != item_size:
self._item_size = item_size
@@ -235,6 +199,7 @@ class PlaylistPanel(Gtk.Stack):
def _set_playlist(self, host, playlist, size):
+ """
if not self._is_selected and self._playlist != playlist:
GObject.idle_add(
self.get_parent().child_set_property,
@@ -242,16 +207,14 @@ class PlaylistPanel(Gtk.Stack):
'needs-attention',
True
)
+ """
self._playlist_lock.acquire()
self._playlist_stop.clear()
self._playlist = playlist
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,31 +228,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()
- # TODO why set_columns()?
- #self.playlist_grid.set_columns(len(playlist))
+ self.playlist_grid.set_model(self._playlist_grid_selection_single)
self._playlist_lock.release()
@@ -305,12 +259,12 @@ class PlaylistPanel(Gtk.Stack):
def _open_standalone(self):
- self.set_visible_child(self.panel_standalone)
+ self.playlist_stack.set_visible_child(self.panel_standalone)
self.emit('open-standalone')
def _close_standalone(self):
- self.set_visible_child(self.get_children()[0])
+ self.playlist_stack.set_visible_child(self.panel_normal)
self.emit('close-standalone')
@@ -318,15 +272,19 @@ class PlaylistPanel(Gtk.Stack):
"""Diese Methode skaliert das geladene Bild aus dem Pixelpuffer
auf die Größe des Fensters unter Beibehalt der Seitenverhältnisse
"""
+ # Get size
+ size_width = self.standalone_stack.get_width()
+ size_height = self.standalone_stack.get_height()
+
+ # Get pixelbuffer
pixbuf = self._standalone_pixbuf
- size = self.standalone_scroll.get_allocation()
# Check pixelbuffer
if pixbuf is None:
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)
@@ -336,18 +294,24 @@ class PlaylistPanel(Gtk.Stack):
if width <= 0 or height <= 0:
return
# Pixelpuffer auf Oberfläche zeichnen
- self.standalone_image.set_allocation(self.standalone_scroll.get_allocation())
self.standalone_image.set_from_pixbuf(pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER))
self.standalone_image.show()
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
)
-
-
+ def _get_selected_albums(self):
+ albums = []
+ for i in range(self.playlist_grid.get_model().get_n_items()):
+ if self.playlist_grid.get_model().is_selected(i):
+ albums.append(self.playlist_grid.get_model().get_item(i).get_album())
+ return albums
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/shortcutsdialog.py b/src/shortcutsdialog.py
index f73864e..6bf16e5 100644
--- a/src/shortcutsdialog.py
+++ b/src/shortcutsdialog.py
@@ -2,8 +2,8 @@
import gi
-gi.require_version('Gtk', '3.0')
-
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
from gi.repository import Gtk
diff --git a/src/utils.py b/src/utils.py
index e5a08bd..3f2ef3a 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, Gtk
@@ -87,3 +87,47 @@ class SortOrder:
TITLE = 1
YEAR = 2
MODIFIED = 3
+
+
+
+
+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
+
+
+ def set_cover(self, cover):
+ self.cover = Gdk.Texture.new_for_pixbuf(cover)
+
+
+
+
+class SearchFilter(Gtk.Filter):
+
+
+ def __init__(self, search_string):
+ super().__init__()
+ self._search_string = search_string
+
+
+ def do_match(self, grid_item):
+ return grid_item.get_album().filter(self._search_string)
diff --git a/src/window.py b/src/window.py
index c0dd46c..ae2a2e8 100644
--- a/src/window.py
+++ b/src/window.py
@@ -2,16 +2,18 @@
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
except:
use_keyring = False
+use_keyring = False
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 +45,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'
@@ -58,33 +60,33 @@ class Window(Gtk.ApplicationWindow):
_CUSTOM_STARTUP_COMPLETE = 'startup-complete'
# Widgets
+ toolbar_view = Gtk.Template.Child()
content_stack = Gtk.Template.Child()
panel_stack = Gtk.Template.Child()
toolbar_stack = Gtk.Template.Child()
# Headerbar
headerbar = Gtk.Template.Child()
- headerbar_title_stack = Gtk.Template.Child()
+ #headerbar_title_stack = Gtk.Template.Child()
headerbar_panel_switcher = Gtk.Template.Child()
- headerbar_connection_label = Gtk.Template.Child()
+ #headerbar_connection_label = Gtk.Template.Child()
headerbar_button_connect = Gtk.Template.Child()
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())
@@ -108,19 +110,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.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(self._playlist_panel, 'playlist-panel', locale.gettext("Playlist"))
- self.panel_stack.add_titled(self._library_panel, 'library-panel', locale.gettext("Library"))
+ self.content_stack.add_child(self._connection_panel)
+ self.panel_stack.add_titled_with_icon(self._server_panel, 'server-panel', locale.gettext("Server"), "network-wired-symbolic")
+ self.panel_stack.add_titled_with_icon(self._cover_panel, 'cover-panel', locale.gettext("Cover"), "image-x-generic-symbolic")
+ self.panel_stack.add_titled_with_icon(self._playlist_panel, 'playlist-panel', locale.gettext("Playlist"), "view-list-symbolic")
+ self.panel_stack.add_titled_with_icon(self._library_panel, 'library-panel', locale.gettext("Library"), "emblem-music-symbolic")
# 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)
+ #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 +136,10 @@ 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::default-height", 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 +182,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()
@@ -236,52 +241,38 @@ 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)
+ GObject.idle_add(self._playlist_panel.set_size, width, height)
+ GObject.idle_add(self._library_panel.set_size, width, 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(self.is_fullscreen())
# 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 +281,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
@@ -311,19 +296,23 @@ class Window(Gtk.ApplicationWindow):
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
- )
+ #GObject.idle_add(
+ # self.panel_stack.child_set_property,
+ # self.panel_stack.get_visible_child(),
+ # 'needs-attention',
+ # False
+ #)
+
def on_panel_open_standalone(self, panel):
- self.set_titlebar(panel.get_headerbar_standalone())
+ self.toolbar_view.add_top_bar(panel.get_headerbar_standalone())
+ self.toolbar_view.remove(self.headerbar)
- def on_panel_close_standalone(self, headerbar):
- self.set_titlebar(self.headerbar)
+ def on_panel_close_standalone(self, panel):
+ self.toolbar_view.add_top_bar(self.headerbar)
+ self.toolbar_view.remove(panel.get_headerbar_standalone())
+
def on_connection_panel_connection_changed(self, widget, host, port, password):
self._settings.set_string(Window.SETTING_HOST, host)
@@ -397,11 +386,11 @@ class Window(Gtk.ApplicationWindow):
def on_library_panel_sort_order_changed(self, widget, sort_order):
- self._settings.set_enum(Window.SETTING_SORT_ORDER, self._library_panel.get_sort_order())
+ self._settings.set_enum(Window.SETTING_SORT_ORDER, sort_order)
def on_library_panel_sort_type_changed(self, widget, sort_type):
- self._settings.set_boolean(Window.SETTING_SORT_TYPE, self._library_panel.get_sort_type())
+ self._settings.set_boolean(Window.SETTING_SORT_TYPE, sort_type)
def on_library_panel_albumart(self, widget, album):
@@ -450,9 +439,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)
@@ -487,6 +474,8 @@ class Window(Gtk.ApplicationWindow):
def on_mcg_custom(self, name):
+ pass
+ """
if name == Window._CUSTOM_STARTUP_COMPLETE:
for panel in self._panels:
GObject.idle_add(
@@ -495,6 +484,7 @@ class Window(Gtk.ApplicationWindow):
'needs-attention',
False
)
+ """
def on_mcg_error(self, error):
@@ -563,17 +553,11 @@ class Window(Gtk.ApplicationWindow):
if self._state.get_property(WindowState.IS_FULLSCREENED):
self.headerbar.hide()
self._cover_panel.set_fullscreen(True)
- # Hide cursor
- self.get_window().set_cursor(
- Gdk.Cursor.new_from_name(Gdk.Display.get_default(), "none")
- )
+ self.set_cursor(Gdk.Cursor.new_from_name("none", None))
else:
self.headerbar.show()
self._cover_panel.set_fullscreen(False)
- # Reset cursor
- self.get_window().set_cursor(
- Gdk.Cursor.new_from_name(Gdk.Display.get_default(), "default")
- )
+ self.set_cursor(Gdk.Cursor.new_from_name("default", None))
def _save_visible_panel(self):
@@ -593,58 +577,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 +620,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))