From 38c32e7c8edba5c7cf6f5094c2a06d60faec5605 Mon Sep 17 00:00:00 2001
From: Zoe Lin <zoelin@amazon.com>
Date: Fri, 8 Nov 2024 15:09:54 -0800
Subject: [PATCH 1/3] add keyboard shortcut for open chat panel

---
 .../feature-4d8a8985-2edc-4031-a9f2-903923d5c757.json         | 4 ++++
 .../jetbrains-community/resources/META-INF/plugin-chat.xml    | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changes/next-release/feature-4d8a8985-2edc-4031-a9f2-903923d5c757.json

diff --git a/.changes/next-release/feature-4d8a8985-2edc-4031-a9f2-903923d5c757.json b/.changes/next-release/feature-4d8a8985-2edc-4031-a9f2-903923d5c757.json
new file mode 100644
index 00000000000..b37b505fe80
--- /dev/null
+++ b/.changes/next-release/feature-4d8a8985-2edc-4031-a9f2-903923d5c757.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "add ctrl+alt+Q as keyboard shortcut for opening Q chat panel"
+}
\ No newline at end of file
diff --git a/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml b/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml
index d08356231f7..d478184c2c9 100644
--- a/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml
+++ b/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml
@@ -34,7 +34,9 @@
             <reference id="aws.toolkit.open.q.window"/>
         </group>
         <!-- TODO: q.openchat will eventually be in amazonq, aws.toolkit.q.sign.in will eventually be in core. -->
-        <action id="q.openchat" class="software.aws.toolkits.jetbrains.services.amazonq.QOpenPanelAction"/>
+        <action id="q.openchat" class="software.aws.toolkits.jetbrains.services.amazonq.QOpenPanelAction">
+            <keyboard-shortcut keymap="$default" first-keystroke="meta alt Q" />
+        </action>
 
         <group id="aws.toolkit.q.sign.in">
             <action id="q.sign.in" class="software.aws.toolkits.jetbrains.services.amazonq.explorerActions.SignInToQAction"/>

From 218e4d467fedb39abecb12c4a590d4c621f7b3f6 Mon Sep 17 00:00:00 2001
From: Zoe Lin <zoelin@amazon.com>
Date: Mon, 11 Nov 2024 10:43:18 -0800
Subject: [PATCH 2/3] fix keybinding on windows

---
 .../resources/META-INF/plugin-chat.xml             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml b/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml
index d478184c2c9..901837c8c5a 100644
--- a/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml
+++ b/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml
@@ -35,7 +35,7 @@
         </group>
         <!-- TODO: q.openchat will eventually be in amazonq, aws.toolkit.q.sign.in will eventually be in core. -->
         <action id="q.openchat" class="software.aws.toolkits.jetbrains.services.amazonq.QOpenPanelAction">
-            <keyboard-shortcut keymap="$default" first-keystroke="meta alt Q" />
+            <keyboard-shortcut keymap="$default" first-keystroke="control alt Q" />
         </action>
 
         <group id="aws.toolkit.q.sign.in">
@@ -55,32 +55,32 @@
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.ExplainCodeAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.ExplainCodeAction">
-                <keyboard-shortcut keymap="$default" first-keystroke="meta alt E" />
+                <keyboard-shortcut keymap="$default" first-keystroke="control alt E" />
             </action>
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.RefactorCodeAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.RefactorCodeAction">
-                <keyboard-shortcut keymap="$default" first-keystroke="meta alt U" />
+                <keyboard-shortcut keymap="$default" first-keystroke="control alt U" />
             </action>
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.FixCodeAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.FixCodeAction">
-                <keyboard-shortcut keymap="$default" first-keystroke="meta alt Y" />
+                <keyboard-shortcut keymap="$default" first-keystroke="control alt Y" />
             </action>
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.OptimizeCodeAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.OptimizeCodeAction">
-                <keyboard-shortcut keymap="$default" first-keystroke="meta alt A" />
+                <keyboard-shortcut keymap="$default" first-keystroke="control alt A" />
             </action>
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.GenerateUnitTestsAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.GenerateUnitTestsAction">
-                <keyboard-shortcut keymap="$default" first-keystroke="meta alt T" />
+                <keyboard-shortcut keymap="$default" first-keystroke="control alt T" />
             </action>
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.SendToPromptAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.SendToPromptAction">
-                <keyboard-shortcut keymap="$default" first-keystroke="meta alt S" />
+                <keyboard-shortcut keymap="$default" first-keystroke="control alt S" />
             </action>
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.inline.openChat"

From acf5ff8de0cc4ac487916f0fe606de736054782c Mon Sep 17 00:00:00 2001
From: Zoe Lin <zoelin@amazon.com>
Date: Mon, 11 Nov 2024 11:03:56 -0800
Subject: [PATCH 3/3] fix for mac

---
 .../resources/META-INF/plugin-chat.xml             | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml b/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml
index 901837c8c5a..96c67b5dd60 100644
--- a/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml
+++ b/plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml
@@ -35,6 +35,8 @@
         </group>
         <!-- TODO: q.openchat will eventually be in amazonq, aws.toolkit.q.sign.in will eventually be in core. -->
         <action id="q.openchat" class="software.aws.toolkits.jetbrains.services.amazonq.QOpenPanelAction">
+            <keyboard-shortcut keymap="Mac OS X" first-keystroke="control alt Q"/>
+            <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="control alt Q"/>
             <keyboard-shortcut keymap="$default" first-keystroke="control alt Q" />
         </action>
 
@@ -55,31 +57,43 @@
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.ExplainCodeAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.ExplainCodeAction">
+                <keyboard-shortcut keymap="Mac OS X" first-keystroke="control alt E"/>
+                <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="control alt E"/>
                 <keyboard-shortcut keymap="$default" first-keystroke="control alt E" />
             </action>
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.RefactorCodeAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.RefactorCodeAction">
+                <keyboard-shortcut keymap="Mac OS X" first-keystroke="control alt U"/>
+                <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="control alt U"/>
                 <keyboard-shortcut keymap="$default" first-keystroke="control alt U" />
             </action>
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.FixCodeAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.FixCodeAction">
+                <keyboard-shortcut keymap="Mac OS X" first-keystroke="control alt Y"/>
+                <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="control alt Y"/>
                 <keyboard-shortcut keymap="$default" first-keystroke="control alt Y" />
             </action>
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.OptimizeCodeAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.OptimizeCodeAction">
+                <keyboard-shortcut keymap="Mac OS X" first-keystroke="control alt A" />
+                <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="control alt A"/>
                 <keyboard-shortcut keymap="$default" first-keystroke="control alt A" />
             </action>
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.GenerateUnitTestsAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.GenerateUnitTestsAction">
+                <keyboard-shortcut keymap="Mac OS X" first-keystroke="control alt T"/>
+                <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="control alt T"/>
                 <keyboard-shortcut keymap="$default" first-keystroke="control alt T" />
             </action>
 
             <action id="aws.toolkit.jetbrains.core.services.cwc.commands.SendToPromptAction"
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.SendToPromptAction">
+                <keyboard-shortcut keymap="Mac OS X" first-keystroke="control alt S"/>
+                <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="control alt S"/>
                 <keyboard-shortcut keymap="$default" first-keystroke="control alt S" />
             </action>