diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/NewCustomFieldAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/NewCustomFieldAction.java index d5728c4de0f8..f06535306752 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/NewCustomFieldAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/NewCustomFieldAction.java @@ -1,40 +1,23 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.debugger.actions; import com.intellij.debugger.ui.tree.render.CustomFieldInplaceEditor; -import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.ui.LayeredIcon; -import com.intellij.util.IconUtil; +import com.intellij.openapi.util.IconLoader; import com.intellij.xdebugger.impl.ui.tree.actions.XDebuggerTreeActionBase; import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl; import org.jetbrains.annotations.NotNull; -import javax.swing.*; +import javax.swing.Icon; /** * @author egor */ public class NewCustomFieldAction extends XDebuggerTreeActionBase { + private static final Icon ClassLevelWatch = IconLoader.getIcon("/debugger/classLevelWatch.svg"); + public NewCustomFieldAction() { - LayeredIcon icon = new LayeredIcon(2); - icon.setIcon(AllIcons.Debugger.Watch, 1); - icon.setIcon(IconUtil.scale(AllIcons.Nodes.Class, 0.7), 0, SwingConstants.NORTH_EAST); - getTemplatePresentation().setIcon(icon); + getTemplatePresentation().setIcon(ClassLevelWatch); } @Override diff --git a/platform/icons/src/actions/copy.svg b/platform/icons/src/actions/copy.svg new file mode 100644 index 000000000000..66910387b373 --- /dev/null +++ b/platform/icons/src/actions/copy.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/platform/icons/src/actions/copy_dark.svg b/platform/icons/src/actions/copy_dark.svg new file mode 100644 index 000000000000..68cc50ee7658 --- /dev/null +++ b/platform/icons/src/actions/copy_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/platform/icons/src/actions/dump.svg b/platform/icons/src/actions/dump.svg new file mode 100644 index 000000000000..831741cc08e0 --- /dev/null +++ b/platform/icons/src/actions/dump.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/actions/dump_dark.svg b/platform/icons/src/actions/dump_dark.svg new file mode 100644 index 000000000000..4bc66df83cb2 --- /dev/null +++ b/platform/icons/src/actions/dump_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/actions/popFrame.svg b/platform/icons/src/actions/popFrame.svg new file mode 100644 index 000000000000..455fe237b652 --- /dev/null +++ b/platform/icons/src/actions/popFrame.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/platform/icons/src/actions/popFrame_dark.svg b/platform/icons/src/actions/popFrame_dark.svg new file mode 100644 index 000000000000..bd37e02166f4 --- /dev/null +++ b/platform/icons/src/actions/popFrame_dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/platform/icons/src/actions/restart.svg b/platform/icons/src/actions/restart.svg new file mode 100644 index 000000000000..1895dd3b1f9e --- /dev/null +++ b/platform/icons/src/actions/restart.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/actions/restart_dark.svg b/platform/icons/src/actions/restart_dark.svg new file mode 100644 index 000000000000..69d27acc41e0 --- /dev/null +++ b/platform/icons/src/actions/restart_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/actions/resume.svg b/platform/icons/src/actions/resume.svg new file mode 100644 index 000000000000..adeaa7e35e77 --- /dev/null +++ b/platform/icons/src/actions/resume.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/actions/resume_dark.svg b/platform/icons/src/actions/resume_dark.svg new file mode 100644 index 000000000000..5f1097cdd42c --- /dev/null +++ b/platform/icons/src/actions/resume_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/actions/runToCursor.svg b/platform/icons/src/actions/runToCursor.svg new file mode 100644 index 000000000000..d3ac9e24bd75 --- /dev/null +++ b/platform/icons/src/actions/runToCursor.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/platform/icons/src/actions/runToCursor_dark.svg b/platform/icons/src/actions/runToCursor_dark.svg new file mode 100644 index 000000000000..51e2037075b4 --- /dev/null +++ b/platform/icons/src/actions/runToCursor_dark.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/platform/icons/src/actions/stepOut.svg b/platform/icons/src/actions/stepOut.svg new file mode 100644 index 000000000000..f82082ef2bb2 --- /dev/null +++ b/platform/icons/src/actions/stepOut.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/actions/stepOut_dark.svg b/platform/icons/src/actions/stepOut_dark.svg new file mode 100644 index 000000000000..55e6c09d7b61 --- /dev/null +++ b/platform/icons/src/actions/stepOut_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/actions/traceInto.svg b/platform/icons/src/actions/traceInto.svg new file mode 100644 index 000000000000..1e85eb1a4b1d --- /dev/null +++ b/platform/icons/src/actions/traceInto.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/actions/traceInto_dark.svg b/platform/icons/src/actions/traceInto_dark.svg new file mode 100644 index 000000000000..79924ebdd59b --- /dev/null +++ b/platform/icons/src/actions/traceInto_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/actions/traceOver.svg b/platform/icons/src/actions/traceOver.svg new file mode 100644 index 000000000000..1eebbe9376ef --- /dev/null +++ b/platform/icons/src/actions/traceOver.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/actions/traceOver_dark.svg b/platform/icons/src/actions/traceOver_dark.svg new file mode 100644 index 000000000000..463e5cb6cd94 --- /dev/null +++ b/platform/icons/src/actions/traceOver_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/debugger/actions/force_run_to_cursor.svg b/platform/icons/src/debugger/actions/force_run_to_cursor.svg new file mode 100644 index 000000000000..71910786c5cb --- /dev/null +++ b/platform/icons/src/debugger/actions/force_run_to_cursor.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/platform/icons/src/debugger/actions/force_run_to_cursor_dark.svg b/platform/icons/src/debugger/actions/force_run_to_cursor_dark.svg new file mode 100644 index 000000000000..4faa1ec6431b --- /dev/null +++ b/platform/icons/src/debugger/actions/force_run_to_cursor_dark.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/platform/icons/src/debugger/actions/force_step_into.svg b/platform/icons/src/debugger/actions/force_step_into.svg new file mode 100644 index 000000000000..7ee449693887 --- /dev/null +++ b/platform/icons/src/debugger/actions/force_step_into.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/debugger/actions/force_step_into_dark.svg b/platform/icons/src/debugger/actions/force_step_into_dark.svg new file mode 100644 index 000000000000..43dc190223ec --- /dev/null +++ b/platform/icons/src/debugger/actions/force_step_into_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/debugger/actions/force_step_over.svg b/platform/icons/src/debugger/actions/force_step_over.svg new file mode 100644 index 000000000000..a117a085acaf --- /dev/null +++ b/platform/icons/src/debugger/actions/force_step_over.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/debugger/actions/force_step_over_dark.svg b/platform/icons/src/debugger/actions/force_step_over_dark.svg new file mode 100644 index 000000000000..c57998f3ea35 --- /dev/null +++ b/platform/icons/src/debugger/actions/force_step_over_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/debugger/addToWatch.svg b/platform/icons/src/debugger/addToWatch.svg new file mode 100644 index 000000000000..2dd7118b54a3 --- /dev/null +++ b/platform/icons/src/debugger/addToWatch.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/platform/icons/src/debugger/addToWatch_dark.svg b/platform/icons/src/debugger/addToWatch_dark.svg new file mode 100644 index 000000000000..ef85fe3e6f73 --- /dev/null +++ b/platform/icons/src/debugger/addToWatch_dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/platform/icons/src/debugger/classLevelWatch.svg b/platform/icons/src/debugger/classLevelWatch.svg new file mode 100644 index 000000000000..f7f535bd68ed --- /dev/null +++ b/platform/icons/src/debugger/classLevelWatch.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/platform/icons/src/debugger/classLevelWatch_dark.svg b/platform/icons/src/debugger/classLevelWatch_dark.svg new file mode 100644 index 000000000000..514779135bef --- /dev/null +++ b/platform/icons/src/debugger/classLevelWatch_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/platform/icons/src/debugger/evaluateExpression.svg b/platform/icons/src/debugger/evaluateExpression.svg new file mode 100644 index 000000000000..c52fa19751c7 --- /dev/null +++ b/platform/icons/src/debugger/evaluateExpression.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/debugger/evaluateExpression_dark.svg b/platform/icons/src/debugger/evaluateExpression_dark.svg new file mode 100644 index 000000000000..4f930be943e0 --- /dev/null +++ b/platform/icons/src/debugger/evaluateExpression_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/debugger/icon-robots.txt b/platform/icons/src/debugger/icon-robots.txt new file mode 100644 index 000000000000..97a31cc6acb5 --- /dev/null +++ b/platform/icons/src/debugger/icon-robots.txt @@ -0,0 +1,3 @@ +deprecated: class_filter.png +deprecated: newWatch.png +deprecated: watches.png diff --git a/platform/icons/src/debugger/killProcess.svg b/platform/icons/src/debugger/killProcess.svg new file mode 100644 index 000000000000..86725aa6f268 --- /dev/null +++ b/platform/icons/src/debugger/killProcess.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/debugger/killProcess_dark.svg b/platform/icons/src/debugger/killProcess_dark.svg new file mode 100644 index 000000000000..01e4d3d4baed --- /dev/null +++ b/platform/icons/src/debugger/killProcess_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/debugger/muteBreakpoints.svg b/platform/icons/src/debugger/muteBreakpoints.svg new file mode 100644 index 000000000000..02771664843f --- /dev/null +++ b/platform/icons/src/debugger/muteBreakpoints.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/debugger/muteBreakpoints_dark.svg b/platform/icons/src/debugger/muteBreakpoints_dark.svg new file mode 100644 index 000000000000..b8d7affbcc96 --- /dev/null +++ b/platform/icons/src/debugger/muteBreakpoints_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/debugger/restoreLayout.svg b/platform/icons/src/debugger/restoreLayout.svg new file mode 100644 index 000000000000..c4956c3af674 --- /dev/null +++ b/platform/icons/src/debugger/restoreLayout.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/debugger/restoreLayout_dark.svg b/platform/icons/src/debugger/restoreLayout_dark.svg new file mode 100644 index 000000000000..a5994a05a56d --- /dev/null +++ b/platform/icons/src/debugger/restoreLayout_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/debugger/showCurrentFrame.svg b/platform/icons/src/debugger/showCurrentFrame.svg new file mode 100644 index 000000000000..e3983bc42a73 --- /dev/null +++ b/platform/icons/src/debugger/showCurrentFrame.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/debugger/showCurrentFrame_dark.svg b/platform/icons/src/debugger/showCurrentFrame_dark.svg new file mode 100644 index 000000000000..49be8fbea883 --- /dev/null +++ b/platform/icons/src/debugger/showCurrentFrame_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/debugger/smartStepInto.svg b/platform/icons/src/debugger/smartStepInto.svg new file mode 100644 index 000000000000..e34f3611f8f8 --- /dev/null +++ b/platform/icons/src/debugger/smartStepInto.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/debugger/smartStepInto_dark.svg b/platform/icons/src/debugger/smartStepInto_dark.svg new file mode 100644 index 000000000000..b2577fda856e --- /dev/null +++ b/platform/icons/src/debugger/smartStepInto_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/debugger/viewBreakpoints.svg b/platform/icons/src/debugger/viewBreakpoints.svg new file mode 100644 index 000000000000..89537f686536 --- /dev/null +++ b/platform/icons/src/debugger/viewBreakpoints.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/debugger/viewBreakpoints_dark.svg b/platform/icons/src/debugger/viewBreakpoints_dark.svg new file mode 100644 index 000000000000..e16e63ad02d8 --- /dev/null +++ b/platform/icons/src/debugger/viewBreakpoints_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/debugger/watch.svg b/platform/icons/src/debugger/watch.svg new file mode 100644 index 000000000000..1ccf4c63336c --- /dev/null +++ b/platform/icons/src/debugger/watch.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/debugger/watchLastReturnValue.svg b/platform/icons/src/debugger/watchLastReturnValue.svg new file mode 100644 index 000000000000..462b35f8110a --- /dev/null +++ b/platform/icons/src/debugger/watchLastReturnValue.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/platform/icons/src/debugger/watchLastReturnValue_dark.svg b/platform/icons/src/debugger/watchLastReturnValue_dark.svg new file mode 100644 index 000000000000..52615f447b1a --- /dev/null +++ b/platform/icons/src/debugger/watchLastReturnValue_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/platform/icons/src/debugger/watch_dark.svg b/platform/icons/src/debugger/watch_dark.svg new file mode 100644 index 000000000000..efd7d9c43889 --- /dev/null +++ b/platform/icons/src/debugger/watch_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/general/add.svg b/platform/icons/src/general/add.svg new file mode 100644 index 000000000000..40b88f31e844 --- /dev/null +++ b/platform/icons/src/general/add.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/general/add_dark.svg b/platform/icons/src/general/add_dark.svg new file mode 100644 index 000000000000..6de6e558e01d --- /dev/null +++ b/platform/icons/src/general/add_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/general/filter.svg b/platform/icons/src/general/filter.svg new file mode 100644 index 000000000000..e613efcc20d6 --- /dev/null +++ b/platform/icons/src/general/filter.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/general/filter_dark.svg b/platform/icons/src/general/filter_dark.svg new file mode 100644 index 000000000000..588260798688 --- /dev/null +++ b/platform/icons/src/general/filter_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/general/pin_tab.svg b/platform/icons/src/general/pin_tab.svg new file mode 100644 index 000000000000..7150a3f1b024 --- /dev/null +++ b/platform/icons/src/general/pin_tab.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/pin_tab_dark.svg b/platform/icons/src/general/pin_tab_dark.svg new file mode 100644 index 000000000000..2f91dd8aea4c --- /dev/null +++ b/platform/icons/src/general/pin_tab_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/remove.svg b/platform/icons/src/general/remove.svg new file mode 100644 index 000000000000..6c93d641800a --- /dev/null +++ b/platform/icons/src/general/remove.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/general/remove_dark.svg b/platform/icons/src/general/remove_dark.svg new file mode 100644 index 000000000000..554482770542 --- /dev/null +++ b/platform/icons/src/general/remove_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml index 089c670aebf9..d3b9cf24d182 100644 --- a/platform/platform-resources/src/idea/LangActions.xml +++ b/platform/platform-resources/src/idea/LangActions.xml @@ -734,7 +734,7 @@ - + @@ -743,7 +743,7 @@ + icon="AllIcons.Debugger.Watch"/> diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 7f1f002d6f30..5b95b995f9dd 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -239,6 +239,9 @@ public class AllIcons { public static final Icon AttachToProcess = IconLoader.getIcon("/debugger/attachToProcess.png"); // 16x16 public static final Icon AutoVariablesMode = IconLoader.getIcon("/debugger/autoVariablesMode.png"); // 16x16 public static final Icon BreakpointAlert = IconLoader.getIcon("/debugger/breakpointAlert.png"); // 16x16 + + @SuppressWarnings("unused") + @Deprecated public static final Icon Class_filter = IconLoader.getIcon("/debugger/class_filter.png"); // 16x16 public static final Icon CommandLine = IconLoader.getIcon("/debugger/commandLine.png"); // 16x16 public static final Icon Console = IconLoader.getIcon("/debugger/console.png"); // 16x16 @@ -309,6 +312,9 @@ public class AllIcons { } public static final Icon MultipleBreakpoints = IconLoader.getIcon("/debugger/MultipleBreakpoints.png"); // 12x12 public static final Icon MuteBreakpoints = IconLoader.getIcon("/debugger/muteBreakpoints.png"); // 16x16 + + @SuppressWarnings("unused") + @Deprecated public static final Icon NewWatch = IconLoader.getIcon("/debugger/newWatch.png"); // 16x16 public static final Icon Overhead = IconLoader.getIcon("/debugger/overhead.png"); // 16x16 public static final Icon Question_badge = IconLoader.getIcon("/debugger/question_badge.png"); // 6x9 @@ -346,6 +352,9 @@ public class AllIcons { public static final Icon Value = IconLoader.getIcon("/debugger/value.png"); // 16x16 public static final Icon ViewBreakpoints = IconLoader.getIcon("/debugger/viewBreakpoints.png"); // 16x16 public static final Icon Watch = IconLoader.getIcon("/debugger/watch.png"); // 16x16 + + @SuppressWarnings("unused") + @Deprecated public static final Icon Watches = IconLoader.getIcon("/debugger/watches.png"); // 16x16 public static final Icon WatchLastReturnValue = IconLoader.getIcon("/debugger/watchLastReturnValue.png"); // 16x16 diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ShowLibraryFramesAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ShowLibraryFramesAction.java index cc4b0b06d0bc..db03757daf0c 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ShowLibraryFramesAction.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/ShowLibraryFramesAction.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.xdebugger.impl.actions; import com.intellij.icons.AllIcons; @@ -37,7 +23,7 @@ final class ShowLibraryFramesAction extends ToggleAction { private static final String ourTextWhenShowIsOff = "Show All Frames"; public ShowLibraryFramesAction() { - super("", "", AllIcons.Debugger.Class_filter); + super("", "", AllIcons.General.Filter); myShouldShow = XDebuggerSettingManagerImpl.getInstanceImpl().getDataViewSettings().isShowLibraryStackFrames(); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XFramesView.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XFramesView.java index 7c59e732175a..645af2c7f151 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XFramesView.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XFramesView.java @@ -1,6 +1,4 @@ -/* - * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.xdebugger.impl.frame; import com.intellij.ide.CommonActionsManager; @@ -225,7 +223,6 @@ public class XFramesView extends XDebugView { final ActionToolbarImpl toolbar = (ActionToolbarImpl)ActionManager.getInstance().createActionToolbar(ActionPlaces.DEBUGGER_TOOLBAR, framesGroup, true); toolbar.setReservePlaceAutoPopupIcon(false); - toolbar.setAddSeparatorFirst(true); return toolbar; } @@ -293,7 +290,6 @@ public class XFramesView extends XDebugView { if (!invisible) { myThreadsPanel.add(myThreadComboBox, BorderLayout.CENTER); } - myToolbar.setAddSeparatorFirst(!invisible); updateFrames(activeExecutionStack, session, event == SessionEvent.FRAME_CHANGED ? currentStackFrame : null); }); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java index 9701169d7648..494b30304df6 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java @@ -203,7 +203,7 @@ public class XDebugSessionTab extends DebuggerSessionTabBase { myWatchesView = new XWatchesViewImpl(session, myWatchesInVariables); registerView(DebuggerContentInfo.WATCHES_CONTENT, myWatchesView); Content watchesContent = myUi.createContent(DebuggerContentInfo.WATCHES_CONTENT, myWatchesView.getPanel(), - XDebuggerBundle.message("debugger.session.tab.watches.title"), AllIcons.Debugger.Watches, null); + XDebuggerBundle.message("debugger.session.tab.watches.title"), AllIcons.Debugger.Watch, null); watchesContent.setCloseable(false); return watchesContent; } diff --git a/plugins/hg4idea/src/META-INF/plugin.xml b/plugins/hg4idea/src/META-INF/plugin.xml index aa8ed6c6fe5b..bcae228e004e 100644 --- a/plugins/hg4idea/src/META-INF/plugin.xml +++ b/plugins/hg4idea/src/META-INF/plugin.xml @@ -88,7 +88,7 @@ + text="Show Mq Unapplied Patches..." icon="AllIcons.Debugger.Watch"/> diff --git a/plugins/stream-debugger/resources/icons/stream_debugger.svg b/plugins/stream-debugger/resources/icons/stream_debugger.svg new file mode 100644 index 000000000000..3a0899583de5 --- /dev/null +++ b/plugins/stream-debugger/resources/icons/stream_debugger.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/plugins/stream-debugger/resources/icons/stream_debugger_dark.svg b/plugins/stream-debugger/resources/icons/stream_debugger_dark.svg new file mode 100644 index 000000000000..256d0211dc72 --- /dev/null +++ b/plugins/stream-debugger/resources/icons/stream_debugger_dark.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/python/resources/icons/com/jetbrains/python/debug/StepIntoMyCode.svg b/python/resources/icons/com/jetbrains/python/debug/StepIntoMyCode.svg new file mode 100644 index 000000000000..adea9970dab0 --- /dev/null +++ b/python/resources/icons/com/jetbrains/python/debug/StepIntoMyCode.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/python/resources/icons/com/jetbrains/python/debug/StepIntoMyCode_dark.svg b/python/resources/icons/com/jetbrains/python/debug/StepIntoMyCode_dark.svg new file mode 100644 index 000000000000..e68aea19f4f6 --- /dev/null +++ b/python/resources/icons/com/jetbrains/python/debug/StepIntoMyCode_dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/python/src/com/jetbrains/python/console/actions/ShowVarsAction.kt b/python/src/com/jetbrains/python/console/actions/ShowVarsAction.kt index a1bdc155040c..050334720159 100644 --- a/python/src/com/jetbrains/python/console/actions/ShowVarsAction.kt +++ b/python/src/com/jetbrains/python/console/actions/ShowVarsAction.kt @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.jetbrains.python.console.actions import com.intellij.icons.AllIcons @@ -25,7 +11,7 @@ import com.jetbrains.python.console.PythonConsoleView /** * Created by Yuli Fiterman on 9/18/2016. */ -class ShowVarsAction(private val consoleView: PythonConsoleView, private val consoleComm: PydevConsoleCommunication) : ToggleAction("Show Variables", "Shows active console variables", AllIcons.Debugger.Watches), DumbAware { +class ShowVarsAction(private val consoleView: PythonConsoleView, private val consoleComm: PydevConsoleCommunication) : ToggleAction("Show Variables", "Shows active console variables", AllIcons.Debugger.Watch), DumbAware { override fun isSelected(e: AnActionEvent): Boolean { return consoleView.isShowVars