diff --git a/apps/common/main/resources/less/slider.less b/apps/common/main/resources/less/slider.less
index 96021a1dee..afc565a72a 100644
--- a/apps/common/main/resources/less/slider.less
+++ b/apps/common/main/resources/less/slider.less
@@ -16,6 +16,7 @@
background-color: @slider-track-background-normal;
border-radius: @slider-border-radius-ie;
border-radius: @slider-border-radius;
+ width: 100%;
width: calc(100% + @slider-thumb-size);
margin-inline: (@slider-thumb-size-ie / -2);
margin-inline: calc(@slider-thumb-size / -2);
@@ -43,8 +44,8 @@
}
.thumb {
- top: calc((@slider-height-ie - @slider-thumb-size-ie) / 2); // implement fallback for ie: 3px
- top: calc((@slider-height - @slider-thumb-size) / 2); // implement fallback for ie: 3px
+ top: calc((@slider-height-ie - @slider-thumb-size-ie) / 2);
+ top: calc((@slider-height - @slider-thumb-size) / 2);
bottom: 0;
transform: translateX(-50%);
margin-left: 0;
@@ -74,7 +75,9 @@
}
&.vertical {
- height: 100%;
+ margin-inline: 0;
+ margin-block: (@slider-thumb-size-ie / 2);
+ margin-block: calc(@slider-thumb-size / 2);
width: @slider-height-ie;
width: @slider-height;
padding-top: 0;
@@ -83,8 +86,12 @@
.track {
position: absolute;
height: 100%;
+ height: calc(100% + @slider-thumb-size);
width: @slider-track-height-ie;
width: @slider-track-height;
+ margin-inline: 0;
+ margin-block: (@slider-thumb-size-ie / -2);
+ margin-block: calc(@slider-thumb-size / -2);
//&:before {
// transform: translateX(-50%);
diff --git a/apps/documenteditor/main/app/controller/DocProtection.js b/apps/documenteditor/main/app/controller/DocProtection.js
index e1484a4aed..e200661461 100644
--- a/apps/documenteditor/main/app/controller/DocProtection.js
+++ b/apps/documenteditor/main/app/controller/DocProtection.js
@@ -285,6 +285,8 @@ define([
},
applyRestrictions: function(type) {
+ if (this.appConfig.isPDFForm && this.api.asc_isFinal()) return;
+
if (type === Asc.c_oAscEDocProtect.ReadOnly) {
this.api.asc_setRestriction(Asc.c_oAscRestrictionType.View);
} else if (type === Asc.c_oAscEDocProtect.Comments) {
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index 9b3ef94f30..02493072f4 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -445,10 +445,10 @@ define([], function () {
'
',
'',
'',
- ' ',
- ' | ',
- ' | ',
- ' ',
+ // ' ',
+ // ' | ',
+ // ' | ',
+ // ' ',
' ',
' | ',
' | ',
@@ -779,10 +779,10 @@ define([], function () {
dataHintOffset: 'big'
});
- this.btnKeyboardMacros = new Common.UI.Button({
- el: $markup.findById('#fms-btn-keyboard-shortcuts')
- });
- this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this));
+ // this.btnKeyboardMacros = new Common.UI.Button({
+ // el: $markup.findById('#fms-btn-keyboard-shortcuts')
+ // });
+ // this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this));
this.cmbFontSizeType = new Common.UI.ComboBox({
el : $markup.find('#fms-cmb-font-size-type'),
@@ -1193,12 +1193,12 @@ define([], function () {
this.dlgAutoCorrect.show();
},
- onClickKeyboardShortcut: function() {
- const win = new Common.Views.ShortcutsDialog({
- api: this.api
- });
- win.show();
- },
+ // onClickKeyboardShortcut: function() {
+ // const win = new Common.Views.ShortcutsDialog({
+ // api: this.api
+ // });
+ // win.show();
+ // },
customizeQuickAccess: function () {
if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return;
diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js
index 9d988f581c..dc0a4631e2 100644
--- a/apps/documenteditor/main/app_dev.js
+++ b/apps/documenteditor/main/app_dev.js
@@ -232,8 +232,8 @@ require([
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
- 'common/main/lib/view/ShortcutsDialog',
- 'common/main/lib/view/ShortcutsEditDialog',
+ // 'common/main/lib/view/ShortcutsDialog',
+ // 'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'documenteditor/main/app/controller/DocumentHolderExt',
diff --git a/apps/documenteditor/main/app_pack.js b/apps/documenteditor/main/app_pack.js
index 5f3002901b..4b718522c3 100644
--- a/apps/documenteditor/main/app_pack.js
+++ b/apps/documenteditor/main/app_pack.js
@@ -33,8 +33,8 @@ require([
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
- 'common/main/lib/view/ShortcutsDialog',
- 'common/main/lib/view/ShortcutsEditDialog',
+ // 'common/main/lib/view/ShortcutsDialog',
+ // 'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'documenteditor/main/app/controller/DocumentHolderExt',
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index e8d4f7a7ac..40e70b9538 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -2570,6 +2570,7 @@
"DE.Views.DocumentHolder.txtUnderbar": "Bar under text",
"DE.Views.DocumentHolder.txtUngroup": "Ungroup",
"DE.Views.DocumentHolder.txtWarnUrl": "Clicking this link can be harmful to your device and data. To protect you computer, click only those hyperlinks from trusted sources. This location may be unsafe:
{0}
Are you sure you want to continue?",
+ "DE.Views.DocumentHolder.txtPercentage": "Percentage",
"DE.Views.DocumentHolder.unicodeText": "Unicode",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Vertical alignment",
diff --git a/apps/pdfeditor/main/app/controller/LeftMenu.js b/apps/pdfeditor/main/app/controller/LeftMenu.js
index 0f6701c9e3..94648dd832 100644
--- a/apps/pdfeditor/main/app/controller/LeftMenu.js
+++ b/apps/pdfeditor/main/app/controller/LeftMenu.js
@@ -113,7 +113,8 @@ define([
'search:showredact': _.bind(this.onShowHideRedactSearch, this)
},
'RedactTab': {
- 'search:showredact': _.bind(this.onShowHideRedactSearch, this)
+ 'search:showredact': _.bind(this.onShowHideRedactSearch, this),
+ 'menu:hide': _.bind(this.clickToolbarTab, this, 'red')
},
'Common.Views.SearchPanel': {
'search:showredact': _.bind(this.onShowHideRedactSearch, this)
diff --git a/apps/pdfeditor/main/app/controller/RedactTab.js b/apps/pdfeditor/main/app/controller/RedactTab.js
index 4f47e37294..9bf61db54f 100644
--- a/apps/pdfeditor/main/app/controller/RedactTab.js
+++ b/apps/pdfeditor/main/app/controller/RedactTab.js
@@ -58,6 +58,8 @@ define([
onLaunch: function () {
this._state = {};
+ this.redactionsWarning = null;
+ this.isFileMenuTab = null;
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this));
@@ -190,8 +192,11 @@ define([
Common.UI.TooltipManager.closeTip('mark-for-redaction');
Common.UI.TooltipManager.closeTip('apply-redaction');
const isMarked = this.api.HasRedact();
- if (isMarked) {
- Common.UI.warning({
+ if (
+ isMarked &&
+ (!this.redactionsWarning || !this.redactionsWarning.isVisible())
+ ) {
+ this.redactionsWarning = Common.UI.warning({
width: 500,
msg: this.textUnappliedRedactions,
buttons: [{
@@ -211,7 +216,10 @@ define([
this.api.RemoveAllRedact();
this.api.SetRedactTool(false);
this.view.btnMarkForRedact.toggle(false);
- } else if (btn == 'cancel') {
+ } else {
+ if (this.isFileMenuTab) {
+ this.view.fireEvent('menu:hide', [this]);
+ }
if (this.mode.isPDFEdit) {
this.toolbar.toolbar.setTab('red')
} else {
@@ -225,6 +233,7 @@ define([
this.api.SetRedactTool(false);
}
}
+ this.isFileMenuTab = tab === 'file';
},
onRedactionStateToggle: function(isRedaction) {
diff --git a/apps/pdfeditor/main/app/view/FileMenuPanels.js b/apps/pdfeditor/main/app/view/FileMenuPanels.js
index f3c50aa878..ddf7c0bdfe 100644
--- a/apps/pdfeditor/main/app/view/FileMenuPanels.js
+++ b/apps/pdfeditor/main/app/view/FileMenuPanels.js
@@ -388,10 +388,10 @@ define([], function () {
' | ',
' | ',
' ',
- ' ',
- ' | ',
- ' | ',
- ' ',
+ // ' ',
+ // ' | ',
+ // ' | ',
+ // ' ',
' |
',
' ',
' | ',
@@ -609,10 +609,10 @@ define([], function () {
});
this.cmbFontRender.on('selected', _.bind(this.onFontRenderSelected, this));
- this.btnKeyboardMacros = new Common.UI.Button({
- el: $markup.findById('#fms-btn-keyboard-shortcuts')
- });
- this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this));
+ // this.btnKeyboardMacros = new Common.UI.Button({
+ // el: $markup.findById('#fms-btn-keyboard-shortcuts')
+ // });
+ // this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this));
this.cmbUnit = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-unit'),
@@ -932,12 +932,12 @@ define([], function () {
this._fontRender = combo.getValue();
},
- onClickKeyboardShortcut: function() {
- const win = new Common.Views.ShortcutsDialog({
- api: this.api
- });
- win.show();
- },
+ // onClickKeyboardShortcut: function() {
+ // const win = new Common.Views.ShortcutsDialog({
+ // api: this.api
+ // });
+ // win.show();
+ // },
customizeQuickAccess: function () {
if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return;
diff --git a/apps/pdfeditor/main/app_dev.js b/apps/pdfeditor/main/app_dev.js
index 4959b2d1bd..dcd9058723 100644
--- a/apps/pdfeditor/main/app_dev.js
+++ b/apps/pdfeditor/main/app_dev.js
@@ -215,8 +215,8 @@ require([
'common/main/lib/view/CustomizeQuickAccessDialog',
'common/main/lib/view/PasswordDialog',
'common/main/lib/component/TextareaField',
- 'common/main/lib/view/ShortcutsDialog',
- 'common/main/lib/view/ShortcutsEditDialog',
+ // 'common/main/lib/view/ShortcutsDialog',
+ // 'common/main/lib/view/ShortcutsEditDialog',
'pdfeditor/main/app/controller/DocumentHolderExt',
'pdfeditor/main/app/view/FileMenuPanels',
diff --git a/apps/pdfeditor/main/app_pack.js b/apps/pdfeditor/main/app_pack.js
index 2e54fd6c7a..c88f2a1769 100644
--- a/apps/pdfeditor/main/app_pack.js
+++ b/apps/pdfeditor/main/app_pack.js
@@ -25,8 +25,8 @@ require([
'common/main/lib/view/CustomizeQuickAccessDialog',
'common/main/lib/view/PasswordDialog',
'common/main/lib/component/TextareaField',
- 'common/main/lib/view/ShortcutsDialog',
- 'common/main/lib/view/ShortcutsEditDialog',
+ // 'common/main/lib/view/ShortcutsDialog',
+ // 'common/main/lib/view/ShortcutsEditDialog',
'pdfeditor/main/app/controller/DocumentHolderExt',
'pdfeditor/main/app/view/FileMenuPanels',
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index 1a9bb5a8b9..d427c5f67c 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -364,10 +364,10 @@ define([], function () {
' | ',
' | ',
' ',
- ' ',
- ' | ',
- ' | ',
- ' ',
+ // ' ',
+ // ' | ',
+ // ' | ',
+ // ' ',
' |
',
' ',
' | ',
@@ -597,10 +597,10 @@ define([], function () {
});
this.lblMacrosDesc = $markup.findById('#fms-lbl-macros');
- this.btnKeyboardMacros = new Common.UI.Button({
- el: $markup.findById('#fms-btn-keyboard-shortcuts')
- });
- this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this));
+ // this.btnKeyboardMacros = new Common.UI.Button({
+ // el: $markup.findById('#fms-btn-keyboard-shortcuts')
+ // });
+ // this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this));
this.chPaste = new Common.UI.CheckBox({
el: $markup.findById('#fms-chb-paste-settings'),
@@ -900,12 +900,12 @@ define([], function () {
this.dlgAutoCorrect.show();
},
- onClickKeyboardShortcut: function() {
- const win = new Common.Views.ShortcutsDialog({
- api: this.api
- });
- win.show();
- },
+ // onClickKeyboardShortcut: function() {
+ // const win = new Common.Views.ShortcutsDialog({
+ // api: this.api
+ // });
+ // win.show();
+ // },
customizeQuickAccess: function () {
if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return;
diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js
index fc36775999..e4a8a8ba66 100644
--- a/apps/presentationeditor/main/app_dev.js
+++ b/apps/presentationeditor/main/app_dev.js
@@ -230,8 +230,8 @@ require([
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
- 'common/main/lib/view/ShortcutsDialog',
- 'common/main/lib/view/ShortcutsEditDialog',
+ // 'common/main/lib/view/ShortcutsDialog',
+ // 'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'common/main/lib/component/TextareaField',
diff --git a/apps/presentationeditor/main/app_pack.js b/apps/presentationeditor/main/app_pack.js
index 359c888196..5e4e30a1d8 100644
--- a/apps/presentationeditor/main/app_pack.js
+++ b/apps/presentationeditor/main/app_pack.js
@@ -30,8 +30,8 @@ require([
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
- 'common/main/lib/view/ShortcutsDialog',
- 'common/main/lib/view/ShortcutsEditDialog',
+ // 'common/main/lib/view/ShortcutsDialog',
+ // 'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'common/main/lib/component/TextareaField',
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index caee5003e6..9d23519ff3 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -374,10 +374,10 @@ define([], function () {
' ',
- ' ',
- ' | ',
- ' | ',
- ' ',
+ // ' ',
+ // ' | ',
+ // ' | ',
+ // ' ',
' |
',
' ',
' | ',
@@ -800,10 +800,10 @@ define([], function () {
dataHintOffset: 'big'
});
- this.btnKeyboardMacros = new Common.UI.Button({
- el: $markup.findById('#fms-btn-keyboard-shortcuts')
- });
- this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this));
+ // this.btnKeyboardMacros = new Common.UI.Button({
+ // el: $markup.findById('#fms-btn-keyboard-shortcuts')
+ // });
+ // this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this));
this.chPaste = new Common.UI.CheckBox({
el: $markup.findById('#fms-chb-paste-settings'),
@@ -1408,12 +1408,12 @@ define([], function () {
this.dlgAutoCorrect.show();
},
- onClickKeyboardShortcut: function() {
- const win = new Common.Views.ShortcutsDialog({
- api: this.api
- });
- win.show();
- },
+ // onClickKeyboardShortcut: function() {
+ // const win = new Common.Views.ShortcutsDialog({
+ // api: this.api
+ // });
+ // win.show();
+ // },
SetDisabled: function(disabled) {
if ( disabled ) {
diff --git a/apps/spreadsheeteditor/main/app/view/TableDesignTab.js b/apps/spreadsheeteditor/main/app/view/TableDesignTab.js
index 9701f393a4..8d0d4bfb0c 100644
--- a/apps/spreadsheeteditor/main/app/view/TableDesignTab.js
+++ b/apps/spreadsheeteditor/main/app/view/TableDesignTab.js
@@ -320,7 +320,7 @@ define([
this.btnAltText = new Common.UI.Button({
cls : 'btn-toolbar x-huge icon-top',
- iconCls : 'toolbar__icon btn-big-pivot-sum',
+ iconCls : 'toolbar__icon btn-table-alt-text',
caption : this.txtAltText,
lock: [_set.editCell, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.wsLock, _set.cantModifyFilter],
style : 'width: 100%;',
diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js
index c10b128f69..dfecf28cdb 100644
--- a/apps/spreadsheeteditor/main/app_dev.js
+++ b/apps/spreadsheeteditor/main/app_dev.js
@@ -229,8 +229,8 @@ require([
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
- 'common/main/lib/view/ShortcutsDialog',
- 'common/main/lib/view/ShortcutsEditDialog',
+ // 'common/main/lib/view/ShortcutsDialog',
+ // 'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'spreadsheeteditor/main/app/controller/DocumentHolderExt',
diff --git a/apps/spreadsheeteditor/main/app_pack.js b/apps/spreadsheeteditor/main/app_pack.js
index 2c8a7046e7..241d2ec645 100644
--- a/apps/spreadsheeteditor/main/app_pack.js
+++ b/apps/spreadsheeteditor/main/app_pack.js
@@ -29,8 +29,8 @@ require([
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
- 'common/main/lib/view/ShortcutsDialog',
- 'common/main/lib/view/ShortcutsEditDialog',
+ // 'common/main/lib/view/ShortcutsDialog',
+ // 'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'spreadsheeteditor/main/app/controller/DocumentHolderExt',
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/big/btn-table-alt-text.png
new file mode 100644
index 0000000000..d04cf84538
Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/big/btn-table-alt-text.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/btn-table-alt-text.png
new file mode 100644
index 0000000000..b8bcd85aa5
Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/btn-table-alt-text.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/big/btn-table-alt-text.png
new file mode 100644
index 0000000000..13e52c2004
Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/big/btn-table-alt-text.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-table-alt-text.png
new file mode 100644
index 0000000000..82694db5c5
Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-table-alt-text.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/big/btn-table-alt-text.svg b/apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/big/btn-table-alt-text.svg
new file mode 100644
index 0000000000..d48077a794
--- /dev/null
+++ b/apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/big/btn-table-alt-text.svg
@@ -0,0 +1,4 @@
+
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/btn-table-alt-text.png
new file mode 100644
index 0000000000..48b1e9e09a
Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/btn-table-alt-text.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.25x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.25x/big/btn-table-alt-text.png
new file mode 100644
index 0000000000..86ec58258b
Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.25x/big/btn-table-alt-text.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.5x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.5x/big/btn-table-alt-text.png
new file mode 100644
index 0000000000..89763791ae
Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.5x/big/btn-table-alt-text.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.75x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.75x/big/btn-table-alt-text.png
new file mode 100644
index 0000000000..2e43be25da
Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.75x/big/btn-table-alt-text.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1x/big/btn-table-alt-text.png
new file mode 100644
index 0000000000..e2754f233f
Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1x/big/btn-table-alt-text.png differ
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/v2/2.5x/big/btn-table-alt-text.svg b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/2.5x/big/btn-table-alt-text.svg
new file mode 100644
index 0000000000..2fe5b64bc5
--- /dev/null
+++ b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/2.5x/big/btn-table-alt-text.svg
@@ -0,0 +1,4 @@
+
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/v2/2x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/2x/big/btn-table-alt-text.png
new file mode 100644
index 0000000000..c4d77ffbee
Binary files /dev/null and b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/2x/big/btn-table-alt-text.png differ
diff --git a/apps/visioeditor/main/app/view/FileMenuPanels.js b/apps/visioeditor/main/app/view/FileMenuPanels.js
index 551a27a5a2..6ffb25aa02 100644
--- a/apps/visioeditor/main/app/view/FileMenuPanels.js
+++ b/apps/visioeditor/main/app/view/FileMenuPanels.js
@@ -621,12 +621,12 @@ define([], function () {
this._fontRender = combo.getValue();
},
- onClickKeyboardShortcut: function() {
- const win = new Common.Views.ShortcutsDialog({
- api: this.api
- });
- win.show();
- },
+ // onClickKeyboardShortcut: function() {
+ // const win = new Common.Views.ShortcutsDialog({
+ // api: this.api
+ // });
+ // win.show();
+ // },
customizeQuickAccess: function () {
if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return;
diff --git a/apps/visioeditor/main/app_dev.js b/apps/visioeditor/main/app_dev.js
index 309658c6fc..103dd09d3a 100644
--- a/apps/visioeditor/main/app_dev.js
+++ b/apps/visioeditor/main/app_dev.js
@@ -173,8 +173,8 @@ require([
'common/main/lib/view/PluginPanel',
'common/main/lib/view/DocumentHolderExt',
'common/main/lib/view/CustomizeQuickAccessDialog',
- 'common/main/lib/view/ShortcutsDialog',
- 'common/main/lib/view/ShortcutsEditDialog',
+ // 'common/main/lib/view/ShortcutsDialog',
+ // 'common/main/lib/view/ShortcutsEditDialog',
'visioeditor/main/app/view/FileMenuPanels',
'visioeditor/main/app/view/DocumentHolderExt'
diff --git a/apps/visioeditor/main/app_pack.js b/apps/visioeditor/main/app_pack.js
index 3e2323d4bb..e4af978b5c 100644
--- a/apps/visioeditor/main/app_pack.js
+++ b/apps/visioeditor/main/app_pack.js
@@ -12,8 +12,8 @@ require([
'common/main/lib/view/TextInputDialog',
'common/main/lib/view/DocumentHolderExt',
'common/main/lib/view/CustomizeQuickAccessDialog',
- 'common/main/lib/view/ShortcutsDialog',
- 'common/main/lib/view/ShortcutsEditDialog',
+ // 'common/main/lib/view/ShortcutsDialog',
+ // 'common/main/lib/view/ShortcutsEditDialog',
'visioeditor/main/app/view/FileMenuPanels',
'visioeditor/main/app/view/DocumentHolderExt'
|