MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-164254 Refactor: create separate group for Terminal tool window actions

Browse Source 
IJ-CR-148020

(cherry picked from commit 4f0eeafb39ef9ce4e868e36caf8e47fcd2ffff16)

GitOrigin-RevId: b85930e1e87f176c0edc76e506861b9866043700
This commit is contained in:
Konstantin Hudyakov
2024-10-22 15:27:07 +03:00
committed by intellij-monorepo-bot
parent 4126bbd708
commit 0dce0bd60a
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/terminal/resources/META-INF/plugin.xml
View File

@@ -153,6 +153,12 @@
<keyboard-shortcut first-keystroke="control R" keymap="Mac OS X 10.5+" replace-all="true"/>
</action>
<action id="Terminal.EnableNewUi" class="org.jetbrains.plugins.terminal.action.EnableBlockTerminalUiAction"/>
<group id="Terminal.ToolWindowActions">
<reference id="Terminal.EnableNewUi"/>
</group>
<group id="Terminal.PromptStyle" popup="true">
<action id="Terminal.UseSingleLinePrompt" class="org.jetbrains.plugins.terminal.block.prompt.TerminalUseSingleLinePromptAction"/>
<action id="Terminal.UseDoubleLinePrompt" class="org.jetbrains.plugins.terminal.block.prompt.TerminalUseDoubleLinePromptAction"/>

8
plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalToolWindowFactory.java
View File

@@ -1,7 +1,8 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.plugins.terminal;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.actionSystem.ActionGroup;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
@@ -10,7 +11,6 @@ import com.intellij.openapi.wm.ToolWindowFactory;
import com.intellij.openapi.wm.ex.ToolWindowEx;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.terminal.action.EnableBlockTerminalUiAction;
import org.jetbrains.plugins.terminal.arrangement.TerminalArrangementManager;
public final class TerminalToolWindowFactory implements ToolWindowFactory, DumbAware {
@@ -24,7 +24,9 @@ public final class TerminalToolWindowFactory implements ToolWindowFactory, DumbA
TerminalToolWindowManager terminalToolWindowManager = TerminalToolWindowManager.getInstance(project);
terminalToolWindowManager.initToolWindow((ToolWindowEx)toolWindow);
toolWindow.setAdditionalGearActions(new DefaultActionGroup(new EnableBlockTerminalUiAction()));
ActionGroup toolWindowActions = (ActionGroup)ActionManager.getInstance().getAction("Terminal.ToolWindowActions");
toolWindow.setAdditionalGearActions(toolWindowActions);
TerminalArrangementManager terminalArrangementManager = TerminalArrangementManager.getInstance(project);
terminalToolWindowManager.restoreTabs(terminalArrangementManager.getArrangementState());

3
plugins/terminal/src/org/jetbrains/plugins/terminal/action/EnableBlockTerminalUiAction.kt
View File

@@ -10,14 +10,13 @@ import com.intellij.openapi.project.DumbAwareToggleAction
import com.intellij.openapi.util.registry.Registry
import com.intellij.ui.ExperimentalUI
import org.jetbrains.plugins.terminal.LocalBlockTerminalRunner
import org.jetbrains.plugins.terminal.TerminalBundle
import org.jetbrains.plugins.terminal.TerminalToolWindowManager
import org.jetbrains.plugins.terminal.block.TerminalUsageLocalStorage
import org.jetbrains.plugins.terminal.block.feedback.showBlockTerminalFeedbackNotification
import org.jetbrains.plugins.terminal.fus.BlockTerminalSwitchPlace
import org.jetbrains.plugins.terminal.fus.TerminalUsageTriggerCollector
internal class EnableBlockTerminalUiAction : DumbAwareToggleAction(TerminalBundle.messagePointer("action.Terminal.EnableNewUi.text")) {
internal class EnableBlockTerminalUiAction : DumbAwareToggleAction() {
override fun isSelected(e: AnActionEvent): Boolean {
return Registry.`is`(LocalBlockTerminalRunner.BLOCK_TERMINAL_REGISTRY)
}