Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-29 22:35:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-6417_d-millar_move_buttons'

Browse Source 
(Closes #8937)
This commit is contained in:
Ryan Kurtz
2026-02-12 13:13:44 -05:00
parent 2b6a66cee0 fc63ec3943
commit 08932a3771
10 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/DisconnectAction.java
+3 -3
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@ interface DisconnectAction extends ControlAction {
String DESCRIPTION = "Close the connection to the debugging agent"; String DESCRIPTION = "Close the connection to the debugging agent";
Icon ICON = DebuggerResources.ICON_DISCONNECT; Icon ICON = DebuggerResources.ICON_DISCONNECT;
String HELP_ANCHOR = "target_disconnect"; String HELP_ANCHOR = "target_disconnect";
int SUB_GROUP = 3; int SUB_GROUP = 11;
KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_K, KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_K,
KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK);
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/EmulateSkipOverAction.java
+3 -3
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@ interface EmulateSkipOverAction extends ControlAction {
"Skip the integrated emulator a single instruction, ignoring its effects"; "Skip the integrated emulator a single instruction, ignoring its effects";
Icon ICON = DebuggerResources.ICON_SKIP_OVER; Icon ICON = DebuggerResources.ICON_SKIP_OVER;
String HELP_ANCHOR = "emu_skip_over"; String HELP_ANCHOR = "emu_skip_over";
int SUB_GROUP = 7; int SUB_GROUP = 5;
KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F10, KeyEvent.CTRL_DOWN_MASK); KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F10, KeyEvent.CTRL_DOWN_MASK);
static ActionBuilder builder(Plugin owner) { static ActionBuilder builder(Plugin owner) {
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/EmulateStepBackAction.java
+3 -3
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@ interface EmulateStepBackAction extends ControlAction {
String DESCRIPTION = "Step the integrated emulator a single instruction backward"; String DESCRIPTION = "Step the integrated emulator a single instruction backward";
Icon ICON = DebuggerResources.ICON_STEP_BACK; Icon ICON = DebuggerResources.ICON_STEP_BACK;
String HELP_ANCHOR = "emu_step_back"; String HELP_ANCHOR = "emu_step_back";
int SUB_GROUP = 4; int SUB_GROUP = 2;
KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F7, 0); KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F7, 0);
static ActionBuilder builder(Plugin owner) { static ActionBuilder builder(Plugin owner) {
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/StepIntoAction.java
+3 -3
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,6 +24,6 @@ import ghidra.app.plugin.core.debug.gui.DebuggerResources;
interface StepIntoAction extends ControlAction { interface StepIntoAction extends ControlAction {
Icon ICON = DebuggerResources.ICON_STEP_INTO; Icon ICON = DebuggerResources.ICON_STEP_INTO;
int SUB_GROUP = 5; int SUB_GROUP = 3;
KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F8, 0); KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F8, 0);
} }
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/TargetKillAction.java
+3 -3
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ interface TargetKillAction extends ControlAction {
String DESCRIPTION = "Kill the target"; String DESCRIPTION = "Kill the target";
Icon ICON = DebuggerResources.ICON_KILL; Icon ICON = DebuggerResources.ICON_KILL;
String HELP_ANCHOR = "target_kill"; String HELP_ANCHOR = "target_kill";
int SUB_GROUP = 2; int SUB_GROUP = 10;
KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_K, KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_K,
KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK);
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/TargetStepExtAction.java
+3 -3
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@ import ghidra.util.HelpLocation;
interface TargetStepExtAction extends ControlAction { interface TargetStepExtAction extends ControlAction {
Icon ICON = DebuggerResources.ICON_STEP_LAST; Icon ICON = DebuggerResources.ICON_STEP_LAST;
String HELP_ANCHOR = "target_step_ext"; String HELP_ANCHOR = "target_step_ext";
int SUB_GROUP = 9; int SUB_GROUP = 7;
KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F8, KeyEvent.CTRL_DOWN_MASK); KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F8, KeyEvent.CTRL_DOWN_MASK);
static ActionBuilder builder(String name, DebuggerControlPlugin owner) { static ActionBuilder builder(String name, DebuggerControlPlugin owner) {
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/TargetStepOutAction.java
+3 -3
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ interface TargetStepOutAction extends ControlAction {
String DESCRIPTION = "Step the target out"; String DESCRIPTION = "Step the target out";
Icon ICON = DebuggerResources.ICON_STEP_FINISH; Icon ICON = DebuggerResources.ICON_STEP_FINISH;
String HELP_ANCHOR = "target_step_out"; String HELP_ANCHOR = "target_step_out";
int SUB_GROUP = 8; int SUB_GROUP = 6;
KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0); KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0);
static TargetActionBuilder builder(DebuggerControlPlugin owner) { static TargetActionBuilder builder(DebuggerControlPlugin owner) {
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/TargetStepOverAction.java
+3 -3
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ interface TargetStepOverAction extends ControlAction {
String DESCRIPTION = "Step the target over"; String DESCRIPTION = "Step the target over";
Icon ICON = DebuggerResources.ICON_STEP_OVER; Icon ICON = DebuggerResources.ICON_STEP_OVER;
String HELP_ANCHOR = "target_step_over"; String HELP_ANCHOR = "target_step_over";
int SUB_GROUP = 6; int SUB_GROUP = 4;
KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0); KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0);
static TargetActionBuilder builder(DebuggerControlPlugin owner) { static TargetActionBuilder builder(DebuggerControlPlugin owner) {
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/TraceSnapBackwardAction.java
+3 -3
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@ interface TraceSnapBackwardAction extends ControlAction {
String DESCRIPTION = "Navigate the trace recording backward one snapshot"; String DESCRIPTION = "Navigate the trace recording backward one snapshot";
Icon ICON = DebuggerResources.ICON_SNAP_BACKWARD; Icon ICON = DebuggerResources.ICON_SNAP_BACKWARD;
String HELP_ANCHOR = "trace_snap_backward"; String HELP_ANCHOR = "trace_snap_backward";
int SUB_GROUP = 10; int SUB_GROUP = 8;
KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F7, 0); KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F7, 0);
static ActionBuilder builder(Plugin owner) { static ActionBuilder builder(Plugin owner) {
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/control/TraceSnapForwardAction.java
+3 -3
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@ interface TraceSnapForwardAction extends ControlAction {
String DESCRIPTION = "Navigate the trace recording forward one snapshot"; String DESCRIPTION = "Navigate the trace recording forward one snapshot";
Icon ICON = DebuggerResources.ICON_SNAP_FORWARD; Icon ICON = DebuggerResources.ICON_SNAP_FORWARD;
String HELP_ANCHOR = "trace_snap_backward"; String HELP_ANCHOR = "trace_snap_backward";
int SUB_GROUP = 11; int SUB_GROUP = 9;
KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F8, 0); KeyStroke KEY_BINDING = KeyStroke.getKeyStroke(KeyEvent.VK_F8, 0);
static ActionBuilder builder(Plugin owner) { static ActionBuilder builder(Plugin owner) {