From c5de06f60f71e2291046d058ea3422b95bcb5fb0 Mon Sep 17 00:00:00 2001 From: Kirill Kalishev Date: Fri, 18 Mar 2011 20:24:47 +0300 Subject: [PATCH] toolbuttons switch icon fix --- platform/icons/src/general/slideIn.png | Bin 3390 -> 0 bytes platform/icons/src/general/slideIn2.png | Bin 3370 -> 0 bytes platform/icons/src/general/slideOut.png | Bin 3399 -> 0 bytes platform/icons/src/general/slideOut2.png | Bin 3369 -> 0 bytes platform/icons/src/general/tbHidden.png | Bin 0 -> 186 bytes platform/icons/src/general/tbShown.png | Bin 0 -> 252 bytes .../wm/impl/ToolWindowManagerImpl.java | 34 ++++++++++-------- .../wm/impl/status/IdeStatusBarImpl.java | 25 ++++++++++--- .../src/misc/registry.properties | 1 + 9 files changed, 41 insertions(+), 19 deletions(-) delete mode 100644 platform/icons/src/general/slideIn.png delete mode 100644 platform/icons/src/general/slideIn2.png delete mode 100644 platform/icons/src/general/slideOut.png delete mode 100644 platform/icons/src/general/slideOut2.png create mode 100644 platform/icons/src/general/tbHidden.png create mode 100644 platform/icons/src/general/tbShown.png diff --git a/platform/icons/src/general/slideIn.png b/platform/icons/src/general/slideIn.png deleted file mode 100644 index 1b9c76fd25827a26b34782fd44143fa8a870820b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3390 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 UHr(j{MF0Q*07*qoM6N<$g5)r3DF6Tf diff --git a/platform/icons/src/general/slideIn2.png b/platform/icons/src/general/slideIn2.png deleted file mode 100644 index d9d8a1a0c71fab3937c389dc9684b3c48def2cac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3370 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 diff --git a/platform/icons/src/general/slideOut.png b/platform/icons/src/general/slideOut.png deleted file mode 100644 index 9e1cfbe5688d96a799986924465340338f192cca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3399 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 diff --git a/platform/icons/src/general/slideOut2.png b/platform/icons/src/general/slideOut2.png deleted file mode 100644 index b69cc9d82fd318eb192d733381d17c0bfc51a490..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3369 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 diff --git a/platform/icons/src/general/tbHidden.png b/platform/icons/src/general/tbHidden.png new file mode 100644 index 0000000000000000000000000000000000000000..779318afa10a02d6cb5665a93a8d69344f4925df GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XVmw_OLn>}1{rUgjo>{el)kP%SY(lD6el@c)chBVclXv!r zoE2W~)8Dk4fu+GNan8ny!$m@87^DvzaZr>nO^A?S@b{R!%&(s%XyOy810E~6Pn@09 h(=#P4y@7$5q3n%V<2>a{SAg~~c)I$ztaD0e0surmK9B$a literal 0 HcmV?d00001 diff --git a/platform/icons/src/general/tbShown.png b/platform/icons/src/general/tbShown.png new file mode 100644 index 0000000000000000000000000000000000000000..0334ba0b5e3ab4f87048338223ec239af447995f GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X=6Sj}hE&{2`t$$4J+o>9tBXjuS%a^js9;*f-)FjUyeG1% zZc9rYr<6{Mb<^~8`%_A%eo{QB(QBzXxGu0={L*DR_H|Uk@-^u yH!>JE2)YQIV!v_a0FQ#Xw~ 0) { - break; - } - } - } + Set vks = getActivateToolWindowVKs(); - if (baseModifiers == 0) { + if (vks.size() == 0) { resetHoldState(); return false; } - Set vks = QuickAccessSettings.getModifiersVKs(baseModifiers); if (vks.contains(e.getKeyCode())) { boolean pressed = e.getID() == KeyEvent.KEY_PRESSED; int modifiers = e.getModifiers(); @@ -297,6 +285,24 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements return false; } + public static Set getActivateToolWindowVKs() { + if (ApplicationManager.getApplication() == null) return new HashSet(); + + Keymap keymap = KeymapManager.getInstance().getActiveKeymap(); + Shortcut[] baseShortcut = keymap.getShortcuts("ActivateProjectToolWindow"); + int baseModifiers = 0; + for (Shortcut each : baseShortcut) { + if (each instanceof KeyboardShortcut) { + KeyStroke keyStroke = ((KeyboardShortcut)each).getFirstKeyStroke(); + baseModifiers = keyStroke.getModifiers(); + if (baseModifiers > 0) { + break; + } + } + } + return QuickAccessSettings.getModifiersVKs(baseModifiers); + } + private void resetHoldState() { myCurrentState = KeyState.waiting; processHoldState(); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java index 1f93e6317652..344a8d1b9fc4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java @@ -18,6 +18,7 @@ package com.intellij.openapi.wm.impl.status; import com.intellij.ide.ui.UISettings; import com.intellij.ide.ui.UISettingsListener; import com.intellij.openapi.Disposable; +import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.progress.TaskInfo; import com.intellij.openapi.ui.MessageType; import com.intellij.openapi.ui.popup.BalloonHandler; @@ -26,6 +27,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.SystemInfo; +import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.CustomStatusBarWidget; import com.intellij.openapi.wm.IdeFrame; @@ -33,6 +35,7 @@ import com.intellij.openapi.wm.StatusBar; import com.intellij.openapi.wm.StatusBarWidget; import com.intellij.openapi.wm.ex.ProgressIndicatorEx; import com.intellij.openapi.wm.ex.StatusBarEx; +import com.intellij.openapi.wm.impl.ToolWindowManagerImpl; import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.popup.NotificationPopup; import com.intellij.util.ArrayUtil; @@ -762,8 +765,8 @@ public class IdeStatusBarImpl extends JComponent implements StatusBarEx { private static class ToolWindowsWidget extends JLabel implements CustomStatusBarWidget, StatusBarWidget.Multiframe, Disposable, UISettingsListener, PropertyChangeListener { - private static final Icon OUT = IconLoader.getIcon("/general/slideOut2.png"); - private static final Icon IN = IconLoader.getIcon("/general/slideIn2.png"); + private static final Icon HIDDEN = IconLoader.getIcon("/general/tbShown.png"); + private static final Icon SHOWN = IconLoader.getIcon("/general/tbHidden.png"); private StatusBar myStatusBar; private ToolWindowsWidget() { @@ -776,7 +779,6 @@ public class IdeStatusBarImpl extends JComponent implements StatusBarEx { UISettings.getInstance().addUISettingsListener(this, this); KeyboardFocusManager.getCurrentKeyboardFocusManager().addPropertyChangeListener("focusOwner", this); - setToolTipText("Click to show/hide tool windows side bars"); } @@ -806,12 +808,24 @@ public class IdeStatusBarImpl extends JComponent implements StatusBarEx { changes = true; } - Icon icon = UISettings.getInstance().HIDE_TOOL_STRIPES ? OUT : IN; + Icon icon = UISettings.getInstance().HIDE_TOOL_STRIPES ? HIDDEN : SHOWN; if (icon != getIcon()) { setIcon(icon); changes = true; } + Set vks = ToolWindowManagerImpl.getActivateToolWindowVKs(); + String text = "Click to show/hide tool windows side bars"; + if (vks.size() == 1) { + Integer stroke = vks.iterator().next(); + String keystrokeText = KeymapUtil.getKeystrokeText(KeyStroke.getKeyStroke(stroke.intValue(), 0)); + text += "\nUse double click of " + keystrokeText + " to popup them when hidden"; + } + if (!text.equals(getToolTipText())) { + setToolTipText(text); + changes = true; + } + if (changes) { revalidate(); repaint(); @@ -819,11 +833,12 @@ public class IdeStatusBarImpl extends JComponent implements StatusBarEx { } else { setVisible(false); + setToolTipText(null); } } private boolean isActive() { - return myStatusBar != null && myStatusBar.getFrame() != null && myStatusBar.getFrame().getProject() != null; + return myStatusBar != null && myStatusBar.getFrame() != null && myStatusBar.getFrame().getProject() != null && Registry.is("ide.windowSystem.showTooWindowButtonsSwitcher"); } @Override diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties index d5bdd55266cc..474e36f5ba89 100644 --- a/platform/platform-resources-en/src/misc/registry.properties +++ b/platform/platform-resources-en/src/misc/registry.properties @@ -49,6 +49,7 @@ ide.windowSystem.focusAppOnStartup=true ide.windowSystem.autoShowProcessPopup=false ide.windowSystem.showListItemsPopup=true ide.windowSystem.asyncSplitters=true +ide.windowSystem.showTooWindowButtonsSwitcher=true ide.tree.yeildingUiUpdate=true ide.tree.showBusyIndicator=true