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

use gio settings bind where possible

Browse Source
This commit is contained in:
Martin Wagner 2021-05-15 12:28:03 +02:00
parent 6d9db0cfd1
commit c90314d24b
1 changed files with 19 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
bin/mpdevil
View File

@ -2411,10 +2411,10 @@ class Browser(Gtk.Paned):
self._use_csd=self._settings.get_boolean("use-csd") self._use_csd=self._settings.get_boolean("use-csd")
# widgets # widgets
self.back_to_current_album_button=Gtk.Button(icon_name="go-previous-symbolic",tooltip_text=_("Back to current album"),can_focus=False) self.back_button=Gtk.Button(icon_name="go-previous-symbolic",tooltip_text=_("Back to current album"),can_focus=False)
self.search_button=Gtk.ToggleButton(icon_name="system-search-symbolic", tooltip_text=_("Search"), can_focus=False) self.search_button=Gtk.ToggleButton(icon_name="system-search-symbolic", tooltip_text=_("Search"), can_focus=False)
if not self._use_csd: if not self._use_csd:
self._settings.bind("icon-size-sec", self.back_to_current_album_button.get_child(), "pixel-size", Gio.SettingsBindFlags.GET) self._settings.bind("icon-size-sec", self.back_button.get_child(), "pixel-size", Gio.SettingsBindFlags.GET)
self._settings.bind("icon-size-sec", self.search_button.get_child(), "pixel-size", Gio.SettingsBindFlags.GET) self._settings.bind("icon-size-sec", self.search_button.get_child(), "pixel-size", Gio.SettingsBindFlags.GET)
self._genre_select=GenreSelect(self._client) self._genre_select=GenreSelect(self._client)
self._artist_window=ArtistWindow(self._client, self._settings, self._genre_select) self._artist_window=ArtistWindow(self._client, self._settings, self._genre_select)
@ -2423,16 +2423,18 @@ class Browser(Gtk.Paned):
# event controllers TODO # event controllers TODO
gesture_click_button1=Gtk.GestureClick(button=1) gesture_click_button1=Gtk.GestureClick(button=1)
self.back_to_current_album_button.add_controller(gesture_click_button1) self.back_button.add_controller(gesture_click_button1)
gesture_click_button1.connect("pressed", self._on_gesture_click_pressed) gesture_click_button1.connect("pressed", self._on_gesture_click_pressed)
# connect # connect
self.back_to_current_album_button.connect("clicked", self._on_back_to_current_album_button_clicked) self.back_button.connect("clicked", self._on_back_button_clicked)
self.search_button.connect("toggled", self._on_search_toggled) self.search_button.connect("toggled", self._on_search_toggled)
self._artist_window.connect("artists_changed", self._on_artists_changed) self._artist_window.connect("artists_changed", self._on_artists_changed)
self._settings.connect("notify::mini-player", self._on_mini_player)
self._client.emitter.connect("disconnected", self._on_disconnected) self._client.emitter.connect("disconnected", self._on_disconnected)
self._client.emitter.connect("reconnected", self._on_reconnected) self._client.emitter.connect("reconnected", self._on_reconnected)
self._settings.bind("mini-player", self, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET)
self._settings.bind("mini-player", self.back_button, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET)
self._settings.bind("mini-player", self.search_button, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET)
# packing # packing
self._stack=Gtk.Stack(transition_type=Gtk.StackTransitionType.CROSSFADE) self._stack=Gtk.Stack(transition_type=Gtk.StackTransitionType.CROSSFADE)
@ -2442,7 +2444,7 @@ class Browser(Gtk.Paned):
if self._use_csd: if self._use_csd:
hbox.append(self._genre_select) hbox.append(self._genre_select)
else: else:
hbox.append(self.back_to_current_album_button) hbox.append(self.back_button)
hbox.append(self._genre_select) hbox.append(self._genre_select)
hbox.append(self.search_button) hbox.append(self.search_button)
box1=Gtk.Box(orientation=Gtk.Orientation.VERTICAL) box1=Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
@ -2471,7 +2473,7 @@ class Browser(Gtk.Paned):
self._artist_window.select(artist) self._artist_window.select(artist)
self._album_window.scroll_to_current_album() self._album_window.scroll_to_current_album()
def _on_back_to_current_album_button_clicked(self, *args): def _on_back_button_clicked(self, *args):
self._back_to_current_album() self._back_to_current_album()
def _on_gesture_click_pressed(self, controller, n_press, x, y): def _on_gesture_click_pressed(self, controller, n_press, x, y):
@ -2486,23 +2488,17 @@ class Browser(Gtk.Paned):
self._stack.set_visible_child_name("albums") self._stack.set_visible_child_name("albums")
def _on_reconnected(self, *args): def _on_reconnected(self, *args):
self.back_to_current_album_button.set_sensitive(True) self.back_button.set_sensitive(True)
self.search_button.set_sensitive(True) self.search_button.set_sensitive(True)
def _on_disconnected(self, *args): def _on_disconnected(self, *args):
self.back_to_current_album_button.set_sensitive(False) self.back_button.set_sensitive(False)
self.search_button.set_active(False) self.search_button.set_active(False)
self.search_button.set_sensitive(False) self.search_button.set_sensitive(False)
def _on_artists_changed(self, *args): def _on_artists_changed(self, *args):
self.search_button.set_active(False) self.search_button.set_active(False)
def _on_mini_player(self, obj, typestring):
state=obj.get_property("mini-player")
self.set_property("visible", not(state))
self.back_to_current_album_button.set_property("visible", not(state))
self.search_button.set_property("visible", not(state))
###################### ######################
# playlist and cover # # playlist and cover #
###################### ######################
@ -2847,9 +2843,9 @@ class PlaylistWindow(Gtk.Box):
self._client.emitter.connect("reconnected", self._on_reconnected) self._client.emitter.connect("reconnected", self._on_reconnected)
self._client.emitter.connect("show-info", self._on_show_info) self._client.emitter.connect("show-info", self._on_show_info)
self._settings.connect("notify::mini-player", self._on_mini_player)
self._settings.connect("changed::column-visibilities", self._load_settings) self._settings.connect("changed::column-visibilities", self._load_settings)
self._settings.connect("changed::column-permutation", self._load_settings) self._settings.connect("changed::column-permutation", self._load_settings)
self._settings.bind("mini-player", self, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET)
# packing # packing
self.append(self._frame) self.append(self._frame)
@ -3026,16 +3022,6 @@ class PlaylistWindow(Gtk.Box):
x,y=self._treeview.convert_bin_window_to_widget_coords(cell.x, cell.y) x,y=self._treeview.convert_bin_window_to_widget_coords(cell.x, cell.y)
self._song_popover.open(self._store[path][8], x, y) self._song_popover.open(self._store[path][8], x, y)
def _on_mini_player(self, obj, typestring):
# TODO
if obj.get_property("mini-player"):
# self.set_property("no-show-all", True)
self.set_property("visible", False)
else:
self.set_property("visible", True)
# self.set_property("no-show-all", False)
# self.show_all()
class CoverPlaylistWindow(Gtk.Paned): class CoverPlaylistWindow(Gtk.Paned):
def __init__(self, client, settings): def __init__(self, client, settings):
super().__init__(shrink_start_child=False, shrink_end_child=False, resize_start_child=False) super().__init__(shrink_start_child=False, shrink_end_child=False, resize_start_child=False)
@ -3404,7 +3390,7 @@ class PlaybackOptions(Gtk.Box):
self._client.emitter.connect("single", self._single_refresh) self._client.emitter.connect("single", self._single_refresh)
self._client.emitter.connect("disconnected", self._on_disconnected) self._client.emitter.connect("disconnected", self._on_disconnected)
self._client.emitter.connect("reconnected", self._on_reconnected) self._client.emitter.connect("reconnected", self._on_reconnected)
self._settings.connect("notify::mini-player", self._on_mini_player) self._settings.bind("mini-player", self, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET)
def _set_option(self, widget, option): def _set_option(self, widget, option):
func=getattr(self._client, option) func=getattr(self._client, option)
@ -3443,9 +3429,6 @@ class PlaybackOptions(Gtk.Box):
def _on_reconnected(self, *args): def _on_reconnected(self, *args):
self.set_sensitive(True) self.set_sensitive(True)
def _on_mini_player(self, obj, typestring):
self.set_property("visible", not(obj.get_property("mini-player")))
################### ###################
# MPD gio actions # # MPD gio actions #
################### ###################
@ -3746,7 +3729,7 @@ class MainWindow(Gtk.ApplicationWindow):
if self._use_csd: if self._use_csd:
self._header_bar=Gtk.HeaderBar(title_widget=Title()) self._header_bar=Gtk.HeaderBar(title_widget=Title())
self.set_titlebar(self._header_bar) self.set_titlebar(self._header_bar)
self._header_bar.pack_start(self._browser.back_to_current_album_button) self._header_bar.pack_start(self._browser.back_button)
self._header_bar.pack_end(self._menu_button) self._header_bar.pack_end(self._menu_button)
self._header_bar.pack_end(self._browser.search_button) self._header_bar.pack_end(self._browser.search_button)
else: else:
@ -3764,14 +3747,10 @@ class MainWindow(Gtk.ApplicationWindow):
while main.pending(): while main.pending():
main.iteration() main.iteration()
# restore paned settings when window is visible (fixes a bug when window is maximized) # restore paned settings when window is visible (fixes a bug when window is maximized)
self._cover_playlist_window.set_position(self._settings.get_int("paned0")) # auto save and restore paned positions
self._browser.set_position(self._settings.get_int("paned1")) self._settings.bind("paned0", self._cover_playlist_window, "position", Gio.SettingsBindFlags.DEFAULT)
self._paned.set_position(self._settings.get_int("paned2")) self._settings.bind("paned1", self._browser, "position", Gio.SettingsBindFlags.DEFAULT)
self._settings.bind("paned2", self._paned, "position", Gio.SettingsBindFlags.DEFAULT)
# auto save paned positions
self._cover_playlist_window.connect("notify::position", self._on_paned_position, "paned0")
self._browser.connect("notify::position", self._on_paned_position, "paned1")
self._paned.connect("notify::position", self._on_paned_position, "paned2")
# start client # start client
def callback(*args): def callback(*args):
@ -3783,7 +3762,7 @@ class MainWindow(Gtk.ApplicationWindow):
self._cover_playlist_window.lyrics_button.set_active(not(self._cover_playlist_window.lyrics_button.get_active())) self._cover_playlist_window.lyrics_button.set_active(not(self._cover_playlist_window.lyrics_button.get_active()))
def _on_back_to_current_album(self, action, param): def _on_back_to_current_album(self, action, param):
self._browser.back_to_current_album_button.emit("clicked") self._browser.back_button.emit("clicked")
def _on_toggle_search(self, action, param): def _on_toggle_search(self, action, param):
self._browser.search_button.set_active(not(self._browser.search_button.get_active())) self._browser.search_button.set_active(not(self._browser.search_button.get_active()))
@ -3865,9 +3844,6 @@ class MainWindow(Gtk.ApplicationWindow):
for action in ("stats","toggle-lyrics","back-to-current-album","toggle-search"): for action in ("stats","toggle-lyrics","back-to-current-album","toggle-search"):
self.lookup_action(action).set_enabled(False) self.lookup_action(action).set_enabled(False)
def _on_paned_position(self, obj, typestring, key):
self._settings.set_int(key, obj.get_position())
def _on_mini_player(self, obj, typestring): def _on_mini_player(self, obj, typestring):
if obj.get_property("mini-player"): if obj.get_property("mini-player"):
if self.is_maximized(): if self.is_maximized():