From b01ca8e925267d34605736f64a765152d305b706 Mon Sep 17 00:00:00 2001
From: Alexey Koshelev <Basher0303@yandex.ru>
Date: Wed, 10 Sep 2025 14:18:12 +0300
Subject: [PATCH] [common] Fix in shortcuts dialog

---
 apps/common/main/lib/controller/Shortcuts.js          | 7 ++++++-
 apps/common/main/lib/view/ShortcutEditDialog.js       | 3 ++-
 apps/common/main/lib/view/ShortcutsDialog.js          | 2 +-
 apps/common/main/resources/less/shortcuts-dialog.less | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/controller/Shortcuts.js b/apps/common/main/lib/controller/Shortcuts.js
index 7dfaab20d4..bb3017769e 100644
--- a/apps/common/main/lib/controller/Shortcuts.js
+++ b/apps/common/main/lib/controller/Shortcuts.js
@@ -278,7 +278,12 @@ define([
                         return !shortcut.ascShortcut.asc_IsHidden();
                     });
                     const hintText = item.label + (firstShortcut ? ' (' + firstShortcut.keys.join('+') + ')' : '');
-                    item.btn.updateHint(hintText);
+                    
+                    if(item.applyCallback) {
+                        item.applyCallback(item, hintText);
+                    } else {
+                        item.btn.updateHint(hintText);
+                    }
                 }
             }
         },
diff --git a/apps/common/main/lib/view/ShortcutEditDialog.js b/apps/common/main/lib/view/ShortcutEditDialog.js
index 070d747a49..1f9130f945 100644
--- a/apps/common/main/lib/view/ShortcutEditDialog.js
+++ b/apps/common/main/lib/view/ShortcutEditDialog.js
@@ -247,7 +247,8 @@ define([
                     if (e.metaKey) keys.push('⌘');
 
                     if (!['Control', 'Shift', 'Alt', 'Meta'].includes(e.key)) {
-                        keys.push(DE.getController('Common.Controllers.Shortcuts').keyCodeToKeyName(e.keyCode));
+                        const app = (window.DE || window.PE || window.SSE || window.PDFE || window.VE);
+                        keys.push(app.getController('Common.Controllers.Shortcuts').keyCodeToKeyName(e.keyCode));
                         ascShortcut.asc_SetKeyCode(e.keyCode);
                     } else {
                         ascShortcut.asc_SetKeyCode(null);
diff --git a/apps/common/main/lib/view/ShortcutsDialog.js b/apps/common/main/lib/view/ShortcutsDialog.js
index b7a5d136d7..e319cb29b0 100644
--- a/apps/common/main/lib/view/ShortcutsDialog.js
+++ b/apps/common/main/lib/view/ShortcutsDialog.js
@@ -102,7 +102,7 @@ define([
                             '<% }); %>',
                         '</div>',
                         '<% if (action.isLocked) { %>',
-                            '<i class="icon toolbar__icon btn-favorite icon-lock">&nbsp;</i>',
+                            '<i class="icon toolbar__icon btn-lock icon-lock">&nbsp;</i>',
                         '<% } else { %>',
                             '<button type="button" class="action-edit btn-toolbar">',
                                 '<i class="icon toolbar__icon btn-edit">&nbsp;</i>',
diff --git a/apps/common/main/resources/less/shortcuts-dialog.less b/apps/common/main/resources/less/shortcuts-dialog.less
index 15750b9c57..15cbb0d050 100644
--- a/apps/common/main/resources/less/shortcuts-dialog.less
+++ b/apps/common/main/resources/less/shortcuts-dialog.less
@@ -34,6 +34,7 @@
                 .action-keys {
                     display: flex;
                     flex-wrap: wrap;
+                    flex: 1;
                     .margin-right(4px);
 
                     .action-keys-item {