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

changed 'SeekBar' behavior

Browse Source
This commit is contained in:
Martin Wagner 2020-03-28 13:23:56 +01:00
parent 6c4cbac2eb
commit d025c2d9c2
1 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
bin/mpdevil.py
View File

@ -2180,6 +2180,8 @@ class SeekBar(Gtk.Box):
self.client=client self.client=client
self.emitter=emitter self.emitter=emitter
self.seek_time="10" #seek increment in seconds self.seek_time="10" #seek increment in seconds
self.update=True
self.jumped=False
#labels #labels
self.elapsed=Gtk.Label() self.elapsed=Gtk.Label()
@ -2189,8 +2191,17 @@ class SeekBar(Gtk.Box):
#progress bar #progress bar
self.scale=Gtk.Scale.new_with_range(orientation=Gtk.Orientation.HORIZONTAL, min=0, max=100, step=0.001) self.scale=Gtk.Scale.new_with_range(orientation=Gtk.Orientation.HORIZONTAL, min=0, max=100, step=0.001)
self.scale.set_show_fill_level(True)
self.scale.set_restrict_to_fill_level(False)
self.scale.set_draw_value(False) self.scale.set_draw_value(False)
#css (scale)
style_context=self.scale.get_style_context()
provider = Gtk.CssProvider()
css = b"""scale fill, scale fill:backdrop { background-color: @theme_selected_bg_color; }"""
provider.load_from_data(css)
style_context.add_provider(provider, 800)
#event boxes #event boxes
self.elapsed_event_box=Gtk.EventBox() self.elapsed_event_box=Gtk.EventBox()
self.rest_event_box=Gtk.EventBox() self.rest_event_box=Gtk.EventBox()
@ -2198,8 +2209,10 @@ class SeekBar(Gtk.Box):
#connect #connect
self.elapsed_event_box.connect("button-press-event", self.on_elapsed_button_press_event) self.elapsed_event_box.connect("button-press-event", self.on_elapsed_button_press_event)
self.rest_event_box.connect("button-press-event", self.on_rest_button_press_event) self.rest_event_box.connect("button-press-event", self.on_rest_button_press_event)
self.scale.connect("change-value", self.seek) self.scale.connect("change-value", self.on_change_value)
self.scale.connect("scroll-event", self.dummy) #disable mouse wheel which caused some noise 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-release-event", self.on_scale_button_release_event)
self.emitter.connect("disconnected", self.on_disconnected) self.emitter.connect("disconnected", self.on_disconnected)
self.emitter.connect("reconnected", self.on_reconnected) self.emitter.connect("reconnected", self.on_reconnected)
self.emitter.connect("player", self.on_player) self.emitter.connect("player", self.on_player)
@ -2217,7 +2230,26 @@ class SeekBar(Gtk.Box):
def dummy(self, *args): def dummy(self, *args):
return True return True
def seek(self, range, scroll, value): #value is inaccurate def on_scale_button_press_event(self, widget, event):
if event.button == 1:
self.update=False
self.scale.set_has_origin(False)
if event.button == 3:
self.jumped=False
def on_scale_button_release_event(self, widget, event):
if event.button == 1:
if self.jumped: #actual seek
status=self.client.status()
duration=float(status["duration"])
factor=(self.scale.get_value()/100)
pos=(duration*factor)
self.client.seekcur(pos)
self.jumped=False
self.scale.set_has_origin(True)
self.update=True
def on_change_value(self, range, scroll, value): #value is inaccurate
if scroll == Gtk.ScrollType.STEP_BACKWARD: if scroll == Gtk.ScrollType.STEP_BACKWARD:
self.seek_backward() self.seek_backward()
elif scroll == Gtk.ScrollType.STEP_FORWARD: elif scroll == Gtk.ScrollType.STEP_FORWARD:
@ -2226,13 +2258,12 @@ class SeekBar(Gtk.Box):
status=self.client.status() status=self.client.status()
duration=float(status["duration"]) duration=float(status["duration"])
factor=(value/100) factor=(value/100)
if factor > 1: #fix error on seek if factor > 1: #fix display error
factor=1 factor=1
#detach mouse from slider elapsed=(factor*duration)
self.scale.set_visible(False) self.elapsed.set_text(str(datetime.timedelta(seconds=int(elapsed))))
self.scale.set_visible(True) self.rest.set_text("-"+str(datetime.timedelta(seconds=int(duration-elapsed))))
pos=(duration*factor) self.jumped=True
self.client.seekcur(pos)
def seek_forward(self): def seek_forward(self):
self.client.seekcur("+"+self.seek_time) self.client.seekcur("+"+self.seek_time)
@ -2299,12 +2330,14 @@ class SeekBar(Gtk.Box):
status=self.client.status() status=self.client.status()
duration=float(status["duration"]) duration=float(status["duration"])
elapsed=float(status["elapsed"]) elapsed=float(status["elapsed"])
if elapsed > duration: if elapsed > duration: #fix display error
elapsed=duration elapsed=duration
fraction=(elapsed/duration)*100 fraction=(elapsed/duration)*100
self.scale.set_value(fraction) if self.update:
self.elapsed.set_text(str(datetime.timedelta(seconds=int(elapsed)))) self.scale.set_value(fraction)
self.rest.set_text("-"+str(datetime.timedelta(seconds=int(duration-elapsed)))) self.elapsed.set_text(str(datetime.timedelta(seconds=int(elapsed))))
self.rest.set_text("-"+str(datetime.timedelta(seconds=int(duration-elapsed))))
self.scale.set_fill_level(fraction)
except: except:
self.disable() self.disable()
return True return True