MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

introduce IdeActions.GROUP_NAVBAR_TOOLBAR

Browse Source 
GitOrigin-RevId: ec7e833f7bb8df0d1ec93d1592cb402f787ed9f4
This commit is contained in:
Gregory.Shrago
2021-04-21 18:15:49 +03:00
committed by intellij-monorepo-bot
parent a61a5cc8a1
commit 6cf0595183
6 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java
View File

@@ -73,7 +73,7 @@ public final class NavBarRootPaneExtension extends IdeRootPaneNorthExtension {
}
public static boolean runToolbarExists() {
final AnAction correctedAction = CustomActionsSchema.getInstance().getCorrectedAction("NavBarToolBar");
final AnAction correctedAction = CustomActionsSchema.getInstance().getCorrectedAction(IdeActions.GROUP_NAVBAR_TOOLBAR);
return correctedAction instanceof DefaultActionGroup && ((DefaultActionGroup)correctedAction).getChildrenCount() > 0 ||
correctedAction instanceof CustomisedActionGroup && ((CustomisedActionGroup)correctedAction).getFirstAction() != null;
}
@@ -131,7 +131,7 @@ public final class NavBarRootPaneExtension extends IdeRootPaneNorthExtension {
private void toggleRunPanel(final boolean show) {
if (show && myRunPanel == null && runToolbarExists()) {
final ActionManager manager = ActionManager.getInstance();
AnAction toolbarRunGroup = CustomActionsSchema.getInstance().getCorrectedAction("NavBarToolBar");
AnAction toolbarRunGroup = CustomActionsSchema.getInstance().getCorrectedAction(IdeActions.GROUP_NAVBAR_TOOLBAR);
if (toolbarRunGroup instanceof ActionGroup && myWrapperPanel != null) {
ActionToolbar actionToolbar = manager.createActionToolbar(ActionPlaces.NAVIGATION_BAR_TOOLBAR, (ActionGroup)toolbarRunGroup, true);

7
platform/lang-impl/src/com/intellij/internal/DumpRunDebugActionStateAction.kt
View File

@@ -3,10 +3,7 @@ package com.intellij.internal
import com.intellij.execution.RunManager
import com.intellij.ide.ui.customization.CustomActionsSchema
import com.intellij.openapi.actionSystem.ActionGroup
import com.intellij.openapi.actionSystem.ActionManager
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.*
import com.intellij.openapi.actionSystem.ex.ComboBoxAction
import com.intellij.openapi.actionSystem.ex.CustomComponentAction
import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl
@@ -20,7 +17,7 @@ class DumpRunDebugActionStateAction : AnAction() {
val result = buildString {
val selectedConfiguration = RunManager.getInstance(project).selectedConfiguration
appendLine("Selected configuration: ${selectedConfiguration?.name}")
val toolbar = ActionToolbarImpl.findToolbar(CustomActionsSchema.getInstance().getCorrectedAction("NavBarToolBar") as ActionGroup) ?: run {
val toolbar = ActionToolbarImpl.findToolbar(CustomActionsSchema.getInstance().getCorrectedAction(IdeActions.GROUP_NAVBAR_TOOLBAR) as ActionGroup) ?: run {
appendLine("No toolbar for action group NavBarToolBar")
return@buildString
}

1
platform/platform-api/src/com/intellij/openapi/actionSystem/IdeActions.java
View File

@@ -196,6 +196,7 @@ public interface IdeActions {
String GROUP_PROJECT_VIEW_POPUP = "ProjectViewPopupMenu";
String GROUP_NAVBAR_POPUP = "NavbarPopupMenu";
String GROUP_NAVBAR_TOOLBAR = "NavBarToolBar";
String GROUP_COMMANDER_POPUP = "CommanderPopupMenu";
String GROUP_TESTTREE_POPUP = "TestTreePopupMenu";
String GROUP_TESTSTATISTICS_POPUP = "TestStatisticsTablePopupMenu";

7
platform/platform-impl/src/com/intellij/ide/ui/customization/CustomActionsSchema.java
View File

@@ -15,7 +15,10 @@ import com.intellij.openapi.keymap.impl.ui.ActionsTreeUtil;
import com.intellij.openapi.keymap.impl.ui.Group;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.DefaultJDOMExternalizer;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
@@ -76,7 +79,7 @@ public final class CustomActionsSchema implements PersistentStateComponent<Eleme
myIdToName.put(IdeActions.GROUP_COMMANDER_POPUP, ActionsTreeUtil.getCommanderPopup());
myIdToName.put(IdeActions.GROUP_J2EE_VIEW_POPUP, ActionsTreeUtil.getJ2EEPopup());
myIdToName.put(IdeActions.GROUP_NAVBAR_POPUP, ActionsTreeUtil.getNavigationBarPopupMenu());
myIdToName.put("NavBarToolBar", ActionsTreeUtil.getNavigationBarToolbar());
myIdToName.put(IdeActions.GROUP_NAVBAR_TOOLBAR, ActionsTreeUtil.getNavigationBarToolbar());
List<Pair<String, @Nls String>> extList = new ArrayList<>();
CustomizableActionGroupProvider.CustomizableActionGroupRegistrar registrar =

5
platform/testGuiFramework/src/com/intellij/testGuiFramework/recorder/ScriptGenerator.kt
View File

@@ -16,6 +16,7 @@
package com.intellij.testGuiFramework.recorder
import com.intellij.openapi.actionSystem.ActionManager
import com.intellij.openapi.actionSystem.ActionPlaces
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.wm.impl.FocusManagerImpl
@@ -68,10 +69,10 @@ object ScriptGenerator {
}
fun processMainMenuActionEvent(action: AnAction, event: AnActionEvent) {
val prohibitedPlaces = setOf("NavBarToolbar", "MainToolbar", "DebuggerToolbar")
val prohibitedPlaces = setOf(ActionPlaces.NAVIGATION_BAR_TOOLBAR, ActionPlaces.MAIN_TOOLBAR, ActionPlaces.DEBUGGER_TOOLBAR)
val actionId: String? = ActionManager.getInstance().getId(action)
if (actionId == null) return
if (event.place != "MainMenu") {
if (event.place != ActionPlaces.MAIN_MENU) {
if (prohibitedPlaces.contains(event.place)) return
addToScript("//invokeAction(\"$actionId\")")
return

3
python/python-features-trainer/src/com/jetbrains/python/ift/lesson/essensial/PythonOnboardingTour.kt
View File

@@ -12,6 +12,7 @@ import com.intellij.ide.util.gotoByName.GotoActionItemProvider
import com.intellij.ide.util.gotoByName.GotoActionModel
import com.intellij.idea.ActionsBundle
import com.intellij.openapi.actionSystem.ActionManager
import com.intellij.openapi.actionSystem.ActionPlaces
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.ex.ComboBoxAction
import com.intellij.openapi.actionSystem.impl.ActionButton
@@ -290,7 +291,7 @@ class PythonOnboardingTour :
task {
triggerByPartOfComponent(highlightInside = true, usePulsation = true) { ui: ActionToolbarImpl ->
ui.takeIf { (ui.place == "NavBarToolbar" || ui.place == "MainToolbar") }?.let { toolbar ->
ui.takeIf { (ui.place == ActionPlaces.NAVIGATION_BAR_TOOLBAR || ui.place == ActionPlaces.MAIN_TOOLBAR) }?.let { toolbar ->
val configurations = ui.components.find { it is JPanel && it.components.any { b -> b is ComboBoxAction.ComboBoxButton } }
val stop = ui.components.find { it is ActionButton && it.action == ActionManager.getInstance().getAction("Stop") }
if (configurations != null && stop != null) {