[Libreoffice-commits] online.git: 2 commits - loleaflet/src
Szymon KÅ‚os (via logerrit)
logerrit at kemper.freedesktop.org
Wed May 6 15:03:33 UTC 2020
loleaflet/src/control/Control.NotebookbarBuilder.js | 30 ++++++++++++++++++--
loleaflet/src/control/Control.Toolbar.js | 13 ++++++++
loleaflet/src/control/Control.TopToolbar.js | 11 -------
3 files changed, 41 insertions(+), 13 deletions(-)
New commits:
commit fab6cb792cd1a16735fed6439e1e1628feacbd68
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon May 4 10:47:18 2020 +0200
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed May 6 17:03:25 2020 +0200
notebookbar: hide not useful comboboxes in calc
Change-Id: Iff24a24c3264dbcc122d9c09aaa27805ae1a1aad
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93571
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 3ca4f3632..a07d5b3a1 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -13,8 +13,8 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
},
_overrideHandlers: function() {
- this._controlHandlers['combobox'] = this._comboboxControl;
- this._controlHandlers['listbox'] = this._comboboxControl;
+ this._controlHandlers['combobox'] = this._comboboxControlHandler;
+ this._controlHandlers['listbox'] = this._comboboxControlHandler;
this._controlHandlers['tabcontrol'] = this._overridenTabsControlHandler;
this._controlHandlers['pushbutton'] = function() { return false; };
@@ -159,13 +159,21 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
return false;
},
+ _comboboxControlHandler: function(parentContainer, data, builder) {
+ if ((data.command === '.uno:StyleApply' && builder.map.getDocType() === 'spreadsheet') ||
+ (data.id === ''))
+ return false;
+
+ return builder._comboboxControl(parentContainer, data, builder);
+ },
+
_overridenTabsControlHandler: function(parentContainer, data, builder) {
data.tabs = builder.wizard.getTabs();
return builder._tabsControlHandler(parentContainer, data, builder);
},
_colorControl: function(parentContainer, data, builder) {
- var commandOverride = data.command === '.uno:Color';
+ var commandOverride = data.command === '.uno:Color' && builder.map.getDocType() === 'text';
if (commandOverride)
data.command = '.uno:FontColor';
commit bfe0cafeef22f6ce2c9ec72b341b8b96f44f77f5
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon May 4 11:05:48 2020 +0200
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed May 6 17:03:15 2020 +0200
notebookbar: conditional format popup
Change-Id: Id4a693cfb472af48a9f82ee798dc0c8f4e55cbf7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93573
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 011cc61bb..3ca4f3632 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -38,6 +38,7 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:Copy'] = this._clipboardButtonControl;
this._toolitemHandlers['.uno:Paste'] = this._clipboardButtonControl;
this._toolitemHandlers['.uno:BasicShapes'] = this._shapesControl;
+ this._toolitemHandlers['.uno:ConditionalFormatMenu'] = this._conditionalFormatControl;
this._toolitemHandlers['.uno:SelectWidth'] = function() {};
this._toolitemHandlers['.uno:SetOutline'] = function() {};
@@ -260,6 +261,21 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
});
},
+ _conditionalFormatControl: function(parentContainer, data, builder) {
+ var control = builder._unoToolButton(parentContainer, data, builder);
+
+ $(control.container).unbind('click');
+ $(control.container).click(function () {
+ if (!$('#conditionalformatmenu-grid').length) {
+ $(control.container).w2overlay(window.getConditionalFormatMenuHtml());
+
+ $('#conditionalformatmenu-grid tr td').click(function () {
+ $(control.container).w2overlay();
+ });
+ }
+ });
+ },
+
_insertGraphicControl: function(parentContainer, data, builder) {
var control = builder._unoToolButton(parentContainer, data, builder);
diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index 26777205c..6e0b5950f 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -233,6 +233,19 @@ function setConditionalFormatIconSet(num) {
global.setConditionalFormatIconSet = setConditionalFormatIconSet;
+function getConditionalFormatMenuHtml() {
+ return '<table id="conditionalformatmenu-grid"><tr>' +
+ '<td class="w2ui-tb-image w2ui-icon iconset00" onclick="setConditionalFormatIconSet(0)"/><td class="w2ui-tb-image w2ui-icon iconset01" onclick="setConditionalFormatIconSet(1)"/><td class="w2ui-tb-image w2ui-icon iconset02" onclick="setConditionalFormatIconSet(2)"/></tr><tr>' +
+ '<td class="w2ui-tb-image w2ui-icon iconset03" onclick="setConditionalFormatIconSet(3)"/><td class="w2ui-tb-image w2ui-icon iconset04" onclick="setConditionalFormatIconSet(4)"/><td class="w2ui-tb-image w2ui-icon iconset05" onclick="setConditionalFormatIconSet(5)"/></tr><tr>' +
+ '<td class="w2ui-tb-image w2ui-icon iconset06" onclick="setConditionalFormatIconSet(6)"/><td class="w2ui-tb-image w2ui-icon iconset08" onclick="setConditionalFormatIconSet(8)"/><td class="w2ui-tb-image w2ui-icon iconset09" onclick="setConditionalFormatIconSet(9)"/></tr><tr>' + // iconset07 deliberately left out, see the .css for the reason
+ '<td class="w2ui-tb-image w2ui-icon iconset10" onclick="setConditionalFormatIconSet(10)"/><td class="w2ui-tb-image w2ui-icon iconset11" onclick="setConditionalFormatIconSet(11)"/><td class="w2ui-tb-image w2ui-icon iconset12" onclick="setConditionalFormatIconSet(12)"/></tr><tr>' +
+ '<td class="w2ui-tb-image w2ui-icon iconset13" onclick="setConditionalFormatIconSet(13)"/><td class="w2ui-tb-image w2ui-icon iconset14" onclick="setConditionalFormatIconSet(14)"/><td class="w2ui-tb-image w2ui-icon iconset15" onclick="setConditionalFormatIconSet(15)"/></tr><tr>' +
+ '<td class="w2ui-tb-image w2ui-icon iconset16" onclick="setConditionalFormatIconSet(16)"/><td class="w2ui-tb-image w2ui-icon iconset17" onclick="setConditionalFormatIconSet(17)"/><td class="w2ui-tb-image w2ui-icon iconset18" onclick="setConditionalFormatIconSet(18)"/></tr><tr>' +
+ '<td class="w2ui-tb-image w2ui-icon iconset19" onclick="setConditionalFormatIconSet(19)"/><td class="w2ui-tb-image w2ui-icon iconset20" onclick="setConditionalFormatIconSet(20)"/><td class="w2ui-tb-image w2ui-icon iconset21" onclick="setConditionalFormatIconSet(21)"/></tr></table>';
+}
+
+global.getConditionalFormatMenuHtml = getConditionalFormatMenuHtml;
+
function getInsertTablePopupHtml() {
return '<div id="inserttable-wrapper">\
<div id="inserttable-popup" class="inserttable-pop ui-widget ui-corner-all">\
diff --git a/loleaflet/src/control/Control.TopToolbar.js b/loleaflet/src/control/Control.TopToolbar.js
index 7fda20d6d..a0d665664 100644
--- a/loleaflet/src/control/Control.TopToolbar.js
+++ b/loleaflet/src/control/Control.TopToolbar.js
@@ -198,16 +198,7 @@ L.Control.TopToolbar = L.Control.extend({
{type: 'button', id: 'sortascending', img: 'sortascending', hint: _UNO('.uno:SortAscending', 'spreadsheet', true), uno: 'SortAscending', disabled: true, hidden: true},
{type: 'button', id: 'sortdescending', img: 'sortdescending', hint: _UNO('.uno:SortDescending', 'spreadsheet', true), uno: 'SortDescending', disabled: true, hidden: true},
{type: 'break', id: 'breaksorting', hidden: true},
- {type: 'drop', id: 'conditionalformaticonset', img: 'conditionalformatdialog', hint: _UNO('.uno:ConditionalFormatMenu', 'spreadsheet', true), hidden: true,
- html: '<table id="conditionalformatmenu-grid"><tr>' +
- '<td class="w2ui-tb-image w2ui-icon iconset00" onclick="setConditionalFormatIconSet(0)"/><td class="w2ui-tb-image w2ui-icon iconset01" onclick="setConditionalFormatIconSet(1)"/><td class="w2ui-tb-image w2ui-icon iconset02" onclick="setConditionalFormatIconSet(2)"/></tr><tr>' +
- '<td class="w2ui-tb-image w2ui-icon iconset03" onclick="setConditionalFormatIconSet(3)"/><td class="w2ui-tb-image w2ui-icon iconset04" onclick="setConditionalFormatIconSet(4)"/><td class="w2ui-tb-image w2ui-icon iconset05" onclick="setConditionalFormatIconSet(5)"/></tr><tr>' +
- '<td class="w2ui-tb-image w2ui-icon iconset06" onclick="setConditionalFormatIconSet(6)"/><td class="w2ui-tb-image w2ui-icon iconset08" onclick="setConditionalFormatIconSet(8)"/><td class="w2ui-tb-image w2ui-icon iconset09" onclick="setConditionalFormatIconSet(9)"/></tr><tr>' + // iconset07 deliberately left out, see the .css for the reason
- '<td class="w2ui-tb-image w2ui-icon iconset10" onclick="setConditionalFormatIconSet(10)"/><td class="w2ui-tb-image w2ui-icon iconset11" onclick="setConditionalFormatIconSet(11)"/><td class="w2ui-tb-image w2ui-icon iconset12" onclick="setConditionalFormatIconSet(12)"/></tr><tr>' +
- '<td class="w2ui-tb-image w2ui-icon iconset13" onclick="setConditionalFormatIconSet(13)"/><td class="w2ui-tb-image w2ui-icon iconset14" onclick="setConditionalFormatIconSet(14)"/><td class="w2ui-tb-image w2ui-icon iconset15" onclick="setConditionalFormatIconSet(15)"/></tr><tr>' +
- '<td class="w2ui-tb-image w2ui-icon iconset16" onclick="setConditionalFormatIconSet(16)"/><td class="w2ui-tb-image w2ui-icon iconset17" onclick="setConditionalFormatIconSet(17)"/><td class="w2ui-tb-image w2ui-icon iconset18" onclick="setConditionalFormatIconSet(18)"/></tr><tr>' +
- '<td class="w2ui-tb-image w2ui-icon iconset19" onclick="setConditionalFormatIconSet(19)"/><td class="w2ui-tb-image w2ui-icon iconset20" onclick="setConditionalFormatIconSet(20)"/><td class="w2ui-tb-image w2ui-icon iconset21" onclick="setConditionalFormatIconSet(21)"/></tr></table>'
- },
+ {type: 'drop', id: 'conditionalformaticonset', img: 'conditionalformatdialog', hint: _UNO('.uno:ConditionalFormatMenu', 'spreadsheet', true), hidden: true, html: window.getConditionalFormatMenuHtml()},
{type: 'button', id: 'numberformatcurrency', img: 'numberformatcurrency', hint: _UNO('.uno:NumberFormatCurrency', 'spreadsheet', true), hidden: true, uno: 'NumberFormatCurrency', disabled: true},
{type: 'button', id: 'numberformatpercent', img: 'numberformatpercent', hint: _UNO('.uno:NumberFormatPercent', 'spreadsheet', true), hidden: true, uno: 'NumberFormatPercent', disabled: true},
{type: 'button', id: 'numberformatdecdecimals', img: 'numberformatdecdecimals', hint: _UNO('.uno:NumberFormatDecDecimals', 'spreadsheet', true), hidden: true, uno: 'NumberFormatDecDecimals', disabled: true},
More information about the Libreoffice-commits
mailing list