[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css | 17 + loleaflet/images/lc_fontdialog.svg |1 loleaflet/images/lc_outlinebullet.svg |1 loleaflet/images/lc_paragraphdialog.svg |1 loleaflet/images/lc_transformdialog.svg |1 loleaflet/src/control/Control.JSDialogBuilder.js|2 loleaflet/src/control/Control.NotebookbarBuilder.js | 12 + loleaflet/src/control/Control.NotebookbarImpress.js | 175 loleaflet/src/control/Control.NotebookbarWriter.js | 163 ++ 9 files changed, 373 insertions(+) New commits: commit 936ea3eb1992f3abe87c0c1e7aad290ed2687f4e Author: Szymon Kłos AuthorDate: Wed Aug 5 11:15:51 2020 +0200 Commit: Szymon Kłos CommitDate: Wed Aug 5 11:57:13 2020 +0200 notebookbar: Format tab for writer & impress Change-Id: Id4365aff42af94d23b398736d00c6c9cde02e4ee Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100156 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css index 15924d608..70805ca81 100644 --- a/loleaflet/css/notebookbar.css +++ b/loleaflet/css/notebookbar.css @@ -283,6 +283,18 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb filter: grayscale(100%) brightness(100%); } +.unotoolbutton.notebookbar { + text-align: center; +} + +.unotoolbutton.notebookbar.has-label { + text-align: center; +} + +.unotoolbutton.notebookbar.has-label:not(.inline) img { + width: 32px !important; + height: 32px !important; +} /* unobuttons with inline labels */ @@ -473,6 +485,11 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb display: none; } +/* Format Tab */ +#table-Format-Section.notebookbar { + margin-top: 25px; +} + /* Table Tab */ #table-Table-Container, diff --git a/loleaflet/images/lc_fontdialog.svg b/loleaflet/images/lc_fontdialog.svg new file mode 100644 index 0..245d0ddc4 --- /dev/null +++ b/loleaflet/images/lc_fontdialog.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_outlinebullet.svg b/loleaflet/images/lc_outlinebullet.svg new file mode 100644 index 0..cb72428fd --- /dev/null +++ b/loleaflet/images/lc_outlinebullet.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_paragraphdialog.svg b/loleaflet/images/lc_paragraphdialog.svg new file mode 100644 index 0..c6ceb2578 --- /dev/null +++ b/loleaflet/images/lc_paragraphdialog.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_transformdialog.svg b/loleaflet/images/lc_transformdialog.svg new file mode 100644 index 0..87f5bd3e2 --- /dev/null +++ b/loleaflet/images/lc_transformdialog.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index d3b1fe202..5c7313370 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -1654,9 +1654,11 @@ L.Control.JSDialogBuilder = L.Control.extend({ label.innerHTML = data.text; controls['label'] = label; + $(div).addClass('has-label'); } else { div.title = data.text; $(div).tooltip(); + $(div).addClass('no-label'); } if (builder.options.useInLineLabelsForUnoButtons === true) { diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js index 2420109cb..40e3320cc 100644 --- a/loleaflet/src/control/Control.NotebookbarBuilder.js +++ b/loleaflet/src/control/Control.NotebookbarBuilder.js @@ -17,6 +17,7 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({ this._controlHandlers['listbox'] = this._comboboxControlHandler; this._controlHandlers['tabcontrol'] = this._overridenTabsControlHandler; this._controlHandlers['menubartoolitem'] = this._menubarToolItemHandler; + this._controlHandlers['bigtoolitem'] = this._bigtoolitemHandler; this._controlHandlers['pushbutton'] = function() { return false; }; this._controlHandlers['spinfield'] = function() { return false; }; @@ -182,6 +183,17 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({ this._toolitemHandlers['vnd.sun.star.findbar:FocusToFindbar'] = function() {}; }, + _bigtoolitemHandler:
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css | 10 ++ loleaflet/images/lc_combine.svg |1 + loleaflet/images/lc_dismantle.svg |1 + loleaflet/images/lc_distributeselection.svg |1 + loleaflet/images/lc_forward.svg |1 + loleaflet/images/lc_intersect.svg |1 + loleaflet/images/lc_merge.svg |1 + loleaflet/images/lc_substract.svg |1 + loleaflet/src/control/Control.NotebookbarBuilder.js | 16 loleaflet/src/control/Control.NotebookbarImpress.js |6 ++ 10 files changed, 39 insertions(+) New commits: commit 60a92ec348a6a85e966c01c664f4e422bd9fe893 Author: Szymon Kłos AuthorDate: Tue Aug 4 12:47:57 2020 +0200 Commit: Szymon Kłos CommitDate: Tue Aug 4 14:57:10 2020 +0200 notebookbar: Draw tab for Impress Change-Id: I8332b8c71aa9af724592377de9f6fcd171e5014d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100080 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css index 22991e442..15924d608 100644 --- a/loleaflet/css/notebookbar.css +++ b/loleaflet/css/notebookbar.css @@ -680,6 +680,16 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb margin-top: 10px; } +/* Draw Tab */ + +#table-DrawTab #table-box6 #XLineColor.notebookbar { + margin-left: -10px; +} + +#table-DrawTab #table-Draw #table-GroupB102.notebookbar { + margin-left: -70px; +} + /* other */ .ui-drawing-area-container diff --git a/loleaflet/images/lc_combine.svg b/loleaflet/images/lc_combine.svg new file mode 100644 index 0..716fb3b7c --- /dev/null +++ b/loleaflet/images/lc_combine.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_dismantle.svg b/loleaflet/images/lc_dismantle.svg new file mode 100644 index 0..9aea821c0 --- /dev/null +++ b/loleaflet/images/lc_dismantle.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_distributeselection.svg b/loleaflet/images/lc_distributeselection.svg new file mode 100644 index 0..e581f95db --- /dev/null +++ b/loleaflet/images/lc_distributeselection.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_forward.svg b/loleaflet/images/lc_forward.svg new file mode 100644 index 0..c0f1b54ae --- /dev/null +++ b/loleaflet/images/lc_forward.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_intersect.svg b/loleaflet/images/lc_intersect.svg new file mode 100644 index 0..4c9bd5e72 --- /dev/null +++ b/loleaflet/images/lc_intersect.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_merge.svg b/loleaflet/images/lc_merge.svg new file mode 100644 index 0..d3f5df9f8 --- /dev/null +++ b/loleaflet/images/lc_merge.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_substract.svg b/loleaflet/images/lc_substract.svg new file mode 100644 index 0..067dac7de --- /dev/null +++ b/loleaflet/images/lc_substract.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js index 7d88c0512..da036bf85 100644 --- a/loleaflet/src/control/Control.NotebookbarBuilder.js +++ b/loleaflet/src/control/Control.NotebookbarBuilder.js @@ -148,6 +148,22 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({ this._toolitemHandlers['.uno:FontworkCharacterSpacingFloater'] = function() {}; this._toolitemHandlers['.uno:Paste'] = function() {}; this._toolitemHandlers['.uno:DataDataPilotRun'] = function() {}; + this._toolitemHandlers['.uno:AdvancedMode'] = function() {}; + this._toolitemHandlers['.uno:Shear'] = function() {}; + this._toolitemHandlers['.uno:CrookSlant'] = function() {}; + this._toolitemHandlers['.uno:LineEndStyle'] = function() {}; + this._toolitemHandlers['.uno:FillShadow'] = function() {}; + this._toolitemHandlers['.uno:BezierConvert'] = function() {}; + this._toolitemHandlers['.uno:BezierSymmetric'] = function() {}; + this._toolitemHandlers['.uno:BezierClose'] = function() {}; + this._toolitemHandlers['.uno:BezierEliminatePoints'] = function() {}; + this._toolitemHandlers['.uno:BezierMove'] = function() {}; + this._toolitemHandlers['.uno:BezierCutLine'] = function() {}; +
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css|5 ++ loleaflet/images/lc_sidebar.svg |1 loleaflet/src/control/Control.Notebookbar.js | 55 ++- 3 files changed, 59 insertions(+), 2 deletions(-) New commits: commit 0d57bb2872326daf1f23b6998699f89a111baa50 Author: Szymon Kłos AuthorDate: Tue Jul 21 09:30:04 2020 +0200 Commit: Szymon Kłos CommitDate: Tue Jul 21 10:23:55 2020 +0200 notebookbar: add sidebar switch Change-Id: Ib64f0d99d428896680eae8ce5ae9109563ec5b76 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99121 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css index d46b2f1dd..88c889986 100644 --- a/loleaflet/css/notebookbar.css +++ b/loleaflet/css/notebookbar.css @@ -68,6 +68,11 @@ margin-bottom: 3px; } +/* options section */ +.notebookbar-options-section { + margin-left: 10px; +} + /* root container */ .notebookbar-scroll-wrapper { diff --git a/loleaflet/images/lc_sidebar.svg b/loleaflet/images/lc_sidebar.svg new file mode 100644 index 0..75c2b7b52 --- /dev/null +++ b/loleaflet/images/lc_sidebar.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/src/control/Control.Notebookbar.js b/loleaflet/src/control/Control.Notebookbar.js index 146888230..b1612cb06 100644 --- a/loleaflet/src/control/Control.Notebookbar.js +++ b/loleaflet/src/control/Control.Notebookbar.js @@ -3,9 +3,10 @@ * L.Control.Notebookbar */ -/* global $ _ */ +/* global $ _ _UNO */ L.Control.Notebookbar = L.Control.extend({ + _optionsSectionWidth: 50, _currentScrollPosition: 0, _showNotebookbar: false, @@ -79,6 +80,9 @@ L.Control.Notebookbar = L.Control.extend({ if (this._showNotebookbar === false) this.hideTabs(); + if (window.mode.isDesktop()) + this.createOptionsSection(); + this.scrollToLastPositionIfNeeded(); }, @@ -151,6 +155,8 @@ L.Control.Notebookbar = L.Control.extend({ $(left).css({'height': '80px'}); $(right).css({'height': '80px'}); + if (window.mode.isDesktop()) + $(right).css({'right': this._optionsSectionWidth + 'px'}); $(left).click(function () { var scroll = $('.notebookbar-scroll-wrapper').scrollLeft() - 300; @@ -203,5 +209,50 @@ L.Control.Notebookbar = L.Control.extend({ } } } - } + }, + + getOptionsSectionData: function() { + return [ + { + 'id': 'optionscontainer', + 'type': 'container', + 'vertical': 'true', + 'children': [ + { + 'id': 'optionstoolboxdown', + 'type': 'toolbox', + 'children': [ + { + 'type': 'toolitem', + 'text': _UNO('.uno:Sidebar', '', true), + 'command': '.uno:Sidebar' + }, + { + 'type': 'toolitem', + // dummy node to avoid creating labels + } + ] + } + ] + } + ]; + }, + + createOptionsSection: function() { + $('.notebookbar-options-td').remove(); + var optionsTd = L.DomUtil.create('td', 'notebookbar-options-td'); + $(optionsTd).css('width', this._optionsSectionWidth + 'px'); + + var optionsSection = L.DomUtil.create('div', 'notebookbar-options-section', optionsTd); + $('#toolbar-up').parent().append(optionsTd); + + var builderOptions = { + mobileWizard: this, + map: this.map, + cssClass: 'notebookbar', + }; + + var builder = new L.control.notebookbarBuilder(builderOptions); + builder.build(optionsSection, this.getOptionsSectionData()); + }, }); ___ Libreoffice-commits mailing
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css |6 ++ loleaflet/images/lc_aligncenter.svg |1 + loleaflet/images/lc_aligndown.svg |1 + loleaflet/images/lc_alignmiddle.svg |1 + loleaflet/images/lc_alignup.svg |1 + loleaflet/images/lc_entergroup.svg |1 + loleaflet/images/lc_formatarea.svg |1 + loleaflet/images/lc_formatline.svg |1 + loleaflet/images/lc_leavegroup.svg |1 + loleaflet/images/lc_objectalignleft.svg |1 + loleaflet/images/lc_objectalignright.svg|1 + loleaflet/src/control/Control.NotebookbarBuilder.js | 14 +- loleaflet/src/control/Control.NotebookbarWriter.js |6 ++ 13 files changed, 35 insertions(+), 1 deletion(-) New commits: commit 12d5e0aabc0237c5ba1fcdc151f17b8ab6db1a0a Author: Szymon Kłos AuthorDate: Fri Jul 10 10:36:58 2020 +0200 Commit: Szymon Kłos CommitDate: Fri Jul 10 14:50:46 2020 +0200 notebookbar: enable Draw tab for writer Change-Id: I32f91d35fbf2332e133db7194fd795b9471af7b1 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98487 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css index 60d851074..a7fcfc57f 100644 --- a/loleaflet/css/notebookbar.css +++ b/loleaflet/css/notebookbar.css @@ -376,6 +376,12 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb margin-top: 20px; } +/* Draw tab */ +#table-Draw #table-box16 #table-first16.notebookbar, +#table-DrawTab #table-GroupB74 #table-SectionBottom48.notebookbar { + display: none; +} + /* Calc */ /* Home tab */ diff --git a/loleaflet/images/lc_aligncenter.svg b/loleaflet/images/lc_aligncenter.svg new file mode 100644 index 0..f2e6308ee --- /dev/null +++ b/loleaflet/images/lc_aligncenter.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_aligndown.svg b/loleaflet/images/lc_aligndown.svg new file mode 100644 index 0..59a972c8a --- /dev/null +++ b/loleaflet/images/lc_aligndown.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_alignmiddle.svg b/loleaflet/images/lc_alignmiddle.svg new file mode 100644 index 0..6186f920d --- /dev/null +++ b/loleaflet/images/lc_alignmiddle.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_alignup.svg b/loleaflet/images/lc_alignup.svg new file mode 100644 index 0..2cbe84e1c --- /dev/null +++ b/loleaflet/images/lc_alignup.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_entergroup.svg b/loleaflet/images/lc_entergroup.svg new file mode 100644 index 0..e05b5b696 --- /dev/null +++ b/loleaflet/images/lc_entergroup.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_formatarea.svg b/loleaflet/images/lc_formatarea.svg new file mode 100644 index 0..ebd7aac9d --- /dev/null +++ b/loleaflet/images/lc_formatarea.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_formatline.svg b/loleaflet/images/lc_formatline.svg new file mode 100644 index 0..bf6ead04f --- /dev/null +++ b/loleaflet/images/lc_formatline.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_leavegroup.svg b/loleaflet/images/lc_leavegroup.svg new file mode 100644 index 0..5bd9a2dfb --- /dev/null +++ b/loleaflet/images/lc_leavegroup.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_objectalignleft.svg b/loleaflet/images/lc_objectalignleft.svg new file mode 100644 index 0..d51301c47 --- /dev/null +++ b/loleaflet/images/lc_objectalignleft.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_objectalignright.svg b/loleaflet/images/lc_objectalignright.svg new file mode 100644 index 0..cab9fb366 --- /dev/null +++ b/loleaflet/images/lc_objectalignright.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js index 36265b450..52e1454c8 100644 --- a/loleaflet/src/control/Control.NotebookbarBuilder.js +++ b/loleaflet/src/control/Control.NotebookbarBuilder.js @@ -82,7 +82,6 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({ this._toolitemHandlers['.uno:SelectObject'] = function() {}; this._toolitemHandlers['.uno:BibliographyComponent'] =
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css| 35 +++ loleaflet/images/lc_down.svg |1 loleaflet/images/lc_up.svg |1 loleaflet/src/control/Control.JSDialogBuilder.js |8 - 4 files changed, 44 insertions(+), 1 deletion(-) New commits: commit e794414e94bc7af37259bcedaa14ae52304b1425 Author: Szymon Kłos AuthorDate: Tue Jun 16 15:54:05 2020 +0200 Commit: Szymon Kłos CommitDate: Fri Jun 19 11:37:43 2020 +0200 notebookbar: loading spinner for styles Change-Id: If9c5094847d00e7148387cfd200166e20c1ed53f Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96686 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css index 6f9675180..e9d084e6d 100644 --- a/loleaflet/css/notebookbar.css +++ b/loleaflet/css/notebookbar.css @@ -402,4 +402,39 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb #table-Table-Section-Layout #table-SectionBottom57.notebookbar { margin-top: 10px; +} + +/* other */ + +.ui-drawing-area-container +{ + position: relative; +} + +.ui-drawing-area-loader +{ + border: 5px solid #f3f3f3; + border-top: 5px solid #3498db; + border-radius: 50%; + width: 20px; + height: 20px; + animation: spin 2s linear infinite; + margin-left: auto; + margin-right: auto; + position: relative; + top: 25%; +} + +.ui-drawing-area-loader-container +{ + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; +} + +@keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } } \ No newline at end of file diff --git a/loleaflet/images/lc_down.svg b/loleaflet/images/lc_down.svg new file mode 100644 index 0..f6c1ad057 --- /dev/null +++ b/loleaflet/images/lc_down.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_up.svg b/loleaflet/images/lc_up.svg new file mode 100644 index 0..3e6b6f298 --- /dev/null +++ b/loleaflet/images/lc_up.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index 0c91dedc2..b3bd9cfcd 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -1546,10 +1546,16 @@ L.Control.JSDialogBuilder = L.Control.extend({ _drawingAreaControl: function(parentContainer, data, builder) { if (data.image) { - var image = L.DomUtil.create('img', builder.options.cssClass + ' ui-drawing-area', parentContainer); + var container = L.DomUtil.create('div', builder.options.cssClass + ' ui-drawing-area-container', parentContainer); + var image = L.DomUtil.create('img', builder.options.cssClass + ' ui-drawing-area', container); image.src = data.image.replace('\\', ''); image.id = data.id; + if (data.loading && data.loading === 'true') { + var loaderContainer = L.DomUtil.create('div', 'ui-drawing-area-loader-container', container); + L.DomUtil.create('div', 'ui-drawing-area-loader', loaderContainer); + } + $(image).click(function () { builder.callback('drawingarea', 'click', image, null, builder); }); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/leaflet.css|8 loleaflet/images/indentation_marker_down.svg | 16 +--- loleaflet/images/indentation_marker_up.svg | 16 +--- loleaflet/src/control/Ruler.js | 17 - 4 files changed, 38 insertions(+), 19 deletions(-) New commits: commit 5299ec381ce9e7df049bc16609f15af11d1c36b3 Author: Tomaž Vajngerl AuthorDate: Wed May 13 09:12:20 2020 +0200 Commit: Tomaž Vajngerl CommitDate: Wed May 13 10:05:11 2020 +0200 make indent markers nicer, put update after _TSContainer change Make markers look more like in LO - smaller, more slick. Move the _updateParagraphIndentations after _TSContainer position is recalculated as we depend on that. Change-Id: I08034f6b5402a1532b6f74203a465164327f4593 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94095 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tomaž Vajngerl diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css index ec6a3d3de..ccf881de2 100644 --- a/loleaflet/css/leaflet.css +++ b/loleaflet/css/leaflet.css @@ -843,8 +843,8 @@ input.clipboard { } .loleaflet-ruler-indentation-marker-down { - width: 17px; - height: 11px; + width: 14px; + height: 10px; background: url(images/indentation_marker_down.svg); position: absolute; left: 0; @@ -854,8 +854,8 @@ input.clipboard { } .loleaflet-ruler-indentation-marker-up { - width: 17px; - height: 11px; + width: 14px; + height: 10px; background: url(images/indentation_marker_up.svg); position: absolute; left: 0; diff --git a/loleaflet/images/indentation_marker_down.svg b/loleaflet/images/indentation_marker_down.svg index 41e73bbeb..9dd7fa373 100644 --- a/loleaflet/images/indentation_marker_down.svg +++ b/loleaflet/images/indentation_marker_down.svg @@ -1,3 +1,13 @@ -http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="0 0 140 110" > - - \ No newline at end of file + +http://www.w3.org/2000/svg; xmlns:cc="http://creativecommons.org/ns#; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;> + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage"/> + + + + + + diff --git a/loleaflet/images/indentation_marker_up.svg b/loleaflet/images/indentation_marker_up.svg index 88f90c049..2bb0a9baf 100644 --- a/loleaflet/images/indentation_marker_up.svg +++ b/loleaflet/images/indentation_marker_up.svg @@ -1,3 +1,13 @@ -http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="0 0 140 110" > - - \ No newline at end of file + +http://www.w3.org/2000/svg; xmlns:cc="http://creativecommons.org/ns#; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;> + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage"/> + + + + + + diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js index 98b65370e..a5537055e 100644 --- a/loleaflet/src/control/Ruler.js +++ b/loleaflet/src/control/Ruler.js @@ -220,9 +220,9 @@ L.Control.Ruler = L.Control.extend({ // Conversion to mm100. if (this.options.indentUnit === 'inch') { - this.options.firstLineIndent = (this.options.firstLineIndent) * 2540; - this.options.leftParagraphIndent = (this.options.leftParagraphIndent) * 2540; - this.options.rightParagraphIndent = (this.options.rightParagraphIndent) * 2540; + this.options.firstLineIndent = this.options.firstLineIndent * 2540; + this.options.leftParagraphIndent = this.options.leftParagraphIndent * 2540; + this.options.rightParagraphIndent = this.options.rightParagraphIndent * 2540; } this.options.firstLineIndent *= pxPerMm100; @@ -235,10 +235,9 @@ L.Control.Ruler = L.Control.extend({ var pEndPosition = this._rTSContainer.getBoundingClientRect().right - this.options.rightParagraphIndent; // We calculated the positions. Now we should move them to left in order to make their sharp edge point to the right direction.. - var halfWidth = (this._firstLineMarker.getBoundingClientRect().right - this._firstLineMarker.getBoundingClientRect().left) * 0.5; - this._firstLineMarker.style.left = (fLinePosition - halfWidth) + 'px'; - this._pStartMarker.style.left = (pStartPosition - halfWidth) + 'px'; - this._pEndMarker.style.left = (pEndPosition - halfWidth) + 'px'; + this._firstLineMarker.style.left = (fLinePosition - (this._firstLineMarker.getBoundingClientRect().width / 2.0)) + 'px'; + this._pStartMarker.style.left = (pStartPosition -
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/leaflet.css| 33 loleaflet/images/indentation_marker_down.svg |3 loleaflet/images/indentation_marker_up.svg |3 loleaflet/src/control/Ruler.js | 217 ++- 4 files changed, 255 insertions(+), 1 deletion(-) New commits: commit 221d666822d8f010e629761456ff30ad8bb8fe24 Author: gokaysatir AuthorDate: Fri May 1 13:18:23 2020 +0300 Commit: Tomaž Vajngerl CommitDate: Tue May 12 13:28:08 2020 +0200 tdf#111535 Add First-line indent, paragraph indent, and tab spaces/Online part. Change-Id: I7b0b6e205aa9af40b8331044b99c44df0bd4cced Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93250 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tomaž Vajngerl diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css index f8f5eb95c..ec6a3d3de 100644 --- a/loleaflet/css/leaflet.css +++ b/loleaflet/css/leaflet.css @@ -842,6 +842,39 @@ input.clipboard { position: absolute; } +.loleaflet-ruler-indentation-marker-down { + width: 17px; + height: 11px; + background: url(images/indentation_marker_down.svg); + position: absolute; + left: 0; + top: 0; + z-index: 12; + background-repeat: no-repeat; +} + +.loleaflet-ruler-indentation-marker-up { + width: 17px; + height: 11px; + background: url(images/indentation_marker_up.svg); + position: absolute; + left: 0; + bottom: 0; + z-index: 12; + background-repeat: no-repeat; +} + +.loleaflet-ruler-indentation-marker-center{ + position: fixed; + display: none; + height: 100vh; + top: 0; + bottom: 0; + left: 0; + border-right: 2px dotted grey; + z-index: 12; +} + .loleaflet-ruler-marginwrapper { height: 100%; position: absolute; diff --git a/loleaflet/images/indentation_marker_down.svg b/loleaflet/images/indentation_marker_down.svg new file mode 100644 index 0..41e73bbeb --- /dev/null +++ b/loleaflet/images/indentation_marker_down.svg @@ -0,0 +1,3 @@ +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="0 0 140 110" > + + \ No newline at end of file diff --git a/loleaflet/images/indentation_marker_up.svg b/loleaflet/images/indentation_marker_up.svg new file mode 100644 index 0..88f90c049 --- /dev/null +++ b/loleaflet/images/indentation_marker_up.svg @@ -0,0 +1,3 @@ +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="0 0 140 110" > + + \ No newline at end of file diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js index 3c849aaad..98b65370e 100644 --- a/loleaflet/src/control/Ruler.js +++ b/loleaflet/src/control/Ruler.js @@ -64,6 +64,89 @@ L.Control.Ruler = L.Control.extend({ } }, + _initiateIndentationMarkers: function() { + // First line indentation.. + this._firstLineMarker = document.createElement('div'); + this._firstLineMarker.id = 'lo-fline-marker'; + this._firstLineMarker.classList.add('loleaflet-ruler-indentation-marker-down'); + this._rFace.appendChild(this._firstLineMarker); + + // Paragraph indentation.. + this._pStartMarker = document.createElement('div'); + this._pStartMarker.id = 'lo-pstart-marker'; + this._pStartMarker.classList.add('loleaflet-ruler-indentation-marker-up'); + this._rFace.appendChild(this._pStartMarker); + + // Paragraph end.. + this._pEndMarker = document.createElement('div'); + this._pEndMarker.id = 'lo-pend-marker'; + this._pEndMarker.classList.add('loleaflet-ruler-indentation-marker-up'); + this._rFace.appendChild(this._pEndMarker); + + // While one of the markers is being dragged, a vertical line should be visible in order to indicate the new position of the marker.. + this._markerVerticalLine = L.DomUtil.create('div', 'loleaflet-ruler-indentation-marker-center'); + this._rFace.appendChild(this._markerVerticalLine); + + var self = this; + + // Now we have indentation markers. Next we should bind drag initializers to them.. + // We will use 3 hammers. 1 hammer is not usable for this case. + if (L.Browser.touch) { + // Hammer for first line indentation.. + this._firstLineHammer = new Hammer(this._firstLineMarker); + this._firstLineHammer.add(new Hammer.Pan({ threshold: 0, pointers: 0 })); + this._firstLineHammer.get('press').set({ + time: 500 + }); + this._firstLineHammer.on('panstart', function (event) { +
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css | 32 ++-- loleaflet/images/lc_footnotedialog.svg |1 loleaflet/images/lc_insertcaptiondialog.svg |1 loleaflet/images/lc_updateall.svg |1 loleaflet/images/lc_updatecurindex.svg |1 loleaflet/src/control/Control.NotebookbarBuilder.js |2 + 6 files changed, 35 insertions(+), 3 deletions(-) New commits: commit 3c73ef8765a7ddfa3568b156385b3786b4784f38 Author: Szymon Kłos AuthorDate: Thu Apr 30 12:40:56 2020 +0200 Commit: Szymon Kłos CommitDate: Fri May 1 21:40:29 2020 +0200 notebookbar: icons & layout the references tab Change-Id: I52f319be7dc17cfe8376e673d46adb691f994df7 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93300 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css index 85c0c077f..fbbe66873 100644 --- a/loleaflet/css/notebookbar.css +++ b/loleaflet/css/notebookbar.css @@ -139,7 +139,8 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb #DrawText.notebookbar img, #VerticalText.notebookbar img, #BasicShapes.notebookbar img, -#table-Insert-Section-Symbol #CharmapControl.notebookbar img{ +#table-Insert-Section-Symbol #CharmapControl.notebookbar img +{ height: 32px !important; width: 32px !important; } @@ -155,7 +156,8 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb #ObjectForwardOne.notebookbar img, #SendToBack.notebookbar img, #ObjectBackOne.notebookbar img, -#PageDialog.notebookbar img { +#PageDialog.notebookbar img +{ height: 32px !important; width: 32px !important; } @@ -167,6 +169,30 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb #InsertBreak.notebookbar, #Watermark.notebookbar, #LineNumberingDialog.notebookbar - { +{ + margin-top: 10px; +} + +/* References Tab */ + +#table-ReferencesBox +{ + margin-top: 5px; +} + +#InsertMultiIndex.notebookbar img, +#InsertFootnote.notebookbar img, +#InsertReferenceField.notebookbar img, +#InsertAuthoritiesEntry.notebookbar img, +#UpdateAll.notebookbar img +{ + height: 32px !important; + width: 32px !important; +} + +#UpdateCurIndex.notebookbar, +#FootnoteDialog.notebookbar, +#InsertCaptionDialog.notebookbar +{ margin-top: 10px; } \ No newline at end of file diff --git a/loleaflet/images/lc_footnotedialog.svg b/loleaflet/images/lc_footnotedialog.svg new file mode 100644 index 0..f1e621a3c --- /dev/null +++ b/loleaflet/images/lc_footnotedialog.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_insertcaptiondialog.svg b/loleaflet/images/lc_insertcaptiondialog.svg new file mode 100644 index 0..5268ce5da --- /dev/null +++ b/loleaflet/images/lc_insertcaptiondialog.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_updateall.svg b/loleaflet/images/lc_updateall.svg new file mode 100644 index 0..6e844f32e --- /dev/null +++ b/loleaflet/images/lc_updateall.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_updatecurindex.svg b/loleaflet/images/lc_updatecurindex.svg new file mode 100644 index 0..e26fc6a01 --- /dev/null +++ b/loleaflet/images/lc_updatecurindex.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js index d9c13f358..9bd26f66e 100644 --- a/loleaflet/src/control/Control.NotebookbarBuilder.js +++ b/loleaflet/src/control/Control.NotebookbarBuilder.js @@ -69,6 +69,8 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({ this._toolitemHandlers['.uno:AttributePageSize'] = function() {}; this._toolitemHandlers['.uno:PageColumnType'] = function() {}; this._toolitemHandlers['.uno:SelectObject'] = function() {}; + this._toolitemHandlers['.uno:BibliographyComponent'] = function() {}; + this._toolitemHandlers['.uno:ViewDataSourceBrowser'] = function() {}; this._toolitemHandlers['vnd.sun.star.findbar:FocusToFindbar'] = function() {}; }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/notebookbar.css | 31 +- loleaflet/images/lc_charmapcontrol.svg |1 loleaflet/images/lc_editstyle.svg |1 loleaflet/images/lc_insertannotation.svg |1 loleaflet/images/lc_styleapply3fstyle3astring3demphasis26familyname3astring3dcharacterstyles.svg |1 loleaflet/images/lc_styleapply3fstyle3astring3dheading20126familyname3astring3dparagraphstyles.svg |1 loleaflet/images/lc_styleapply3fstyle3astring3dheading20226familyname3astring3dparagraphstyles.svg |1 loleaflet/images/lc_styleapply3fstyle3astring3dheading20326familyname3astring3dparagraphstyles.svg |1 loleaflet/images/lc_styleapply3fstyle3astring3dheading20426familyname3astring3dparagraphstyles.svg |1 loleaflet/images/lc_styleapply3fstyle3astring3dstrong20emphasis26familyname3astring3dcharacterstyles.svg |1 loleaflet/src/control/Control.NotebookbarBuilder.js |6 + 11 files changed, 44 insertions(+), 2 deletions(-) New commits: commit 9e020d60241ccf36d6ae99f6d0e47a1f47794c89 Author: Szymon Kłos AuthorDate: Wed Apr 29 12:11:59 2020 +0200 Commit: Szymon Kłos CommitDate: Fri May 1 21:39:38 2020 +0200 notebookbar: icons & layout the home tab Change-Id: I73f8b1dcc51994f89db6debce83bcf20dfa90c31 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93296 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css index 4cf5403bb..585075e39 100644 --- a/loleaflet/css/notebookbar.css +++ b/loleaflet/css/notebookbar.css @@ -81,7 +81,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb border: 1px solid silver; } -/* Reset attributes control */ +/* Home tab */ #clearFormatting.notebookbar div img { width: 24px !important; height: 24px !important; @@ -89,4 +89,33 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb #clearFormatting.notebookbar { height: 24px !important; +} + +#Paste.notebookbar img, #InsertAnnotation.notebookbar img, #SearchDialog.notebookbar img { + height: 32px !important; + width: 32px !important; +} + +#ControlCodes.notebookbar { + padding-left: 30px !important; +} + +#fontnamecombobox.notebookbar ~ .select2 { + width: 150px !important; +} + +#fontsizecombobox.notebookbar ~ .select2 { + width: 50px !important; +} + +#applystyle.notebookbar ~ .select2 { + width: 170px !important; +} + +#table-StyleParagraphSection1.notebookbar, #table-GroupB15.notebookbar, #table-GroupB11.notebookbar { + margin-top: -5px; +} + +#Copy.notebookbar, #clearFormatting.notebookbar, #table-GroupB20.notebookbar { + margin-top: 10px; } \ No newline at end of file diff --git a/loleaflet/images/lc_charmapcontrol.svg b/loleaflet/images/lc_charmapcontrol.svg new file mode 100644 index 0..87497d495 --- /dev/null +++ b/loleaflet/images/lc_charmapcontrol.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_editstyle.svg b/loleaflet/images/lc_editstyle.svg new file mode 100644 index 0..8d9d0dec1 --- /dev/null +++ b/loleaflet/images/lc_editstyle.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> diff --git a/loleaflet/images/lc_insertannotation.svg b/loleaflet/images/lc_insertannotation.svg new file mode 100644 index 0..2b0e791fa --- /dev/null +++ b/loleaflet/images/lc_insertannotation.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_styleapply3fstyle3astring3demphasis26familyname3astring3dcharacterstyles.svg b/loleaflet/images/lc_styleapply3fstyle3astring3demphasis26familyname3astring3dcharacterstyles.svg new file mode 100644 index 0..8c61f612b --- /dev/null +++ b/loleaflet/images/lc_styleapply3fstyle3astring3demphasis26familyname3astring3dcharacterstyles.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> diff --git a/loleaflet/images/lc_styleapply3fstyle3astring3dheading20126familyname3astring3dparagraphstyles.svg b/loleaflet/images/lc_styleapply3fstyle3astring3dheading20126familyname3astring3dparagraphstyles.svg new file mode 100644 index 0..885e34997 --- /dev/null +++ b/loleaflet/images/lc_styleapply3fstyle3astring3dheading20126familyname3astring3dparagraphstyles.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> diff --git a/loleaflet/images/lc_styleapply3fstyle3astring3dheading20226familyname3astring3dparagraphstyles.svg
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/leaflet.css | 47 +++--- loleaflet/images/tabstop-center.svg | 68 loleaflet/images/tabstop-decimal.svg | 76 + loleaflet/images/tabstop-left.svg | 68 loleaflet/images/tabstop-right.svg| 68 loleaflet/src/control/Ruler.js| 263 ++ loleaflet/src/layer/tile/TileLayer.js |9 + 7 files changed, 494 insertions(+), 105 deletions(-) New commits: commit 63b423b004d11b268f220edf8ac94e9f23d5cec4 Author: Tomaž Vajngerl AuthorDate: Tue Apr 14 08:02:22 2020 +0200 Commit: Tomaž Vajngerl CommitDate: Tue Apr 14 20:36:11 2020 +0200 change tabstop handling on the ruler, add markers, use Hammer.js This changes handling of tabstops on the ruler: * Tabstops are now updated from the 'tabstoplistupdate'. * For touch handling we now use Hammer.js so it is easier to handle with. * Markers for different types are added as SVG's. * Rework handling and calculating positions to be much simpler and logical (no additions of positions, which can cause rounding errors). * Use .uno:ChangeTabStop to send tabstop changes. Change-Id: I966dfa2c17652ab74e3fd8912622cf6c951e514d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92142 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tomaž Vajngerl diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css index 7caea9340..10b892599 100644 --- a/loleaflet/css/leaflet.css +++ b/loleaflet/css/leaflet.css @@ -874,23 +874,36 @@ input.clipboard { line-height: 7px; } -/* A triangle pointing up */ -.loleaflet-ruler-tabstop { - width: 0; - height: 0; - vertical-align: bottom; - display: inline-block; - /* So that we hardcode this in just one place */ - --loleaflet-ruler-tabstop-border: 8; - border-top: calc(var(--loleaflet-ruler-tabstop-border) * 1px) solid transparent; - border-left: calc(var(--loleaflet-ruler-tabstop-border) * 1px) solid transparent; - /* Offset the left border with left margin to make this really take zero horizontal space until the JS code bumps the marginLeft */ - margin-left: calc(-1 * var(--loleaflet-ruler-tabstop-border) * 1px); - border-right: calc(var(--loleaflet-ruler-tabstop-border) * 1px) solid transparent; - /* Ditto for the right border, this is left as is */ - margin-right: calc(-1 * var(--loleaflet-ruler-tabstop-border) * 1px); - border-bottom: calc(var(--loleaflet-ruler-tabstop-border) * 1px) solid black; - margin-bottom: calc(-1 * var(--loleaflet-ruler-tabstop-border) * 1px / 2); +.loleaflet-ruler-tabstop-left { + width: 20px; + height: 20px; + background: url(images/tabstop-left.svg); + position: absolute; + pointer-events: none; +} + +.loleaflet-ruler-tabstop-right { + width: 20px; + height: 20px; + background: url(images/tabstop-right.svg); + position: absolute; + pointer-events: none; +} + +.loleaflet-ruler-tabstop-center { + width: 20px; + height: 20px; + background: url(images/tabstop-center.svg); + position: absolute; + pointer-events: none; +} + +.loleaflet-ruler-tabstop-decimal { + width: 20px; + height: 20px; + background: url(images/tabstop-decimal.svg); + position: absolute; + pointer-events: none; } .loleaflet-ruler-margin { diff --git a/loleaflet/images/tabstop-center.svg b/loleaflet/images/tabstop-center.svg new file mode 100644 index 0..5f1589dd3 --- /dev/null +++ b/loleaflet/images/tabstop-center.svg @@ -0,0 +1,68 @@ + +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; + inkscape:version="1.0beta2 (unknown)" + sodipodi:docname="tabstop-center.svg" + viewBox="0 0 20 20" + id="svg2" + version="1.1" + width="20" + height="20"> + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage; /> + + + + + + + + diff --git a/loleaflet/images/tabstop-decimal.svg b/loleaflet/images/tabstop-decimal.svg new file mode 100644 index 0..5d33d5f32 --- /dev/null +++ b/loleaflet/images/tabstop-decimal.svg @@ -0,0 +1,76 @@ + +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; + inkscape:version="1.0beta2 (unknown)" +
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/mobilewizard.css|9 + loleaflet/images/lc_delbreakmenu.svg | 10 ++ loleaflet/images/lc_deletecolumnbreak.svg |9 + loleaflet/images/lc_deleterowbreak.svg| 10 ++ loleaflet/images/lc_groupoutlinemenu.svg |1 + loleaflet/images/lc_insertbreakmenu.svg |1 + loleaflet/images/lc_insertcolumnsmenu.svg |1 + loleaflet/images/lc_insertrowbreak.svg| 11 ++- loleaflet/images/lc_insertrowsmenu.svg|1 + loleaflet/src/control/Control.Menubar.js | 10 +- 10 files changed, 49 insertions(+), 14 deletions(-) New commits: commit 7918f69a2452045e2e88639947d05278e4aa7028 Author: Pedro Pinto Silva AuthorDate: Mon Mar 16 11:18:41 2020 +0100 Commit: Pedro Pinto da Silva CommitDate: Mon Mar 16 12:22:00 2020 +0100 Mobile: Calc: Hamburger menu: sheet and submenus: add icons - Remove default gray elements for submenus - Fix some icon sizes from 32 pc to 24 px - Add new delete icons - Add icon for data > group outline etc Change-Id: I62e234d995fc6e875c5344715661dfd3202ef6a6 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90557 Tested-by: Jenkins CollaboraOffice Tested-by: Pedro Pinto da Silva Reviewed-by: Pedro Pinto da Silva diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css index 00a109811..897879943 100644 --- a/loleaflet/css/mobilewizard.css +++ b/loleaflet/css/mobilewizard.css @@ -43,14 +43,7 @@ #leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage, .menu-entry-icon.setanchoratchar, .menu-entry-icon.setanchortochar, .menu-entry-icon.setanchortopage, .menu-entry-icon.setanchortocellresize, .menu-entry-icon.setanchortocell{ display: none; } - .ui-header.level-2.mobile-wizard.ui-widget img[src='images/lc_deleterowbreak.svg'], .ui-header.level-2.mobile-wizard.ui-widget img[src='images/lc_deletecolumnbreak.svg']{ - visibility: hidden; - } - .menu-entry-icon.deleterowbreak, .menu-entry-icon.deletecolumnbreak{ - background-color: #ee; - border-radius: 100px; - box-shadow: inset 0 0px 0 8px white; - } + .ui-header.level-1.mobile-wizard.ui-widget img[src='images/lc_downloadas-pdf.svg']{ visibility: visible; } diff --git a/loleaflet/images/lc_delbreakmenu.svg b/loleaflet/images/lc_delbreakmenu.svg new file mode 100644 index 0..b6753cbdc --- /dev/null +++ b/loleaflet/images/lc_delbreakmenu.svg @@ -0,0 +1,10 @@ +http://www.w3.org/2000/svg;> + + + + + + + + + diff --git a/loleaflet/images/lc_deletecolumnbreak.svg b/loleaflet/images/lc_deletecolumnbreak.svg new file mode 100644 index 0..59ffdd0f2 --- /dev/null +++ b/loleaflet/images/lc_deletecolumnbreak.svg @@ -0,0 +1,9 @@ +http://www.w3.org/2000/svg;> + + + + + + + + diff --git a/loleaflet/images/lc_deleterowbreak.svg b/loleaflet/images/lc_deleterowbreak.svg new file mode 100644 index 0..b6753cbdc --- /dev/null +++ b/loleaflet/images/lc_deleterowbreak.svg @@ -0,0 +1,10 @@ +http://www.w3.org/2000/svg;> + + + + + + + + + diff --git a/loleaflet/images/lc_groupoutlinemenu.svg b/loleaflet/images/lc_groupoutlinemenu.svg new file mode 100644 index 0..a8bd1bf35 --- /dev/null +++ b/loleaflet/images/lc_groupoutlinemenu.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_insertbreakmenu.svg b/loleaflet/images/lc_insertbreakmenu.svg new file mode 100644 index 0..65af4963c --- /dev/null +++ b/loleaflet/images/lc_insertbreakmenu.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_insertcolumnsmenu.svg b/loleaflet/images/lc_insertcolumnsmenu.svg new file mode 100644 index 0..38a4af1d6 --- /dev/null +++ b/loleaflet/images/lc_insertcolumnsmenu.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_insertrowbreak.svg b/loleaflet/images/lc_insertrowbreak.svg index 65af4963c..e5d519167 100644 --- a/loleaflet/images/lc_insertrowbreak.svg +++ b/loleaflet/images/lc_insertrowbreak.svg @@ -1 +1,10 @@ -http://www.w3.org/2000/svg;> \ No newline at end of file +http://www.w3.org/2000/svg;> + + + + + + + + + diff --git a/loleaflet/images/lc_insertrowsmenu.svg b/loleaflet/images/lc_insertrowsmenu.svg new file mode 100644 index 0..9d11d146d --- /dev/null +++ b/loleaflet/images/lc_insertrowsmenu.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 88b455d69..7bd57d538 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -581,19 +581,19 @@ L.Control.Menubar = L.Control.extend({
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/mobilewizard.css |3 ++ loleaflet/images/lc_inserttable_mono.svg |1 loleaflet/src/control/Control.JSDialogBuilder.js | 26 +++ 3 files changed, 26 insertions(+), 4 deletions(-) New commits: commit 5b44398bccecfe1865e75c1256aad8012d275dcb Author: Pedro Pinto Silva AuthorDate: Tue Jan 28 15:37:25 2020 +0100 Commit: Pedro Pinto da Silva CommitDate: Tue Jan 28 17:47:34 2020 +0100 MobileWizard: Insert: Table: - Add exeption - Even if there is no image passed add it manually and adjust HTML sctructure so to be consistent with other menu-entry-with-icon elements - Add inserttable monochrome icon - pass optional argument data.id Change-Id: I34536272d3ef5742895c4db5a52058fe6558f837 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87633 Reviewed-by: Pedro Pinto da Silva Tested-by: Pedro Pinto da Silva diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css index aaae8b01c..d5d67b8e9 100644 --- a/loleaflet/css/mobilewizard.css +++ b/loleaflet/css/mobilewizard.css @@ -363,6 +363,9 @@ .ui-header.level-1.mobile-wizard.ui-widget .ui-header-left span.menu-entry-with-icon { vertical-align: middle; } + .flex-fullwidth { + flex-grow: 100; + } .ui-tabs.mobile-wizard { text-align: center; diff --git a/loleaflet/images/lc_inserttable_mono.svg b/loleaflet/images/lc_inserttable_mono.svg new file mode 100644 index 0..13c8fca45 --- /dev/null +++ b/loleaflet/images/lc_inserttable_mono.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 24"> diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index a3dcdb844..027934cb5 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -343,12 +343,30 @@ L.Control.JSDialogBuilder = L.Control.extend({ } }, - _explorableMenu: function(parentContainer, title, children, builder, customContent) { + _explorableMenu: function(parentContainer, title, children, builder, customContent, dataid) { + dataid = dataid || 0; + var icon = null; var sectionTitle = L.DomUtil.create('div', 'ui-header level-' + builder._currentDepth + ' mobile-wizard ui-widget', parentContainer); $(sectionTitle).css('justify-content', 'space-between'); - var titleSpan = L.DomUtil.create('span', 'sub-menu-title', sectionTitle); - titleSpan.innerHTML = title; + + if (dataid === 'inserttable') { + var iconSpan = L.DomUtil.create('span', 'menu-entry-icon inserttable', sectionTitle); + var iconPath = 'images/lc_inserttable_mono.svg'; + icon = L.DomUtil.create('img', '', iconSpan); + icon.src = iconPath; + icon.alt = ''; + icon.addEventListener('error', function() { + icon.style.display = 'none'; + }); + + var titleSpan2 = L.DomUtil.create('span', 'menu-entry-with-icon flex-fullwidth', sectionTitle); + titleSpan2.innerHTML = title; + } + else { + var titleSpan = L.DomUtil.create('span', 'sub-menu-title', sectionTitle); + titleSpan.innerHTML = title; + } var arrowSpan = L.DomUtil.create('span', 'sub-menu-arrow', sectionTitle); arrowSpan.innerHTML = '>'; @@ -1509,7 +1527,7 @@ L.Control.JSDialogBuilder = L.Control.extend({ builder.map.fire('closemobilewizard'); }); - builder._explorableMenu(parentContainer, title, data.children, builder, content); + builder._explorableMenu(parentContainer, title, data.children, builder, content, data.id); }, build: function(parent, data) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/loleaflet.css|9 +++ loleaflet/images/table-row-or-column-select-marker.svg |3 + loleaflet/src/layer/tile/TileLayer.TableOverlay.js | 46 - 3 files changed, 46 insertions(+), 12 deletions(-) New commits: commit ebaca16c4f28ae7a499c632b70b24eaaa1083439 Author: Tor Lillqvist AuthorDate: Mon Jan 20 16:12:47 2020 +0200 Commit: Tor Lillqvist CommitDate: Tue Jan 21 10:26:58 2020 +0100 tdf#128509: Make the column and row headers tappable on touch devices After you have sleected a table on a text document in the iOS (and Android) app, you are supposed to be able to tap the "header" rectangle that is painted for each column and row, in order to select the whole of that column or row. But this worked only in web-based Online with a desktop browser, for clicking it with a mouse. Was much more complicated than expected. But now it seems to work. One needs to use Marker instead of Rectangle. Change-Id: I4f701c70dd4edce6a3edb6fcf9feffa7b7969a8c Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87079 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css index 7d3326687..4f80a03af 100644 --- a/loleaflet/css/loleaflet.css +++ b/loleaflet/css/loleaflet.css @@ -91,6 +91,15 @@ cursor: row-resize; } +.table-row-or-column-select-marker { + margin: 0px; + width: 24px; + height: 24px; + background-image: url('images/table-row-or-column-select-marker.svg'); + background-size: cover; + background-repeat: no-repeat; +} + .table-move-marker { margin-left: 0px; margin-top: 0px; diff --git a/loleaflet/images/table-row-or-column-select-marker.svg b/loleaflet/images/table-row-or-column-select-marker.svg new file mode 100644 index 0..6ee9d4673 --- /dev/null +++ b/loleaflet/images/table-row-or-column-select-marker.svg @@ -0,0 +1,3 @@ +http://www.w3.org/2000/svg;> + + diff --git a/loleaflet/src/layer/tile/TileLayer.TableOverlay.js b/loleaflet/src/layer/tile/TileLayer.TableOverlay.js index 25e8f93e7..96c27ecb5 100644 --- a/loleaflet/src/layer/tile/TileLayer.TableOverlay.js +++ b/loleaflet/src/layer/tile/TileLayer.TableOverlay.js @@ -18,6 +18,11 @@ L.TileLayer.include({ var point = this._latLngToTwips(this._map.unproject(new L.Point(pixel, 0))); return point.x; }, + _convertTwipsToPixels: function(twips) { + var point = this._twipsToLatLng(twips) + point = this._map.project(point); + return point; + }, hasTableSelection: function () { return this._currentTableData.rows != null || this._currentTableData.columns != null; }, @@ -218,10 +223,14 @@ L.TileLayer.include({ return; var startX, endX, startY, endY; - var point1, point2; + var point1; var delta1 = this._convertPixelToTwips(this._selectionHeaderDistanceFromTable); - var delta2 = this._convertPixelToTwips(this._selectionHeaderDistanceFromTable + this._selectionHeaderHeight); + + // The 24 is the height and width of the .table-row-or-column-select-marker in loleaflet.css + var height = 24; + var width = height; + var selectionMarkerNominalSize = this._convertPixelToTwips(width); for (var i = 0; i < positions.length - 1; i++) { if (type === 'column') { @@ -229,23 +238,29 @@ L.TileLayer.include({ endX = this._tablePositionColumnOffset + positions[i + 1]; startY = start; endY = end; - point1 = this._twipsToLatLng(new L.Point(startX, startY - delta1), this._map.getZoom()); - point2 = this._twipsToLatLng(new L.Point(endX, startY - delta2), this._map.getZoom()); + point1 = this._twipsToLatLng(new L.Point(startX, startY - delta1 - selectionMarkerNominalSize), + this._map.getZoom()); + width = this._convertTwipsToPixels(new L.Point(endX - startX, 0)).x - 2; } else { startX = start; endX = end; startY = this._tablePositionRowOffset + positions[i]; endY = this._tablePositionRowOffset + positions[i + 1]; - point1 = this._twipsToLatLng(new L.Point(startX - delta1, startY), this._map.getZoom()); - point2 = this._twipsToLatLng(new L.Point(startX - delta2,
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/mobilewizard.css | 29 +++ loleaflet/images/lc_helpindex_secondary.svg |4 +++ loleaflet/src/control/Control.JSDialogBuilder.js |4 +-- loleaflet/src/control/Control.MobileWizard.js|4 +++ 4 files changed, 25 insertions(+), 16 deletions(-) New commits: commit 18e2137a17238ec81a26d2022983aec1b6148a08 Author: Pedro Pinto Silva AuthorDate: Tue Nov 26 12:44:48 2019 +0100 Commit: Pedro Pinto da Silva CommitDate: Tue Nov 26 12:49:16 2019 +0100 funcWizard: style * Replace hardcoded info icon with the existent help icon from the theme * Add help background image to the description panel so the user knows at all times (even if looking away and then back) which screen he is and does know that to insert or go see all the function he needs to go back one level * text styling Change-Id: I717d42e7f2b6c54c595a2aefe454a1fa06c20072 Reviewed-on: https://gerrit.libreoffice.org/83752 Reviewed-by: Pedro Pinto da Silva Tested-by: Pedro Pinto da Silva diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css index 783d63d1e..4cb167a75 100644 --- a/loleaflet/css/mobilewizard.css +++ b/loleaflet/css/mobilewizard.css @@ -180,7 +180,12 @@ bottom: 0px; width: 100%; } - + #mobile-wizard.funcwizard div#mobile-wizard-content.hideHelpBG { + background: none !important; + } + #mobile-wizard.funcwizard div#mobile-wizard-content.showHelpBG { + background: url(images/lc_helpindex_secondary.svg) no-repeat right 16px bottom 88px / 124px !important; + } #mobile-wizard-content:not(.with-slide-sorter-above){ top: 63px !important; } @@ -272,6 +277,7 @@ display: flex; flex-direction: row; align-items: center; + background-color: #fff; } .ui-header.mobile-wizard:active { @@ -323,25 +329,20 @@ } .func-info-icon { - display: table-cell; - padding-left: 8px; - padding-right: 8px; - background: transparent; - font-size: 1.2em; - font-weight: bold; - color: #aaa !important; - vertical-align: middle; - border-radius: 100px; - border: solid 2px #aaa; + display: block; + background: url(images/lc_helpindex.svg) no-repeat center; + min-width: 28px; + min-height: 28px; } .func-info-sig { - margin-left: 1em; - margin-bottom: 2em; + margin: 1em 0px 1em 4%; + font-weight: bold; + color: #44 !important; } .func-info-desc { - margin-left: 1em; + margin-left: 4%; } .entry-value { diff --git a/loleaflet/images/lc_helpindex_secondary.svg b/loleaflet/images/lc_helpindex_secondary.svg new file mode 100644 index 0..96d6567a2 --- /dev/null +++ b/loleaflet/images/lc_helpindex_secondary.svg @@ -0,0 +1,4 @@ +http://www.w3.org/2000/svg;> + + + diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index ba39f3d2d..51be4b3f5 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -283,8 +283,8 @@ L.Control.JSDialogBuilder = L.Control.extend({ titleSpan.innerHTML = data.text; var rightDiv = L.DomUtil.create('div', 'ui-header-right', sectionTitle); - var arrowSpan = L.DomUtil.create('span', 'func-info-icon', rightDiv); - arrowSpan.innerHTML = 'i'; + var arrowSpan = L.DomUtil.create('div', 'func-info-icon', rightDiv); + arrowSpan.innerHTML = ''; var contentDiv = L.DomUtil.create('div', 'ui-content level-' + builder._currentDepth + ' mobile-wizard', parentContainer); contentDiv.title = data.text; diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js index 69205e60f..2af4f2cf9 100644 --- a/loleaflet/src/control/Control.MobileWizard.js +++ b/loleaflet/src/control/Control.MobileWizard.js @@ -105,6 +105,8 @@ L.Control.MobileWizard = L.Control.extend({ var titles = '.ui-header.level-' + this.getCurrentLevel() + '.mobile-wizard'; $(titles).hide('slide', { direction: 'left' }, 'fast'); $(contentToShow).siblings().hide(); + $('#mobile-wizard.funcwizard div#mobile-wizard-content').removeClass('hideHelpBG'); + $('#mobile-wizard.funcwizard div#mobile-wizard-content').addClass('showHelpBG'); $(contentToShow).show('slide', { direction: 'right' }, 'fast');
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/toolbar.css |3 ++- loleaflet/images/lc_fullscreen-presentation-toolbar-mobile.svg |4 loleaflet/src/layer/tile/ImpressTileLayer.js |4 +--- 3 files changed, 7 insertions(+), 4 deletions(-) New commits: commit 5e035078d6dca7d77a82f397feb22ec1e0a068f2 Author: Pedro AuthorDate: Fri Oct 25 16:58:29 2019 +0200 Commit: Szymon Kłos CommitDate: Tue Oct 29 12:09:00 2019 +0100 Impress: Mobile: Toolbar-up: Remove next and previous record buttons, add fullscreen-presentation and icon couldn't find the uno action/command for fullscreen-presentation (it seems there is already a function for that action in the hamburger menu item Change-Id: I4e25f8f9ceaee15656e44775185cc8ed3856b7f7 Reviewed-on: https://gerrit.libreoffice.org/81510 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css index ca1992b2d..61d6b2589 100644 --- a/loleaflet/css/toolbar.css +++ b/loleaflet/css/toolbar.css @@ -260,7 +260,7 @@ border-right: none; height: 35px !important; } - #tb_actionbar_item_undo .w2ui-tb-image, #tb_actionbar_item_redo .w2ui-tb-image, #tb_actionbar_item_mobile_wizard .w2ui-tb-image, #tb_actionbar_item_prev .w2ui-tb-image, #tb_actionbar_item_next .w2ui-tb-image, #tb_actionbar_item_insertion_mobile_wizard .w2ui-tb-image, #tb_actionbar_item_insertcomment .w2ui-tb-image{ + #tb_actionbar_item_undo .w2ui-tb-image, #tb_actionbar_item_redo .w2ui-tb-image, #tb_actionbar_item_mobile_wizard .w2ui-tb-image, #tb_actionbar_item_prev .w2ui-tb-image, #tb_actionbar_item_next .w2ui-tb-image, #tb_actionbar_item_insertion_mobile_wizard .w2ui-tb-image, #tb_actionbar_item_insertcomment .w2ui-tb-image, #tb_actionbar_item_fullscreen-presentation .w2ui-tb-image{ min-width: 38px; } @@ -931,6 +931,7 @@ button.leaflet-control-search-next .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.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; } .w2ui-icon.insertcomment{ background: url('images/lc_insertcomment.svg') no-repeat center !important; } diff --git a/loleaflet/images/lc_fullscreen-presentation-toolbar-mobile.svg b/loleaflet/images/lc_fullscreen-presentation-toolbar-mobile.svg new file mode 100644 index 0..841dd448d --- /dev/null +++ b/loleaflet/images/lc_fullscreen-presentation-toolbar-mobile.svg @@ -0,0 +1,4 @@ + +http://www.w3.org/2000/svg;> + + diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js b/loleaflet/src/layer/tile/ImpressTileLayer.js index 66163c82d..37d2ed858 100644 --- a/loleaflet/src/layer/tile/ImpressTileLayer.js +++ b/loleaflet/src/layer/tile/ImpressTileLayer.js @@ -138,11 +138,9 @@ L.ImpressTileLayer = L.TileLayer.extend({ items: [ {type: 'button', id: 'closemobile', img: 'closemobile'}, {type: 'spacer'}, - {type: 'button', id: 'prev', img: 'prev', hint: _UNO('.uno:PageUp', 'text')}, - {type: 'button', id: 'next', img: 'next', hint: _UNO('.uno:PageDown', 'text')}, {type: 'button', id: 'undo', img: 'undo', hint: _UNO('.uno:Undo'), uno: 'Undo', disabled: true}, {type: 'button', id: 'redo', img: 'redo', hint: _UNO('.uno:Redo'), uno: 'Redo', disabled: true}, - {type: 'button', id: 'fullscreen', img: 'fullscreen', hint: _UNO('.uno:FullScreen', 'text')}, + {type: 'button', id: 'fullscreen-presentation', img: 'fullscreen-presentation', hint: _UNO('.uno:FullScreen', 'presentation')}, {type: 'button', id: 'mobile_wizard', img: 'mobile_wizard', disabled: true}, {type: 'button', id: 'insertion_mobile_wizard', img: 'insertion_mobile_wizard', disabled: true}, {type: 'button', id: 'insertcomment', img: 'insertcomment', disabled: true}, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/mobilewizard.css |9 +++-- loleaflet/images/lc_clearoutline.svg |1 + loleaflet/images/lc_hidedetail.svg | 10 ++ loleaflet/images/lc_showdetail.svg | 10 ++ loleaflet/src/control/Control.JSDialogBuilder.js |2 +- 5 files changed, 29 insertions(+), 3 deletions(-) New commits: commit 79a0dcc9ff30f00b9b51e7903fd17840c5d1f9d6 Author: Pedro AuthorDate: Thu Oct 24 15:00:42 2019 +0200 Commit: Szymon Kłos CommitDate: Thu Oct 24 15:42:06 2019 +0200 Hamburger menu: add missing icons, add default placeholder, add parent class in JS Change-Id: I61d4127f1ddcf1e08b61cc7d6a76e47a80ba49f7 Reviewed-on: https://gerrit.libreoffice.org/81452 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css index 0ce1e3afe..0ed0cc2af 100644 --- a/loleaflet/css/mobilewizard.css +++ b/loleaflet/css/mobilewizard.css @@ -35,10 +35,15 @@ span#main-menu-btn-icon { #leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage{ display: none; } -.ui-header.level-1.mobile-wizard.ui-widget img[src^="images/lc_downloadas-doc"], .ui-header.level-1.mobile-wizard.ui-widget img[src^="images/lc_downloadas-pp"],.ui-header.level-1.mobile-wizard.ui-widget img[src^="images/lc_downloadas-xls"], .ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_showdetail.svg"], .ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_hidedetail.svg"], .ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_clearoutline.svg"], .ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_deleterowbreak.svg"], .ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_deletecolumnbreak.svg"]{ +.ui-header.level-1.mobile-wizard.ui-widget img[src^='images/lc_downloadas-doc'], .ui-header.level-1.mobile-wizard.ui-widget img[src^='images/lc_downloadas-pp'],.ui-header.level-1.mobile-wizard.ui-widget img[src^='images/lc_downloadas-xls'], .ui-header.level-2.mobile-wizard.ui-widget img[src='images/lc_deleterowbreak.svg'], .ui-header.level-2.mobile-wizard.ui-widget img[src='images/lc_deletecolumnbreak.svg']{ visibility: hidden; } -.ui-header.level-1.mobile-wizard.ui-widget img[src="images/lc_downloadas-pdf.svg"]{ +.menu-entry-icon.deleterowbreak, .menu-entry-icon.deletecolumnbreak, .menu-entry-icon.downloadas-xls, .menu-entry-icon.downloadas-xlsx, .menu-entry-icon.downloadas-doc, .menu-entry-icon.downloadas-docx, .menu-entry-icon.downloadas-ppt, .menu-entry-icon.downloadas-pptx{ + background-color: #ee; + border-radius: 100px; + box-shadow: inset 0 0px 0 8px white; +} +.ui-header.level-1.mobile-wizard.ui-widget img[src='images/lc_downloadas-pdf.svg']{ visibility: visible; } diff --git a/loleaflet/images/lc_clearoutline.svg b/loleaflet/images/lc_clearoutline.svg new file mode 100644 index 0..a4c65dde9 --- /dev/null +++ b/loleaflet/images/lc_clearoutline.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_hidedetail.svg b/loleaflet/images/lc_hidedetail.svg new file mode 100644 index 0..49c03cf44 --- /dev/null +++ b/loleaflet/images/lc_hidedetail.svg @@ -0,0 +1,10 @@ +http://www.w3.org/2000/svg;> + + + diff --git a/loleaflet/images/lc_showdetail.svg b/loleaflet/images/lc_showdetail.svg new file mode 100644 index 0..8ae2992ab --- /dev/null +++ b/loleaflet/images/lc_showdetail.svg @@ -0,0 +1,10 @@ +http://www.w3.org/2000/svg;> + + + diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index 0028a3380..7ac9f9a41 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -794,7 +794,7 @@ L.Control.JSDialogBuilder = L.Control.extend({ var icon = null; var commandName = data.command ? data.command.substring('.uno:'.length) : data.id; if (commandName && commandName.length && L.LOUtil.existsIconForCommand(commandName)) { - var iconSpan = L.DomUtil.create('span', 'menu-entry-icon', menuEntry); + var iconSpan = L.DomUtil.create('span', 'menu-entry-icon ' + commandName.toLowerCase(), menuEntry); var iconPath = 'images/lc_' + commandName.toLowerCase() + '.svg'; icon = L.DomUtil.create('img', '', iconSpan); icon.src = iconPath; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/mobilewizard.css | 101 loleaflet/css/toolbar.css | 96 -- loleaflet/images/lc_color-picker-selected.svg |8 + loleaflet/images/lc_square_rounded_unfilled.svg |1 loleaflet/src/control/ColorPicker.js|2 5 files changed, 111 insertions(+), 97 deletions(-) New commits: commit 9e790e53fcfe62fb5e14a4a3bb86f3fb814c7999 Author: Pedro AuthorDate: Tue Oct 22 15:55:44 2019 +0200 Commit: Szymon Kłos CommitDate: Thu Oct 24 12:55:20 2019 +0200 Style color-picker and add icons; move rules to mobilewizard.css Change-Id: Icc8261c9ef138ea5ea4869296a156c0b860e983b Reviewed-on: https://gerrit.libreoffice.org/81335 Reviewed-by: Szymon Kłos Tested-by: Szymon Kłos diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css index 5081c4476..16e29ebc1 100644 --- a/loleaflet/css/mobilewizard.css +++ b/loleaflet/css/mobilewizard.css @@ -113,3 +113,104 @@ span#main-menu-btn-icon { .layout.layout_head02a { background: url('images/layout_head02a.svg') no-repeat center !important; } + +/*Color-picker*/ +.color-sample-selected { + height: 32px !important; + width: 32px !important; + border: 1px solid #8A8A8A; + border-radius: 100px; +} + +.no-color-selected { + text-align: center; + font-size: 30pt; + line-height: 32px; + font-weight: 300; + color: #ff !important; + background-color: #fff !important; +} + +.colors-container-selected-basic-color{ + box-shadow: 0 2px 3px -2px #0b87e7; + border-radius: 4px; +} +.color-sample-small { + border: 2px solid #fff; + width: 28px; + height: 28px; + color: #f0f8ff; + text-align: center; + vertical-align: bottom; + display: table-cell; +} + +.color-sample-big { + padding: 5px; + width: 118px; + height: 42px; + color: #f0f8ff; + text-align: right; + vertical-align: bottom; + display: table-cell; + box-shadow: 0px 0px 0px 1px #dd, 1px 1px 0 3px #ff; +} + +.colors-container { + display: table; +} + +.colors-container-no-color-row { + display: flex; + justify-content: space-between; + height: 50px; +} + +.colors-container-basic-colors-row { + padding-bottom: 20px; +} + +.colors-container-tints { + padding-bottom: 0px; +} + +.no-color-control-label { + display:table-cell; + padding-left: 4px; + vertical-align: middle; +} + +.no-color-control-mark { + color: #0b87e7 !important; + font-size: larger; + line-height: 0; +} + +.no-color-control-icon { + display: table-cell; + height: 32px !important; + width: 32px !important; + text-align: center; + font-size: 26pt; + line-height: 28px; + font-weight: 300; + color: #ff !important; + background: url(images/lc_square_rounded_unfilled.svg) no-repeat center; +} + +.colors-container-basic-color-mark { + border: 4px solid transparent; + border-top: 5px solid #0b87e7; + margin-top: 2px; + position: absolute; + margin-left: 10px +} + +.colors-container-tint-mark { + width: 20px; + height: 20px; + background-image: url('images/lc_color-picker-selected.svg'); + margin-left: auto; + background-repeat: no-repeat; + background-size: auto; +} diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css index 925c14406..517f826f1 100644 --- a/loleaflet/css/toolbar.css +++ b/loleaflet/css/toolbar.css @@ -1262,99 +1262,3 @@ menu-entry-with-icon.padding-left + menu-entry-icon.width */ vertical-align: middle; padding-left: 8px; } - -.color-sample-selected { - height: 32px !important; - width: 32px !important; - border: 1px solid #8A8A8A; - border-radius: 100px; -} - -.no-color-selected { - text-align: center; - font-size: 30pt; - line-height: 32px; - font-weight: 300; - color: #ff !important; - background-color: #fff !important; -} - -.color-sample-small { - border-left: 3px solid #fff; - border-right: 3px solid #fff; - border-bottom: 3px solid #fff; - width: 28px; - height: 28px; - color: #f0f8ff; - text-align: center; - vertical-align: bottom; - display: table-cell; -} - -.color-sample-big { - border: 5px solid #f2f8f0; - padding: 5px; - width: 118px; - height: 42px; - color: #f0f8ff; - text-align: right; - vertical-align: bottom; - display: table-cell; -} - -.colors-container { - display: table; -} - -.colors-container-no-color-row { - display: flex; - justify-content: space-between; - height: 50px; -} - -.colors-container-basic-colors-row { - padding-bottom: 20px; -} - -.colors-container-tints { -
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/mobilewizard.css | 72 +++ loleaflet/images/layout_empty.svg|1 loleaflet/images/layout_head01.svg |1 loleaflet/images/layout_head02.svg |1 loleaflet/images/layout_head02a.svg |1 loleaflet/images/layout_head02b.svg |1 loleaflet/images/layout_head03.svg |1 loleaflet/images/layout_head03a.svg |1 loleaflet/images/layout_head03b.svg |1 loleaflet/images/layout_head03c.svg |1 loleaflet/images/layout_head04.svg |1 loleaflet/images/layout_head06.svg |1 loleaflet/images/layout_textonly.svg |1 loleaflet/images/layout_vertical01.svg |1 loleaflet/images/layout_vertical02.svg |1 loleaflet/src/control/Control.JSDialogBuilder.js | 22 +++ 16 files changed, 108 insertions(+) New commits: commit 389f05af1cb8f314194255f38557316b70ea58be Author: Henry Castro AuthorDate: Fri Oct 18 10:44:40 2019 -0400 Commit: Henry Castro CommitDate: Fri Oct 18 16:49:16 2019 +0200 jsdialogs: add valueset control handler The LO Core server sends data items of the valueset control. For Example Layouts items of the Sidebar in Impress Document, this item need to be transformed into an element inside of mobile wizard dialog. Change-Id: I2ce166aee62ebd075edde5b91f62c0591ee5a0a1 Reviewed-on: https://gerrit.libreoffice.org/81054 Reviewed-by: Henry Castro Tested-by: Henry Castro diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css index 0cea4beb3..292e266ed 100644 --- a/loleaflet/css/mobilewizard.css +++ b/loleaflet/css/mobilewizard.css @@ -41,3 +41,75 @@ span#main-menu-btn-icon { .ui-header.level-1.mobile-wizard.ui-widget img[src="images/lc_downloadas-pdf.svg"]{ visibility: visible; } + +.layout { + height: 60px; + width: 60px; + overflow: hidden; + margin: 2px 2px !important; + display: inline-block; +} + +.layout.layout_empty { + background: url('images/layout_empty.svg') no-repeat center !important; +} + +.layout.layout_head03 { + background: url('images/layout_head03.svg') no-repeat center !important; +} + +.layout.layout_head02 { + background: url('images/layout_head02.svg') no-repeat center !important; +} + +.layout.layout_head02a { + background: url('images/layout_head02a.svg') no-repeat center !important; +} + +.layout.layout_head01 { + background: url('images/layout_head01.svg') no-repeat center !important; +} + +.layout.layout_textonly { + background: url('images/layout_textonly.svg') no-repeat center !important; +} + +.layout.layout_head03b { + background: url('images/layout_head03b.svg') no-repeat center !important; +} + +.layout.layout_head03c { + background: url('images/layout_head03c.svg') no-repeat center !important; +} + +.layout.layout_head03a { + background: url('images/layout_head0a.svg') no-repeat center !important; +} + +.layout.layout_head02b { + background: url('images/layout_head02b.svg') no-repeat center !important; +} + +.layout.layout_head04 { + background: url('images/layout_head04.svg') no-repeat center !important; +} + +.layout.layout_head06 { + background: url('images/layout_head06.svg') no-repeat center !important; +} + +.layout.layout_vertical02 { + background: url('images/layout_vertical02.svg') no-repeat center !important; +} + +.layout.layout_vertical01 { + background: url('images/layout_vertical01.svg') no-repeat center !important; +} + +.layout.layout_head02 { + background: url('images/layout_head02.svg') no-repeat center !important; +} + +.layout.layout_head02a { + background: url('images/layout_head02a.svg') no-repeat center !important; +} diff --git a/loleaflet/images/layout_empty.svg b/loleaflet/images/layout_empty.svg new file mode 100644 index 0..83a26f133 --- /dev/null +++ b/loleaflet/images/layout_empty.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;> \ No newline at end of file diff --git a/loleaflet/images/layout_head01.svg b/loleaflet/images/layout_head01.svg new file mode 100644 index 0..32640081a --- /dev/null +++ b/loleaflet/images/layout_head01.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;> \ No newline at end of file diff --git a/loleaflet/images/layout_head02.svg b/loleaflet/images/layout_head02.svg new file mode 100644 index 0..4bddfdb27 --- /dev/null +++ b/loleaflet/images/layout_head02.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;> \ No newline at end of file diff --git a/loleaflet/images/layout_head02a.svg b/loleaflet/images/layout_head02a.svg new file mode 100644 index
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/toolbar.css|1 + loleaflet/images/lc_charfontname.svg |1 + loleaflet/images/lc_fontheight.svg |1 + loleaflet/src/control/Control.JSDialogBuilder.js | 22 -- 4 files changed, 19 insertions(+), 6 deletions(-) New commits: commit e7f79f4f1c13236512333098024f6bd783b98649 Author: Marco Cecchetti AuthorDate: Wed Oct 9 18:13:05 2019 +0200 Commit: Marco Cecchetti CommitDate: Wed Oct 9 19:04:44 2019 +0200 loleaflet: icons for expandable entries Change-Id: I1698b540226e8342a59300b640c7113e48f6f1b3 diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css index 390dea08e..fb7475ce0 100644 --- a/loleaflet/css/toolbar.css +++ b/loleaflet/css/toolbar.css @@ -1065,6 +1065,7 @@ tr.useritem > td > img { .menu-entry-icon { width: 32px; height: 32px; + vertical-align: middle; background: transparent; } diff --git a/loleaflet/images/lc_charfontname.svg b/loleaflet/images/lc_charfontname.svg new file mode 100644 index 0..78a1c82e9 --- /dev/null +++ b/loleaflet/images/lc_charfontname.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> diff --git a/loleaflet/images/lc_fontheight.svg b/loleaflet/images/lc_fontheight.svg new file mode 100644 index 0..cccd0cd97 --- /dev/null +++ b/loleaflet/images/lc_fontheight.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;>A diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index e3852b256..c094f8afb 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -141,9 +141,17 @@ L.Control.JSDialogBuilder = L.Control.extend({ return null; }, - _explorableEntry: function(parentContainer, title, contentNode, builder) { + _explorableEntry: function(parentContainer, title, contentNode, builder, iconPath) { var sectionTitle = L.DomUtil.create('div', 'ui-header level-' + builder._currentDepth + ' mobile-wizard ui-widget', parentContainer); - sectionTitle.innerHTML = title; + if (iconPath) { + var div = L.DomUtil.create('div', '', sectionTitle); + var icon = L.DomUtil.create('img', 'menu-entry-icon', div); + icon.src = iconPath; + var titleSpan = L.DomUtil.create('span', 'menu-entry-with-icon', div); + titleSpan.innerHTML = title; + } else { + sectionTitle.innerHTML = title; + } $(sectionTitle).css('justify-content', 'space-between'); @@ -399,7 +407,7 @@ L.Control.JSDialogBuilder = L.Control.extend({ return false; }, - _comboboxControl: function(parentContainer, data, builder) { + _comboboxControl: function(parentContainer, data, builder, iconPath) { // TODO: event listener in the next level... if (!data.entries || data.entries.length == 0) @@ -418,7 +426,7 @@ L.Control.JSDialogBuilder = L.Control.extend({ var contentNode = {type: 'container', children: entries}; - builder._explorableEntry(parentContainer, title, contentNode, builder); + builder._explorableEntry(parentContainer, title, contentNode, builder, iconPath); return false; }, @@ -575,13 +583,15 @@ L.Control.JSDialogBuilder = L.Control.extend({ }, _fontNameControl: function(parentContainer, data, builder) { + var iconPath = 'images/lc_charfontname.svg'; data.entries = [ 'Liberation Sans' ]; - builder._comboboxControl(parentContainer, data, builder); + builder._comboboxControl(parentContainer, data, builder, iconPath); }, _fontHeightControl: function(parentContainer, data, builder) { + var iconPath = 'images/lc_fontheight.svg'; data.entries = [ '8', '10', '11', '12', '14', '16', '24', '32', '48' ]; - builder._comboboxControl(parentContainer, data, builder); + builder._comboboxControl(parentContainer, data, builder, iconPath); }, build: function(parent, data) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/toolbar.css |2 ++ loleaflet/images/lc_insertcolumnsafter.svg |1 + loleaflet/images/lc_insertrowsafter.svg|1 + loleaflet/src/control/Control.Menubar.js |1 + loleaflet/src/layer/tile/CalcTileLayer.js | 12 +++- 5 files changed, 12 insertions(+), 5 deletions(-) New commits: commit f3363723c649b0ce6c59a69c4c4eed3ac743bdef Author: Michael Meeks AuthorDate: Wed Oct 9 15:35:31 2019 +0100 Commit: Michael Meeks CommitDate: Wed Oct 9 15:35:45 2019 +0100 mobile: simplify calc quick toolbar, add row insert/remove. Change-Id: I1bd8ca5a952bfe720dfaea82513917121ce74f6e diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css index fb227886a..e8b43628e 100644 --- a/loleaflet/css/toolbar.css +++ b/loleaflet/css/toolbar.css @@ -796,6 +796,8 @@ button.leaflet-control-search-next .w2ui-icon.numberformatincdecimals{ background: url('images/lc_numberformatincdecimals.svg') no-repeat center !important; } .w2ui-icon.numberformatdecdecimals{ background: url('images/lc_numberformatdecdecimals.svg') no-repeat center !important; } .w2ui-icon.insertobjectchart{ background: url('images/lc_drawchart.svg') no-repeat center !important; } +.w2ui-icon.insertrowsafter{ background: url('images/lc_insertrowsafter.svg') no-repeat center !important; } +.w2ui-icon.insertcolumnsafter{ background: url('images/lc_insertcolumnsafter.svg') no-repeat center !important; } .w2ui-icon.autosum{ background: url('images/lc_autosum.svg') no-repeat center !important; } .w2ui-icon.functiondialog{ background: url('images/lc_functiondialog.svg') no-repeat center !important; } diff --git a/loleaflet/images/lc_insertcolumnsafter.svg b/loleaflet/images/lc_insertcolumnsafter.svg new file mode 100644 index 0..8e3a8059b --- /dev/null +++ b/loleaflet/images/lc_insertcolumnsafter.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_insertrowsafter.svg b/loleaflet/images/lc_insertrowsafter.svg new file mode 100644 index 0..9278fe221 --- /dev/null +++ b/loleaflet/images/lc_insertrowsafter.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 6019985c5..4095bf4bf 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -390,6 +390,7 @@ L.Control.Menubar = L.Control.extend({ {name: _UNO('.uno:InsertAnnotation', 'spreadsheet'), id: 'insertcomment', type: 'action'}, {type: 'separator'}, {name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'}, + {name: _('Insert Shape'), id: 'insertshape', desktop: false, mobile: true, type: 'action' }, {uno: '.uno:InsertSymbol', mobile: false}, {uno: '.uno:EditHeaderAndFooter', mobile: false} ]}, diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js index 6045d5ba1..25ca2f478 100644 --- a/loleaflet/src/layer/tile/CalcTileLayer.js +++ b/loleaflet/src/layer/tile/CalcTileLayer.js @@ -69,14 +69,14 @@ L.CalcTileLayer = L.TileLayer.extend({ var map = this._map; var toolItems = [ {type: 'button', id: 'bold', img: 'bold', hint: _UNO('.uno:Bold'), uno: 'Bold'}, - {type: 'button', id: 'italic', img: 'italic', hint: _UNO('.uno:Italic'), uno: 'Italic'}, +// {type: 'button', id: 'italic', img: 'italic', hint: _UNO('.uno:Italic'), uno: 'Italic'}, {type: 'button', id: 'underline', img: 'underline', hint: _UNO('.uno:Underline'), uno: 'Underline'}, {type: 'button', id: 'strikeout', img: 'strikeout', hint: _UNO('.uno:Strikeout'), uno: 'Strikeout'}, {type: 'break'}, {type: 'text-color', id: 'fontcolor', img: 'textcolor', hint: _UNO('.uno:FontColor')}, - {type: 'color', id: 'backcolor', img: 'backcolor', hint: _UNO('.uno:BackgroundColor')}, +// {type: 'color', id: 'backcolor', img: 'backcolor', hint: _UNO('.uno:BackgroundColor')}, {type: 'button', id: 'togglemergecells', img: 'togglemergecells', hint: _UNO('.uno:ToggleMergeCells', 'spreadsheet', true), uno: 'ToggleMergeCells', disabled: true}, - {type: 'break', id: 'breakmergecells'}, +// {type: 'break', id: 'breakmergecells'}, {type: 'menu', id: 'textalign', img: 'alignblock', hint: _UNO('.uno:TextAlign'), items: [ {id: 'alignleft', text: _UNO('.uno:AlignLeft',
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/toolbar.css| 22 +- loleaflet/images/lc_hyperlinkdialog.svg |1 + loleaflet/images/lc_insertauthoritiesentry.svg |1 + loleaflet/images/lc_insertcolumnbreak.svg| 14 ++ loleaflet/images/lc_insertcomment.svg|2 +- loleaflet/images/lc_insertdatefield.svg |1 + loleaflet/images/lc_insertendnote.svg|1 + loleaflet/images/lc_insertfootnote.svg |1 + loleaflet/images/lc_insertgraphic.svg|1 + loleaflet/images/lc_insertgraphicremote.svg |1 + loleaflet/images/lc_insertindexesentry.svg |1 + loleaflet/images/lc_insertmultiindex.svg |1 + loleaflet/images/lc_insertobjectchart.svg|1 + loleaflet/images/lc_insertpagebreak.svg |1 + loleaflet/images/lc_insertpagecountfield.svg |1 + loleaflet/images/lc_insertpagenumberfield.svg|1 + loleaflet/images/lc_insertsection.svg|1 + loleaflet/images/lc_inserttimefield.svg |1 + loleaflet/images/lc_inserttitlefield.svg |1 + loleaflet/images/lc_inserttopicfield.svg |1 + loleaflet/src/control/Control.JSDialogBuilder.js | 18 +++--- loleaflet/src/control/Control.Menubar.js |8 22 files changed, 72 insertions(+), 9 deletions(-) New commits: commit 172c9ca384b5e579cd6de35c6d7ca6e80142f54e Author: Marco Cecchetti AuthorDate: Tue Oct 8 08:50:08 2019 +0200 Commit: Marco Cecchetti CommitDate: Tue Oct 8 12:43:32 2019 +0200 loleaflet: adding icons to insert menu entries Change-Id: I24664aa41f208ccd70331f37a8e1d031eefc43fd diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css index ccbd50fdf..021a98d3c 100644 --- a/loleaflet/css/toolbar.css +++ b/loleaflet/css/toolbar.css @@ -935,7 +935,7 @@ tr.useritem > td > img { margin: 0px; padding: 0px; border: solid 1px #fff; - padding-left: 74px !important; + padding-left: 32px !important; display: flex; flex-direction: row; align-items: center; @@ -966,6 +966,10 @@ tr.useritem > td > img { vertical-align: middle; } +.sub-menu-title { + padding-left: 42px; +} + .sub-menu-arrow { margin-right: 40px; background: transparent; @@ -973,3 +977,19 @@ tr.useritem > td > img { font-weight: bold; color: #aaa !important; } + +.menu-entry-icon { + width: 32px; + height: 32px; + background: transparent; +} + +.menu-entry-with-icon { + padding-left: 10px; +} + +/* Don't forget to update it when you change one of the two above! +menu-entry-with-icon.padding-left + menu-entry-icon.width */ +.menu-entry-no-icon { + padding-left: 42px; +} \ No newline at end of file diff --git a/loleaflet/images/lc_hyperlinkdialog.svg b/loleaflet/images/lc_hyperlinkdialog.svg new file mode 100644 index 0..0aab5a02d --- /dev/null +++ b/loleaflet/images/lc_hyperlinkdialog.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_insertauthoritiesentry.svg b/loleaflet/images/lc_insertauthoritiesentry.svg new file mode 100644 index 0..4c999760f --- /dev/null +++ b/loleaflet/images/lc_insertauthoritiesentry.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_insertcolumnbreak.svg b/loleaflet/images/lc_insertcolumnbreak.svg new file mode 100644 index 0..eda22cde9 --- /dev/null +++ b/loleaflet/images/lc_insertcolumnbreak.svg @@ -0,0 +1,14 @@ +http://www.w3.org/2000/svg;> + + + + diff --git a/loleaflet/images/lc_insertcomment.svg b/loleaflet/images/lc_insertcomment.svg index ac434b08d..e449feccd 100644 --- a/loleaflet/images/lc_insertcomment.svg +++ b/loleaflet/images/lc_insertcomment.svg @@ -63,4 +63,4 @@ d="M 21.99,4 C 21.99,2.9 21.1,2 20,2 H 4 C 2.9,2 2,2.9 2,4 v 12 c 0,1.1 0.9,2 2,2 h 14 l 4,4 z M 17,11 h -4 v 4 H 11 V 11 H 7 V 9 h 4 V 5 h 2 v 4 h 4 z" id="path1613" /> - + \ No newline at end of file diff --git a/loleaflet/images/lc_insertdatefield.svg b/loleaflet/images/lc_insertdatefield.svg new file mode 100644 index 0..c0091b903 --- /dev/null +++ b/loleaflet/images/lc_insertdatefield.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_insertendnote.svg b/loleaflet/images/lc_insertendnote.svg new file mode 100644 index 0..021c56344 --- /dev/null +++ b/loleaflet/images/lc_insertendnote.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_insertfootnote.svg b/loleaflet/images/lc_insertfootnote.svg new file mode 100644 index 0..fb87e5561 --- /dev/null +++ b/loleaflet/images/lc_insertfootnote.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/toolbar.css |1 loleaflet/images/lc_mobile_wizard.svg | 57 loleaflet/src/control/Control.Toolbar.js| 13 +- loleaflet/src/layer/tile/CalcTileLayer.js |6 ++ loleaflet/src/layer/tile/WriterTileLayer.js |6 ++ 5 files changed, 82 insertions(+), 1 deletion(-) New commits: commit 54997803bd6921d4a4e4cd94eb67adfae5c9e11a Author: Tamás Zolnai AuthorDate: Thu Oct 3 14:44:27 2019 +0200 Commit: Tamás Zolnai CommitDate: Thu Oct 3 15:40:21 2019 +0200 mobile: Add a menu item to trigger the bottom toolbar palett The menu item is disabled by default and enabled by stepping into edit mode. The menu item triggers the mobile wizard which is displayed on the bottom of the screen. The menu item is checked when the mobile wizard is visible. Icon created by: Pedro Change-Id: I9ec90a38305f9cb288f61d38ca29273e074025af diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css index 319a7153e..4249e3932 100644 --- a/loleaflet/css/toolbar.css +++ b/loleaflet/css/toolbar.css @@ -633,6 +633,7 @@ button.leaflet-control-search-next .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.mobile_wizard{ background: url('images/lc_mobile_wizard.svg') no-repeat center !important; } .w2ui-icon.vereign{ background: url('images/vereign.png') no-repeat center !important; } diff --git a/loleaflet/images/lc_mobile_wizard.svg b/loleaflet/images/lc_mobile_wizard.svg new file mode 100644 index 0..58dd0cd8c --- /dev/null +++ b/loleaflet/images/lc_mobile_wizard.svg @@ -0,0 +1,57 @@ + +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; + viewBox="0 0 24 24" + version="1.1" + id="svg4"> + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage; /> + + + + + + + + + + + + diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js index f840eabe1..cb62b0ff3 100644 --- a/loleaflet/src/control/Control.Toolbar.js +++ b/loleaflet/src/control/Control.Toolbar.js @@ -316,6 +316,17 @@ function onClick(e, id, item, subItem) { map.remove(); } } + else if (id === 'mobile_wizard') { + if (window.mobileWizard === true) { + window.mobileWizard = false + map.sendUnoCommand('.uno:Sidebar'); + map.fire('closemobilewizard'); + } + else { + window.mobileWizard = true + map.sendUnoCommand('.uno:Sidebar'); + } + } else { map.handleSigningClickEvent(id, item); // this handles a bunch of signing bar click events } @@ -1991,7 +2002,7 @@ function onUpdatePermission(e) { var spreadsheetButtons = ['insertsheet']; var formulaBarButtons = ['functiondialog', 'sum', 'function']; var presentationButtons = ['insertpage', 'duplicatepage', 'deletepage']; - var toolbarDownButtons = ['next', 'prev']; + var toolbarDownButtons = ['next', 'prev', 'mobile_wizard']; if (e.perm === 'edit') { // Enable list boxes $('.styles-select').prop('disabled', false); diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js index b7d9783c0..607af9f6f 100644 --- a/loleaflet/src/layer/tile/CalcTileLayer.js +++ b/loleaflet/src/layer/tile/CalcTileLayer.js @@ -110,6 +110,7 @@ L.CalcTileLayer = L.TileLayer.extend({ {type: 'spacer'}, {type: 'button', id: 'undo', img: 'undo', hint: _UNO('.uno:Undo'), uno: 'Undo', disabled: true}, {type: 'button', id: 'redo', img: 'redo', hint: _UNO('.uno:Redo'), uno: 'Redo', disabled: true}, + {type: 'button', id: 'mobile_wizard', img: 'mobile_wizard', name: _('Mobile Wizard'), disabled: true}, {type: 'button', id: 'fullscreen', img: 'fullscreen', hint: _UNO('.uno:FullScreen', 'text')}, {type: 'drop', id: 'userlist', img: 'users', html: '' + '' + @@ -139,6 +140,11 @@ L.CalcTileLayer = L.TileLayer.extend({ map.on('addview', window.onAddView); map.on('removeview',
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/loleaflet.css| 11 +++ loleaflet/images/table-move-marker.svg | 56 loleaflet/src/dom/Draggable.js |3 loleaflet/src/layer/marker/Marker.Drag.js |8 +- loleaflet/src/layer/tile/TileLayer.TableOverlay.js | 71 - 5 files changed, 141 insertions(+), 8 deletions(-) New commits: commit d1eaa895aa6a4b5978ed4038cd6b03aebbaa6107 Author: Tomaž Vajngerl AuthorDate: Sun Sep 29 23:41:28 2019 +0200 Commit: Tomaž Vajngerl CommitDate: Mon Sep 30 00:39:11 2019 +0200 tdf#125565 Added table move marker Change-Id: Iffa1b969986c9f9b405d5713b56a192a1069645f Reviewed-on: https://gerrit.libreoffice.org/79821 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css index 30591d13d..a26cfcf1c 100644 --- a/loleaflet/css/loleaflet.css +++ b/loleaflet/css/loleaflet.css @@ -89,6 +89,17 @@ cursor: row-resize; } +.table-move-marker { + margin-left: 0px; + margin-top: 0px; + width: 24px; + height: 24px; + background-image: url('images/table-move-marker.svg'); + background-size: 100% 100%; + background-repeat: no-repeat; + cursor: col-resize; +} + body { margin: 0; overflow: hidden; diff --git a/loleaflet/images/table-move-marker.svg b/loleaflet/images/table-move-marker.svg new file mode 100644 index 0..6ab8ef55a --- /dev/null +++ b/loleaflet/images/table-move-marker.svg @@ -0,0 +1,56 @@ + +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="svg4" + sodipodi:docname="marker-move.svg" + width="24" + height="24" + inkscape:version="0.92.4 (unknown)"> + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage; /> + + + + + + + + diff --git a/loleaflet/src/dom/Draggable.js b/loleaflet/src/dom/Draggable.js index 16f48235f..d3183704a 100644 --- a/loleaflet/src/dom/Draggable.js +++ b/loleaflet/src/dom/Draggable.js @@ -137,7 +137,7 @@ L.Draggable = L.Evented.extend({ L.DomEvent.preventDefault(e); if (!this._moved) { - this.fire('dragstart'); + this.fire('dragstart', {originalEvent: e}); this._moved = true; this._startPos = L.DomUtil.getPosition(this._element).subtract(offset); @@ -192,6 +192,7 @@ L.Draggable = L.Evented.extend({ L.Util.cancelAnimFrame(this._animRequest); this.fire('dragend', { + originalEvent: e, distance: this._newPos.distanceTo(this._startPos) }); } else { diff --git a/loleaflet/src/layer/marker/Marker.Drag.js b/loleaflet/src/layer/marker/Marker.Drag.js index d9f789235..179408e9b 100644 --- a/loleaflet/src/layer/marker/Marker.Drag.js +++ b/loleaflet/src/layer/marker/Marker.Drag.js @@ -58,11 +58,11 @@ L.Handler.MarkerDrag = L.Handler.extend({ this._marker.fire('down', e); }, - _onDragStart: function () { + _onDragStart: function (e) { this._marker .closePopup() - .fire('movestart') - .fire('dragstart'); + .fire('movestart', e) + .fire('dragstart', e); }, _onDrag: function (e) { @@ -86,7 +86,7 @@ L.Handler.MarkerDrag = L.Handler.extend({ _onDragEnd: function (e) { this._marker - .fire('moveend') + .fire('moveend', e) .fire('dragend', e); }, diff --git a/loleaflet/src/layer/tile/TileLayer.TableOverlay.js b/loleaflet/src/layer/tile/TileLayer.TableOverlay.js index 7af0d971b..6a7cba29b 100644 --- a/loleaflet/src/layer/tile/TileLayer.TableOverlay.js +++ b/loleaflet/src/layer/tile/TileLayer.TableOverlay.js @@ -8,6 +8,7 @@ L.TileLayer.include({ this._tableColumnMarkers = []; this._tableRowMarkers = []; this._tableMarkersDragged = false; + this._initMoveMarkers(); this._tableSelectionColumnMarkers = []; this._tableSelectionRowMarkers = []; this._selectionHeaderDistanceFromTable = 6; @@ -17,6 +18,17 @@ L.TileLayer.include({ var point = this._latLngToTwips(this._map.unproject(new L.Point(pixel, 0))); return point.x; }, +
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/loleaflet.css | 24 ++ loleaflet/images/table-column-resize-marker-hover.svg | 10 +++ loleaflet/images/table-row-resize-marker-hover.svg| 10 +++ loleaflet/src/dom/Draggable.js| 16 loleaflet/src/layer/marker/Marker.Drag.js | 10 +++ loleaflet/src/layer/tile/TileLayer.TableOverlay.js|5 +++ 6 files changed, 75 insertions(+) New commits: commit 7467710dab48d30fc3dcee66fc5a2fdec46184ae Author: Tomaž Vajngerl AuthorDate: Sun Aug 18 10:22:21 2019 +0900 Commit: Tomaž Vajngerl CommitDate: Mon Aug 19 01:03:20 2019 +0200 table handles: drag only in x/y axis, marker on hover, cursor This adds: - support to freeze movement to x or y axis when dragging the marker (depends on the marker type - column or row marker) - change marker on hover, which uses a different image, which is solved in css - change cursor to col-resize / row-resize when howering over the marker Change-Id: I63bf5e82860ef75f2dfde31ee2ab7ede6f61ce70 Reviewed-on: https://gerrit.libreoffice.org/77652 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css index 62cecafa9..08d172546 100644 --- a/loleaflet/css/loleaflet.css +++ b/loleaflet/css/loleaflet.css @@ -49,6 +49,18 @@ background-image: url('images/table-column-resize-marker.svg'); background-size: 100% 100%; background-repeat: no-repeat; + cursor: col-resize; +} + +.table-column-resize-marker:hover { + margin-left: 0px; + margin-top: 0px; + width: 24px; + height: 24px; + background-image: url('images/table-column-resize-marker-hover.svg'); + background-size: 100% 100%; + background-repeat: no-repeat; + cursor: col-resize; } .table-row-resize-marker { @@ -59,6 +71,18 @@ background-image: url('images/table-row-resize-marker.svg'); background-size: 100% 100%; background-repeat: no-repeat; + cursor: row-resize; +} + +.table-row-resize-marker:hover { + margin-left: 0px; + margin-top: 0px; + width: 24px; + height: 24px; + background-image: url('images/table-row-resize-marker-hover.svg'); + background-size: 100% 100%; + background-repeat: no-repeat; + cursor: row-resize; } body { diff --git a/loleaflet/images/table-column-resize-marker-hover.svg b/loleaflet/images/table-column-resize-marker-hover.svg new file mode 100644 index 0..a805d05ae --- /dev/null +++ b/loleaflet/images/table-column-resize-marker-hover.svg @@ -0,0 +1,10 @@ +http://www.w3.org/2000/svg;> + + + + + + + + + diff --git a/loleaflet/images/table-row-resize-marker-hover.svg b/loleaflet/images/table-row-resize-marker-hover.svg new file mode 100644 index 0..7dab991ac --- /dev/null +++ b/loleaflet/images/table-row-resize-marker-hover.svg @@ -0,0 +1,10 @@ +http://www.w3.org/2000/svg;> + + + + + + + + + diff --git a/loleaflet/src/dom/Draggable.js b/loleaflet/src/dom/Draggable.js index df22f3b11..d9f5485a8 100644 --- a/loleaflet/src/dom/Draggable.js +++ b/loleaflet/src/dom/Draggable.js @@ -25,6 +25,16 @@ L.Draggable = L.Evented.extend({ this._element = element; this._dragStartTarget = dragStartTarget || element; this._preventOutline = preventOutline; + this._freezeX = false; + this._freezeY = false; + }, + + freezeX: function (boolChoice) { + this._freezeX = boolChoice; + }, + + freezeY: function (boolChoice) { + this._freezeY = boolChoice; }, enable: function () { @@ -139,6 +149,12 @@ L.Draggable = L.Evented.extend({ } this._newPos = this._startPos.add(offset); + + if (this._freezeY) + this._newPos.y = this._startPos.y + if (this._freezeX) + this._newPos.x = this._startPos.x + this._moving = true; L.Util.cancelAnimFrame(this._animRequest); diff --git a/loleaflet/src/layer/marker/Marker.Drag.js b/loleaflet/src/layer/marker/Marker.Drag.js index 5b879cd2b..d9f789235 100644 --- a/loleaflet/src/layer/marker/Marker.Drag.js +++ b/loleaflet/src/layer/marker/Marker.Drag.js @@ -44,6 +44,16 @@ L.Handler.MarkerDrag = L.Handler.extend({ return this._draggable && this._draggable._moved; }, + freezeX: function (boolChoice) { + if (this._draggable) + this._draggable.freezeX(boolChoice); + }, + + freezeY: function (boolChoice) { + if (this._draggable) + this._draggable.freezeY(boolChoice); + }, + _onDown: function (e) {
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/toolbar.css|1 + loleaflet/images/lc_text.svg |1 + loleaflet/src/control/Control.Toolbar.js |3 ++- loleaflet/src/unocommands.js |3 +-- 4 files changed, 5 insertions(+), 3 deletions(-) New commits: commit fd18e490c5f88cb64b8f06848d8878c5a143cff4 Author: Jan Holesovsky AuthorDate: Thu May 23 16:45:46 2019 +0200 Commit: Jan Holesovsky CommitDate: Fri May 24 17:43:54 2019 +0200 Add textbox creation to the Impress toolbar. Uses the newly added parameter to insert it directly, instead of using the mouse to define the bounds first. Change-Id: I3c10f379151b6789908585af02a8a18f3103e001 diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css index 5db1821ea..3509ced8e 100644 --- a/loleaflet/css/toolbar.css +++ b/loleaflet/css/toolbar.css @@ -560,6 +560,7 @@ button.leaflet-control-search-next .w2ui-icon.bullet{ background: url('images/lc_defaultbullet.svg') no-repeat center !important; } .w2ui-icon.incrementindent{ background: url('images/lc_decrementlevel.svg') no-repeat center !important; } .w2ui-icon.decrementindent{ background: url('images/lc_decrementindent.svg') no-repeat center !important; } +.w2ui-icon.text{ background: url('images/lc_text.svg') no-repeat center !important; } .w2ui-icon.annotation{ background: url('images/lc_showannotations.svg') no-repeat center !important; } .w2ui-icon.inserttable{ background: url('images/lc_inserttable.svg') no-repeat center !important; } .w2ui-icon.insertgraphic{ background: url('images/lc_gallery.svg') no-repeat center !important; } diff --git a/loleaflet/images/lc_text.svg b/loleaflet/images/lc_text.svg new file mode 100644 index 0..e766b7390 --- /dev/null +++ b/loleaflet/images/lc_text.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;>A \ No newline at end of file diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js index 97f3b2694..e69761152 100644 --- a/loleaflet/src/control/Control.Toolbar.js +++ b/loleaflet/src/control/Control.Toolbar.js @@ -804,6 +804,7 @@ function initNormalToolbar() { {type: 'button', id: 'numberformatdecdecimals', img: 'numberformatdecdecimals', hint: _UNO('.uno:NumberFormatDecDecimals', 'spreadsheet', true), hidden: true, uno: 'NumberFormatDecDecimals', disabled: true}, {type: 'button', id: 'numberformatincdecimals', img: 'numberformatincdecimals', hint: _UNO('.uno:NumberFormatIncDecimals', 'spreadsheet', true), hidden: true, uno: 'NumberFormatIncDecimals', disabled: true}, {type: 'break', id: 'break-number', hidden: true}, + {type: 'button', id: 'inserttextbox', img: 'text', hint: _UNO('.uno:Text', '', true), uno: 'Text?CreateDirectly:bool=true', hidden: true}, {type: 'button', id: 'insertannotation', img: 'annotation', hint: _UNO('.uno:InsertAnnotation', '', true), hidden: true}, {type: 'drop', id: 'inserttable', img: 'inserttable', hint: _('Insert table'), hidden: true, overlay: {onShow: insertTable}, html: ''}, @@ -1531,7 +1532,7 @@ function onDocLayerInit() { // FALLTHROUGH intended case 'drawing': toolbarUp.show('leftpara', 'centerpara', 'rightpara', 'justifypara', 'breakpara', 'linespacing', - 'breakspacing', 'defaultbullet', 'defaultnumbering', 'breakbullet', 'inserttable', 'backcolor'); + 'breakspacing', 'defaultbullet', 'defaultnumbering', 'breakbullet', 'inserttextbox', 'inserttable', 'backcolor'); statusbar.show('prev', 'next'); $('#presentation-toolbar').show(); diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js index a0e65bffb..5d5ef423c 100644 --- a/loleaflet/src/unocommands.js +++ b/loleaflet/src/unocommands.js @@ -178,8 +178,6 @@ var unoCommandsArray = { ParaspaceDecrease:{global:{context:_('Decrease Paragraph Spacing'),menu:_('Decrease Paragraph Spacing'),},}, ParaspaceIncrease:{global:{context:_('Increase Paragraph Spacing'),menu:_('Increase Paragraph Spacing'),},}, Paste:{global:{menu:_('~Paste'),},}, - PasteSpecialMenu:{global:{menu:_('Paste ~Special'),},}, - PasteUnformatted:{global:{context:_('~Unformatted Text'),menu:_('Paste Unformatted Text'),},}, PickList:{global:{menu:_('~File'),},}, PreviousTrackedChange:{text:{menu:_('Pr~evious'),},}, Print:{global:{menu:_('~Print...'),},}, @@ -239,6 +237,7 @@ var unoCommandsArray = { TableMenu:{global:{menu:_('T~able'),},}, TableSelectMenu:{text:{menu:_('~Select'),},}, TaskPaneInsertPage:{presentation:{menu:_('Insert Slide'),},}, + Text:{global:{context:_('Insert Text Box'),menu:_('~Text Box'),},}, TextAlign:{global:{menu:_('Alig~n'),},},
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/toolbar.css|1 + loleaflet/images/lc_backgroundcolor.svg |1 + loleaflet/src/control/Control.Toolbar.js | 23 ++- loleaflet/src/unocommands.js |1 + 4 files changed, 21 insertions(+), 5 deletions(-) New commits: commit 6167dc9c44b783cfac0062755a1f1fc73114b538 Author: Samuel Mehrbrodt AuthorDate: Wed May 22 16:39:49 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu May 23 14:33:52 2019 +0200 Disambiguate Highlight color vs background color Highlighting is character level while background color is paragraph/cell level. Use different uno commands/icons/texts for the two. Change-Id: I79264fcdcd968734b68278f69450a377d6607323 Reviewed-on: https://gerrit.libreoffice.org/72786 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css index 29a9aa472..5db1821ea 100644 --- a/loleaflet/css/toolbar.css +++ b/loleaflet/css/toolbar.css @@ -550,6 +550,7 @@ button.leaflet-control-search-next .w2ui-icon.strikeout{ background: url('images/lc_strikeout.svg') no-repeat center !important; } .w2ui-icon.textcolor{ background: url('images/lc_color.svg') no-repeat center !important; } .w2ui-icon.backcolor{ background: url('images/lc_backcolor.svg') no-repeat center !important; } +.w2ui-icon.backgroundcolor{ background: url('images/lc_backgroundcolor.svg') no-repeat center !important; } .w2ui-icon.alignleft{ background: url('images/lc_alignleft.svg') no-repeat center !important; } .w2ui-icon.alignhorizontal{ background: url('images/lc_alignhorizontalcenter.svg') no-repeat center !important; } .w2ui-icon.alignright{ background: url('images/lc_alignright.svg') no-repeat center !important; } diff --git a/loleaflet/images/lc_backgroundcolor.svg b/loleaflet/images/lc_backgroundcolor.svg new file mode 100644 index 0..ebd7aac9d --- /dev/null +++ b/loleaflet/images/lc_backgroundcolor.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js index 7161f800f..b8028da40 100644 --- a/loleaflet/src/control/Control.Toolbar.js +++ b/loleaflet/src/control/Control.Toolbar.js @@ -230,6 +230,9 @@ function onClick(e, id, item, subItem) { else if (id === 'backcolor' && typeof e.color !== 'undefined') { onColorPick(id, e.color) } + else if (id === 'backgroundcolor' && typeof e.color !== 'undefined') { + onColorPick(id, e.color) + } else if (id === 'sum') { map.sendUnoCommand('.uno:AutoSum'); } @@ -637,15 +640,24 @@ function onColorPick(id, color) { command[fontcolor].value = color; var uno = '.uno:' + fontcolor; } + // "backcolor" can be used in Writer and Impress and translates to "Highlighting" while + // "backgroundcolor" can be used in Writer and Calc and translates to "Background color". else if (id === 'backcolor') { backcolor = {'text': 'BackColor', -'spreadsheet': 'BackgroundColor', 'presentation': 'CharBackColor'}[map.getDocType()]; command[backcolor] = {}; command[backcolor].type = 'long'; command[backcolor].value = color; uno = '.uno:' + backcolor; } + else if (id === 'backgroundcolor') { + backcolor = {'text': 'BackgroundColor', +'spreadsheet': 'BackgroundColor'}[map.getDocType()]; + command[backcolor] = {}; + command[backcolor].type = 'long'; + command[backcolor].value = color; + uno = '.uno:' + backcolor; + } map.sendUnoCommand(uno, command); map.focus(); } @@ -746,7 +758,8 @@ function initNormalToolbar() { {type: 'button', id: 'strikeout', img: 'strikeout', hint: _UNO('.uno:Strikeout'), uno: 'Strikeout'}, {type: 'break', id: 'breakformatting'}, {type: 'text-color', id: 'fontcolor', img: 'textcolor', hint: _UNO('.uno:FontColor')}, - {type: 'color', id: 'backcolor', img: 'backcolor', hint: _UNO('.uno:BackgroundColor')}, + {type: 'color', id: 'backcolor', img: 'backcolor', hint: _UNO('.uno:BackColor'), hidden: true}, + {type: 'color', id: 'backgroundcolor', img: 'backgroundcolor', hint: _UNO('.uno:BackgroundColor'), hidden: true}, {type: 'break' , id: 'breakcolor', mobile:false}, {type: 'button', id: 'leftpara', img: 'alignleft', hint: _UNO('.uno:LeftPara', '', true), uno: 'LeftPara', hidden: true, unosheet: 'AlignLeft', disabled: true}, {type: 'button', id: 'centerpara', img: 'alignhorizontal', hint: