loleaflet/css/notebookbar.css | 2 -
loleaflet/src/control/Control.Notebookbar.js | 29 +++++++++++++++++++-
loleaflet/src/control/Control.NotebookbarBuilder.js | 1
3 files changed, 30 insertions(+), 2 deletions(-)
New commits:
commit 37a182a37eac4d67835a4cf17f69e464bfcfc50c
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Apr 24 11:27:39 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri May 1 17:38:41 2020 +0200
notebookbar: added placeholders for tabs
Change-Id: Ib5ad481e92d635b48713a67b608368a867f3e02a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93271
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index bb8c05b3c..82cffd524 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -36,7 +36,7 @@
/* unobuttons */
-#SendToBack.notebookbar, #ObjectBackOne.notebookbar,
#ObjectForwardOne.notebookbar, #BringToFront.notebookbar,
#SetObjectToBackground.notebookbar, #SetObjectToForeground.notebookbar,
#FlipVertical.notebookbar, #FlipHorizontal.notebookbar, #Bold.notebookbar,
#Italic.notebookbar, #Underline.notebookbar, #Strikeout.notebookbar,
#StyleApply.notebookbar, #StyleUpdateByExample.notebookbar,
#StyleNewByExample.notebookbar, #Shadowed.notebookbar, #Grow.notebookbar,
#Shrink.notebookbar, #Spacing.notebookbar, #SuperScript.notebookbar,
#SubScript.notebookbar,#AlignLeft.notebookbar, #AlignRight.notebookbar,
#AlignHorizontalCenter.notebookbar, #AlignBlock.notebookbar,
#ParaRightToLeft.notebookbar, #ParaLeftToRight.notebookbar,
#AlignTop.notebookbar, #AlignVCenter.notebookbar, #AlignBottom.notebookbar,
#IncrementIndent.notebookbar, #DecrementIndent.notebookbar,
#LeftPara.notebookbar, #RightPara.notebookbar, #CenterPara.notebookbar,
#JustifyPara.notebookbar, #DefaultBullet.notebookbar, #DefaultNumb
ering.notebookbar, #ParaspaceIncrease.notebookbar,
#ParaspaceDecrease.notebookbar, #LineSpacing.notebookbar,
#HangingIndent.notebookbar, #CellVertTop.notebookbar,
#CellVertCenter.notebookbar, #CellVertBottom.notebookbar,
#ParaspaceIncrease.notebookbar, #ParaspaceDecrease.notebookbar,
#DeleteTable.notebookbar, #MergeCells.notebookbar{
+div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookbar, #ObjectBackOne.notebookbar,
#ObjectForwardOne.notebookbar, #BringToFront.notebookbar,
#SetObjectToBackground.notebookbar, #SetObjectToForeground.notebookbar,
#FlipVertical.notebookbar, #FlipHorizontal.notebookbar, #Bold.notebookbar,
#Italic.notebookbar, #Underline.notebookbar, #Strikeout.notebookbar,
#StyleApply.notebookbar, #StyleUpdateByExample.notebookbar,
#StyleNewByExample.notebookbar, #Shadowed.notebookbar, #Grow.notebookbar,
#Shrink.notebookbar, #Spacing.notebookbar, #SuperScript.notebookbar,
#SubScript.notebookbar,#AlignLeft.notebookbar, #AlignRight.notebookbar,
#AlignHorizontalCenter.notebookbar, #AlignBlock.notebookbar,
#ParaRightToLeft.notebookbar, #ParaLeftToRight.notebookbar,
#AlignTop.notebookbar, #AlignVCenter.notebookbar, #AlignBottom.notebookbar,
#IncrementIndent.notebookbar, #DecrementIndent.notebookbar,
#LeftPara.notebookbar, #RightPara.notebookbar, #CenterPara.notebookbar, #Justif
yPara.notebookbar, #DefaultBullet.notebookbar, #DefaultNumbering.notebookbar,
#ParaspaceIncrease.notebookbar, #ParaspaceDecrease.notebookbar,
#LineSpacing.notebookbar, #HangingIndent.notebookbar, #CellVertTop.notebookbar,
#CellVertCenter.notebookbar, #CellVertBottom.notebookbar,
#ParaspaceIncrease.notebookbar, #ParaspaceDecrease.notebookbar,
#DeleteTable.notebookbar, #MergeCells.notebookbar{
padding: 0px !important;
margin: 0px !important;
}
diff --git a/loleaflet/src/control/Control.Notebookbar.js
b/loleaflet/src/control/Control.Notebookbar.js
index 70bb35edd..ad36e4972 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -36,6 +36,22 @@ L.Control.Notebookbar = L.Control.extend({
case 'Home':
this.loadTab(this.getHomeTab());
break;
+
+ case 'Insert':
+ this.loadTab(this.getInsertTab());
+ break;
+
+ case 'Layout':
+ this.loadTab(this.getLayoutTab());
+ break;
+
+ case 'References':
+ this.loadTab(this.getReferencesTab());
+ break;
+
+ case 'Table':
+ this.loadTab(this.getTableTab());
+ break;
}
},
@@ -44,8 +60,19 @@ L.Control.Notebookbar = L.Control.extend({
getHomeTab: function() {
return '';
- }
+ },
+ getInsertTab: function() {
+ return '';
+ },
+
+ getLayoutTab: function() {
+ return '';
+ },
+
+ getReferencesTab: function() {
+ return '';
+ }
});
L.control.notebookbar = function (options) {
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index f70f1d3c5..981ed1af2 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -15,6 +15,7 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
this._controlHandlers['combobox'] = this._comboboxControl;
this._controlHandlers['listbox'] = this._comboboxControl;
this._controlHandlers['pushbutton'] = function() { return
false; };
+ this._controlHandlers['spinfield'] = function() { return false;
};
this._toolitemHandlers['.uno:XLineColor'] = this._colorControl;
this._toolitemHandlers['.uno:SelectWidth'] = function() {};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
