mirror/mpdevil
1
0
Fork 0
mirror of https://github.com/SoongNoonien/mpdevil.git synced 2023-08-10 21:12:44 +03:00
Code Issues Projects Releases Wiki Activity

improved internal structure of playlist/cover

Browse Source
This commit is contained in:
Martin Wagner 2020-08-23 12:02:20 +02:00
parent 3b4af8f6a9
commit 94e3d55410
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bin/mpdevil.py
View File

@ -2120,15 +2120,13 @@ class MainCover(Gtk.Frame):
# connect
event_box.connect("button-press-event", self._on_button_press_event)
self._client.emitter.connect("current_song_changed", self._refresh)
self._client.emitter.connect("disconnected", self._on_disconnected)
self._client.emitter.connect("reconnected", self._on_reconnected)
self._settings.connect("changed::track-cover", self._on_settings_changed)
event_box.add(self._cover)
self.add(event_box)
def clear(self, *args):
self._cover.set_from_pixbuf(Cover(self._settings, {}).get_pixbuf(self._settings.get_int("track-cover")))
self.song_file=None
def _refresh(self, *args):
current_song=self._client.wrapped_call("currentsong")
self._cover.set_from_pixbuf(Cover(self._settings, current_song).get_pixbuf(self._settings.get_int("track-cover")))
@ -2161,6 +2159,15 @@ class MainCover(Gtk.Frame):
album_dialog.open()
album_dialog.destroy()
def _on_disconnected(self, *args):
size=self._settings.get_int("track-cover")
self._cover.set_from_pixbuf(Cover(self._settings, {}).get_pixbuf(size))
self.song_file=None
self._cover.set_sensitive(False)
def _on_reconnected(self, *args):
self._cover.set_sensitive(True)
def _on_settings_changed(self, *args):
size=self._settings.get_int("track-cover")
self._cover.set_size_request(size, size)
@ -2282,11 +2289,6 @@ class PlaylistWindow(Gtk.Box):
self.pack_start(frame, True, True, 0)
self.pack_end(action_bar, False, False, 0)
def clear(self, *args):
self._playlist_info.set_text("")
self._store.clear()
self._playlist_version=None
def save_settings(self): # only saves the column sizes
columns=self._treeview.get_columns()
permutation=self._settings.get_value("column-permutation").unpack()
@ -2307,6 +2309,11 @@ class PlaylistWindow(Gtk.Box):
self._columns[i].set_visible(visibilities[i])
self._treeview.append_column(self._columns[i])
def _clear(self, *args):
self._playlist_info.set_text("")
self._store.clear()
self._playlist_version=None
def _refresh_playlist_info(self):
songs=self._client.wrapped_call("playlistinfo")
if songs == []:
@ -2417,7 +2424,7 @@ class PlaylistWindow(Gtk.Box):
self._client.clear()
def _on_disconnected(self, *args):
self.clear()
self._clear()
self._back_to_song_button.set_sensitive(False)
self._clear_button.set_sensitive(False)
@ -2479,7 +2486,6 @@ class CoverLyricsOSD(Gtk.Overlay):
def _on_disconnected(self, *args):
self._lyrics_button.set_sensitive(False)
self._main_cover.clear()
try:
self._lyrics_win.destroy()
except: