Skip to content

Commit

Permalink
Added Left/Right as Seek Hotkeys #4
Browse files Browse the repository at this point in the history
  • Loading branch information
jaruba committed May 2, 2015
1 parent 3583f4b commit 28d161a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 9 deletions.
6 changes: 6 additions & 0 deletions player/core/Hotkeys.qml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ Rectangle {
vlcPlayer.playlist.next();
}
}
if (event.key == Qt.Key_Left) {
progressBar.seekProgress(-1);
}
if (event.key == Qt.Key_Right) {
progressBar.seekProgress(1);
}
if(event.modifiers == Qt.ControlModifier) {
if (event.key == Qt.Key_Right) {
if (typeof settings.preventKey[Qt.ControlModifier+"+"+Qt.Key_Right] === "undefined") {
Expand Down
24 changes: 15 additions & 9 deletions player/themes/sleek/components/ProgressBar.qml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@ Rectangle {
property var lastTimestamp: 0;
property var lastCalc: 0;

function seekProgress(direction) {
settings.newProgress = (vlcPlayer.time + lastCalc) / wjs.getLength();
settings = settings;
if (vlcPlayer.playing) vlcPlayer.togglePause();
lastTimestamp = Date.now();
checkWheel = true;
if (wjs.getLength() > 0) var newDif = Math.floor(wjs.getLength() /100);
else var newDif = 30000;

if (direction == 1) lastCalc = lastCalc +newDif;
if (direction == -1) lastCalc = lastCalc + (newDif * (-1));
}

RowLayout {
id: rowLayer
anchors.left: parent.left
Expand All @@ -48,16 +61,9 @@ Rectangle {
onPositionChanged: root.changed(mouse.x,mouse.y);
onReleased: root.released(mouse.x,mouse.y);
onWheel: {
settings.newProgress = (vlcPlayer.time + lastCalc) / wjs.getLength();
settings = settings;
if (vlcPlayer.playing) vlcPlayer.togglePause();
lastTimestamp = Date.now();
checkWheel = true;
if (wjs.getLength() > 0) var newDif = Math.floor(wjs.getLength() /100);
else var newDif = 30000;

if (wheel.angleDelta.y > 0) lastCalc = lastCalc +newDif;
if (wheel.angleDelta.y < 0) lastCalc = lastCalc + (newDif * (-1));
if (wheel.angleDelta.y > 0) seekProgress(1);
if (wheel.angleDelta.y < 0) seekProgress(-1);

}
}
Expand Down

0 comments on commit 28d161a

Please # to comment.