mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-01-06 03:21:12 +07:00
[git] remove the custom action group for the "Edit Commit Message" dialog toolbar
Use the "Vcs.MessageActionGroup" group in the "Edit Commit Message" dialog and hide unavailable LLM actions based on the context. GitOrigin-RevId: 658acd9e85c98f4c0de91af3a9b9547cf96e3476
This commit is contained in:
committed by
intellij-monorepo-bot
parent
8e35eadea3
commit
3c1bcebc62
@@ -7643,6 +7643,7 @@ c:com.intellij.openapi.vcs.ui.CommitMessage
|
||||
- <init>(com.intellij.openapi.project.Project):V
|
||||
- <init>(com.intellij.openapi.project.Project,Z,Z,Z):V
|
||||
- <init>(com.intellij.openapi.project.Project,Z,Z,Z,java.lang.String):V
|
||||
- createToolbar(Z):javax.swing.JComponent
|
||||
- dispose():V
|
||||
- focus():V
|
||||
- getComment():java.lang.String
|
||||
|
||||
@@ -172,7 +172,7 @@ public class CommitMessage extends JPanel implements Disposable, DataProvider, C
|
||||
}
|
||||
|
||||
@NotNull
|
||||
private JComponent createToolbar(boolean horizontal) {
|
||||
public JComponent createToolbar(boolean horizontal) {
|
||||
ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar("CommitMessage", getToolbarActions(), horizontal);
|
||||
toolbar.setReservePlaceAutoPopupIcon(false);
|
||||
toolbar.getComponent().setBorder(createEmptyBorder());
|
||||
|
||||
@@ -51,9 +51,6 @@
|
||||
<action id="Git.Revert.In.Log" class="git4idea.revert.GitRevertAction"/>
|
||||
<action id="Git.Uncommit" class="git4idea.reset.GitUncommitAction"/>
|
||||
<action id="Git.Reword.Commit" class="git4idea.rebase.GitRewordAction"/>
|
||||
<group id="Git.Reword.ToolbarActions">
|
||||
<reference ref="Vcs.ShowMessageHistory" />
|
||||
</group>
|
||||
<action id="Git.Squash.Commits" class="git4idea.rebase.log.squash.GitSquashLogAction"/>
|
||||
<action id="Git.Drop.Commits" class="git4idea.rebase.log.drop.GitDropLogAction"/>
|
||||
<action id="Git.Rename.Local.Branch" class="git4idea.ui.branch.dashboard.BranchesDashboardActions$RenameLocalBranch"/>
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package git4idea.rebase.log
|
||||
|
||||
import com.intellij.openapi.actionSystem.ActionGroup
|
||||
import com.intellij.openapi.actionSystem.ActionManager
|
||||
import com.intellij.openapi.ui.DialogWrapper
|
||||
import com.intellij.openapi.ui.ValidationInfo
|
||||
import com.intellij.openapi.util.Disposer
|
||||
@@ -10,7 +8,6 @@ import com.intellij.openapi.vcs.VcsConfiguration
|
||||
import com.intellij.openapi.vcs.ui.CommitMessage
|
||||
import com.intellij.ui.dsl.builder.Align
|
||||
import com.intellij.ui.dsl.builder.panel
|
||||
import com.intellij.util.ui.JBDimension
|
||||
import com.intellij.util.ui.JBUI
|
||||
import com.intellij.vcs.log.VcsLogDataKeys
|
||||
import com.intellij.vcs.log.ui.VcsLogInternalDataKeys
|
||||
@@ -18,8 +15,6 @@ import git4idea.findProtectedRemoteBranch
|
||||
import git4idea.i18n.GitBundle
|
||||
import git4idea.rebase.log.GitCommitEditingActionBase.Companion.findContainingBranches
|
||||
import org.jetbrains.annotations.Nls
|
||||
import java.awt.Dimension
|
||||
import javax.swing.BorderFactory
|
||||
import javax.swing.JComponent
|
||||
|
||||
internal class GitNewCommitMessageActionDialog<T : GitCommitEditingActionBase.MultipleCommitEditingData>(
|
||||
@@ -71,7 +66,7 @@ internal class GitNewCommitMessageActionDialog<T : GitCommitEditingActionBase.Mu
|
||||
label(dialogLabel)
|
||||
.resizableColumn()
|
||||
.align(Align.FILL)
|
||||
cell(createToolbar())
|
||||
cell(commitEditor.createToolbar(true))
|
||||
}
|
||||
row {
|
||||
cell(commitEditor)
|
||||
@@ -84,15 +79,6 @@ internal class GitNewCommitMessageActionDialog<T : GitCommitEditingActionBase.Mu
|
||||
}
|
||||
}
|
||||
|
||||
private fun createToolbar(): JComponent {
|
||||
val actionGroup = ActionManager.getInstance().getAction("Git.Reword.ToolbarActions") as ActionGroup
|
||||
val toolbar = ActionManager.getInstance().createActionToolbar("GitNewCommitMessageActionDialog", actionGroup, true)
|
||||
toolbar.setReservePlaceAutoPopupIcon(false)
|
||||
toolbar.getComponent().setBorder(BorderFactory.createEmptyBorder())
|
||||
toolbar.setTargetComponent(commitEditor)
|
||||
return toolbar.getComponent()
|
||||
}
|
||||
|
||||
override fun getPreferredFocusedComponent() = commitEditor.editorField
|
||||
|
||||
override fun getDimensionServiceKey() = "Git.Rebase.Log.Action.NewCommitMessage.Dialog"
|
||||
|
||||
Reference in New Issue
Block a user