birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6300 from tjmgd/bug-script-canvas-60

Browse Source 
Script Canvas Groups - Updated keyboard shortcut bindings to avoid conflict with "play game" shortcuts
This commit is contained in:
Luis Sempé
2022-01-03 14:56:06 -08:00
committed by GitHub
parent 005acbf195 7276ad0dbf
commit 7581967da3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/EditorPanelUtils.cpp
+2 -2
View File
@@ -319,8 +319,8 @@ public:
keys.push_back(QPair<QString, QString>("Edit Menu.Duplicate", "Ctrl+D"));
keys.push_back(QPair<QString, QString>("Edit Menu.Undo", "Ctrl+Z"));
keys.push_back(QPair<QString, QString>("Edit Menu.Redo", "Ctrl+Shift+Z"));
keys.push_back(QPair<QString, QString>("Edit Menu.Group", "Ctrl+G"));
keys.push_back(QPair<QString, QString>("Edit Menu.Ungroup", "Ctrl+Shift+G"));
keys.push_back(QPair<QString, QString>("Edit Menu.Group", "Ctrl+Alt+O"));
keys.push_back(QPair<QString, QString>("Edit Menu.Ungroup", "Ctrl+Alt+P"));
keys.push_back(QPair<QString, QString>("Edit Menu.Rename", "Ctrl+R"));
keys.push_back(QPair<QString, QString>("Edit Menu.Reset", ""));
keys.push_back(QPair<QString, QString>("Edit Menu.Edit Hotkeys", ""));
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/AssetEditorToolbar/AssetEditorToolbar.ui
+4 -4
View File
@@ -56,7 +56,7 @@
<item>
<widget class="QToolButton" name="groupNodes">
<property name="toolTip">
<string>Groups the current selection in the active graph [Ctrl+Shift+G]</string>
<string>Groups the current selection in the active graph [Ctrl+Alt+O]</string>
</property>
<property name="text">
<string>...</string>
@@ -66,14 +66,14 @@
<normaloff>:/GraphCanvasEditorResources/group.svg</normaloff>:/GraphCanvasEditorResources/group.svg</iconset>
</property>
<property name="shortcut">
<string>Ctrl+Shift+G</string>
<string>Ctrl+Alt+O</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="ungroupNodes">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ungroups the selected element in the active graph [Ctrl+Shift+H]&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Ungroups the selected element in the active graph [Ctrl+Alt+P]</string>
</property>
<property name="text">
<string>...</string>
@@ -83,7 +83,7 @@
<normaloff>:/GraphCanvasEditorResources/ungroup.svg</normaloff>:/GraphCanvasEditorResources/ungroup.svg</iconset>
</property>
<property name="shortcut">
<string>Ctrl+Shift+H</string>
<string>Ctrl+Alt+P</string>
</property>
</widget>
</item>