From 65c75112a7f0c9c6ad886fc39f97099033733f55 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Wed, 5 Oct 2016 16:47:24 +0100 Subject: osc: move tooltip to inside seekbar for top/bottombar Tooltip border is user-alterable --- DOCS/man/osc.rst | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'DOCS/man/osc.rst') diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst index c737d2e898..65ed3f9e7f 100644 --- a/DOCS/man/osc.rst +++ b/DOCS/man/osc.rst @@ -235,6 +235,10 @@ Configurable Options | Default: slider | Sets the style of the seekbar, slider (diamond marker) or bar (fill) +``tooltipborder`` + | Default: 1 + | Size of the tooltip outline when using bottombar or topbar layouts + ``timetotal`` | Default: no | Show total time instead of time remaining -- cgit v1.2.3 From 8bb57c038799da39e72491888d0fc19beb493d62 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Fri, 7 Oct 2016 00:19:34 +0100 Subject: osc: change default layout to bottombar Change a few other defaults accordingly: - seekbarstyle=bar looks better with bottombar. - Bigger scalewindowed and scalefullscreen make bottom/topbar more readable. --- DOCS/man/osc.rst | 98 +++++++++++++++++++++----------------------------------- 1 file changed, 37 insertions(+), 61 deletions(-) (limited to 'DOCS/man/osc.rst') diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst index 65ed3f9e7f..b7723a86d3 100644 --- a/DOCS/man/osc.rst +++ b/DOCS/man/osc.rst @@ -20,71 +20,46 @@ The Interface :: - +------------------+-----------+--------------------+ - | playlist prev | title | playlist next | - +-------+------+---+--+------+-+----+------+--------+ - | audio | skip | seek | | seek | skip | full | - +-------+ back | back | play | frwd | frwd | screen | - | sub | | | | | | | - +-------+------+------+------+------+------+--------+ - | seekbar | - +----------------+--------------+-------------------+ - | time passed | cache status | time remaining | - +----------------+--------------+-------------------+ - - -playlist prev - ============= ================================================ - left-click play previous file in playlist - shift+L-click show playlist - ============= ================================================ + +---------+----------+----------------------------+-------------+ + | pl prev | pl next | title | cache | + +------+--+---+------+---------+-----------+------+-------+-----+ + | play | skip | skip | time | seekbar | time | audio | sub | + | | back | frwd | elapsed | | left | | | + +------+------+------+---------+-----------+------+-------+-----+ -title - | Displays current media-title or filename +pl prev ============= ================================================ - left-click show playlist position and length and full title - right-click show filename + left-click play previous file in playlist + shift+L-click show playlist ============= ================================================ -playlist next +pl next ============= ================================================ left-click play next file in playlist shift+L-click show playlist ============= ================================================ -audio and sub - | Displays selected track and amount of available tracks - - ============= ================================================ - left-click cycle audio/sub tracks forward - right-click cycle audio/sub tracks backwards - shift+L-click show available audio/sub tracks - ============= ================================================ +title + | Displays current media-title or filename -skip back ============= ================================================ - left-click go to beginning of chapter / previous chapter - shift+L-click show chapters + left-click show playlist position and length and full title + right-click show filename ============= ================================================ -seek back - ============= ================================================ - left-click skip back 5 seconds - right-click skip back 30 seconds - shift-L-click skip back 1 frame - ============= ================================================ +cache + | Shows current cache fill status play ============= ================================================ left-click toggle play/pause ============= ================================================ -seek frwd +skip back ============= ================================================ - left-click skip forward 10 seconds - right-click skip forward 60 seconds - shift-L-click skip forward 1 frame + left-click go to beginning of chapter / previous chapter + shift+L-click show chapters ============= ================================================ skip frwd @@ -93,9 +68,11 @@ skip frwd shift+L-click show chapters ============= ================================================ -fullscreen +time elapsed + | Shows current playback position timestamp + ============= ================================================ - left-click toggle fullscreen + left-click toggle displaying timecodes with milliseconds ============= ================================================ seekbar @@ -105,21 +82,20 @@ seekbar left-click seek to position ============= ================================================ -time passed - | Shows current playback position timestamp +time left + | Shows remaining playback time timestamp ============= ================================================ - left-click toggle displaying timecodes with milliseconds + left-click toggle between total and remaining time ============= ================================================ -cache status - | Shows current cache fill status (only visible when below 45%) - -time remaining - | Shows remaining playback time timestamp +audio and sub + | Displays selected track and amount of available tracks ============= ================================================ - left-click toggle between total and remaining time + left-click cycle audio/sub tracks forward + right-click cycle audio/sub tracks backwards + shift+L-click show available audio/sub tracks ============= ================================================ Key Bindings @@ -176,11 +152,11 @@ Configurable Options | Enable the OSC when fullscreen ``scalewindowed`` - | Default: 1.0 + | Default: 1.5 | Scale factor of the OSC when windowed ``scalefullscreen`` - | Default: 1.0 + | Default: 1.5 | Scale factor of the OSC when fullscreen ``scaleforcedwindow`` @@ -214,7 +190,7 @@ Configurable Options | Duration of fade out in ms, 0 = no fade ``deadzonesize`` - | Default: 0 + | Default: 1 | Size of the deadzone. The deadzone is an area that makes the mouse act like leaving the window. Movement there won't make the OSC show up and it will hide immediately if the mouse enters it. The deadzone starts @@ -222,17 +198,17 @@ Configurable Options of the window it will span. Values between 0 and 1. ``minmousemove`` - | Default: 3 + | Default: 0 | Minimum amount of pixels the mouse has to move between ticks to make the OSC show up ``layout`` - | Default: box + | Default: bottombar | The layout for the OSC. Currently available are: box, slimbox, bottombar and topbar. ``seekbarstyle`` - | Default: slider + | Default: bar | Sets the style of the seekbar, slider (diamond marker) or bar (fill) ``tooltipborder`` -- cgit v1.2.3 From b99dc17f8e9ec1ddc7b07743e175cf7d7ce86585 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Sat, 8 Oct 2016 01:43:23 +0100 Subject: osc: add right-click behavior to playlist and chapter buttons --- DOCS/man/osc.rst | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'DOCS/man/osc.rst') diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst index b7723a86d3..6f8048125f 100644 --- a/DOCS/man/osc.rst +++ b/DOCS/man/osc.rst @@ -31,12 +31,14 @@ The Interface pl prev ============= ================================================ left-click play previous file in playlist + right-click show playlist shift+L-click show playlist ============= ================================================ pl next ============= ================================================ left-click play next file in playlist + right-click show playlist shift+L-click show playlist ============= ================================================ @@ -59,12 +61,14 @@ play skip back ============= ================================================ left-click go to beginning of chapter / previous chapter + right-click show chapters shift+L-click show chapters ============= ================================================ skip frwd ============= ================================================ left-click go to next chapter + right-click show chapters shift+L-click show chapters ============= ================================================ -- cgit v1.2.3 From 2a99e7ae128209bc22bfb7b6e6fab32cd3d31747 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Mon, 10 Oct 2016 22:53:33 +0100 Subject: osc: add user-alterable margin for top/bottombar --- DOCS/man/osc.rst | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'DOCS/man/osc.rst') diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst index 6f8048125f..2c66ede2d8 100644 --- a/DOCS/man/osc.rst +++ b/DOCS/man/osc.rst @@ -180,6 +180,10 @@ Configurable Options | Default: 0.0 | Horizontal alignment, -1 (left) to 1 (right) +``barmargin`` + | Default: 0 + | Margin from bottom (bottombar) or top (topbar), in pixels + ``boxalpha`` | Default: 80 | Alpha of the background box, 0 (opaque) to 255 (fully transparent) -- cgit v1.2.3 From 118d7a310e4eacc657f6656bf5769d356bb45438 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Mon, 17 Oct 2016 15:55:17 +0100 Subject: man/osc: better explain the values of deadzonesize --- DOCS/man/osc.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'DOCS/man/osc.rst') diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst index 2c66ede2d8..20f7fbf7e6 100644 --- a/DOCS/man/osc.rst +++ b/DOCS/man/osc.rst @@ -203,7 +203,9 @@ Configurable Options like leaving the window. Movement there won't make the OSC show up and it will hide immediately if the mouse enters it. The deadzone starts at the window border opposite to the OSC and the size controls how much - of the window it will span. Values between 0 and 1. + of the window it will span. Values between 0 and 1, where 0 means the + OSC will always popup with mouse movement in the window, and 1 means the + OSC will only show up when the mouse hovers it. ``minmousemove`` | Default: 0 -- cgit v1.2.3