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

Add help button to new git merge and pull dialogs IDEA-242889

Browse Source 
GitOrigin-RevId: eefaef9625a67259542204c7228b593f64be1f21
This commit is contained in:
Daniil Tsaryov
2020-06-08 21:20:20 +03:00
committed by intellij-monorepo-bot
parent 3e24a07e2a
commit 053647bb22
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
+8 -1
View File
@@ -92,10 +92,17 @@ class GitMergeDialog(private val project: Project,
override fun createSouthPanel(): JComponent {
val southPanel = super.createSouthPanel()
southPanel.add(createOptionsDropDown(), BorderLayout.WEST)
(southPanel.components[0] as JPanel).apply {
(layout as BorderLayout).hgap = JBUI.scale(5)
add(createOptionsDropDown(), BorderLayout.EAST)
}
return southPanel
}
override fun getHelpId() = "reference.VersionControl.Git.MergeBranches"
override fun getDimensionServiceKey(): String = GitMergeDialog::class.java.name
override fun doOKAction() {
try {
saveSettings()
plugins/git4idea/src/git4idea/pull/GitPullDialog.kt
+8 -1
View File
@@ -75,10 +75,17 @@ class GitPullDialog(private val project: Project,
override fun createSouthPanel(): JComponent {
val southPanel = super.createSouthPanel()
southPanel.add(createOptionsDropDown(), BorderLayout.WEST)
(southPanel.components[0] as JPanel).apply {
(layout as BorderLayout).hgap = JBUI.scale(5)
add(createOptionsDropDown(), BorderLayout.EAST)
}
return southPanel
}
override fun getHelpId() = "reference.VersionControl.Git.Pull"
override fun getDimensionServiceKey(): String = GitPullDialog::class.java.name
override fun doValidateAll(): MutableList<ValidationInfo> {
val branchFieldValidation = validateBranchField()
if (branchFieldValidation != null) {