Skip to content

Commit 9f7eaeb

Browse files
neph1neph1
authored
Merge pull request #385 from neph1/replace_icons_4
Most icons for "core" modules. Might as well merge this and continue in new PR's with the rest.
2 parents a941c29 + c126608 commit 9f7eaeb

File tree

164 files changed

+2482
-164
lines changed

Some content is hidden

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

164 files changed

+2482
-164
lines changed

‎branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
LBL_Copyright=<p><em>Copyright &copy; 2022 jMonkeyEngine.\n<br>Please visit <a style="color: #f3c802;" href="http://jmonkeyengine.org">http://jmonkeyengine.org</a> for more information.</em></p><p>Icons sets : <ul><li><a style="color: #f3c802;" href="http://brankic1979.com/icons/">Brankic1979</a></li><li><a style="color: #f3c802;" href="http://www.entypo.com/index.php">Entypo+</a></li><li><a style="color: #f3c802;" href="https://hub.jmonkeyengine.org/u/ogli">Ogli</a> (edited by <a style="color: #f3c802;" href="https://hub.jmonkeyengine.org/u/grizeldi">grizeldi</a>)</li><ul> </p>
1+
LBL_Copyright=<p><em>Copyright &copy; 2022 jMonkeyEngine.\n<br>Please visit <a style="color: #f3c802;" href="http://jmonkeyengine.org">http://jmonkeyengine.org</a> for more information.</em></p><p>Icons sets : <ul><li><a style="color: #f3c802;" href="https://game-icons.net/">Lorc, Delapouite & contributors @ game-icons.net</a></li><li><a style="color: #f3c802;" href="http://brankic1979.com/icons/">Brankic1979</a></li><li><a style="color: #f3c802;" href="http://www.entypo.com/index.php">Entypo+</a></li><li><a style="color: #f3c802;" href="https://hub.jmonkeyengine.org/u/ogli">Ogli</a> (edited by <a style="color: #f3c802;" href="https://hub.jmonkeyengine.org/u/grizeldi">grizeldi</a>)</li><ul> </p>
22
updates_not_found=<p style="margin: 0"><b>Updates:</b> jMonkeyEngine SDK is updated to version {0}</p>\n
33
URL_ON_IMG=http://jmonkeyengine.org/

‎jme3-core/src/com/jme3/gde/core/assets/AssetDataObject.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.jme3.asset.AssetKey;
3636
import com.jme3.export.Savable;
3737
import com.jme3.export.binary.BinaryExporter;
38+
import com.jme3.gde.core.icons.IconList;
3839
import com.jme3.gde.core.scene.SceneApplication;
3940
import java.io.BufferedOutputStream;
4041
import java.io.IOException;
@@ -138,7 +139,7 @@ private ProjectAssetManager findAssetManager() {
138139
@Override
139140
protected Node createNodeDelegate() {
140141
AssetDataNode node = new AssetDataNode(this, Children.LEAF, new ProxyLookup(getCookieSet().getLookup(), contentLookup));
141-
node.setIconBaseWithExtension("com/jme3/gde/core/icons/model.gif");
142+
node.setIconBaseWithExtension(IconList.CARDBOARD_BOX_CLOSED);
142143
return node;
143144
}
144145

‎jme3-core/src/com/jme3/gde/core/assets/BinaryModelFileLoader.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232
package com.jme3.gde.core.assets;
3333

34+
import com.jme3.gde.core.icons.IconList;
3435
import java.io.IOException;
3536
import org.openide.awt.ActionID;
3637
import org.openide.awt.ActionReference;
@@ -54,7 +55,7 @@
5455
mimeType = "application/jme3model",
5556
extension = {"j3o", "j3s", "j3odata"}
5657
)
57-
@DataObject.Registration(iconBase = "com/jme3/gde/core/icons/model.gif", displayName = "jME3 Model", mimeType = "application/jme3model")
58+
@DataObject.Registration(iconBase = IconList.CARDBOARD_BOX_CLOSED, displayName = "jME3 Model", mimeType = "application/jme3model")
5859
@ActionReferences({
5960
@ActionReference(id = @ActionID(category = "Edit", id = "org.openide.actions.CutAction"), path = "Loaders/application/jme3model/Actions", position = 200, separatorBefore = 100),
6061
@ActionReference(id = @ActionID(category = "Edit", id = "org.openide.actions.CopyAction"), path = "Loaders/application/jme3model/Actions", position = 300, separatorAfter = 400),

‎jme3-core/src/com/jme3/gde/core/assets/FilterDataObject.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
package com.jme3.gde.core.assets;
3333

3434
import com.jme3.gde.core.filters.FilterPostProcessorNode;
35+
import com.jme3.gde.core.icons.IconList;
3536
import com.jme3.post.FilterPostProcessor;
3637
import java.io.IOException;
3738
import org.openide.awt.ActionID;
@@ -52,7 +53,7 @@
5253
mimeType = "application/jme3filterpostprocessor",
5354
extension = {"j3f"}
5455
)
55-
@DataObject.Registration(iconBase = "com/jme3/gde/core/icons/eye.gif", displayName = "jME3 FilterPostProcessor", mimeType = "application/jme3filterpostprocessor")
56+
@DataObject.Registration(iconBase = IconList.FILTER, displayName = "jME3 FilterPostProcessor", mimeType = "application/jme3filterpostprocessor")
5657
@ActionReferences({
5758
@ActionReference(id = @ActionID(category = "Edit", id = "org.openide.actions.CutAction"), path = "Loaders/application/jme3filterpostprocessor/Actions", position = 200, separatorBefore = 100),
5859
@ActionReference(id = @ActionID(category = "Edit", id = "org.openide.actions.CopyAction"), path = "Loaders/application/jme3filterpostprocessor/Actions", position = 300, separatorAfter = 400),

‎jme3-core/src/com/jme3/gde/core/icons/65.png

-607 Bytes
Binary file not shown.

‎jme3-core/src/com/jme3/gde/core/icons/IconList.java

+120-59
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003-2012 jMonkeyEngine
2+
* Copyright (c) 2003-2022 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -31,33 +31,87 @@
3131
*/
3232
package com.jme3.gde.core.icons;
3333

34+
import javax.swing.Icon;
3435
import javax.swing.ImageIcon;
3536
import org.openide.util.ImageUtilities;
3637

3738
/**
38-
*
39+
* Svg icons from game-icons.net. Icon names are fairly (but not completely)
40+
* consistent with names on the web.
41+
* Authors: https://game-icons.net/about.html#authors
42+
*
43+
*
3944
* @author normenhansen
4045
*/
4146
public class IconList {
42-
47+
48+
public static final String ICONS_PATH = "com/jme3/gde/core/icons/";
49+
public static final String JME_LOGO = ICONS_PATH + "jaime_silhouette.svg";
50+
public static final String CARDBOARD_BOX = ICONS_PATH + "cardboard-box.svg";
51+
public static final String CARDBOARD_BOX_CLOSED = ICONS_PATH + "cardboard-box-closed.svg";
52+
public static final String SOUND = ICONS_PATH + "speaker.svg";
53+
public static final String MATERIAL = ICONS_PATH + "palette.svg";
54+
public static final String FILTER = ICONS_PATH + "ice-iris.svg";
55+
public static final String FONT = ICONS_PATH + "font.svg";
56+
public static final String LIGHT_BULB = ICONS_PATH + "light-bulb.svg";
57+
public static final String LIGHT_BULB_OFF = ICONS_PATH + "light-bulb-off.svg";
58+
public static final String CONFIRMED = ICONS_PATH + "confirmed.svg";
59+
public static final String WARNING = ICONS_PATH + "interdiction.svg";
60+
public static final String ERROR = ICONS_PATH + "hazard-sign.svg";
61+
public static final String PHYSICS_WHEEL = ICONS_PATH + "cog.svg";
62+
public static final String ANIM_CONTROL = ICONS_PATH + "film-spool.svg";
63+
public static final String ANIM = ICONS_PATH + "film-strip.svg";
64+
public static final String SKELETON = ICONS_PATH + "skeleton.svg";
65+
public static final String PLAY = ICONS_PATH + "play.svg";
66+
public static final String PICTURE = ICONS_PATH + "mona-lisa.svg";
67+
public static final String INFO = ICONS_PATH + "info.svg";
68+
public static final String INFO_GREEN = ICONS_PATH + "info_green.svg";
69+
public static final String EMITTER = ICONS_PATH + "bright-fireworks.svg";
70+
public static final String PLAYER = ICONS_PATH + "character.svg";
71+
public static final String GHOST_CONTROL = ICONS_PATH + "invisible.svg";
72+
public static final String QUESTION = ICONS_PATH + "uncertainty.svg";
73+
public static final String NODE = ICONS_PATH + "family-tree.svg";
74+
public static final String IMPORTANT = ICONS_PATH + "files.svg";
75+
public static final String BONE = ICONS_PATH + "bone.svg";
76+
public static final String TRACK = ICONS_PATH + "track.svg";
77+
public static final String MESH = ICONS_PATH + "wireframe-globe.svg";
78+
public static final String GEOMETRY = ICONS_PATH + "cube.svg";
79+
public static final String VEHICLE = ICONS_PATH + "race-car.svg";
80+
public static final String BOX_COLOR = ICONS_PATH + "cube-green.svg";
81+
public static final String WIRE_MESH = ICONS_PATH + "wire-mesh.svg";
82+
public static final String BONE_TRACK = ICONS_PATH + "bone-track.svg";
83+
public static final String AUDIO_TRACK = ICONS_PATH + "audio-track.svg";
84+
public static final String EFFECT_TRACK = ICONS_PATH + "effect-track.svg";
85+
public static final String LINK = ICONS_PATH + "sideswipe.svg";
86+
public static final String EYE = ICONS_PATH + "eye.svg";
87+
public static final String EYE_GREEN = ICONS_PATH + "eye-green.svg";
88+
public static final String EYE_OFF = ICONS_PATH + "sight-disabled.svg";
89+
public static final String MOTION_EVENT = ICONS_PATH + "run.svg";
90+
public static final String TERRAIN = ICONS_PATH + "terrain.svg";
91+
public static final String PBR_SKY = ICONS_PATH + "sun-cloud.svg";
92+
public static final String PBR_ENV = ICONS_PATH + "confirmed_large.svg";
93+
public static final String NORMAL_VIEW = ICONS_PATH + "normal_view.svg";
94+
95+
// 16x16
96+
4397
public static final ImageIcon jmeLogo =
44-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/jme-logo.png", false);
98+
ImageUtilities.loadImageIcon(JME_LOGO, false);
4599
public static final ImageIcon asset =
46-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/assets.gif", false);
100+
ImageUtilities.loadImageIcon(CARDBOARD_BOX, false);
47101
public static final ImageIcon model =
48-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/model.gif", false);
102+
ImageUtilities.loadImageIcon(CARDBOARD_BOX_CLOSED, false);
49103
public static final ImageIcon sound =
50-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/sound.gif", false);
104+
ImageUtilities.loadImageIcon(SOUND, false);
51105
public static final ImageIcon material =
52-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/material.gif", false);
106+
ImageUtilities.loadImageIcon(MATERIAL, false);
53107
public static final ImageIcon matDef =
54-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/jme-logo.png", false);
108+
ImageUtilities.loadImageIcon(JME_LOGO, false);
55109
public static final ImageIcon font =
56-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/font.gif", false);
110+
ImageUtilities.loadImageIcon(FONT, false);
57111
public static final ImageIcon filter =
58-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/eye.gif", false);
112+
ImageUtilities.loadImageIcon(FILTER, false);
59113
public static final ImageIcon texture =
60-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/image.gif", false);
114+
ImageUtilities.loadImageIcon(PICTURE, false);
61115
public static final ImageIcon orthoMode =
62116
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/ortho.png", false);
63117
public static final ImageIcon perspMode =
@@ -77,81 +131,88 @@ public class IconList {
77131
public static final ImageIcon frontView =
78132
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/front.png", false);
79133
public static final ImageIcon audioTrack =
80-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/audioTrack.png", false);
134+
ImageUtilities.loadImageIcon(AUDIO_TRACK, false);
81135
public static final ImageIcon effectTrack =
82-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/effectTrack.png", false);
136+
ImageUtilities.loadImageIcon(EFFECT_TRACK, false);
83137
public static final ImageIcon boneTrack =
84-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/boneTrack.png", false);
138+
ImageUtilities.loadImageIcon(BONE_TRACK, false);
85139
public static final ImageIcon track =
86-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/track.png", false);
140+
ImageUtilities.loadImageIcon(TRACK, false);
87141
public static final ImageIcon lightOff =
88-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/lightbulb_off.gif", false);
142+
ImageUtilities.loadImageIcon(LIGHT_BULB_OFF, false);
89143
public static final ImageIcon lightOn =
90-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/lightbulb.gif", false);
144+
ImageUtilities.loadImageIcon(LIGHT_BULB, false);
91145
public static final ImageIcon eyeOpen =
92-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/eye.gif", false);
93-
public static final ImageIcon eyeGreen =
94-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/eyeGreen.gif", false);
95-
public static final ImageIcon eyeOff =
96-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/eyeOff.gif", false);
146+
ImageUtilities.loadImageIcon(EYE, false);
97147
public static final ImageIcon eyeCrossed =
98-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/crossedEye.gif", false);
99-
public static final ImageIcon colorBox =
100-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/box_color.gif", false);
101-
public static final ImageIcon wireBox =
102-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/box_wire.gif", false);
148+
ImageUtilities.loadImageIcon(EYE_OFF, false);
103149
public static final ImageIcon info =
104-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/65.png", false);
150+
ImageUtilities.loadImageIcon(INFO, false);
105151
public static final ImageIcon player =
106-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/player.gif", false);
152+
ImageUtilities.loadImageIcon(PLAYER, false);
107153
public static final ImageIcon important =
108-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/important.gif", false);
154+
ImageUtilities.loadImageIcon(IMPORTANT, false);
109155
public static final ImageIcon animControl =
110-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/animationcontrol.gif", false);
156+
ImageUtilities.loadImageIcon(ANIM_CONTROL, false);
111157
public static final ImageIcon animation =
112-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/anim.png", false);
158+
ImageUtilities.loadImageIcon(ANIM, false);
113159
public static final ImageIcon animationPlay =
114-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/animPlay.png", false);
160+
ImageUtilities.loadImageIcon(PLAY, false);
115161
public static final ImageIcon link =
116-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/linknode.gif", false);
162+
ImageUtilities.loadImageIcon(LINK, false);
117163
public static final ImageIcon bone =
118-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/bone.png", false);
164+
ImageUtilities.loadImageIcon(BONE, false);
119165
public static final ImageIcon wheel =
120-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/physicswheel.gif", false);
166+
ImageUtilities.loadImageIcon(PHYSICS_WHEEL, false);
121167
public static final ImageIcon geometry =
122-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/geometry.gif", false);
168+
ImageUtilities.loadImageIcon(GEOMETRY, false);
123169
public static final ImageIcon ghostControl =
124-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/ghostcontrol.gif", false);
125-
public static final ImageIcon light =
126-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/light.gif", false);
170+
ImageUtilities.loadImageIcon(GHOST_CONTROL, false);
127171
public static final ImageIcon mesh =
128-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/mesh.gif", false);
172+
ImageUtilities.loadImageIcon(MESH, false);
129173
public static final ImageIcon motionEvent =
130-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/chimpanzee-sad.gif", false); // TODO: Find something better
174+
ImageUtilities.loadImageIcon(MOTION_EVENT, false);
131175
public static final ImageIcon node =
132-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/node.gif", false);
176+
ImageUtilities.loadImageIcon(NODE, false);
133177
public static final ImageIcon emitter =
134-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/particleemitter.gif", false);
178+
ImageUtilities.loadImageIcon(EMITTER, false);
135179
public static final ImageIcon physicsControl =
136-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/physicscontrol.gif", false);
180+
ImageUtilities.loadImageIcon(PHYSICS_WHEEL, false);
137181
public static final ImageIcon skeletonControl =
138-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/skeletonControl.gif", false);
182+
ImageUtilities.loadImageIcon(SKELETON, false);
139183
public static final ImageIcon terrain =
140-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/terrain.png", false);
184+
ImageUtilities.loadImageIcon(TERRAIN, false);
141185
public static final ImageIcon vehicle =
142-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/vehicle.png", false);
186+
ImageUtilities.loadImageIcon(VEHICLE, false);
143187
public static final ImageIcon chimpConfused =
144-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/chimpanzee-confused.gif", false);
145-
public static final ImageIcon chimpLobo =
146-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/chimpanzee-lobotized.gif", false);
147-
public static final ImageIcon chimpMad =
148-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/chimpanzee-mad.gif", false);
188+
ImageUtilities.loadImageIcon(QUESTION, false);
189+
public static final ImageIcon exception =
190+
ImageUtilities.loadImageIcon(ERROR, false);
149191
public static final ImageIcon chimpNogood =
150-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/chimpanzee-nogood.gif", false);
192+
ImageUtilities.loadImageIcon(ERROR, false);
151193
public static final ImageIcon chimpSad =
152-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/chimpanzee-sad.gif", false);
194+
ImageUtilities.loadImageIcon(WARNING, false);
153195
public static final ImageIcon chimpSmile =
154-
ImageUtilities.loadImageIcon("com/jme3/gde/core/icons/chimpanzee-smile.gif", false);
155-
// public static ImageIcon icon =
156-
// ImageUtilities.loadImageIcon("", false);
196+
ImageUtilities.loadImageIcon(CONFIRMED, false);
197+
198+
// SceneViewer 32x32
199+
200+
public static final ImageIcon colorBox =
201+
ImageUtilities.loadImageIcon(BOX_COLOR, false);
202+
public static final ImageIcon wireBox =
203+
ImageUtilities.loadImageIcon(WIRE_MESH, false);
204+
public static final ImageIcon light =
205+
ImageUtilities.loadImageIcon(LIGHT_BULB, false);
206+
public static final ImageIcon eyeOff =
207+
ImageUtilities.loadImageIcon(EYE_OFF, false);
208+
public static final ImageIcon eyeGreen =
209+
ImageUtilities.loadImageIcon(EYE_GREEN, false);
210+
public static final ImageIcon enablePbrEnvironment =
211+
ImageUtilities.loadImageIcon(PBR_ENV, false);
212+
public static final ImageIcon enablePbrSky =
213+
ImageUtilities.loadImageIcon(PBR_SKY, false);
214+
public static final ImageIcon sceneInfo =
215+
ImageUtilities.loadImageIcon(INFO_GREEN, false);
216+
public static final ImageIcon normalView =
217+
ImageUtilities.loadImageIcon(NORMAL_VIEW, false);
157218
}

‎jme3-core/src/com/jme3/gde/core/icons/anim.png

-376 Bytes
Binary file not shown.

‎jme3-core/src/com/jme3/gde/core/icons/animPlay.png

-574 Bytes
Binary file not shown.

‎jme3-core/src/com/jme3/gde/core/icons/animationcontrol.gif

-511 Bytes
Binary file not shown.

‎jme3-core/src/com/jme3/gde/core/icons/assets.gif

-515 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)