From cbb0841bf330e004e35a7347f0f3bc7df6cde38b Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 19 Sep 2024 13:05:28 +0200 Subject: [PATCH] IJPL-62159 vcs: fix mnemonics in commit options popup GitOrigin-RevId: 731318e0b5b625df5831b3b80e2ab6fc6d99ce56 --- .../src/com/intellij/ui/dsl/builder/impl/utils.kt | 4 +++- plugins/git4idea/resources/messages/GitBundle.properties | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/dsl/builder/impl/utils.kt b/platform/platform-impl/src/com/intellij/ui/dsl/builder/impl/utils.kt index ac2fd207596d..e45e5eada23c 100644 --- a/platform/platform-impl/src/com/intellij/ui/dsl/builder/impl/utils.kt +++ b/platform/platform-impl/src/com/intellij/ui/dsl/builder/impl/utils.kt @@ -9,6 +9,7 @@ import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.util.IntellijInternalApi import com.intellij.openapi.util.NlsContexts import com.intellij.openapi.util.text.TextWithMnemonic +import com.intellij.ui.EditorTextField import com.intellij.ui.dsl.UiDslException import com.intellij.ui.dsl.builder.* import com.intellij.ui.dsl.builder.components.DslLabel @@ -74,7 +75,8 @@ private val ALLOWED_LABEL_COMPONENTS = listOf( JTable::class, JTextComponent::class, JTree::class, - SegmentedButtonComponent::class + SegmentedButtonComponent::class, + EditorTextField::class ) /** diff --git a/plugins/git4idea/resources/messages/GitBundle.properties b/plugins/git4idea/resources/messages/GitBundle.properties index 5e4eb2484d58..94c9d84e9499 100644 --- a/plugins/git4idea/resources/messages/GitBundle.properties +++ b/plugins/git4idea/resources/messages/GitBundle.properties @@ -44,7 +44,7 @@ changes.retrieving=Retrieving Changes for Revision {0} commit.action.commit.and.rebase.text=Commit and Rebase\u2026 commit.action.name=Comm&it commit.author.diffs=Author differs from default -commit.author=&Author: +commit.author=A&uthor: common.current.branch.tooltip=The currently checked-out branch. common.current.branch=Current Branch: common.git.root.tooltip=Select Git VCS root