MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-170117 VCS actions are missing in "Add to Main Toolbar" menu in Remote Development

Browse Source 
GitOrigin-RevId: e9647484d8dfe48c6eb6d4e48bf5d3f84777d4c4
This commit is contained in:
Alexander Lobas
2025-04-12 13:14:28 +00:00
committed by intellij-monorepo-bot
parent d25df5429f
commit c0791891de
5 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/frontend/resources/intellij.vcs.git.frontend.xml
+10
View File
@@ -11,9 +11,19 @@
<action id="GitRdToolbarWidgetAction" class="com.intellij.vcs.git.frontend.widget.GitRdToolbarWidgetAction">
<add-to-group group-id="MainToolbarVCSGroup" anchor="first"/>
</action>
<group id="GitMainToolbarQuickActions" searchable="false" popup="false">
<add-to-group group-id="MainToolbarQuickActionsRaw" relative-to-action="MainToolbarQuickActions.Run" anchor="before"/>
<group id="MainToolbarQuickActions.VCS" class="com.intellij.ide.ui.customization.ToolbarQuickActionsGroup" searchable="false" popup="false"/>
</group>
</actions>
<extensions defaultExtensionNs="com.intellij">
<postStartupActivity implementation="com.intellij.vcs.git.frontend.widget.GitWidgetStateHolder$Activator"/>
<toolbarQuickAction implementationClass="com.intellij.vcs.git.frontend.UpdatePushQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
<toolbarQuickAction implementationClass="com.intellij.vcs.git.frontend.CommitQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
<toolbarQuickAction implementationClass="com.intellij.vcs.git.frontend.HistoryQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
<toolbarQuickAction implementationClass="com.intellij.vcs.git.frontend.RollbackQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
</extensions>
</idea-plugin>
plugins/git4idea/frontend/resources/messages/GitFrontendBundle.properties
+6 -1
View File
@@ -3,4 +3,9 @@ action.GitRdToolbarWidgetAction.text=VCS Widget
# Copied from GitBundle.properties
git.toolbar.widget.no.loaded.repo=Git
git.toolbar.widget.no.repo=Version control
git.toolbar.widget.no.repo.tooltip=Configure a version control for the project
git.toolbar.widget.no.repo.tooltip=Configure a version control for the project
MainToolbarQuickActions.Git.UpdatePush.text=Update Project / Push
MainToolbarQuickActions.Git.Commit.text=Commit\u2026
MainToolbarQuickActions.Git.History.text=Show History\u2026
MainToolbarQuickActions.Git.Rollback.text=Rollback\u2026
plugins/git4idea/src/git4idea/ui/toolbar/GitQuickActions.kt → plugins/git4idea/frontend/src/com/intellij/vcs/git/frontend/GitQuickActions.kt
+6 -7
View File
@@ -1,16 +1,15 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package git4idea.ui.toolbar
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.vcs.git.frontend
import com.intellij.icons.AllIcons
import com.intellij.ide.ui.customization.GroupEnd
import com.intellij.ide.ui.customization.ToolbarAddQuickActionInfo
import com.intellij.openapi.actionSystem.IdeActions
import git4idea.i18n.GitBundle
private val insertStrategy = GroupEnd("MainToolbarNewUI", "MainToolbarVCSGroup")
.orElse(GroupEnd("MainToolbarNewUI", IdeActions.GROUP_MAIN_TOOLBAR_LEFT))
class UpdatePushQuickAction: ToolbarAddQuickActionInfo(listOf("Vcs.UpdateProject", "Vcs.Push"), GitBundle.message("MainToolbarQuickActions.Git.UpdatePush.text"), AllIcons.Actions.CheckOut, insertStrategy)
class CommitQuickAction: ToolbarAddQuickActionInfo(listOf("CheckinProject"), GitBundle.message("MainToolbarQuickActions.Git.Commit.text"), AllIcons.Actions.Commit, insertStrategy)
class HistoryQuickAction: ToolbarAddQuickActionInfo(listOf("Vcs.ShowTabbedFileHistory"), GitBundle.message("MainToolbarQuickActions.Git.History.text"), AllIcons.Vcs.History, insertStrategy)
class RollbackQuickAction: ToolbarAddQuickActionInfo(listOf("ChangesView.Revert"), GitBundle.message("MainToolbarQuickActions.Git.Rollback.text"), AllIcons.Diff.Revert, insertStrategy)
class UpdatePushQuickAction: ToolbarAddQuickActionInfo(listOf("Vcs.UpdateProject", "Vcs.Push"), GitFrontendBundle.message("MainToolbarQuickActions.Git.UpdatePush.text"), AllIcons.Actions.CheckOut, insertStrategy)
class CommitQuickAction: ToolbarAddQuickActionInfo(listOf("CheckinProject"), GitFrontendBundle.message("MainToolbarQuickActions.Git.Commit.text"), AllIcons.Actions.Commit, insertStrategy)
class HistoryQuickAction: ToolbarAddQuickActionInfo(listOf("Vcs.ShowTabbedFileHistory"), GitFrontendBundle.message("MainToolbarQuickActions.Git.History.text"), AllIcons.Vcs.History, insertStrategy)
class RollbackQuickAction: ToolbarAddQuickActionInfo(listOf("ChangesView.Revert"), GitFrontendBundle.message("MainToolbarQuickActions.Git.Rollback.text"), AllIcons.Diff.Revert, insertStrategy)
plugins/git4idea/resources/intellij.vcs.git.xml
-10
View File
@@ -510,11 +510,6 @@
<reference ref="Git.Revert.Abort"/>
</group>
<group id="GitMainToolbarQuickActions" searchable="false" popup="false">
<add-to-group group-id="MainToolbarQuickActionsRaw" relative-to-action="MainToolbarQuickActions.Run" anchor="before"/>
<group id="MainToolbarQuickActions.VCS" class="com.intellij.ide.ui.customization.ToolbarQuickActionsGroup" searchable="false" popup="false"/>
</group>
<group id="Git.Hosting.Open.In.Browser.Group" popup="false">
<add-to-group group-id="RevealGroup"/>
<add-to-group group-id="Vcs.Log.ContextMenu" anchor="last"/>
@@ -853,11 +848,6 @@
<postStartupActivity implementation="git4idea.commit.GitMergeCommitMessageActivity"/>
<vcs.defaultCommitMessagePolicy implementation="git4idea.commit.GitMergeCommitMessagePolicy"/>
<toolbarQuickAction implementationClass="git4idea.ui.toolbar.UpdatePushQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
<toolbarQuickAction implementationClass="git4idea.ui.toolbar.CommitQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
<toolbarQuickAction implementationClass="git4idea.ui.toolbar.HistoryQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
<toolbarQuickAction implementationClass="git4idea.ui.toolbar.RollbackQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
<changesViewContent tabName="Git Conflicts"
className="git4idea.conflicts.GitConflictsToolWindowManager$ContentProvider"
predicateClassName="git4idea.conflicts.GitConflictsToolWindowManager$ContentPredicate"
plugins/git4idea/resources/messages/GitBundle.properties
-5
View File
@@ -1643,11 +1643,6 @@ vcs.log.status.bar.replacing.log.index.data=Replacing Git Log index data\u2026
vcs.log.create.archive.with.log.index.data=Dump Git Log Index Data
vcs.log.archiving.log.index.data=Archiving Git Log index data\u2026
MainToolbarQuickActions.Git.UpdatePush.text=Update Project / Push
MainToolbarQuickActions.Git.Commit.text=Commit\u2026
MainToolbarQuickActions.Git.History.text=Show History\u2026
MainToolbarQuickActions.Git.Rollback.text=Rollback\u2026
open.in.browser.error=Cannot open in browser
open.in.browser.getting.revision=Getting Last File Revision
open.in.browser.getting.revision.error=Cannot retrieve latest revision for file