loleaflet/css/toolbar.css | 1 +
loleaflet/images/lc_orientation.svg | 1 +
loleaflet/src/control/Control.Toolbar.js | 3 ++-
loleaflet/src/layer/tile/WriterTileLayer.js | 2 ++
4 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 0bf742fa646cd16459345d7a3c6901d03dd0aa3a
Author: Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Sat Dec 21 14:19:53 2019 +0300
Commit: Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sat Dec 21 15:07:05 2019 +0100
Add pseudo uno command ToggleOrientation
Relies on commit 1131dfc387abc7ef33bc2c84677ec3c09d3e59e4
on cp-6.2
Added the button to the bottom toolbar on mobile,
and the standard toolbar on Online for Writer
Change-Id: I7fb8cf79369987f029ca05a9a668361cfeff16aa
Reviewed-on: https://gerrit.libreoffice.org/85653
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 485a8dfb0..95d7eae00 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -656,6 +656,7 @@ button.leaflet-control-search-next
.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.orientation{ background: url('images/lc_orientation.svg') no-repeat center !important; }
.w2ui-icon.functiondialog{ background: url('images/lc_functiondialog.svg') no-repeat center !important; }
.w2ui-icon.accepttrackedchanges{ background: url('images/lc_accepttrackedchanges.svg') no-repeat center !important; }
diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index f807684d4..a854e6cde 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -955,6 +955,7 @@ function initNormalToolbar() {
html: '<div id="insertshape-wrapper"><div id="insertshape-popup" class="insertshape-pop ui-widget ui-corner-all"><div class="insertshape-grid"></div></div></div>'},
{type: 'button', id: 'link', img: 'link', hint: _UNO('.uno:HyperlinkDialog', '', true), disabled: true},
{type: 'button', id: 'insertsymbol', img: 'insertsymbol', hint: _UNO('.uno:InsertSymbol', '', true), uno: 'InsertSymbol'},
+ {type: 'button', id: 'toggleorientation', img: 'orientation', hint: _('Toggle Page Orientation'), uno: 'ToggleOrientation', hidden: true},
{type: 'spacer'},
{type: 'button', id: 'edit', img: 'edit'},
{type: 'button', id: 'sidebar', img: 'sidebar_modify_page', hint: _UNO('.uno:Sidebar', '', true), uno: '.uno:Sidebar', hidden: true},
@@ -1577,7 +1578,7 @@ function onDocLayerInit() {
if (toolbarUp)
toolbarUp.show('leftpara', 'centerpara', 'rightpara', 'justifypara', 'breakpara', 'linespacing',
'breakspacing', 'defaultbullet', 'defaultnumbering', 'breakbullet', 'incrementindent', 'decrementindent',
- 'breakindent', 'inserttable', 'insertannotation', 'backcolor', 'breaksidebar', 'sidebar');
+ 'breakindent', 'inserttable', 'insertannotation', 'backcolor', 'breaksidebar', 'sidebar', 'toggleorientation');
if (!_inMobileMode()) {
statusbar.insert('left', [
diff --git a/loleaflet/src/layer/tile/WriterTileLayer.js b/loleaflet/src/layer/tile/WriterTileLayer.js
index c2c4f7850..ac343ff24 100644
--- a/loleaflet/src/layer/tile/WriterTileLayer.js
+++ b/loleaflet/src/layer/tile/WriterTileLayer.js
@@ -72,6 +72,8 @@ L.WriterTileLayer = L.TileLayer.extend({
{type: 'break', id: 'breakbullet', hidden: true},
{type: 'button', id: 'incrementindent', img: 'incrementindent', hint: _UNO('.uno:IncrementIndent', '', true), uno: 'IncrementIndent', disabled: true},
{type: 'button', id: 'decrementindent', img: 'decrementindent', hint: _UNO('.uno:DecrementIndent', '', true), uno: 'DecrementIndent', disabled: true},
+ {type: 'break'},
+ {type: 'button', id: 'toggleorientation', img: 'orientation', hint: _('Toggle Page Orientation'), uno: 'ToggleOrientation'},
];
var toolbar = $('#toolbar-up');
commit c80e3f2b5f2556e471b3815dfef8320d43d31683
Author: Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Sat Dec 21 14:17:26 2019 +0300
Commit: Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sat Dec 21 15:06:55 2019 +0100
Import image from colibre: lc_orientation.svg
Needed for the uno command Orientation, and
the pseudo uno command ToggleOrientation
Change-Id: Ic2fef83c17db92bd3f7af3cf3e46bb4fd15713b1
Reviewed-on: https://gerrit.libreoffice.org/85652
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
diff --git a/loleaflet/images/lc_orientation.svg b/loleaflet/images/lc_orientation.svg
new file mode 100644
index 000000000..8427a05e9
--- /dev/null
+++ b/loleaflet/images/lc_orientation.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m6.7324219 5.0019531-3.7304688 4v9.9999999h9.2285159c-.1351-.494007-.218007-1.009286-.226563-1.542969v-.001953c-.0017-.034112-.003906-.070272-.003906-.101562v-.001953c.001889-.995803.815308-1.850891 1.828125-1.853516h.001953c1.016039-.002215 1.836002.854577 1.837891 1.853516v.001953c0 .644919.23873 1.217031.61914 1.646484h3.425782c.38041-.429453.61914-1.001565.61914-1.646484 0-.953689-.58917-1.603029-1.332031-2.001953v.291015c-.000469.830346-.954108 1.298496-1.611328.791016l-3.332031-2.574219c-.517521-.400374-.517521-1.181657 0-1.582031l3.332031-2.5703126c.180842-.1399594.404186-.2137144.632812-.2089844.543854.0117401.978588.4560194.978516 1v.923828c.718003.129286 1.392388.385135 2.001953.740234v-7.1621089z" fill="#fff"/><path d="m6.7773438 3.9980469c-.2134034.00517-.3200357.081745-.8007813.609375l-3.2382813 3.3066406c-.7368575.709525-.7363281.7121221-.7363281 1.0957031v.3300782.6621092 9c0 .554.446 1 1 1h9.5957029
c-.150082-.319521-.272445-.653567-.367187-1h-9.2285159v-9h4c.554 0 1-.4459999 1-.9999999v-4h12.9999999v7.1621089c.361252.210446.691038.464647 1 .742188v-7.9042969c0-.554-.446-1-1-1h-10.109375-3.6406249-.2089843c-.11267 0-.1944906-.00563-.265625-.00391z" fill="#808080"/><path d="m7.00238 9.00238v-4l-4 4z" fill="#fff" fill-rule="evenodd"/><path d="m18.000047 10.500002v1.714844c2.761974 0 4.999953 2.300623 4.999953 5.140623 0 2.839999-2.237979 5.144531-4.999953 5.144531-2.733975 0-4.952047-2.258594-4.996047-5.058593-.0028-.02856-.004-.05724-.004-.08594.000896-.47224.372945-.854772.832024-.855468.460603-.0015.835032.38166.835928.855468 0 1.894 1.492018 3.429687 3.332001 3.429687s3.332-1.535687 3.332-3.429687-1.492017-3.42578-3.332-3.42578v1.714844l-3.332001-2.574219 3.332001-2.570312z" fill="#4d82b8"/></svg>
\ No newline at end of file