loleaflet/src/layer/tile/CalcTileLayer.js | 13 ++++++-------
loleaflet/src/layer/tile/ImpressTileLayer.js | 22 ++++++----------------
loleaflet/src/layer/tile/WriterTileLayer.js | 10 ----------
3 files changed, 12 insertions(+), 33 deletions(-)
New commits:
commit c1788f94f899fe1473a03a5ed165a9215d4bcc02
Author: mert <mert.tu...@collabora.com>
AuthorDate: Wed Dec 4 15:04:50 2019 +0300
Commit: Mert Tümer <mert.tu...@collabora.com>
CommitDate: Thu Dec 5 19:49:21 2019 +0100
Remove buttons that open popup menu on quickbar
Change-Id: I7fc0a633d1ba7488469caa486ff5f12d800bd6e7
Reviewed-on: https://gerrit.libreoffice.org/84400
Reviewed-by: Mert Tümer <mert.tu...@collabora.com>
Tested-by: Mert Tümer <mert.tu...@collabora.com>
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 2fabe44d2..abbcea8b3 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -83,13 +83,12 @@ L.CalcTileLayer = L.TileLayer.extend({
// {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: 'menu', id: 'textalign', img: 'alignblock',
hint: _UNO('.uno:TextAlign'),
- items: [
- {id: 'alignleft', text:
_UNO('.uno:AlignLeft', 'spreadsheet', true), icon: 'alignleft', uno:
'AlignLeft'},
- {id: 'alignhorizontalcenter', text:
_UNO('.uno:AlignHorizontalCenter', 'spreadsheet', true), icon:
'alignhorizontal', uno: 'AlignHorizontalCenter'},
- {id: 'alignright', text:
_UNO('.uno:AlignRight', 'spreadsheet', true), icon: 'alignright', uno:
'AlignRight'},
- {id: 'alignblock', text:
_UNO('.uno:AlignBlock', 'spreadsheet', true), icon: 'alignblock', uno:
'AlignBlock'},
- ]},
+ {type: 'break'},
+ {type: 'button', id: 'alignleft', img: 'alignleft',
hint: _UNO('.uno:AlignLeft', 'spreadsheet', true), uno: 'AlignLeft'},
+ {type: 'button', id: 'alignhorizontalcenter', img:
'alignhorizontal', hint: _UNO('.uno:AlignHorizontalCenter', 'spreadsheet',
true), uno: 'AlignHorizontalCenter'},
+ {type: 'button', id: 'alignright', img: 'alignright',
hint: _UNO('.uno:AlignRight', 'spreadsheet', true), uno: 'AlignRight'},
+ {type: 'button', id: 'alignblock', img: 'alignblock',
hint: _UNO('.uno:AlignBlock', 'spreadsheet', true), uno: 'AlignBlock'},
+ {type: 'break'},
{type: 'button', id: 'wraptext', img: 'wraptext',
hint: _UNO('.uno:WrapText', 'spreadsheet', true), uno: 'WrapText', disabled:
true},
{type: 'button', id: 'insertrowsafter', img:
'insertrowsafter', hint: _UNO('.uno:InsertRowsAfter'), uno: 'InsertRowsAfter'},
{type: 'button', id: 'insertcolumnsafter', img:
'insertcolumnsafter', hint: _UNO('.uno:InsertColumnsAfter'), uno:
'InsertColumnsAfter'},
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 70c109593..787411afb 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -122,22 +122,12 @@ L.ImpressTileLayer = L.TileLayer.extend({
{type: 'button', id: 'strikeout', img: 'strikeout',
hint: _UNO('.uno:Strikeout'), uno: 'Strikeout'},
{type: 'button', id: 'fontcolor', img: 'textcolor',
hint: _UNO('.uno:FontColor')},
{type: 'button', id: 'backcolor', img: 'backcolor',
hint: _UNO('.uno:BackgroundColor')},
- {type: 'menu', id: 'textalign', img: 'alignblock',
hint: _UNO('.uno:TextAlign'),
- items: [
- {id: 'leftpara', text:
_UNO('.uno:LeftPara', '', true), icon: 'alignleft', uno: 'LeftPara'},
- {id: 'centerpara', text:
_UNO('.uno:CenterPara', '', true), icon: 'alignhorizontal', uno: 'CenterPara'},
- {id: 'rightpara', text:
_UNO('.uno:RigthPara', '', true), icon: 'alignright', uno: 'RightPara'},
- {id: 'justifypara', text:
_UNO('.uno:JustifyPara', '', true), icon: 'alignblock', uno: 'JustifyPara'},
- ]},
- {type: 'menu', id: 'linespacing', img: 'linespacing',
hint: _UNO('.uno:FormatSpacingMenu'),
- items: [
- {id: 'spacepara1', text:
_UNO('.uno:SpacePara1'), uno: 'SpacePara1'},
- {id: 'spacepara15', text:
_UNO('.uno:SpacePara15'), uno: 'SpacePara15'},
- {id: 'spacepara2', text:
_UNO('.uno:SpacePara2'), uno: 'SpacePara2'},
- {type: 'break'},
- {id: 'paraspaceincrease', text:
_UNO('.uno:ParaspaceIncrease'), uno: 'ParaspaceIncrease'},
- {id: 'paraspacedecrease', text:
_UNO('.uno:ParaspaceDecrease'), uno: 'ParaspaceDecrease'}
- ]},
+ {type: 'break'},
+ {type: 'button', id: 'leftpara', img: 'alignleft',
hint: _UNO('.uno:LeftPara', '', true), uno: 'LeftPara'},
+ {type: 'button', id: 'centerpara', img:
'alignhorizontal', hint: _UNO('.uno:CenterPara', '', true), uno: 'CenterPara'},
+ {type: 'button', id: 'rightpara', img: 'alignright',
hint: _UNO('.uno:RigthPara', '', true), uno: 'RightPara'},
+ {type: 'button', id: 'justifypara', img: 'alignblock',
hint: _UNO('.uno:JustifyPara', '', true), uno: 'JustifyPara'},
+ {type: 'break'},
{type: 'button', id: 'defaultbullet', img: 'bullet',
hint: _UNO('.uno:DefaultBullet', '', true), uno: 'DefaultBullet', disabled:
true},
];
diff --git a/loleaflet/src/layer/tile/WriterTileLayer.js
b/loleaflet/src/layer/tile/WriterTileLayer.js
index 9ac4a11e0..8b42c775b 100644
--- a/loleaflet/src/layer/tile/WriterTileLayer.js
+++ b/loleaflet/src/layer/tile/WriterTileLayer.js
@@ -66,16 +66,6 @@ L.WriterTileLayer = L.TileLayer.extend({
{type: 'button', id: 'centerpara', img:
'alignhorizontal', hint: _UNO('.uno:CenterPara', '', true), uno: 'CenterPara',
unosheet: 'AlignHorizontalCenter', disabled: true},
{type: 'button', id: 'rightpara', img: 'alignright',
hint: _UNO('.uno:RightPara', '', true), uno: 'RightPara', unosheet:
'AlignRight', disabled: true},
{type: 'button', id: 'justifypara', img:
'alignblock', hint: _UNO('.uno:JustifyPara', '', true), uno: 'JustifyPara',
unosheet: '', disabled: true},
- {type: 'break', id: 'breakpara'},
- {type: 'menu', id: 'linespacing', img: 'linespacing',
hint: _UNO('.uno:FormatSpacingMenu'),
- items: [
- {id: 'spacepara1', text:
_UNO('.uno:SpacePara1'), uno: 'SpacePara1'},
- {id: 'spacepara15', text:
_UNO('.uno:SpacePara15'), uno: 'SpacePara15'},
- {id: 'spacepara2', text:
_UNO('.uno:SpacePara2'), uno: 'SpacePara2'},
- {type: 'break'},
- {id: 'paraspaceincrease', text:
_UNO('.uno:ParaspaceIncrease'), uno: 'ParaspaceIncrease'},
- {id: 'paraspacedecrease', text:
_UNO('.uno:ParaspaceDecrease'), uno: 'ParaspaceDecrease'}
- ]},
{type: 'break', id: 'breakspacing'},
{type: 'button', id: 'defaultnumbering', img:
'numbering', hint: _UNO('.uno:DefaultNumbering', '', true),uno:
'DefaultNumbering', disabled: true},
{type: 'button', id: 'defaultbullet', img: 'bullet',
hint: _UNO('.uno:DefaultBullet', '', true), uno: 'DefaultBullet', disabled:
true},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
