mirror of
https://github.com/Rafostar/clapper.git
synced 2025-08-30 07:42:23 +02:00
@@ -18,6 +18,7 @@ var actions = {
|
||||
prev_track: ['<Ctrl>Left'],
|
||||
volume_up: ['Up'],
|
||||
volume_down: ['Down'],
|
||||
mute: ['<Ctrl>m'],
|
||||
toggle_play: ['space'],
|
||||
change_repeat: ['<Ctrl>r'],
|
||||
reveal_controls: ['Return'],
|
||||
@@ -74,6 +75,9 @@ function handleAction(action, window)
|
||||
case 'volume_down':
|
||||
player.adjust_volume(bool);
|
||||
break;
|
||||
case 'mute':
|
||||
player.mute ^= true;
|
||||
break;
|
||||
case 'next_track':
|
||||
player.playlistWidget.nextTrack();
|
||||
break;
|
||||
|
@@ -206,9 +206,30 @@ var VolumeButton = GObject.registerClass({
|
||||
GTypeName: 'ClapperVolumeButton',
|
||||
Template: Misc.getResourceUri('ui/volume-button.ui'),
|
||||
Children: ['volumeScale'],
|
||||
Properties: {
|
||||
'muted': GObject.ParamSpec.boolean(
|
||||
'muted',
|
||||
'Set muted',
|
||||
'Mark scale as muted',
|
||||
GObject.ParamFlags.WRITABLE,
|
||||
false
|
||||
),
|
||||
}
|
||||
},
|
||||
class ClapperVolumeButton extends PopoverButtonBase
|
||||
{
|
||||
_init(opts)
|
||||
{
|
||||
super._init(opts);
|
||||
this._isMuted = false;
|
||||
}
|
||||
|
||||
set muted(isMuted)
|
||||
{
|
||||
this._isMuted = isMuted;
|
||||
this._onVolumeScaleValueChanged(this.volumeScale);
|
||||
}
|
||||
|
||||
_onVolumeScaleValueChanged(scale)
|
||||
{
|
||||
const volume = scale.get_value();
|
||||
@@ -224,7 +245,7 @@ class ClapperVolumeButton extends PopoverButtonBase
|
||||
scale.remove_css_class(cssClass);
|
||||
}
|
||||
|
||||
const icon = (volume <= 0)
|
||||
const icon = (volume <= 0 || this._isMuted)
|
||||
? 'muted'
|
||||
: (volume <= 0.3)
|
||||
? 'low'
|
||||
|
3
src/controls.js
vendored
3
src/controls.js
vendored
@@ -376,6 +376,9 @@ class ClapperControls extends Gtk.Box
|
||||
: settings.get_double('volume-last');
|
||||
|
||||
clapperWidget.player.volume = initialVolume;
|
||||
clapperWidget.player.bind_property('mute', this.volumeButton, 'muted',
|
||||
GObject.BindingFlags.DEFAULT
|
||||
);
|
||||
}
|
||||
|
||||
_onPlayerResize(width, height)
|
||||
|
Reference in New Issue
Block a user