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

Pull request Pre "9 June" Update (#1100)

Browse source 
* i18n

* My last menubar edit

Based on : https://developer.apple.com/design/human-interface-guidelines/macos/menus/menu-bar-menus/

And : https://www.electronjs.org/docs/latest/api/menu

make changes about how work on linux and let the mac untouched for more native options

* Linux Only

* some fixes

* alt everywhere

* im stupid

* im stupid pt2

* popup fix

* Zoom

* Fixes

* Zoom and other things Update

* Hardcoded Changes

* i18N "es_ES"

* Windows/MacOS Fixes

* Some test

* test2

* MacOS

* Sorry MacOS

* PT2

* i suposse

* Test Changes

* Pre test

* finally

* Last

* documentation

* Update es_ES

* Now stores ZoomFactor

* Deprecated UI Scale to Zoom Built in Electron Feature. Its more easy, native and more compatible.

* I hate Git

* best methods

* Plz

* SVG

* finally fixes
This commit is contained in:
Gabriel Davila 2022-06-17 21:44:32 -03:00 • committed by GitHub
parent 8afe1ef0cc
commit 8be274bf19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 417 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/renderer/main/events.js
View file

@ -24,7 +24,7 @@ const Events = {
// CTRL + R
if (event.keyCode === 82 && event.ctrlKey) {
event.preventDefault()
bootbox.confirm("Reload Cider?", (res)=>{
bootbox.confirm(app.getLz('term.reload'), (res)=>{
if (res) {
window.location.reload()
}
@ -91,8 +91,6 @@ const Events = {
setTimeout(refreshFocus, 200);
}
app.getHTMLStyle()
refreshFocus();
}
}

5
src/renderer/main/vueapp.js
View file

@ -527,11 +527,6 @@ const app = new Vue({
navigateForward() {
history.forward()
},
getHTMLStyle() {
ipcRenderer.send("setScreenScale", app.cfg.visual.uiScale);
},
resetState() {
this.menuPanel.visible = false;
app.selectedMediaItems = [];

40
src/renderer/style.less
View file

@ -3419,20 +3419,7 @@ body.no-gpu {
}
}
.keybindings-border {
padding-left: 15px;
padding-right: 15px;
border-style: solid;
border-radius: 5px;
border-color: #CBCBCB;
}
.keybinding-text {
width: 95px;
display: flex;
justify-content: center;
align-items: center;
}
.qrimg {
width: -webkit-fill-available;
@ -3591,14 +3578,31 @@ body[platform='darwin'] {
display: none;
}
.keybinds-page .md-option-header {
padding: 0px 0px;
.keybinds-page{
.md-option-header {
padding: 10px 0px;
border-bottom: unset;
border-top: unset;
font-weight: 600;
background: rgba(255, 255, 255, 0);
font-size: 2em;
}
.md-option-header-sub {
padding: 15px 10px;
border-bottom: unset;
border-top: unset;
font-weight: 600;
background: rgba(255, 255, 255, 0);
font-size: 2em;
}
font-weight: 600;
font-size: 1.7em;
}
.md-option-line{
padding: 15px 20px;
font-size: 0.90em;
}
}
.content-inner.keybinds-page {
top: var(--navigationBarHeight);

51
src/renderer/views/pages/keybinds.ejs
View file

@ -4,6 +4,9 @@
<span>{{$root.getLz('settings.option.general.keybindings')}}</span>
</div>
<div class="settings-option-body">
<div class="md-option-header-sub">
<span>{{$root.getLz('settings.option.general.keybindings.library')}}</span>
</div>
<div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('settings.description.search')}}
@ -81,6 +84,9 @@
</button>
</div>
</div>
<div class="md-option-header-sub">
<span>{{$root.getLz('settings.option.general.keybindings.session')}}</span>
</div>
<div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('settings.description.private')}}
@ -92,6 +98,9 @@
</button>
</div>
</div>
<div class="md-option-header-sub">
<span>{{$root.getLz('settings.option.general.keybindings.control')}}</span>
</div>
<div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('settings.description.remote')}}
@ -147,6 +156,45 @@
</button>
</div>
</div>
<div class="md-option-header-sub" v-if="app.platform !== 'darwin'">
<span>{{$root.getLz('settings.option.general.keybindings.interface')}}</span>
</div>
<div class="md-option-line" v-if="app.platform !== 'darwin'">
<div class="md-option-segment">
{{$root.getLz('term.zoomin')}}
</div>
<div class="md-option-segment md-option-segment_auto">
<button class="md-btn md-btn-small md-btn-block"
@click="keyBindUpdate('zoomn')">
{{app.cfg.general.keybindings.zoomn.join(' + ')}}
</button>
</div>
</div>
<div class="md-option-line" v-if="app.platform !== 'darwin'">
<div class="md-option-segment">
{{$root.getLz('term.zoomout')}}
</div>
<div class="md-option-segment md-option-segment_auto">
<button class="md-btn md-btn-small md-btn-block"
@click="keyBindUpdate('zoomt')">
{{app.cfg.general.keybindings.zoomt.join(' + ')}}
</button>
</div>
</div>
<div class="md-option-line" v-if="app.platform !== 'darwin'">
<div class="md-option-segment">
{{$root.getLz('term.zoomreset')}}
</div>
<div class="md-option-segment md-option-segment_auto">
<button class="md-btn md-btn-small md-btn-block"
@click="keyBindUpdate('zoomrst')">
{{app.cfg.general.keybindings.zoomrst.join(' + ')}}
</button>
</div>
</div>
<div class="md-option-header-sub">
<span>{{$root.getLz('settings.option.general.keybindings.advanced')}}</span>
</div>
<div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('settings.description.developer')}}
@ -243,6 +291,9 @@
app.cfg.general.keybindings.pluginMenu = [app.platform == "darwin" ? "Command" : "Control",app.platform == "darwin" ? "Option" : (app.platform == "linux" ? "Shift" : "Alt"), "P"];
app.cfg.general.keybindings.castToDevices = [app.platform == "darwin" ? "Command" : "Control",app.platform == "darwin" ? "Option" : (app.platform == "linux" ? "Shift" : "Alt"), "C"];
app.cfg.general.keybindings.settings = [app.platform == "darwin" ? "Command" : "Control", ","];
app.cfg.general.keybindings.zoomn = [app.platform == "darwin" ? "Command" : "Control", "numadd"];
app.cfg.general.keybindings.zoomt = [app.platform == "darwin" ? "Command" : "Control", "numsub"];
app.cfg.general.keybindings.zoomrst = [app.platform == "darwin" ? "Command" : "Control", "num0"];
app.cfg.general.keybindings.openDeveloperTools = [app.platform == "darwin" ? "Command" : "Control", app.platform == "darwin" ? "Option" : "Shift", "I"];
notyf.success(app.getLz('settings.notyf.general.keybindings.update.success'));
bootbox.confirm(app.getLz("settings.prompt.general.keybindings.update.success"), (ok) => {

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

@ -96,8 +96,7 @@
<option value="listen_now">{{$root.getLz('term.listenNow')}}</option>
<option value="browse">{{$root.getLz('term.browse')}}</option>
<option value="radio">{{$root.getLz('term.radio')}}</option>
<option value="library-recentlyadded">{{$root.getLz('term.recentlyAdded')}}
</option>
<option value="library-recentlyadded">{{$root.getLz('term.recentlyAdded')}}</option>
<option value="library-songs">{{$root.getLz('term.songs')}}</option>
<option value="library-albums">{{$root.getLz('term.albums')}}</option>
<option value="library-artists">{{$root.getLz('term.artists')}}</option>
@ -194,8 +193,8 @@
{{$root.getLz('settings.option.general.keybindings')}}
</div>
<div class="md-option-segment md-option-segment_auto">
<button class="md-btn" @click="app.appRoute('keybinds-settings')">
{{$root.getLz('settings.option.general.keybindings.open')}}
<button class="md-btn" @click="app.appRoute('keybinds-settings')" >
{{$root.getLz('action.open')}}
</button>
</div>
</div>
@ -595,19 +594,7 @@
</label>
</div>
</div>
<div class="md-option-line">
<div class="md-option-segment">
{{$root.getLz('settings.option.visual.uiscale')}}
</div>
<div class="md-option-segment md-option-segment_auto">
<label>
<input type="number" min="0.5" max="4.0" step="0.25" @change="$root.getHTMLStyle()"
v-model="app.cfg.visual.uiScale"/>
</label>
</div>
</div>
</div>
</div>
</b-tab>
<b-tab :title="$root.getLz('settings.header.lyrics')">