[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/images loleaflet/src
Szymon KÅ‚os (via logerrit)
logerrit at kemper.freedesktop.org
Thu Aug 6 08:39:55 UTC 2020
loleaflet/css/notebookbar.css | 8
loleaflet/images/lc_editheaderandfooter.svg | 1
loleaflet/src/control/Control.NotebookbarCalc.js | 214 ++++++++++++++++++++++-
3 files changed, 221 insertions(+), 2 deletions(-)
New commits:
commit 11a3fca6db9534eb64d097425cf1af8a4bbf56e4
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Aug 6 10:04:35 2020 +0200
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Aug 6 10:39:44 2020 +0200
notebookbar: hide duplicated icons
Change-Id: Ie0a57c5a48986eb742a3e1f5fe77c46e99e22564
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100202
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index aecffe463..8f0ed9c35 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -618,6 +618,10 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
width: 32px !important;
}
+#table-DataTab #table-ViewMenu3.notebookbar {
+ display: none;
+}
+
/* Review Tab */
#table-GroupB40 #Hyphenate.notebookbar,
@@ -635,6 +639,10 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
width: 32px !important;
}
+#table-ReviewTab #table-Review #AcceptChanges.notebookbar {
+ display: none;
+}
+
/* Sheet Tab */
#table-Sheet-Section.notebookbar {
commit 87aa4346de3f72fd55fdb29e4be61dfbd5a53c2d
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Aug 6 09:59:38 2020 +0200
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Aug 6 10:39:36 2020 +0200
notebookbar: customize Insert tab in Calc
Change-Id: I6d7eead3bfb80afaa2b3e72d13fb96d53d81ce65
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100201
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/loleaflet/images/lc_editheaderandfooter.svg b/loleaflet/images/lc_editheaderandfooter.svg
new file mode 100644
index 000000000..4c03f51d4
--- /dev/null
+++ b/loleaflet/images/lc_editheaderandfooter.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h14v-14.2705905l-4-3.7294095z" fill="#fff"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h14c.554 0 1-.446 1-1v-10.109375-3.6412209-.2079239c0-.4506799.09887-.4265951-.604637-1.0675892l-3.307389-3.2370335c-.709525-.7368575-.711223-.7368575-1.094804-.7368575h-.331557-.661613zm0 1h9v4c0 .554.446 1 1 1h4v13h-14z" fill="#808080"/><path d="m15 7h4l-4-4z" fill="#fff" fill-rule="evenodd"/><g fill="#eac282"><path d="m6 4h7v3h-7z"/><path d="m6 17h11v3h-11z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.NotebookbarCalc.js b/loleaflet/src/control/Control.NotebookbarCalc.js
index e15a695f8..b05ea8650 100644
--- a/loleaflet/src/control/Control.NotebookbarCalc.js
+++ b/loleaflet/src/control/Control.NotebookbarCalc.js
@@ -21,8 +21,8 @@ L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
},
{
'text': _('~Insert'),
- 'id': '3',
- 'name': 'InsertLabel'
+ 'id': '-4',
+ 'name': 'Insert'
},
{
'text': _('~Sheet'),
@@ -61,6 +61,9 @@ L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
this.loadTab(this.getSheetTab());
break;
+ case 'Insert':
+ this.loadTab(this.getInsertTab());
+ break;
}
},
@@ -2075,6 +2078,213 @@ L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
}
]
};
+ },
+
+ getInsertTab: function() {
+ return {
+ 'id': '',
+ 'type': 'control',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': '',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'NotebookBar',
+ 'type': 'grid',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'box',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'ContextContainer',
+ 'type': 'tabcontrol',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': '',
+ 'type': 'tabpage',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'Insert Tab',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'Insert',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'Insert-Section-Image',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'SectionBottom65',
+ 'type': 'toolbox',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'type': 'bigtoolitem',
+ 'text': _UNO('.uno:InsertGraphic'),
+ 'command': '.uno:InsertGraphic'
+ }
+ ]
+ }
+ ],
+ 'vertical': 'false'
+ },
+ {
+ 'id': 'Insert-Section-Table1',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'LineA11',
+ 'type': 'toolbox',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'type': 'bigtoolitem',
+ 'text': _UNO('.uno:InsertObjectChart'),
+ 'command': '.uno:InsertObjectChart'
+ }
+ ]
+ }
+ ],
+ 'vertical': 'false'
+ },
+ {
+ 'id': 'Insert-Section-Bookmark',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'SectionBottom14',
+ 'type': 'toolbox',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'type': 'bigtoolitem',
+ 'text': _UNO('.uno:HyperlinkDialog'),
+ 'command': '.uno:HyperlinkDialog'
+ }
+ ]
+ }
+ ],
+ 'vertical': 'false'
+ },
+ {
+ 'id': 'Insert-Section-Draw2',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'shapes6',
+ 'type': 'toolbox',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'type': 'bigtoolitem',
+ 'text': _UNO('.uno:BasicShapes'),
+ 'command': '.uno:BasicShapes'
+ }
+ ]
+ }
+ ],
+ 'vertical': 'false'
+ },
+ {
+ 'id': 'Insert-Section-Symbol',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'SectionBottom105',
+ 'type': 'toolbox',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'type': 'bigtoolitem',
+ 'text': _UNO('.uno:CharmapControl'),
+ 'command': '.uno:CharmapControl'
+ }
+ ]
+ }
+ ],
+ 'vertical': 'false'
+ },
+ {
+ 'id': 'Insert-Section-HeaderFooter',
+ 'type': 'container',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'id': 'SectionHeaderFooter',
+ 'type': 'toolbox',
+ 'text': '',
+ 'enabled': 'true',
+ 'children': [
+ {
+ 'type': 'bigtoolitem',
+ 'text': _UNO('.uno:EditHeaderAndFooter', 'spreadsheet'),
+ 'command': '.uno:EditHeaderAndFooter'
+ }
+ ]
+ }
+ ],
+ 'vertical': 'false'
+ }
+ ],
+ 'vertical': 'false'
+ }
+ ],
+ 'vertical': 'false'
+ }
+ ]
+ }
+ ],
+ 'tabs': [],
+ 'selected': '-4'
+ }
+ ],
+ 'vertical': 'true',
+ 'left': '0',
+ 'top': '0'
+ }
+ ]
+ }
+ ],
+ 'vertical': 'true'
+ }
+ ]
+ };
}
});
More information about the Libreoffice-commits
mailing list