pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 11:31:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'release/v9.1.0' (#779) from release/v9.1.0 into develop

Browse Source
This commit is contained in:
Julia Radzhabova
2025-10-09 12:34:56 +00:00
parent 1d38bbb5d5 ffd75eb7a7
commit ea8731a02e
33 changed files with 118 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/common/main/resources/less/slider.less
View File

@ -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%);

2
apps/documenteditor/main/app/controller/DocProtection.js
View File

@ -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) {

28
apps/documenteditor/main/app/view/FileMenuPanels.js
View File

@ -445,10 +445,10 @@ define([], function () {
'<td>',
'<div><div id="fms-cmb-macros"></div>',
'</tr>',
'<tr>',
'<td><label><%= scope.strKeyboardShortcuts %><span class="new-hint"><%= Common.UI.SynchronizeTip.prototype.textNew.toUpperCase() %></span></label></td>',
'<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-keyboard-shortcuts" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtCustomize %></button></div></td>',
'</tr>',
// '<tr>',
// '<td><label><%= scope.strKeyboardShortcuts %><span class="new-hint"><%= Common.UI.SynchronizeTip.prototype.textNew.toUpperCase() %></span></label></td>',
// '<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-keyboard-shortcuts" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtCustomize %></button></div></td>',
// '</tr>',
'<tr>',
'<td><label><%= scope.strFontSizeType %></label></td>',
'<td><span id="fms-cmb-font-size-type"></span></td>',
@ -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;

4
apps/documenteditor/main/app_dev.js
View File

@ -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',

4
apps/documenteditor/main/app_pack.js
View File

@ -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',

1
apps/documenteditor/main/locale/en.json
View File

@ -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:<br><br>{0}<br><br>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",

3
apps/pdfeditor/main/app/controller/LeftMenu.js
View File

@ -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)

15
apps/pdfeditor/main/app/controller/RedactTab.js
View File

@ -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) {

28
apps/pdfeditor/main/app/view/FileMenuPanels.js
View File

@ -388,10 +388,10 @@ define([], function () {
'<td><label><%= scope.strFontRender %></label></td>',
'<td><span id="fms-cmb-font-render"></span></td>',
'</tr>',
'<tr>',
'<td><label><%= scope.strKeyboardShortcuts %><span class="new-hint"><%= Common.UI.SynchronizeTip.prototype.textNew.toUpperCase() %></span></label></td>',
'<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-keyboard-shortcuts" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtCustomize %></button></div></td>',
'</tr>',
// '<tr>',
// '<td><label><%= scope.strKeyboardShortcuts %><span class="new-hint"><%= Common.UI.SynchronizeTip.prototype.textNew.toUpperCase() %></span></label></td>',
// '<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-keyboard-shortcuts" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtCustomize %></button></div></td>',
// '</tr>',
'<tr class ="divider-group"></tr>',
'<tr class="fms-btn-apply">',
'<td style="padding-top:15px; padding-bottom: 15px;"><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.okButtonText %></button></td>',
@ -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;

4
apps/pdfeditor/main/app_dev.js
View File

@ -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',

4
apps/pdfeditor/main/app_pack.js
View File

@ -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',

28
apps/presentationeditor/main/app/view/FileMenuPanels.js
View File

@ -364,10 +364,10 @@ define([], function () {
'<td><label><%= scope.strMacrosSettings %></label></td>',
'<td><div><div id="fms-cmb-macros"></div></div></td>',
'</tr>',
'<tr>',
'<td><label><%= scope.strKeyboardShortcuts %><span class="new-hint"><%= Common.UI.SynchronizeTip.prototype.textNew.toUpperCase() %></span></label></td>',
'<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-keyboard-shortcuts" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtCustomize %></button></div></td>',
'</tr>',
// '<tr>',
// '<td><label><%= scope.strKeyboardShortcuts %><span class="new-hint"><%= Common.UI.SynchronizeTip.prototype.textNew.toUpperCase() %></span></label></td>',
// '<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-keyboard-shortcuts" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtCustomize %></button></div></td>',
// '</tr>',
'<tr class ="divider-group"></tr>',
'<tr class="fms-btn-apply">',
'<td style="padding-top:15px; padding-bottom: 15px;"><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.okButtonText %></button></td>',
@ -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;

4
apps/presentationeditor/main/app_dev.js
View File

@ -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',

4
apps/presentationeditor/main/app_pack.js
View File

@ -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',

28
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View File

@ -374,10 +374,10 @@ define([], function () {
'<div><div id="fms-cmb-macros"></div>',
'</td>',
'</tr>',
'<tr>',
'<td><label><%= scope.strKeyboardShortcuts %><span class="new-hint"><%= Common.UI.SynchronizeTip.prototype.textNew.toUpperCase() %></span></label></td>',
'<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-keyboard-shortcuts" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtCustomize %></button></div></td>',
'</tr>',
// '<tr>',
// '<td><label><%= scope.strKeyboardShortcuts %><span class="new-hint"><%= Common.UI.SynchronizeTip.prototype.textNew.toUpperCase() %></span></label></td>',
// '<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-keyboard-shortcuts" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtCustomize %></button></div></td>',
// '</tr>',
'<tr class ="divider-group"></tr>',
'<tr>',
'<td class="group-name" colspan="2"><label><%= scope.strRegSettings %></label></td>',
@ -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 ) {

2
apps/spreadsheeteditor/main/app/view/TableDesignTab.js
View File

@ -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%;',

4
apps/spreadsheeteditor/main/app_dev.js
View File

@ -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',

4
apps/spreadsheeteditor/main/app_pack.js
View File

@ -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',

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/big/btn-table-alt-text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 197 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/btn-table-alt-text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 198 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/big/btn-table-alt-text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 183 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-table-alt-text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 186 B

4
apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/big/btn-table-alt-text.svg Normal file
View File

@ -0,0 +1,4 @@
<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M20.5 20a.5.5 0 0 1 0 1h-4a.5.5 0 0 1 0-1zm0-3a.5.5 0 0 1 0 1h-4a.5.5 0 0 1 0-1z" fill="#000"/>
<path d="M21.5 6a.5.5 0 0 1 .5.5V14h1.5a.5.5 0 0 1 .5.5v9a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5V22H4.5a.5.5 0 0 1-.5-.5v-15a.5.5 0 0 1 .5-.5zM14 23h9v-8h-9zm-3-2h2v-6.5a.5.5 0 0 1 .5-.5H21v-2H11zm-6 0h5v-4H5zm0-5h5v-4H5zm0-5h16V7H5z" fill="#000"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 463 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/btn-table-alt-text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 242 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.25x/big/btn-table-alt-text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 379 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.5x/big/btn-table-alt-text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 401 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.75x/big/btn-table-alt-text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 418 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/v2/1x/big/btn-table-alt-text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 327 B

4
apps/spreadsheeteditor/main/resources/img/toolbar/v2/2.5x/big/btn-table-alt-text.svg Normal file
View File

@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none">
<path d="M4.5 11.5v-4a1 1 0 0 1 1-1h15a1 1 0 0 1 1 1v4m-17 0h6m-6 0v5m17-5v3m0-3h-11m0 0v5m0 5h-5a1 1 0 0 1-1-1v-4m6 5v-5m0 5h3m-3-5h-6" class="icon-stroke-gray-primary"/>
<path d="M20.5 17.5h-4m0 3h4m3 2v-7a1 1 0 0 0-1-1h-8a1 1 0 0 0-1 1v7a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1Z" class="icon-stroke-blue-primary"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 488 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/v2/2x/big/btn-table-alt-text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 502 B

12
apps/visioeditor/main/app/view/FileMenuPanels.js
View File

@ -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;

4
apps/visioeditor/main/app_dev.js
View File

@ -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'

4
apps/visioeditor/main/app_pack.js
View File

@ -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'