Skip to content

Commit 548ed6e

Browse files
mr-cheffymr-cheffy
committed
feat: part 2 - Finish workspace creation form, refactor collapsed toolbar and update motion to v12.16.0, b=no-bug, c=workspaces, common, tabs, vendor
1 parent df916f1 commit 548ed6e

18 files changed

+250
-152
lines changed

‎src/browser/base/content/zen-keysets.inc.xhtml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
15
<commandset id="zenCommandSet">
26
<command id="cmd_zenCompactModeToggle" />
37
<command id="cmd_zenCompactModeShowSidebar" />

‎src/browser/base/content/zen-locales.inc.xhtml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
14

25
<link rel="localization" href="browser/zen-workspaces.ftl"/>
36
<link rel="localization" href="browser/zen-split-view.ftl"/>

‎src/browser/base/content/zen-panels/emojis-picker.inc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
5+
<panel type="arrow" orient="vertical" id="PanelUI-zen-emojis-picker" position="bottomright topright" side="bottom">
6+
<hbox id="PanelUI-zen-emojis-picker-header">
7+
<html:input type="search" id="PanelUI-zen-emojis-picker-search" placeholder="Search emojis" />
8+
<toolbarbutton id="PanelUI-zen-emojis-picker-none" class="toolbarbutton-1" />
9+
</hbox>
10+
<hbox id="PanelUI-zen-emojis-picker-list" />
11+
</panel>

‎src/browser/base/content/zen-panels/gradient-generator.inc‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
5+
<panel flip="side" type="arrow" popupalign="center" orient="vertical" id="PanelUI-zen-gradient-generator" position="bottomright topright" mainview="true" side="left">
6+
<panelmultiview id="PanelUI-zen-gradient-generator-multiview" mainViewId="PanelUI-zen-gradient-generator-view">
7+
<panelview id="PanelUI-zen-gradient-generator-view" class="PanelUI-subView zen-theme-picker" role="document" mainview-with-header="true" has-custom-header="true">
8+
<hbox>
9+
<hbox id="PanelUI-zen-gradient-generator-predefined">
10+
<box data-algo="analogous" data-num-dots="3" data-position="219,99" style="background: linear-gradient(135deg, rgb(117, 255, 136), rgb(60, 66, 58));"></box>
11+
<box data-algo="analogous" data-num-dots="3" data-position="167,201" style="background: linear-gradient(135deg, #a03fe0, #382b5c);"></box>
12+
<box data-algo="analogous" data-num-dots="3" data-position="90,170" style="background: linear-gradient(135deg, #c57aa3, #af824f);"></box>
13+
<box data-algo="splitComplementary" data-num-dots="3" data-position="83,103" style="background: linear-gradient(135deg, #1e90ff, #968a4a);"></box>
14+
<box data-algo="analogous" data-num-dots="3" data-position="186,186" style="background: linear-gradient(135deg, #a07a48, #ab80e4);"></box>
15+
<box data-algo="float" data-num-dots="1" data-position="196,176" style="background: #7bcbda;"></box>
16+
<box data-algo="float" data-num-dots="1" data-position="116,167" style="background: #be9ac9;"></box>
17+
<box data-algo="float" data-num-dots="1" data-position="122,110" style="background: #cdcea1;"></box>
18+
<box data-algo="float" data-num-dots="1" data-position="181,83" style="background: #6ac593;"></box>
19+
<box data-algo="complementary" data-num-dots="2" data-position="82,112" style="background: linear-gradient(135deg, #1e90ff, #cfb179);"></box>
20+
</hbox>
21+
</hbox>
22+
<hbox class="zen-theme-picker-gradient">
23+
<box id="PanelUI-zen-gradient-generator-rotation-dot"></box>
24+
<box id="PanelUI-zen-gradient-generator-rotation-line"></box>
25+
<box id="PanelUI-zen-gradient-generator-color-actions">
26+
<button id="PanelUI-zen-gradient-generator-color-add" class="subviewbutton">
27+
</button>
28+
<button id="PanelUI-zen-gradient-generator-color-remove" class="subviewbutton">
29+
</button>
30+
<html:div class="separator"></html:div>
31+
<button id="PanelUI-zen-gradient-generator-color-toggle-algo" class="subviewbutton" data-l10n-id="zen-panel-ui-gradient-generator-algo-floating">
32+
</button>
33+
</box>
34+
<label data-l10n-id="zen-panel-ui-gradient-click-to-add" id="PanelUI-zen-gradient-generator-color-click-to-add"></label>
35+
</hbox>
36+
<hbox id="PanelUI-zen-gradient-generator-controls">
37+
<hbox id="PanelUI-zen-gradient-colors-wrapper">
38+
<vbox flex="1">
39+
<label data-l10n-id="zen-panel-ui-gradient-generator-opacity-text"></label>
40+
<html:input type="range" min="0" max="1" value="0.5" step="0.05" id="PanelUI-zen-gradient-generator-opacity" />
41+
</vbox>
42+
<vbox id="PanelUI-zen-gradient-generator-texture-wrapper">
43+
</vbox>
44+
</hbox>
45+
</hbox>
46+
<vbox id="PanelUI-zen-gradient-generator-custom-colors">
47+
<vbox id="zen-theme-picker-color">
48+
<label data-l10n-id="zen-panel-ui-gradient-generator-custom-color"></label>
49+
<hbox>
50+
<html:input type="text" placeholder="#000000" id="PanelUI-zen-gradient-generator-custom-input" />
51+
<toolbarbutton id="PanelUI-zen-gradient-generator-color-custom-add" class="subviewbutton">
52+
<image></image>
53+
</toolbarbutton>
54+
</hbox>
55+
</vbox>
56+
<vbox id="PanelUI-zen-gradient-generator-custom-list">
57+
</vbox>
58+
</vbox>
59+
</panelview>
60+
</panelmultiview>
61+
</panel>

‎src/browser/base/content/zen-panels/popups.inc‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
5+
<menupopup id="zenCreateNewPopup">
6+
<menuitem data-l10n-id="tabs-toolbar-new-tab" command="cmd_newNavigatorTab" image="chrome://browser/skin/zen-icons/plus.svg" />
7+
<menuseparator/>
8+
<menuitem data-l10n-id="zen-panel-ui-workspaces-create" command="cmd_zenOpenWorkspaceCreation" image="chrome://browser/skin/zen-icons/duplicate-tab.svg" />
9+
</menupopup>
10+
11+
<menupopup id="zenWorkspaceMoreActions">
12+
<menuitem id="context_zenEditWorkspace" data-l10n-id="zen-panel-ui-workspaces-create" command="cmd_zenChangeWorkspaceName"/>
13+
<menuitem id="context_zenEditWorkspaceIcon" data-l10n-id="zen-workspaces-panel-change-icon" command="cmd_zenChangeWorkspaceIcon"/>
14+
<menuitem class="zenToolbarThemePicker"
15+
data-l10n-id="zen-workspaces-change-theme"
16+
command="cmd_zenOpenZenThemePicker"/>
17+
<menu id="context_zenWorkspacesOpenInContainerTab"
18+
data-l10n-id="zen-workspaces-panel-context-open-in-container-tab"
19+
selection-type="single"
20+
node-type="link"
21+
hide-if-private-browsing="true"
22+
hide-if-usercontext-disabled="true">
23+
<menupopup />
24+
</menu>
25+
<menuseparator/>
26+
<menuitem id="context_zenOpenWorkspacePanel" data-l10n-id="zen-workspaces-panel-context-manage" command="cmd_zenOpenWorkspacePanel"/>
27+
<menuseparator/>
28+
<menuitem id="context_zenDeleteWorkspace" data-l10n-id="zen-workspaces-panel-context-delete" command="cmd_zenCtxDeleteWorkspace"/>
29+
</menupopup>

‎src/browser/base/content/zen-panels/workspaces-panel.inc‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
5+
<panel flip="slide" type="arrow" orient="vertical" id="PanelUI-zen-workspaces" position="bottomright topright" mainview="true" side="left">
6+
<panelmultiview id="PanelUI-zen-workspaces-multiview" mainViewId="PanelUI-zen-workspaces-view">
7+
<panelview id="PanelUI-zen-workspaces-view" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true" closemenu="none">
8+
<vbox>
9+
<hbox>
10+
<h3 data-l10n-id="zen-panel-ui-workspaces-text" id="PanelUI-zen-workspaces-header"></h3>
11+
<toolbarbutton id="PanelUI-zen-workspaces-reorder-mode" class="subviewbutton">
12+
<image></image>
13+
</toolbarbutton>
14+
<toolbarbutton id="PanelUI-zen-workspaces-new" class="subviewbutton" command="cmd_zenOpenWorkspaceCreation">
15+
<image></image>
16+
</toolbarbutton>
17+
</hbox>
18+
</vbox>
19+
<html:div id="PanelUI-zen-workspaces-list">
20+
</html:div>
21+
</panelview>
22+
</panelmultiview>
23+
</panel>

‎src/browser/base/content/zen-popupset.inc.xhtml‎

Lines changed: 7 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,9 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
14

2-
<panel flip="side" type="arrow" orient="vertical" id="PanelUI-zen-gradient-generator" position="bottomright topright" mainview="true" side="left">
3-
<panelmultiview id="PanelUI-zen-gradient-generator-multiview" mainViewId="PanelUI-zen-gradient-generator-view">
4-
<panelview id="PanelUI-zen-gradient-generator-view" class="PanelUI-subView zen-theme-picker" role="document" mainview-with-header="true" has-custom-header="true">
5-
<hbox>
6-
<hbox id="PanelUI-zen-gradient-generator-predefined">
7-
<box data-algo="analogous" data-num-dots="3" data-position="219,99" style="background: linear-gradient(135deg, rgb(117, 255, 136), rgb(60, 66, 58));"></box>
8-
<box data-algo="analogous" data-num-dots="3" data-position="167,201" style="background: linear-gradient(135deg, #a03fe0, #382b5c);"></box>
9-
<box data-algo="analogous" data-num-dots="3" data-position="90,170" style="background: linear-gradient(135deg, #c57aa3, #af824f);"></box>
10-
<box data-algo="splitComplementary" data-num-dots="3" data-position="83,103" style="background: linear-gradient(135deg, #1e90ff, #968a4a);"></box>
11-
<box data-algo="analogous" data-num-dots="3" data-position="186,186" style="background: linear-gradient(135deg, #a07a48, #ab80e4);"></box>
12-
<box data-algo="float" data-num-dots="1" data-position="196,176" style="background: #7bcbda;"></box>
13-
<box data-algo="float" data-num-dots="1" data-position="116,167" style="background: #be9ac9;"></box>
14-
<box data-algo="float" data-num-dots="1" data-position="122,110" style="background: #cdcea1;"></box>
15-
<box data-algo="float" data-num-dots="1" data-position="181,83" style="background: #6ac593;"></box>
16-
<box data-algo="complementary" data-num-dots="2" data-position="82,112" style="background: linear-gradient(135deg, #1e90ff, #cfb179);"></box>
17-
</hbox>
18-
</hbox>
19-
<hbox class="zen-theme-picker-gradient">
20-
<box id="PanelUI-zen-gradient-generator-rotation-dot"></box>
21-
<box id="PanelUI-zen-gradient-generator-rotation-line"></box>
22-
<box id="PanelUI-zen-gradient-generator-color-actions">
23-
<button id="PanelUI-zen-gradient-generator-color-add" class="subviewbutton">
24-
</button>
25-
<button id="PanelUI-zen-gradient-generator-color-remove" class="subviewbutton">
26-
</button>
27-
<html:div class="separator"></html:div>
28-
<button id="PanelUI-zen-gradient-generator-color-toggle-algo" class="subviewbutton" data-l10n-id="zen-panel-ui-gradient-generator-algo-floating">
29-
</button>
30-
</box>
31-
<label data-l10n-id="zen-panel-ui-gradient-click-to-add" id="PanelUI-zen-gradient-generator-color-click-to-add"></label>
32-
</hbox>
33-
<hbox id="PanelUI-zen-gradient-generator-controls">
34-
<hbox id="PanelUI-zen-gradient-colors-wrapper">
35-
<vbox flex="1">
36-
<label data-l10n-id="zen-panel-ui-gradient-generator-opacity-text"></label>
37-
<html:input type="range" min="0" max="1" value="0.5" step="0.05" id="PanelUI-zen-gradient-generator-opacity" />
38-
</vbox>
39-
<vbox id="PanelUI-zen-gradient-generator-texture-wrapper">
40-
</vbox>
41-
</hbox>
42-
</hbox>
43-
<vbox id="PanelUI-zen-gradient-generator-custom-colors">
44-
<vbox id="zen-theme-picker-color">
45-
<label data-l10n-id="zen-panel-ui-gradient-generator-custom-color"></label>
46-
<hbox>
47-
<html:input type="text" placeholder="#000000" id="PanelUI-zen-gradient-generator-custom-input" />
48-
<toolbarbutton id="PanelUI-zen-gradient-generator-color-custom-add" class="subviewbutton">
49-
<image></image>
50-
</toolbarbutton>
51-
</hbox>
52-
</vbox>
53-
<vbox id="PanelUI-zen-gradient-generator-custom-list">
54-
</vbox>
55-
</vbox>
56-
</panelview>
57-
</panelmultiview>
58-
</panel>
5+
#include zen-panels/gradient-generator.inc
6+
#include zen-panels/workspaces-panel.inc
7+
#include zen-panels/emojis-picker.inc
598

60-
<panel flip="slide" type="arrow" orient="vertical" id="PanelUI-zen-workspaces" position="bottomright topright" mainview="true" side="left">
61-
<panelmultiview id="PanelUI-zen-workspaces-multiview" mainViewId="PanelUI-zen-workspaces-view">
62-
<panelview id="PanelUI-zen-workspaces-view" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true" closemenu="none">
63-
<vbox>
64-
<hbox>
65-
<h3 data-l10n-id="zen-panel-ui-workspaces-text" id="PanelUI-zen-workspaces-header"></h3>
66-
<toolbarbutton id="PanelUI-zen-workspaces-reorder-mode" class="subviewbutton">
67-
<image></image>
68-
</toolbarbutton>
69-
<toolbarbutton id="PanelUI-zen-workspaces-new" class="subviewbutton" command="cmd_zenOpenWorkspaceCreation">
70-
<image></image>
71-
</toolbarbutton>
72-
</hbox>
73-
</vbox>
74-
<html:div id="PanelUI-zen-workspaces-list">
75-
</html:div>
76-
</panelview>
77-
</panelmultiview>
78-
</panel>
79-
80-
<panel type="arrow" orient="vertical" id="PanelUI-zen-emojis-picker" position="bottomright topright" side="bottom">
81-
<hbox id="PanelUI-zen-emojis-picker-header">
82-
<html:input type="search" id="PanelUI-zen-emojis-picker-search" placeholder="Search emojis" />
83-
<toolbarbutton id="PanelUI-zen-emojis-picker-none" class="toolbarbutton-1" />
84-
</hbox>
85-
<hbox id="PanelUI-zen-emojis-picker-list" />
86-
</panel>
87-
88-
<menupopup id="zenCreateNewPopup">
89-
<menuitem data-l10n-id="tabs-toolbar-new-tab" command="cmd_newNavigatorTab" image="chrome://browser/skin/zen-icons/plus.svg" />
90-
<menuseparator/>
91-
<menuitem data-l10n-id="zen-panel-ui-workspaces-create" command="cmd_zenOpenWorkspaceCreation" image="chrome://browser/skin/zen-icons/duplicate-tab.svg" />
92-
</menupopup>
93-
94-
<menupopup id="zenWorkspaceMoreActions">
95-
<menuitem id="context_zenEditWorkspace" data-l10n-id="zen-panel-ui-workspaces-create" command="cmd_zenChangeWorkspaceName"/>
96-
<menuitem id="context_zenEditWorkspaceIcon" data-l10n-id="zen-workspaces-panel-change-icon" command="cmd_zenChangeWorkspaceIcon"/>
97-
<menuitem class="zenToolbarThemePicker"
98-
data-l10n-id="zen-workspaces-change-theme"
99-
command="cmd_zenOpenZenThemePicker"/>
100-
<menu id="context_zenWorkspacesOpenInContainerTab"
101-
data-l10n-id="zen-workspaces-panel-context-open-in-container-tab"
102-
selection-type="single"
103-
node-type="link"
104-
hide-if-private-browsing="true"
105-
hide-if-usercontext-disabled="true">
106-
<menupopup />
107-
</menu>
108-
<menuseparator/>
109-
<menuitem id="context_zenOpenWorkspacePanel" data-l10n-id="zen-workspaces-panel-context-manage" command="cmd_zenOpenWorkspacePanel"/>
110-
<menuseparator/>
111-
<menuitem id="context_zenDeleteWorkspace" data-l10n-id="zen-workspaces-panel-context-delete" command="cmd_zenCtxDeleteWorkspace"/>
112-
</menupopup>
9+
#include zen-panels/popups.inc

‎src/browser/base/content/zen-preloaded.inc.xhtml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
15
# This needs to be here, before all the other scripts, because it's used before
26
# the window is fully loaded.
37
# Make sure they are loaded before the global-scripts.inc file.

‎src/browser/base/content/zen-sidebar-icons.inc.xhtml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
15
#include ../../../zen/media/zen-media-controls.inc.xhtml
6+
27
<toolbar brighttext="true"
3-
id="zen-sidebar-bottom-buttons"
8+
id="zen-sidebar-foot-buttons"
49
fullscreentoolbar="true"
510
class="browser-toolbar customization-target"
611
data-l10n-id="tabs-toolbar"

‎src/browser/base/content/zen-tabbrowser-elements.inc.xhtml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
4+
15
<vbox id="zen-toast-container"></vbox>
26

37
#include ../../../zen/split-view/zen-splitview-overlay.inc.xhtml

0 commit comments

Comments
 (0)