diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index d218b3dee..628c591da 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -130,6 +130,7 @@ jobs: source: + if: false permissions: contents: write runs-on: ubuntu-latest diff --git a/README.md b/README.md index acb98039e..5519cd410 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Zen is built with performance in mind, and we have optimized the browser to be a Clone the project ```bash -git clone https://github.com/zen-browser/desktop.git --recursive +git clone https://github.com/zen-browser/desktop.git cd desktop ``` diff --git a/docs/key-shortcuts.md b/docs/key-shortcuts.md new file mode 100644 index 000000000..c45cc87eb --- /dev/null +++ b/docs/key-shortcuts.md @@ -0,0 +1,19 @@ + +# Custom Keyboard Shortcuts + +```json +{ + "": { + "key": "", + "alt": false, + "shift": false, + "ctrl": false, + "meta": false, + "keycode": 0 + } +} +``` + +The `key` field is the key that will trigger the shortcut. The `alt`, `shift`, `ctrl`, and `meta` fields are booleans that indicate if the respective modifier key should be pressed when the shortcut is triggered. + +The `keycode` field is the keycode of the key that will trigger the shortcut. This field is optional and can be used to specify the keycode of the key that will trigger the shortcut. If the `keycode` field is specified, the `key` field will be ignored. diff --git a/docs/workspaces.md b/docs/workspaces.md index 13fd78aee..9c4d9e387 100644 --- a/docs/workspaces.md +++ b/docs/workspaces.md @@ -1,7 +1,7 @@ # Workspaces Layout -``` +```json { "workspaces": [ { diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index 93fec1a09..2a42f3c77 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -71,6 +71,7 @@ pref('zen.view.compact.hide-toolbar', false); pref('zen.view.sidebar-expanded', false); pref('zen.view.sidebar-expanded.show-button', true); pref('zen.view.sidebar-expanded.max-width', 400); +pref('zen.keyboard.shortcuts', "{}"); // Pref to enable the new profiles (TODO: Check this out!) //pref("browser.profiles.enabled", true); diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components index 751b71035..47c436108 160000 --- a/src/browser/base/content/zen-components +++ b/src/browser/base/content/zen-components @@ -1 +1 @@ -Subproject commit 751b71035b55c3f63b357d4623c041a01ced7c02 +Subproject commit 47c43610827bbd6ce54804c402637a15ed0340f7 diff --git a/src/browser/base/content/zen-scripts.inc.xhtml b/src/browser/base/content/zen-scripts.inc.xhtml index 64d8ac345..c8dd76038 100644 --- a/src/browser/base/content/zen-scripts.inc.xhtml +++ b/src/browser/base/content/zen-scripts.inc.xhtml @@ -5,5 +5,6 @@ window.addEventListener("DOMContentLoaded", async () => { Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaces.mjs"); Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenViewSplitter.mjs"); Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenProfileDialogUI.mjs"); + Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs"); }, { once: true }); \ No newline at end of file diff --git a/src/browser/base/content/zen-scripts.jar.inc.mn b/src/browser/base/content/zen-scripts.jar.inc.mn index 14025239c..2fe21674b 100644 --- a/src/browser/base/content/zen-scripts.jar.inc.mn +++ b/src/browser/base/content/zen-scripts.jar.inc.mn @@ -3,5 +3,6 @@ content/browser/zen-components/ZenViewSplitter.mjs (content/zen-components/src/ZenViewSplitter.mjs) content/browser/zen-components/ZenWorkspaces.mjs (content/zen-components/src/ZenWorkspaces.mjs) content/browser/zen-components/ZenSidebarManager.mjs (content/zen-components/src/ZenSidebarManager.mjs) - content/browser/zen-components/ZenProfileDialogUI.mjs (content/zen-components/src/ZenProfileDialogUI.mjs) + content/browser/zen-components/ZenProfileDialogUI.mjs (content/zen-components/src/ZenProfileDialogUI.mjs) + content/browser/zen-components/ZenKeyboardShortcuts.mjs (content/zen-components/src/ZenKeyboardShortcuts.mjs) \ No newline at end of file