Skip to content

Commit a25dd48

Browse files
VISTALLVISTALL
committed
update icons to last ui (from idea)
1 parent 0193990 commit a25dd48

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+206
-70
lines changed

‎python-impl/src/main/java/com/jetbrains/python/impl/PythonIcons.java‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,46 +18,44 @@
1818

1919
import consulo.annotation.DeprecationInfo;
2020
import consulo.python.impl.icon.PythonImplIconGroup;
21+
import consulo.python.psi.icon.PythonPsiIconGroup;
2122
import consulo.ui.image.Image;
2223

2324
@Deprecated
2425
@DeprecationInfo("Use PythonIcons")
2526
public class PythonIcons {
26-
public static class Pyqt {
27-
public static final Image UiForm = PythonImplIconGroup.pyqtUiform();
28-
}
27+
public static class Pyqt {
28+
public static final Image UiForm = PythonImplIconGroup.pyqtUiform();
29+
}
2930

30-
public static class Python {
31+
public static class Python {
3132

32-
public static class Buildout {
33-
public static final Image Buildout = PythonImplIconGroup.pythonBuildoutBuildout();
34-
}
33+
public static class Buildout {
34+
public static final Image Buildout = PythonImplIconGroup.pythonBuildoutBuildout();
35+
}
3536

36-
public static class Debug {
37-
public static final Image CommandLine = PythonImplIconGroup.pythonDebugCommandline();
38-
public static final Image SpecialVar = PythonImplIconGroup.pythonDebugSpecialvar();
39-
public static final Image StepIntoMyCode = PythonImplIconGroup.pythonDebugStepintomycode();
40-
}
37+
public static class Debug {
38+
public static final Image SpecialVar = PythonImplIconGroup.pythonDebugSpecialvar();
39+
public static final Image StepIntoMyCode = PythonImplIconGroup.pythonDebugStepintomycode();
40+
}
4141

42-
public static final Image Dotnet = PythonImplIconGroup.pythonDotnet();
42+
public static final Image Dotnet = PythonImplIconGroup.pythonDotnet();
4343

44-
public static class Nodes {
45-
public static final Image Cyan_dot = PythonImplIconGroup.pythonNodesCyan_dot();
46-
public static final Image Lock = PythonImplIconGroup.pythonNodesLock();
47-
public static final Image Red_inv_triangle = PythonImplIconGroup.pythonNodesRed_inv_triangle();
44+
public static class Nodes {
45+
public static final Image Cyan_dot = PythonImplIconGroup.pythonNodesCyan_dot();
46+
public static final Image Lock = PythonImplIconGroup.pythonNodesLock();
47+
public static final Image Red_inv_triangle = PythonImplIconGroup.pythonNodesRed_inv_triangle();
4848

49-
}
49+
}
5050

51-
public static final Image PropertyDeleter = PythonImplIconGroup.pythonPropertydeleter();
52-
public static final Image PropertyGetter = PythonImplIconGroup.pythonPropertygetter();
53-
public static final Image PropertySetter = PythonImplIconGroup.pythonPropertysetter();
54-
public static final Image Pypy = PythonImplIconGroup.pythonPypy();
55-
public static final Image Python = PythonImplIconGroup.pythonPython();
56-
public static final Image Python_24 = PythonImplIconGroup.pythonPython_24();
57-
public static final Image PythonConsole = PythonImplIconGroup.pythonPythonconsole();
58-
public static final Image PythonClosed = PythonImplIconGroup.pythonPythonclosed();
59-
public static final Image PythonTests = PythonImplIconGroup.pythonPythontests();
60-
public static final Image RemoteInterpreter = PythonImplIconGroup.pythonRemoteinterpreter();
61-
public static final Image Virtualenv = PythonImplIconGroup.pythonVirtualenv();
62-
}
51+
public static final Image PropertyDeleter = PythonImplIconGroup.pythonPropertydeleter();
52+
public static final Image PropertyGetter = PythonImplIconGroup.pythonPropertygetter();
53+
public static final Image PropertySetter = PythonImplIconGroup.pythonPropertysetter();
54+
@Deprecated
55+
public static final Image Python = PythonPsiIconGroup.python();
56+
public static final Image PythonConsole = PythonImplIconGroup.pythonPythonconsole();
57+
public static final Image PythonTests = PythonImplIconGroup.pythonPythontests();
58+
public static final Image RemoteInterpreter = PythonImplIconGroup.pythonRemoteinterpreter();
59+
public static final Image Virtualenv = PythonImplIconGroup.pythonVirtualenv();
60+
}
6361
}

‎python-impl/src/main/java/com/jetbrains/python/impl/actions/CreatePythonFileAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535
public class CreatePythonFileAction extends CreateFileFromTemplateAction implements DumbAware {
3636
public CreatePythonFileAction() {
37-
super(LocalizeValue.localizeTODO("Python File"), LocalizeValue.localizeTODO("Creates a Python file from the specified template"), PythonPsiIconGroup.pythonfile());
37+
super(LocalizeValue.localizeTODO("Python File"), LocalizeValue.localizeTODO("Creates a Python file from the specified template"), PythonPsiIconGroup.python());
3838
}
3939

4040
@Override

‎python-impl/src/main/java/com/jetbrains/python/impl/console/PyOpenDebugConsoleAction.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
*/
1616
package com.jetbrains.python.impl.console;
1717

18-
import com.jetbrains.python.impl.PythonIcons;
1918
import consulo.application.dumb.DumbAware;
2019
import consulo.application.ui.wm.ApplicationIdeFocusManager;
2120
import consulo.dataContext.DataContext;
2221
import consulo.execution.ExecutionHelper;
22+
import consulo.execution.icon.ExecutionIconGroup;
2323
import consulo.execution.ui.RunContentDescriptor;
2424
import consulo.language.editor.CommonDataKeys;
2525
import consulo.process.ProcessHandler;
2626
import consulo.project.Project;
2727
import consulo.ui.ex.action.AnAction;
2828
import consulo.ui.ex.action.AnActionEvent;
29-
3029
import jakarta.annotation.Nonnull;
30+
3131
import java.util.Collection;
3232
import java.util.function.Consumer;
3333

@@ -38,7 +38,7 @@ public class PyOpenDebugConsoleAction extends AnAction implements DumbAware {
3838

3939
public PyOpenDebugConsoleAction() {
4040
super();
41-
getTemplatePresentation().setIcon(PythonIcons.Python.Debug.CommandLine);
41+
getTemplatePresentation().setIcon(ExecutionIconGroup.console());
4242
}
4343

4444
@Override

‎python-impl/src/main/java/com/jetbrains/python/impl/console/PythonDebugLanguageConsoleView.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@
1515
*/
1616
package com.jetbrains.python.impl.console;
1717

18-
import com.jetbrains.python.impl.PyBundle;
19-
import com.jetbrains.python.impl.PythonIcons;
2018
import consulo.application.ui.wm.IdeFocusManager;
2119
import consulo.codeEditor.Editor;
2220
import consulo.content.bundle.Sdk;
21+
import consulo.execution.icon.ExecutionIconGroup;
2322
import consulo.execution.ui.console.ConsoleView;
2423
import consulo.execution.ui.console.TextConsoleBuilderFactory;
2524
import consulo.ide.impl.idea.execution.impl.ConsoleViewImpl;
2625
import consulo.project.Project;
27-
26+
import consulo.python.impl.localize.PyLocalize;
2827
import jakarta.annotation.Nonnull;
2928
import jakarta.annotation.Nullable;
3029

@@ -40,8 +39,8 @@ public PythonDebugLanguageConsoleView(final Project project, Sdk sdk, ConsoleVie
4039

4140
enableConsole(!PyConsoleOptions.getInstance(project).isShowDebugConsoleByDefault());
4241

43-
getSwitchConsoleActionPresentation().setIcon(PythonIcons.Python.Debug.CommandLine);
44-
getSwitchConsoleActionPresentation().setText(PyBundle.message("run.configuration.show.command.line.action.name"));
42+
getSwitchConsoleActionPresentation().setIcon(ExecutionIconGroup.console());
43+
getSwitchConsoleActionPresentation().setTextValue(PyLocalize.runConfigurationShowCommandLineActionName());
4544
}
4645

4746
public PythonDebugLanguageConsoleView(final Project project, Sdk sdk) {

‎python-impl/src/main/java/com/jetbrains/python/impl/psi/impl/PyFunctionImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import consulo.language.psi.util.PsiTreeUtil;
5757
import consulo.language.util.IncorrectOperationException;
5858
import consulo.navigation.ItemPresentation;
59+
import consulo.platform.base.icon.PlatformIconGroup;
5960
import consulo.ui.image.Image;
6061
import consulo.util.collection.ArrayUtil;
6162
import consulo.util.collection.JBIterable;
@@ -143,7 +144,7 @@ public Image getIcon(int flags) {
143144
if (property.getDeleter().valueOrNull() == this) {
144145
return PythonIcons.Python.PropertyDeleter;
145146
}
146-
return AllIcons.Nodes.Property;
147+
return PlatformIconGroup.nodesProperty();
147148
}
148149
if (getContainingClass() != null) {
149150
return AllIcons.Nodes.Method;

‎python-impl/src/main/java/com/jetbrains/python/impl/run/PythonConfigurationType.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@
2323
import consulo.localize.LocalizeValue;
2424
import consulo.module.extension.ModuleExtensionHelper;
2525
import consulo.project.Project;
26-
import consulo.python.impl.icon.PythonImplIconGroup;
2726
import consulo.python.impl.localize.PyLocalize;
2827
import consulo.python.module.extension.PyModuleExtension;
28+
import consulo.python.psi.icon.PythonPsiIconGroup;
2929
import consulo.ui.image.Image;
30-
import org.jetbrains.annotations.NonNls;
31-
3230
import jakarta.annotation.Nonnull;
3331

3432
/**
@@ -79,7 +77,7 @@ public LocalizeValue getConfigurationTypeDescription() {
7977

8078
@Override
8179
public Image getIcon() {
82-
return PythonImplIconGroup.pythonPython();
80+
return PythonPsiIconGroup.python();
8381
}
8482

8583
@Override

‎python-impl/src/main/java/com/jetbrains/python/impl/sdk/PythonSdkType.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
import consulo.process.util.ProcessOutput;
4444
import consulo.project.Project;
4545
import consulo.project.ui.notification.NotificationGroup;
46-
import consulo.python.impl.icon.PythonImplIconGroup;
4746
import consulo.python.impl.localize.PyLocalize;
4847
import consulo.python.module.extension.PyModuleExtension;
48+
import consulo.python.psi.icon.PythonPsiIconGroup;
4949
import consulo.ui.image.Image;
5050
import consulo.util.collection.ArrayUtil;
5151
import consulo.util.collection.ContainerUtil;
@@ -125,7 +125,7 @@ public static PythonSdkType getInstance() {
125125
@Nonnull
126126
@Override
127127
public Image getIcon() {
128-
return PythonImplIconGroup.pythonPython();
128+
return PythonPsiIconGroup.python();
129129
}
130130

131131
@Nonnull

‎python-impl/src/main/java/com/jetbrains/python/impl/sdk/flavors/MayaSdkFlavor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.jetbrains.python.impl.sdk.flavors;
1818

1919
import consulo.annotation.component.ExtensionImpl;
20-
import consulo.python.impl.icon.PythonImplIconGroup;
20+
import consulo.python.psi.icon.PythonPsiIconGroup;
2121
import consulo.ui.image.Image;
2222
import consulo.util.io.FileUtil;
2323
import consulo.virtualFileSystem.VirtualFile;
@@ -60,7 +60,7 @@ public String getName() {
6060
@Nonnull
6161
@Override
6262
public Image getIcon() {
63-
return PythonImplIconGroup.pythonPython(); //TODO: maya icon
63+
return PythonPsiIconGroup.python(); //TODO: maya icon
6464
}
6565

6666
@Override

‎python-impl/src/main/java/com/jetbrains/python/impl/sdk/flavors/PythonSdkFlavor.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,13 @@
3333
import consulo.process.ProcessHandler;
3434
import consulo.process.cmd.GeneralCommandLine;
3535
import consulo.process.util.ProcessOutput;
36-
import consulo.python.impl.icon.PythonImplIconGroup;
36+
import consulo.python.psi.icon.PythonPsiIconGroup;
3737
import consulo.ui.image.Image;
3838
import consulo.util.io.FileUtil;
3939
import consulo.util.lang.PatternUtil;
4040
import consulo.util.lang.StringUtil;
4141
import consulo.virtualFileSystem.VirtualFile;
4242
import consulo.virtualFileSystem.encoding.EncodingManager;
43-
4443
import jakarta.annotation.Nonnull;
4544
import jakarta.annotation.Nullable;
4645

@@ -256,7 +255,7 @@ public LanguageLevel getLanguageLevel(Sdk sdk) {
256255

257256
@Nonnull
258257
public Image getIcon() {
259-
return PythonImplIconGroup.pythonPython();
258+
return PythonPsiIconGroup.python();
260259
}
261260

262261
public void initPythonPath(Collection<String> path, Map<String, String> env) {

‎python-impl/src/main/java/consulo/python/module/extension/BasePyModuleExtensionProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import consulo.module.content.layer.ModuleRootLayer;
77
import consulo.module.extension.ModuleExtension;
88
import consulo.module.extension.MutableModuleExtension;
9-
import consulo.python.impl.icon.PythonImplIconGroup;
9+
import consulo.python.psi.icon.PythonPsiIconGroup;
1010
import consulo.ui.image.Image;
1111
import jakarta.annotation.Nonnull;
1212

@@ -31,7 +31,7 @@ public LocalizeValue getName() {
3131
@Nonnull
3232
@Override
3333
public Image getIcon() {
34-
return PythonImplIconGroup.pythonPython();
34+
return PythonPsiIconGroup.python();
3535
}
3636

3737
@Nonnull

0 commit comments

Comments
 (0)