Skip to content

Commit

Permalink
Hint keyboard shortcuts in the tooltips where applicable
Browse files Browse the repository at this point in the history
refs #1086
  • Loading branch information
paulijar committed Jan 22, 2024
1 parent 7360330 commit ef7cb95
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[#1098](https://github.com/owncloud/music/issues/1098)
- Optional "strict" mode for the history filters of the smart playlist
[#1099](https://github.com/owncloud/music/issues/1099)
- Hint about the keyboard shortcuts to the Settings view
- Hint about the keyboard shortcuts in the Settings view and in tooltips
[#1086](https://github.com/owncloud/music/issues/1086)

### Changed
Expand Down
3 changes: 3 additions & 0 deletions templates/fake-template.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@
<!-- localizations fr the player controls pane -->
<span translate>Play</span>
<span translate>Pause</span>
<span translate>(press and hold for more)</span>
<span translate>Mute</span>
<span translate>Unmute</span>
13 changes: 9 additions & 4 deletions templates/partials/controls.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,20 @@
<div id="controls" ng-controller="PlayerController" ng-class="{started: started}">
<div id="play-controls">
<img id="skip-prev-button" ng-click="prev()" class="control small svg" alt="{{ 'Previous' | translate }}"
title="{{ 'Previous' | translate }}&#013;[CTRL+LEFT]"
src="<?php HtmlUtil::printSvgPath('skip-previous') ?>" />
<div id="play-pause-container"
title="{{ playPauseContextMenuVisible ? null : ('press and hold for more' | translate) }}"
ng-on-contextmenu="playbackBtnContextMenu($event)"
ng-on-long-press="playbackBtnLongPress($event)"
data-long-press-delay="500"
>
<div id="stop-button" ng-click="stop()" class="control icon-stop svg"
title="{{ 'Stop' | translate }}&#013;[SHIFT+SPACE]"
ng-show="shiftHeldDown" alt="{{ 'Stop' | translate }}">
</div>
<div id="play-pause-button" ng-click="togglePlayback()" class="control svg"
ng-class="playing ? 'icon-pause-big' : 'icon-play-big'"
title="{{ (playing ? 'Pause' : 'Play') | translate }} [SPACE]&#013;{{ playPauseContextMenuVisible ? null : ('(press and hold for more)' | translate) }}"
ng-show="!shiftHeldDown" alt="{{ (playing ? 'Pause' : 'Play') | translate }}">
</div>
<div id="play-pause-menu" class="popovermenu bubble" ng-show="playPauseContextMenuVisible">
Expand Down Expand Up @@ -49,6 +51,7 @@
</div>
</div>
<img ng-click="next()" class="control small svg" alt="{{ 'Next' | translate }}"
title="{{ 'Next' | translate }}&#013;[CTRL+RIGHT]"
src="<?php HtmlUtil::printSvgPath('skip-next') ?>" />
</div>

Expand Down Expand Up @@ -93,9 +96,11 @@
<img id="repeat" class="control toggle small svg" alt="{{ 'Repeat' | translate }}" title="{{ repeatTooltip() }}"
src="{{ repeat === 'one' ? '<?php HtmlUtil::printSvgPath('repeat-1') ?>' : '<?php HtmlUtil::printSvgPath('repeat') ?>' }}"
ng-class="{active: repeat != 'false' }" ng-click="toggleRepeat()" />
<div class="volume-control" title="{{ 'Volume' | translate }} {{volume}} %">
<div class="volume-control">
<img id="volume-icon" class="control toggle small svg" alt="{{ 'Volume' | translate }}" ng-click="toggleVolume()"
ng-src="{{ volume === 0 ? '<?php HtmlUtil::printSvgPath('sound-off') ?>' : '<?php HtmlUtil::printSvgPath('sound') ?>' }}" />
<input type="range" class="volume-slider" min="0" max="100" ng-model="volume"/>
ng-src="{{ volume === 0 ? '<?php HtmlUtil::printSvgPath('sound-off') ?>' : '<?php HtmlUtil::printSvgPath('sound') ?>' }}"
title="{{ volume === 0 ? ('Unmute' | translate) : ('Mute' | translate) }} [M]" />
<input type="range" class="volume-slider" min="0" max="100" ng-model="volume"
title="{{ 'Volume' | translate }} {{volume}} %&#013;[NUMPAD +/-]"/>
</div>
</div>
2 changes: 1 addition & 1 deletion templates/partials/navigation.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
title="{{ trackCountText(playlist) }}"
icon="'playlist'">
</li>
<li id="music-nav-search" class="docked-navigation-item">
<li id="music-nav-search" class="docked-navigation-item" title="{{ showSearch ? null : '[CTRL+F]' }}">
<div class="music-navigation-item-content">
<div class="icon-search" ng-click="startSearch()"></div>
<div class="label app-navigation-noclose" ng-click="startSearch()" ng-hide="showSearch" translate>Search</div>
Expand Down

0 comments on commit ef7cb95

Please sign in to comment.