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

Merge branch 'ciderapp:main' into develop

Browse source
This commit is contained in:
Gabriel Davila 2022-05-17 18:56:57 -03:00 • committed by GitHub
commit 4853a08498
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/base/store.ts
View file

@ -101,7 +101,7 @@ export class Store {
],
"settings": [
"CommandOrControl", // Who the hell uses a different key for this? Fucking Option?
"S"
","
],
"openDeveloperTools": [
"CommandOrControl",

18
src/main/plugins/menubar.ts
View file

@ -22,25 +22,21 @@ export default class Thumbar {
{
label: app.getName(),
submenu: [
{
label: `${utils.getLocale(utils.getStoreValue('general.language'), 'term.about')} ${app.getName()}`,
click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`)
},
{type: 'separator'},
{
label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggleprivate'),
accelerator: utils.getStoreValue("general.keybindings.togglePrivateSession").join('+'),
click: () => utils.getWindow().webContents.executeJavaScript(`app.cfg.general.privateEnabled = !app.cfg.general.privateEnabled`)
},
{type: 'separator'},
{
label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.settings'),
accelerator: utils.getStoreValue("general.keybindings.settings").join('+'),
click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`),
},
...(this.isMac ? [
{type: 'separator'},
{role: 'services'},
{type: 'separator'},
{role: 'hide'},
{role: 'hideOthers'},
{role: 'unhide'},
]: [
{type: 'separator'},
{
label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.about'),
@ -48,10 +44,8 @@ export default class Thumbar {
},
{type: 'separator'},
{role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')},
]),
],
]
},
{
label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.view'),
submenu: [

4
winget.json
View file

@ -1,7 +1,7 @@
{
"electronVersion": "18.2.0",
"electronVersion": "18.2.3",
"electronDownload": {
"version": "18.2.0+wvcus",
"version": "18.2.3+wvcus",
"mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
},
"appId": "cider",