From d7dcfca5cf793307b0d4779135e00715a35ba56f Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 14 Feb 2012 17:38:22 +0100 Subject: [PATCH] cosmetic --- .../intellij/ide/util/gotoByName/ChooseByNameBase.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java index d385bd463a0f..11134129eb64 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java @@ -33,6 +33,7 @@ import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.keymap.Keymap; import com.intellij.openapi.keymap.KeymapManager; +import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; @@ -66,6 +67,7 @@ import com.intellij.util.diff.FilesTooBigForDiffException; import com.intellij.util.text.Matcher; import com.intellij.util.text.MatcherHolder; import com.intellij.util.ui.AsyncProcessIcon; +import com.intellij.util.ui.EmptyIcon; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -355,7 +357,7 @@ public abstract class ChooseByNameBase { myCardContainer.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 4)); // space between checkbox and filter/show all in view buttons final String checkBoxName = myModel.getCheckBoxName(); - myCheckBox = new JCheckBox(checkBoxName != null ? checkBoxName : ""); + myCheckBox = new JCheckBox(checkBoxName != null ? checkBoxName + " (" + KeymapUtil.getShortcutsText(myCheckBoxShortcut.getShortcuts()) + ")" : ""); myCheckBox.setAlignmentX(SwingConstants.RIGHT); if (!SystemInfo.isMac) { @@ -412,9 +414,10 @@ public abstract class ChooseByNameBase { hBox.add(toolbarComponent); - if (myToolArea != null) { - hBox.add(myToolArea); + if (myToolArea == null) { + myToolArea = new JLabel(EmptyIcon.create(1, 24)); } + hBox.add(myToolArea); myTextFieldPanel.add(caption2Tools); myHistory = new ArrayList>();