[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/images loleaflet/src
Ashod Nakashian (via logerrit)
logerrit at kemper.freedesktop.org
Thu Nov 7 14:41:48 UTC 2019
loleaflet/css/toolbar.css | 5 ++++-
loleaflet/images/sidebar-animation-large.png |binary
loleaflet/images/sidebar-property-large.png |binary
loleaflet/images/sidebar-template-large.png |binary
loleaflet/images/sidebar-transition-large.svg | 1 +
loleaflet/src/control/Control.Toolbar.js | 17 +++++++++--------
loleaflet/src/layer/tile/TileLayer.js | 9 +++++++--
7 files changed, 21 insertions(+), 11 deletions(-)
New commits:
commit 8a28a560f2674512a552599c5bb85b5ebf5a0bea
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Dec 9 18:39:12 2018 -0500
Commit: Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Thu Nov 7 15:41:40 2019 +0100
leaflet: add sidebar buttons to Impress toolbar
(cherry picked from commit 00b0c3156b5a574f7ee98f4166fd127976ea1b56)
Change-Id: Ib21db9e950cfe828ddff66a8e5bb517331610d04
Reviewed-on: https://gerrit.libreoffice.org/82225
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 2967ab909..3a0440166 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -955,7 +955,10 @@ button.leaflet-control-search-next
.w2ui-icon.fullscreen{ background: url('images/lc_fullscreen.svg') no-repeat center !important; }
.w2ui-icon.closemobile{ background: url('images/lc_closedocmobile.svg') no-repeat center !important; }
.w2ui-icon.closetoolbar{ background: url('images/close_toolbar.svg') no-repeat center !important; }
-.w2ui-icon.sidebar_modify_page{ background: url('images/lc_formproperties.svg') no-repeat center !important; }
+.w2ui-icon.sidebar_modify_page{ background: url('images/sidebar-property-large.png') no-repeat center !important; }
+.w2ui-icon.sidebar_slide_change{ background: url('images/sidebar-transition-large.svg') no-repeat center !important; }
+.w2ui-icon.sidebar_custom_animation{ background: url('images/sidebar-animation-large.png') no-repeat center !important; }
+.w2ui-icon.sidebar_master_slides{ background: url('images/sidebar-template-large.png') no-repeat center !important; }
.w2ui-icon.mobile_wizard{ background: url('images/lc_mobile_wizard.svg') no-repeat center !important; }
.w2ui-icon.fullscreen-presentation{ background: url('images/lc_fullscreen-presentation-toolbar-mobile.svg') no-repeat center !important;}
.w2ui-icon.insertion_mobile_wizard{ background: url('images/lc_insertion_mobile_wizard.svg') no-repeat center !important; }
diff --git a/loleaflet/images/sidebar-animation-large.png b/loleaflet/images/sidebar-animation-large.png
new file mode 100644
index 000000000..2ac1c2d02
Binary files /dev/null and b/loleaflet/images/sidebar-animation-large.png differ
diff --git a/loleaflet/images/sidebar-property-large.png b/loleaflet/images/sidebar-property-large.png
new file mode 100644
index 000000000..cd29367f6
Binary files /dev/null and b/loleaflet/images/sidebar-property-large.png differ
diff --git a/loleaflet/images/sidebar-template-large.png b/loleaflet/images/sidebar-template-large.png
new file mode 100644
index 000000000..2137a4b8b
Binary files /dev/null and b/loleaflet/images/sidebar-template-large.png differ
diff --git a/loleaflet/images/sidebar-transition-large.svg b/loleaflet/images/sidebar-transition-large.svg
new file mode 100644
index 000000000..d8c2057f3
--- /dev/null
+++ b/loleaflet/images/sidebar-transition-large.svg
@@ -0,0 +1 @@
+<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 3h18v18h-18z" fill="#fff"/><g fill="#808080"><rect height="3" ry="1" width="3" x="19" y="2"/><rect height="3" ry="1" width="3" x="2" y="2"/><rect height="3" ry="1" width="3" x="19" y="19"/><rect height="3" ry="1" width="3" x="2" y="19"/><rect height="1" ry=".5" width="12" x="6" y="20"/><rect height="1" ry=".5" width="12" x="6" y="3"/><rect height="12" ry=".5" width="1" x="3" y="6"/><rect height="12" ry=".5" width="1" x="20" y="6"/></g><path d="m12 5-2.625 5h-4.375l4 3.5-1 5.5 4-3 4 3-1-5.5 4-3.5h-4.375z" fill="#eac282"/></svg>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index adea5a6e0..c9153c3de 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -888,11 +888,12 @@ function initNormalToolbar() {
{type: 'button', id: 'insertsymbol', img: 'insertsymbol', hint: _UNO('.uno:InsertSymbol', '', true), uno: 'InsertSymbol'},
{type: 'spacer'},
{type: 'button', id: 'edit', img: 'edit'},
- {type: 'button', id: 'modifypage', img: 'sidebar_modify_page', hint: _UNO('.uno:ModifyPage', 'presentation', true), uno: '.uno:ModifyPage', hidden: true},
- {type: 'button', id: 'slidechangewindow', img: 'sidebar_slide_change', hint: _UNO('.uno:SlideChangeWindow', 'presentation', true), uno: '.uno:SlideChangeWindow', hidden: true},
- {type: 'button', id: 'customanimation', img: 'sidebar_custom_animation', hint: _UNO('.uno:CustomAnimation', 'presentation', true), uno: '.uno:CustomAnimation', hidden: true},
- {type: 'button', id: 'masterslidespanel', img: 'sidebar_master_slides', hint: _UNO('.uno:MasterSlidesPanel', 'presentation', true), uno: '.uno:MasterSlidesPanel', hidden: true},
{type: 'break', id: 'breaksidebar', hidden: true},
+ {type: 'button', id: 'sidebar-modify-page', img: 'sidebar_modify_page', hint: _UNO('.uno:ModifyPage', 'presentation', true), uno: 'ModifyPage', hidden: true},
+ {type: 'button', id: 'sidebar-slide-change', img: 'sidebar_slide_change', hint: _UNO('.uno:SlideChangeWindow', 'presentation', true), uno: 'SlideChangeWindow', hidden: true},
+ {type: 'button', id: 'sidebar-custom-animation', img: 'sidebar_custom_animation', hint: _UNO('.uno:CustomAnimation', 'presentation', true), uno: 'CustomAnimation', hidden: true},
+ {type: 'button', id: 'sidebar-master-slides', img: 'sidebar_master_slides', hint: _UNO('.uno:MasterSlidesPanel', 'presentation', true), uno: 'MasterSlidesPanel', hidden: true},
+ {type: 'spacer'},
{type: 'button', id: 'fold', img: 'fold', desktop: true, mobile: false, hidden: true},
{type: 'button', id: 'hamburger-tablet', img: 'hamburger', desktop: false, mobile: false, tablet: true, iosapptablet: false, hidden: true},
{type: 'button', id: 'languagecode', desktop: false, mobile: true, tablet: false}
@@ -1447,7 +1448,7 @@ function onDocLayerInit() {
toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'conditionalformaticonset',
'numberformatcurrency', 'numberformatpercent',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'togglemergecells', 'breakmergecells',
- 'setborderstyle', 'sortascending', 'sortdescending', 'breaksorting', 'backgroundcolor', 'breaksidebar', 'sidebar');
+ 'setborderstyle', 'sortascending', 'sortdescending', 'breaksorting', 'backgroundcolor', 'breaksidebar', 'sidebar-modify-page');
toolbarUp.remove('styles');
}
@@ -1517,7 +1518,7 @@ function onDocLayerInit() {
if (toolbarUp)
toolbarUp.show('leftpara', 'centerpara', 'rightpara', 'justifypara', 'breakpara', 'linespacing',
'breakspacing', 'defaultbullet', 'defaultnumbering', 'breakbullet', 'incrementindent', 'decrementindent',
- 'breakindent', 'inserttable', 'insertannotation', 'backcolor', 'breaksidebar', 'sidebar');
+ 'breakindent', 'inserttable', 'insertannotation', 'backcolor', 'breaksidebar', 'sidebar-modify-page');
if (!_inMobileMode()) {
statusbar.insert('left', [
@@ -1552,7 +1553,7 @@ function onDocLayerInit() {
break;
case 'presentation':
if (toolbarUp) {
- toolbarUp.show('breaksidebar', 'sidebar');
+ toolbarUp.show('breaksidebar', 'sidebar-modify-page');
}
var presentationToolbar = w2ui['presentation-toolbar'];
@@ -1579,7 +1580,7 @@ function onDocLayerInit() {
if (toolbarUp)
toolbarUp.show('leftpara', 'centerpara', 'rightpara', 'justifypara', 'breakpara', 'linespacing',
'breakspacing', 'defaultbullet', 'defaultnumbering', 'breakbullet', 'inserttextbox', 'inserttable', 'backcolor',
- 'breaksidebar', 'modifypage', 'slidechangewindow', 'customanimation', 'masterslidespanel');
+ 'breaksidebar', 'sidebar-modify-page', 'sidebar-slide-change', 'sidebar-custom-animation', 'sidebar-master-slides');
if (statusbar)
statusbar.show('prev', 'next');
commit 19ee9f089b27c405c9506a1d96f03909a7a3df5c
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Jun 27 08:42:19 2019 -0400
Commit: Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Thu Nov 7 15:41:28 2019 +0100
leaflet: flag complex selection for graphics
(cherry picked from commit ac5b9907ce36ad5ee6e77ea32dd95f0f1483c97f)
Change-Id: I9b13cdcc7972bc24ba22cba1ff99039bc19aeef8
Reviewed-on: https://gerrit.libreoffice.org/82224
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index bc8d905f4..92171c498 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -905,8 +905,13 @@ L.TileLayer = L.GridLayer.extend({
}
}
- // Graphics are by default complex selections.
- this._map._clip.onComplexSelection();
+ // Graphics are by default complex selections, unless Core tells us otherwise.
+ this._map._clip.onComplexSelection('');
+ if (this._selectionContentRequest) {
+ clearTimeout(this._selectionContentRequest);
+ }
+ this._selectionContentRequest = setTimeout(L.bind(function () {
+ this._map._socket.sendMessage('gettextselection mimetype=text/html');}, this), 100);
this._onUpdateGraphicSelection();
},
More information about the Libreoffice-commits
mailing list