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

reworked profile selection

Browse Source
This commit is contained in:
Martin Wagner 2020-02-07 20:13:38 +01:00
parent 2e5ce9bf2b
commit d9e518c687
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/mpdevil.py
View File

@ -138,6 +138,8 @@ class Settings(Gio.Settings):
BASE_KEY = "org.mpdevil" BASE_KEY = "org.mpdevil"
def __init__(self): def __init__(self):
super().__init__(schema=self.BASE_KEY) super().__init__(schema=self.BASE_KEY)
if len(self.get_value("profiles")) < (self.get_int("active-profile")+1):
self.set_int("active-profile", 0)
def array_append(self, vtype, key, value): #append to Gio.Settings (self.settings) array def array_append(self, vtype, key, value): #append to Gio.Settings (self.settings) array
array=self.get_value(key).unpack() array=self.get_value(key).unpack()
@ -1411,15 +1413,13 @@ class ProfileSelect(Gtk.ComboBoxText):
self.settings.connect("changed::paths", self.on_settings_changed) self.settings.connect("changed::paths", self.on_settings_changed)
self.reload() self.reload()
self.handler_block(self.changed)
self.set_active(self.settings.get_int("active-profile"))
self.handler_unblock(self.changed)
def reload(self, *args): def reload(self, *args):
self.handler_block(self.changed) self.handler_block(self.changed)
self.remove_all() self.remove_all()
for profile in self.settings.get_value("profiles"): for profile in self.settings.get_value("profiles"):
self.append_text(profile) self.append_text(profile)
self.set_active(self.settings.get_int("active-profile"))
self.handler_unblock(self.changed) self.handler_unblock(self.changed)
def on_settings_changed(self, *args): def on_settings_changed(self, *args):
@ -1751,6 +1751,7 @@ class MainWindow(Gtk.ApplicationWindow):
self.search_button.connect("clicked", self.on_search_clicked) self.search_button.connect("clicked", self.on_search_clicked)
self.lyrics_button.connect("toggled", self.on_lyrics_toggled) self.lyrics_button.connect("toggled", self.on_lyrics_toggled)
self.info_bar.connect("response", self.on_info_bar_response) self.info_bar.connect("response", self.on_info_bar_response)
self.settings.connect("changed::profiles", self.on_settings_changed)
#unmap space #unmap space
binding_set=Gtk.binding_set_find('GtkTreeView') binding_set=Gtk.binding_set_find('GtkTreeView')
Gtk.binding_entry_remove(binding_set, 32, Gdk.ModifierType.MOD2_MASK) Gtk.binding_entry_remove(binding_set, 32, Gdk.ModifierType.MOD2_MASK)
@ -1774,6 +1775,7 @@ class MainWindow(Gtk.ApplicationWindow):
self.hbox.pack_start(self.go_home_button, False, False, 0) self.hbox.pack_start(self.go_home_button, False, False, 0)
self.hbox.pack_start(self.search_button, False, False, 0) self.hbox.pack_start(self.search_button, False, False, 0)
self.hbox.pack_start(self.lyrics_button, False, False, 0) self.hbox.pack_start(self.lyrics_button, False, False, 0)
if len(self.settings.get_value("profiles")) > 1:
self.hbox.pack_start(self.profiles, False, False, 0) self.hbox.pack_start(self.profiles, False, False, 0)
self.hbox.pack_start(self.play_opts, False, False, 0) self.hbox.pack_start(self.play_opts, False, False, 0)
self.hbox.pack_end(menu_button, False, False, 0) self.hbox.pack_end(menu_button, False, False, 0)
@ -1873,6 +1875,13 @@ class MainWindow(Gtk.ApplicationWindow):
if self.client.connected(): if self.client.connected():
self.client.update() self.client.update()
def on_settings_changed(self, *args):
self.hbox.remove(self.profiles)
if len(self.settings.get_value("profiles")) > 1:
self.hbox.pack_start(self.profiles, False, False, 0)
self.hbox.reorder_child(self.profiles, 5)
self.profiles.show()
class mpdevil(Gtk.Application): class mpdevil(Gtk.Application):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, application_id="org.mpdevil", flags=Gio.ApplicationFlags.FLAGS_NONE, **kwargs) super().__init__(*args, application_id="org.mpdevil", flags=Gio.ApplicationFlags.FLAGS_NONE, **kwargs)