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 behavior in disconnected state

Browse Source
This commit is contained in:
Martin Wagner 2020-05-16 09:55:11 +02:00
parent f40ed4b707
commit a3dc822420
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bin/mpdevil.py
View File

@ -2404,8 +2404,8 @@ class SeekBar(Gtk.Box):
self.scale.connect("scroll-event", self.dummy) #disable mouse wheel self.scale.connect("scroll-event", self.dummy) #disable mouse wheel
self.scale.connect("button-press-event", self.on_scale_button_press_event) self.scale.connect("button-press-event", self.on_scale_button_press_event)
self.scale.connect("button-release-event", self.on_scale_button_release_event) self.scale.connect("button-release-event", self.on_scale_button_release_event)
self.client.emitter.connect("disconnected", self.on_disconnected) self.client.emitter.connect("disconnected", self.disable)
self.client.emitter.connect("reconnected", self.on_reconnected) self.client.emitter.connect("reconnected", self.enable)
self.client.emitter.connect("player", self.on_player) self.client.emitter.connect("player", self.on_player)
#periodic_signal #periodic_signal
self.periodic_signal=self.client.emitter.connect("periodic_signal", self.refresh) self.periodic_signal=self.client.emitter.connect("periodic_signal", self.refresh)
@ -2463,13 +2463,13 @@ class SeekBar(Gtk.Box):
def seek_backward(self): def seek_backward(self):
self.client.seekcur("-"+self.seek_time) self.client.seekcur("-"+self.seek_time)
def enable(self): def enable(self, *args):
self.scale.set_sensitive(True) self.scale.set_sensitive(True)
self.scale.set_range(0, 100) self.scale.set_range(0, 100)
self.elapsed_event_box.set_sensitive(True) self.elapsed_event_box.set_sensitive(True)
self.rest_event_box.set_sensitive(True) self.rest_event_box.set_sensitive(True)
def disable(self): def disable(self, *args):
self.scale.set_sensitive(False) self.scale.set_sensitive(False)
self.scale.set_range(0, 0) self.scale.set_range(0, 0)
self.elapsed_event_box.set_sensitive(False) self.elapsed_event_box.set_sensitive(False)
@ -2489,12 +2489,6 @@ class SeekBar(Gtk.Box):
elif event.button == 3 and event.type == Gdk.EventType.BUTTON_PRESS: elif event.button == 3 and event.type == Gdk.EventType.BUTTON_PRESS:
self.seek_backward() self.seek_backward()
def on_reconnected(self, *args):
self.enable()
def on_disconnected(self, *args):
self.disable()
def on_player(self, *args): def on_player(self, *args):
status=self.client.status() status=self.client.status()
if status['state'] == "stop": if status['state'] == "stop":
@ -2666,13 +2660,25 @@ class AudioType(Gtk.Button):
self.connect("clicked", self.on_clicked) self.connect("clicked", self.on_clicked)
#periodic_signal #periodic_signal
self.client.emitter.connect("periodic_signal", self.refresh) self.client.emitter.connect("periodic_signal", self.refresh)
self.client.emitter.connect("disconnected", self.disable)
self.client.emitter.connect("reconnected", self.enable)
#packing #packing
self.popover.add(self.treeview) self.popover.add(self.treeview)
self.add(self.label) self.add(self.label)
self.disable()
def enable(self, *args):
self.set_sensitive(True)
def disable(self, *args):
self.set_sensitive(False)
self.label.set_text("-")
def refresh(self, *args): def refresh(self, *args):
try: try:
self.enable()
status=self.client.status() status=self.client.status()
file_type=self.client.playlistinfo(status["song"])[0]["file"].split('.')[-1] file_type=self.client.playlistinfo(status["song"])[0]["file"].split('.')[-1]
freq, res, chan=status["audio"].split(':') freq, res, chan=status["audio"].split(':')
@ -2681,7 +2687,7 @@ class AudioType(Gtk.Button):
string=_("%(bitrate)s kb/s, %(frequency)s kHz, %(resolution)s bit, %(channels)s channels, %(file_type)s") % {"bitrate": brate, "frequency": freq, "resolution": res, "channels": chan, "file_type": file_type} string=_("%(bitrate)s kb/s, %(frequency)s kHz, %(resolution)s bit, %(channels)s channels, %(file_type)s") % {"bitrate": brate, "frequency": freq, "resolution": res, "channels": chan, "file_type": file_type}
self.label.set_text(string) self.label.set_text(string)
except: except:
self.label.set_text("-") pass
def on_clicked(self, *args): def on_clicked(self, *args):
try: try:
@ -2695,8 +2701,10 @@ class AudioType(Gtk.Button):
self.store.append([tag, value]) self.store.append([tag, value])
self.popover.show_all() self.popover.show_all()
self.treeview.queue_resize() self.treeview.queue_resize()
else:
self.disable()
except: except:
pass self.disable()
class ProfileSelect(Gtk.ComboBoxText): class ProfileSelect(Gtk.ComboBoxText):
def __init__(self, client, settings): def __init__(self, client, settings):