okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upcoming' of https://github.com/ciderapp/Cider into upcoming

Browse source
This commit is contained in:
vapormusic 2022-01-26 15:11:59 +07:00
commit ebef384726
14 changed files with 452 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
src/renderer/assets/logocut.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

2
src/renderer/style.less
View file

@ -551,6 +551,8 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
display: flex;
font-size: 14px;
flex-direction: column;
text-align: center;
margin-right: 35px ;
}
.app-sidebar-button > .sidebar-user-text .fullname {

4
src/renderer/views/components/mediaitem-list-item.ejs
View file

@ -238,7 +238,7 @@
}
},
{
name: `Play ${app.selectedMediaItems.length} tracks next`,
name: app.getLz('action.playTracksNext'),
"icon": "./assets/arrow-bend-up.svg",
action: () => {
let itemsToPlay = {}
@ -260,7 +260,7 @@
}
},
{
name: `Play ${app.selectedMediaItems.length} tracks later`,
name: app.getLz('action.playTracksLater'),
"icon": "./assets/arrow-bend-down.svg",
action: () => {
let itemsToPlay = {}

4
src/renderer/views/components/mediaitem-square-large.ejs
View file

@ -144,7 +144,7 @@
multiple: {
items: [
{
name: `Play ${app.selectedMediaItems.length} tracks next`,
name: this.$root.getLz('action.playTracksNext'),
action: () => {
let itemsToPlay = {}
app.selectedMediaItems.forEach(item => {
@ -165,7 +165,7 @@
}
},
{
name: `Play ${app.selectedMediaItems.length} tracks later`,
name: app.getLz('action.playTracksLater'),
action: () => {
let itemsToPlay = {}
app.selectedMediaItems.forEach(item => {

4
src/renderer/views/components/mediaitem-square-sp.ejs
View file

@ -158,7 +158,7 @@
multiple: {
items: [
{
name: `Play ${app.selectedMediaItems.length} tracks next`,
name: app.getLz('action.playTracksNext'),
action: () => {
let itemsToPlay = {}
app.selectedMediaItems.forEach(item => {
@ -179,7 +179,7 @@
}
},
{
name: `Play ${app.selectedMediaItems.length} tracks later`,
name: app.getLz('action.playTracksLater'),
action: () => {
let itemsToPlay = {}
app.selectedMediaItems.forEach(item => {

4
src/renderer/views/components/mediaitem-square.ejs
View file

@ -250,7 +250,7 @@
multiple: {
items: [
{
name: `Play ${app.selectedMediaItems.length} tracks next`,
name: app.getLz('action.playTracksNext'),
"icon": "./assets/arrow-bend-up.svg",
action: () => {
let itemsToPlay = {}
@ -272,7 +272,7 @@
}
},
{
name: `Play ${app.selectedMediaItems.length} tracks later`,
name: app.getLz('action.playTracksLater'),
"icon": "./assets/arrow-bend-down.svg",
action: () => {
let itemsToPlay = {}

2
src/renderer/views/components/queue.ejs
View file

@ -97,7 +97,7 @@
},
multiple: {
items: [{
"name": `Remove ${self.selectedItems.length} tracks from queue`,
"name": app.getLz('action.removeTracks'),
"action": function () {
// add property to items to be removed
self.selectedItems.forEach(function (item) {

2
src/renderer/views/pages/settings.ejs
View file

@ -524,6 +524,8 @@
<option value="tr_TR">tr_TR</option>
<option value="zh_CN">zh_CN</option>
<option value="zh_TW">zh_TW</option>
<option value="zh_HK">zh_HK</option>
<option value="en_HODOR">HODOR?</option>
</select>
</div>
</div>