haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Collapse notebook bar from view tab 

Signed-off-by: Maks Wolkowinski <m.wolkowinski@beebuzziness.com>
Change-Id: Ic15fb1723bff6861b1fc115ef161cf6caa1b70af
pull/7004/head
Maks Wolkowinski 2023-07-28 14:57:55 +02:00 committed by pedropintosilva
parent d99aece12f
commit 1f5919140d
7 changed files with 228 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
browser/images/dark/lc_collapsenotebookbar.svg 100644
View File

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 24 24"
version="1.1"
id="svg10"
sodipodi:docname="lc_collapsenotebookbar.svg"
inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
<metadata
id="metadata16">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs14" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="952"
inkscape:window-height="1046"
id="namedview12"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="13.155132"
inkscape:cx="19.84766"
inkscape:cy="5.9768397"
inkscape:window-x="2882"
inkscape:window-y="28"
inkscape:window-maximized="0"
inkscape:current-layer="svg10">
<sodipodi:guide
position="31.850687,21.035378"
orientation="0,-1"
id="guide18" />
</sodipodi:namedview>
<path
d="m 15.4,9.9 a 0.5,0.5 0 0 1 0.4,0.2 l 3,3 a 0.5,0.5 0 1 1 -0.7,0.7 L 16,11.7 v 5.8 a 0.5,0.5 0 1 1 -1,0 v -5.8 l -2.1,2.1 a 0.5,0.5 0 1 1 -0.7,-0.7 l 2.8,-3 a 0.5,0.5 0 0 1 0.4,-0.2 z"
fill="#1e8bcd"
id="path2" />
<path
d="m3 3c-.554 0-1 .446-1 1v16c0 .554.446 1 1 1h18c.554 0 1-.446 1-1v-16c0-.554-.446-1-1-1zm0 1h18v16h-18z"
fill="#fafafa"
id="path4" />
<path
d="M 22,4 C 22,3.446 21.554,3 21,3 H 3 C 2.446,3 2,3.446 2,4 v 2 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 z M 21,4 V 6 H 3 V 4 Z"
fill="#83beec"
id="path6" />
<path
d="M 21,4 H 3 v 2 h 18 z"
fill="#0063b1"
id="path8" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

70
browser/images/lc_collapsenotebookbar.svg 100644
View File

@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 24 24"
version="1.1"
id="svg12"
sodipodi:docname="lc_collapsenotebookbar.svg"
inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
<metadata
id="metadata18">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs16" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="952"
inkscape:window-height="1046"
id="namedview14"
showgrid="false"
inkscape:zoom="37.208333"
inkscape:cx="12"
inkscape:cy="12"
inkscape:window-x="2882"
inkscape:window-y="28"
inkscape:window-maximized="0"
inkscape:current-layer="svg12"
inkscape:document-rotation="0" />
<path
d="m3 4v16h18v-16z"
fill="#fafafa"
id="path2" />
<path
d="m 15.373223,9.0629853 a 0.5,0.5 0 0 1 0.4,0.2 l 3,2.9999997 a 0.5,0.5 0 1 1 -0.7,0.7 l -2.1,-2.1 v 5.8 a 0.5,0.5 0 1 1 -1,0 v -5.8 l -2.1,2.1 a 0.5,0.5 0 1 1 -0.7,-0.7 l 2.8,-2.9999997 a 0.5,0.5 0 0 1 0.4,-0.2 z"
fill="#1e8bcd"
id="path4" />
<path
d="m3 3c-.554 0-1 .446-1 1v16c0 .554.446 1 1 1h18c.554 0 1-.446 1-1v-16c0-.554-.446-1-1-1zm0 1h18v16h-18z"
fill="#3a3a38"
id="path6" />
<path
d="M 22,4 C 22,3.446 21.554,3 21,3 H 3 C 2.446,3 2,3.446 2,4 v 2 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 z M 21,4 V 6 H 3 V 4 Z"
fill="#0063b1"
id="path8" />
<path
d="M 21,4 H 3 v 2 h 18 z"
fill="#83beec"
id="path10" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

3
browser/src/control/Control.Menubar.js
View File

@ -1694,7 +1694,6 @@ L.Control.Menubar = L.Control.extend({
} else {
$(aItem).removeClass(constChecked);
}
} else if (id === 'toggleuimode') {
if (self._map.uiManager.shouldUseNotebookbarMode()) {
$(aItem).text(_('Use Compact view'));
@ -1883,6 +1882,8 @@ L.Control.Menubar = L.Control.extend({
this._map.uiManager.toggleStatusBar();
} else if (id === 'togglemenubar') {
this._map.uiManager.toggleMenubar();
} else if (id === 'collapsenotebookbar') {
this._map.uiManager.collapseNotebookbar();
} else if (id === 'fullscreen-presentation' && this._map.getDocType() === 'presentation') {
this._map.fire('fullscreen');
} else if (id === 'presentation-currentslide' && this._map.getDocType() === 'presentation') {

30
browser/src/control/Control.NotebookbarCalc.js
View File

@ -1027,10 +1027,32 @@ L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
'command': _('Toggle UI Mode')
},
{
'id': 'showstatusbar',
'type': 'menubartoolitem',
'text': _('Status Bar'),
'command': _('Show Status Bar')
'type': 'container',
'children': [
{
'type': 'toolbox',
'children': [
{
'id': 'collapsenotebookbar',
'type': 'menubartoolitem',
'text': _('Collapse Tabs'),
'command': _('Collapse Notebook Bar')
}
]
},
{
'type': 'toolbox',
'children': [
{
'id': 'showstatusbar',
'type': 'menubartoolitem',
'text': _('Status Bar'),
'command': _('Show Status Bar')
}
]
}
],
'vertical': 'true'
},
{
'id':'toggledarktheme',

30
browser/src/control/Control.NotebookbarDraw.js
View File

@ -311,10 +311,32 @@ L.Control.NotebookbarDraw = L.Control.NotebookbarImpress.extend({
'command': _('Toggle UI Mode')
},
{
'id': 'showstatusbar',
'type': 'menubartoolitem',
'text': _('Status Bar'),
'command': _('Show Status Bar')
'type': 'container',
'children': [
{
'type': 'toolbox',
'children': [
{
'id': 'collapsenotebookbar',
'type': 'menubartoolitem',
'text': _('Collapse Tabs'),
'command': _('Collapse Notebook Bar')
}
]
},
{
'type': 'toolbox',
'children': [
{
'id': 'showstatusbar',
'type': 'menubartoolitem',
'text': _('Status Bar'),
'command': _('Show Status Bar')
}
]
}
],
'vertical': 'true'
},
{
'id':'toggledarktheme',

30
browser/src/control/Control.NotebookbarImpress.js
View File

@ -423,10 +423,32 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
'command': _('Toggle UI Mode')
},
{
'id': 'showstatusbar',
'type': 'menubartoolitem',
'text': _('Status Bar'),
'command': _('Show Status Bar')
'type': 'container',
'children': [
{
'type': 'toolbox',
'children': [
{
'id': 'collapsenotebookbar',
'type': 'menubartoolitem',
'text': _('Collapse Tabs'),
'command': _('Collapse Notebook Bar')
}
]
},
{
'type': 'toolbox',
'children': [
{
'id': 'showstatusbar',
'type': 'menubartoolitem',
'text': _('Status Bar'),
'command': _('Show Status Bar')
}
]
}
],
'vertical': 'true'
},
{
'type': 'bigtoolitem',

6
browser/src/control/Control.NotebookbarWriter.js
View File

@ -1168,6 +1168,12 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
],
'vertical': 'true'
},
{
'id': 'collapsenotebookbar',
'type': 'bigmenubartoolitem',
'text': _('Collapse Tabs'),
'command': _('Collapse Notebook Bar')
},
{
'id':'toggledarktheme',
'type': 'bigcustomtoolitem',