diff --git a/core/src/main/java/org/jivesoftware/resource/SparkRes.java b/core/src/main/java/org/jivesoftware/resource/SparkRes.java index e169a290..ab9483ac 100644 --- a/core/src/main/java/org/jivesoftware/resource/SparkRes.java +++ b/core/src/main/java/org/jivesoftware/resource/SparkRes.java @@ -335,6 +335,7 @@ public class SparkRes { public static final String CHECK_UPDATE = "CHECK_UPDATE"; public static final String NOTIFICATIONS = "NOTIFICATIONS"; public static final String UPLOAD_ICON = "UPLOAD_ICON"; + public static final String PADE_ICON = "PADE_ICON"; private static final ClassLoader cl = SparkRes.class.getClassLoader(); diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatParticipantList.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatParticipantList.java index a03109b1..7344ab00 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatParticipantList.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatParticipantList.java @@ -692,7 +692,7 @@ public class GroupChatParticipantList extends JPanel { changeNicknameAction.putValue(Action.NAME, Res.getString("menuitem.change.nickname")); changeNicknameAction.putValue(Action.SMALL_ICON, - SparkRes.getImageIcon(SparkRes.DESKTOP_IMAGE)); + SparkRes.getImageIcon(SparkRes.TYPING_TRAY)); if (allowNicknameChange) { popup.add(changeNicknameAction); diff --git a/core/src/main/resources/images/emoticons/Emoticons.plist b/core/src/main/resources/images/emoticons/Emoticons.plist new file mode 100644 index 00000000..8ee6a18f --- /dev/null +++ b/core/src/main/resources/images/emoticons/Emoticons.plist @@ -0,0 +1,251 @@ + + + + +SparkSetVersion +1 +Emoticons + +angry.png + + Equivalents + + >:o + >:-o + >:O + >:-O + + + Name + Angry + +blush.png + + Equivalents + + :-[ + + Name + Blush + +confused.png + + Equivalents + + ?:| + + Name + Confused + +cool.png + + Equivalents + + B-) + 😎 + + Name + Cool + +cry.png + + Equivalents + + :'( + + + Name + Cry + +devil.png + + Equivalents + + ]:) + + Name + Devil + +grin.png + + Equivalents + + :-D + :D + 😄 + 😃 + 😂 + 😁 + 😀 + + + Name + Grin + +happy.png + + Equivalents + + :-) + + Name + Happy + +laugh.png + + Equivalents + + :^0 + 😅 + 😆 + + Name + Laugh + +love.png + + Equivalents + + :x + 😍 + 😘 + + Name + Love + +mischief.png + + Equivalents + + ;\ + + Name + Mischief + +sad.png + + Equivalents + + :-( + :( + ☹ + + + Name + Sad + +happy.png + + Equivalents + + :-) + :) + 😊 + 🙂 + ☺ + + + Name + Smile + +plain.png + + Equivalents + + :| + + + Name + Plain + +shocked.png + + Equivalents + + :0 + + + Name + Shocked + +silly.png + + Equivalents + + :-p + :-P + :P + :p + 😋 + 😜 + 😝 + + + Name + Tongue + +wink.png + + Equivalents + + ;-) + ;) + 😉 + + + Name + Wink + +alert.png + + Equivalents + + (!) + + Name + Alert + + + +info.png + + Equivalents + + (i) + + Name + Info + + +minus.png + + Equivalents + + (-) + + Name + Minus + + +plus.png + + Equivalents + + (+) + + Name + Plus + + +heart.png + + Equivalents + + (heart) + + Name + Heart + + + + diff --git a/core/src/main/resources/images/emoticons/alert.png b/core/src/main/resources/images/emoticons/alert.png new file mode 100644 index 00000000..c37bd062 Binary files /dev/null and b/core/src/main/resources/images/emoticons/alert.png differ diff --git a/core/src/main/resources/images/emoticons/heart.png b/core/src/main/resources/images/emoticons/heart.png new file mode 100644 index 00000000..9b598de8 Binary files /dev/null and b/core/src/main/resources/images/emoticons/heart.png differ diff --git a/core/src/main/resources/images/emoticons/info.png b/core/src/main/resources/images/emoticons/info.png new file mode 100644 index 00000000..12cd1aef Binary files /dev/null and b/core/src/main/resources/images/emoticons/info.png differ diff --git a/core/src/main/resources/images/emoticons/love.png b/core/src/main/resources/images/emoticons/love.png index 9b598de8..05820459 100644 Binary files a/core/src/main/resources/images/emoticons/love.png and b/core/src/main/resources/images/emoticons/love.png differ diff --git a/core/src/main/resources/images/emoticons/minus.png b/core/src/main/resources/images/emoticons/minus.png new file mode 100644 index 00000000..08f24936 Binary files /dev/null and b/core/src/main/resources/images/emoticons/minus.png differ diff --git a/core/src/main/resources/images/emoticons/plus.png b/core/src/main/resources/images/emoticons/plus.png new file mode 100644 index 00000000..6332fefe Binary files /dev/null and b/core/src/main/resources/images/emoticons/plus.png differ diff --git a/core/src/main/resources/images/icons/headset.png b/core/src/main/resources/images/icons/headset.png new file mode 100644 index 00000000..d3b60aed Binary files /dev/null and b/core/src/main/resources/images/icons/headset.png differ diff --git a/core/src/main/resources/images/icons/lightning.png b/core/src/main/resources/images/icons/lightning.png new file mode 100644 index 00000000..41331fe2 Binary files /dev/null and b/core/src/main/resources/images/icons/lightning.png differ diff --git a/core/src/main/resources/images/icons/pade.png b/core/src/main/resources/images/icons/pade.png new file mode 100644 index 00000000..c2e4a868 Binary files /dev/null and b/core/src/main/resources/images/icons/pade.png differ diff --git a/core/src/main/resources/images/icons/settings.png b/core/src/main/resources/images/icons/settings.png new file mode 100644 index 00000000..4a141026 Binary files /dev/null and b/core/src/main/resources/images/icons/settings.png differ diff --git a/core/src/main/resources/images/steel.png b/core/src/main/resources/images/steel.png index c588c226..21ad5409 100644 Binary files a/core/src/main/resources/images/steel.png and b/core/src/main/resources/images/steel.png differ diff --git a/core/src/main/resources/images/toolbar.png b/core/src/main/resources/images/toolbar.png index 02cb432b..b113fca6 100644 Binary files a/core/src/main/resources/images/toolbar.png and b/core/src/main/resources/images/toolbar.png differ diff --git a/core/src/main/resources/images/top_bottom_background_image.png b/core/src/main/resources/images/top_bottom_background_image.png index 582e0069..e1ccb528 100644 Binary files a/core/src/main/resources/images/top_bottom_background_image.png and b/core/src/main/resources/images/top_bottom_background_image.png differ diff --git a/core/src/main/resources/spark.properties b/core/src/main/resources/spark.properties index 9e934fea..fe7f225f 100644 --- a/core/src/main/resources/spark.properties +++ b/core/src/main/resources/spark.properties @@ -219,7 +219,7 @@ MESSAGE_DND = images/DoNotDisturb.png MESSAGE_NEW_TRAY = images/spark_tray_message-16x16.png MESSAGE_NEW_TRAY_LINUX = images/spark_tray_message-24x24.png TYPING_TRAY = images/icons/edit.png -TYPING_TRAY_LINUX = images/icons/.edit.png +TYPING_TRAY_LINUX = images/icons/edit.png OFFLINE_IMAGE = images/Offline.png ERASER_IMAGE = images/icons/clear.png TOOLBAR_BACKGROUND = images/toolbar.png @@ -334,11 +334,11 @@ IM_UNAVAILABLE_STALE_IMAGE = images/im_unavailable_stale.png #Misc DIVIDER_IMAGE = images/divider.png -LIGHTING_BOLT_IMAGE = images/lightning16.png -HEADSET_IMAGE = images/headset.png +LIGHTING_BOLT_IMAGE = images/icons/lightning.png +HEADSET_IMAGE = images/icons/headset.png BUZZ_IMAGE = images/icons/buzz.png -SETTINGS_IMAGE_16x16 = images/settings16x16.png -SETTINGS_IMAGE_24x24 = images/settings24x24.png +SETTINGS_IMAGE_16x16 = images/icons/settings.png +SETTINGS_IMAGE_24x24 = images/icons/settings.png #Phone DIAL_PHONE_IMAGE_24x24 = images/phone_call.png @@ -358,4 +358,5 @@ EXECUTABLE_NAME = Spark.exe #new icons -UPLOAD_ICON = images/icons/upload.png \ No newline at end of file +UPLOAD_ICON = images/icons/upload.png +PADE_ICON = images/icons/pade.png \ No newline at end of file diff --git a/emoticons/src/main/Default.adiumemoticonset/angry.png b/emoticons/src/main/Default.adiumemoticonset/angry.png index 02a3f016..b974be02 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/angry.png and b/emoticons/src/main/Default.adiumemoticonset/angry.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/blush.png b/emoticons/src/main/Default.adiumemoticonset/blush.png index 82e7456d..7b0edb71 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/blush.png and b/emoticons/src/main/Default.adiumemoticonset/blush.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/confused.png b/emoticons/src/main/Default.adiumemoticonset/confused.png index d5e4be29..2ec4fdbd 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/confused.png and b/emoticons/src/main/Default.adiumemoticonset/confused.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/cool.png b/emoticons/src/main/Default.adiumemoticonset/cool.png index 090464c8..e55afd8d 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/cool.png and b/emoticons/src/main/Default.adiumemoticonset/cool.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/cry.png b/emoticons/src/main/Default.adiumemoticonset/cry.png index f34b7fdd..9246e223 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/cry.png and b/emoticons/src/main/Default.adiumemoticonset/cry.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/devil.png b/emoticons/src/main/Default.adiumemoticonset/devil.png index 57e60eed..61865a8f 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/devil.png and b/emoticons/src/main/Default.adiumemoticonset/devil.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/grin.png b/emoticons/src/main/Default.adiumemoticonset/grin.png index 3932d475..2a3c8e73 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/grin.png and b/emoticons/src/main/Default.adiumemoticonset/grin.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/happy.png b/emoticons/src/main/Default.adiumemoticonset/happy.png index ae922204..7b0edb71 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/happy.png and b/emoticons/src/main/Default.adiumemoticonset/happy.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/heart.png b/emoticons/src/main/Default.adiumemoticonset/heart.png index d9ee53e5..9b598de8 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/heart.png and b/emoticons/src/main/Default.adiumemoticonset/heart.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/laugh.png b/emoticons/src/main/Default.adiumemoticonset/laugh.png index 1574cc38..52ed0881 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/laugh.png and b/emoticons/src/main/Default.adiumemoticonset/laugh.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/love.png b/emoticons/src/main/Default.adiumemoticonset/love.png index d5580218..05820459 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/love.png and b/emoticons/src/main/Default.adiumemoticonset/love.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/mischief.png b/emoticons/src/main/Default.adiumemoticonset/mischief.png index 5da82ffc..a76f5f07 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/mischief.png and b/emoticons/src/main/Default.adiumemoticonset/mischief.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/plain.png b/emoticons/src/main/Default.adiumemoticonset/plain.png index 2a045918..f01ee81a 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/plain.png and b/emoticons/src/main/Default.adiumemoticonset/plain.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/sad.png b/emoticons/src/main/Default.adiumemoticonset/sad.png index d336ce2b..ac9c3b13 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/sad.png and b/emoticons/src/main/Default.adiumemoticonset/sad.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/shocked.png b/emoticons/src/main/Default.adiumemoticonset/shocked.png index b02c7bcc..34850af7 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/shocked.png and b/emoticons/src/main/Default.adiumemoticonset/shocked.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/silly.png b/emoticons/src/main/Default.adiumemoticonset/silly.png index 7688458a..7ce9e7c2 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/silly.png and b/emoticons/src/main/Default.adiumemoticonset/silly.png differ diff --git a/emoticons/src/main/Default.adiumemoticonset/wink.png b/emoticons/src/main/Default.adiumemoticonset/wink.png index aa25da94..b902cbed 100644 Binary files a/emoticons/src/main/Default.adiumemoticonset/wink.png and b/emoticons/src/main/Default.adiumemoticonset/wink.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/alert.png b/emoticons/src/main/sparkEmoticonSet/alert.png new file mode 100644 index 00000000..c37bd062 Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/alert.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/angry.png b/emoticons/src/main/sparkEmoticonSet/angry.png index 02a3f016..b974be02 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/angry.png and b/emoticons/src/main/sparkEmoticonSet/angry.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/blush.png b/emoticons/src/main/sparkEmoticonSet/blush.png index 82e7456d..7b0edb71 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/blush.png and b/emoticons/src/main/sparkEmoticonSet/blush.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/confused.png b/emoticons/src/main/sparkEmoticonSet/confused.png index d5e4be29..2ec4fdbd 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/confused.png and b/emoticons/src/main/sparkEmoticonSet/confused.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/cool.png b/emoticons/src/main/sparkEmoticonSet/cool.png index 090464c8..e55afd8d 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/cool.png and b/emoticons/src/main/sparkEmoticonSet/cool.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/cry.png b/emoticons/src/main/sparkEmoticonSet/cry.png index f34b7fdd..9246e223 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/cry.png and b/emoticons/src/main/sparkEmoticonSet/cry.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/devil.png b/emoticons/src/main/sparkEmoticonSet/devil.png index 57e60eed..61865a8f 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/devil.png and b/emoticons/src/main/sparkEmoticonSet/devil.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/grin.png b/emoticons/src/main/sparkEmoticonSet/grin.png index 3932d475..2a3c8e73 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/grin.png and b/emoticons/src/main/sparkEmoticonSet/grin.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/happy.png b/emoticons/src/main/sparkEmoticonSet/happy.png index ae922204..7b0edb71 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/happy.png and b/emoticons/src/main/sparkEmoticonSet/happy.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/heart.png b/emoticons/src/main/sparkEmoticonSet/heart.png new file mode 100644 index 00000000..9b598de8 Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/heart.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/info.png b/emoticons/src/main/sparkEmoticonSet/info.png new file mode 100644 index 00000000..12cd1aef Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/info.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/laugh.png b/emoticons/src/main/sparkEmoticonSet/laugh.png index 1574cc38..52ed0881 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/laugh.png and b/emoticons/src/main/sparkEmoticonSet/laugh.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/love.png b/emoticons/src/main/sparkEmoticonSet/love.png index d5580218..05820459 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/love.png and b/emoticons/src/main/sparkEmoticonSet/love.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/minus.png b/emoticons/src/main/sparkEmoticonSet/minus.png new file mode 100644 index 00000000..08f24936 Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/minus.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/mischief.png b/emoticons/src/main/sparkEmoticonSet/mischief.png index 5da82ffc..a76f5f07 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/mischief.png and b/emoticons/src/main/sparkEmoticonSet/mischief.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/plain.png b/emoticons/src/main/sparkEmoticonSet/plain.png index 2a045918..f01ee81a 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/plain.png and b/emoticons/src/main/sparkEmoticonSet/plain.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/plus.png b/emoticons/src/main/sparkEmoticonSet/plus.png new file mode 100644 index 00000000..6332fefe Binary files /dev/null and b/emoticons/src/main/sparkEmoticonSet/plus.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/sad.png b/emoticons/src/main/sparkEmoticonSet/sad.png index d336ce2b..ac9c3b13 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/sad.png and b/emoticons/src/main/sparkEmoticonSet/sad.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/shocked.png b/emoticons/src/main/sparkEmoticonSet/shocked.png index b02c7bcc..34850af7 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/shocked.png and b/emoticons/src/main/sparkEmoticonSet/shocked.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/silly.png b/emoticons/src/main/sparkEmoticonSet/silly.png index 7688458a..7ce9e7c2 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/silly.png and b/emoticons/src/main/sparkEmoticonSet/silly.png differ diff --git a/emoticons/src/main/sparkEmoticonSet/wink.png b/emoticons/src/main/sparkEmoticonSet/wink.png index aa25da94..b902cbed 100644 Binary files a/emoticons/src/main/sparkEmoticonSet/wink.png and b/emoticons/src/main/sparkEmoticonSet/wink.png differ diff --git a/plugins/fileupload/src/main/resources/images/icon16.png b/plugins/fileupload/src/main/resources/images/icon16.png index 1de36e94..58b702ba 100644 Binary files a/plugins/fileupload/src/main/resources/images/icon16.png and b/plugins/fileupload/src/main/resources/images/icon16.png differ diff --git a/plugins/flashing/src/main/java/org/jivesoftware/spark/plugin/flashing/FlashingPreference.java b/plugins/flashing/src/main/java/org/jivesoftware/spark/plugin/flashing/FlashingPreference.java index 624ac470..ea9287cd 100644 --- a/plugins/flashing/src/main/java/org/jivesoftware/spark/plugin/flashing/FlashingPreference.java +++ b/plugins/flashing/src/main/java/org/jivesoftware/spark/plugin/flashing/FlashingPreference.java @@ -72,7 +72,7 @@ public class FlashingPreference implements Preference { @Override public Icon getIcon() { ClassLoader cl = getClass().getClassLoader(); - return new ImageIcon(cl.getResource("lightning16.png")); + return new ImageIcon(cl.getResource("lightning.png")); } @Override diff --git a/plugins/flashing/src/main/resources/lightning.png b/plugins/flashing/src/main/resources/lightning.png new file mode 100644 index 00000000..41331fe2 Binary files /dev/null and b/plugins/flashing/src/main/resources/lightning.png differ diff --git a/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/ChatRoomDecorator.java b/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/ChatRoomDecorator.java index e8bd5761..bc295f1d 100644 --- a/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/ChatRoomDecorator.java +++ b/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/ChatRoomDecorator.java @@ -25,6 +25,7 @@ import org.jivesoftware.spark.util.log.*; import org.jivesoftware.smack.packet.*; import javax.xml.bind.DatatypeConverter; +import org.jivesoftware.resource.SparkRes; public class ChatRoomDecorator { @@ -39,7 +40,7 @@ public class ChatRoomDecorator String imageString = "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAKDSURBVDhPXVM7axVBFP5m7maN5gFyJTdNEEVDUt3C/yAIKkRSidjEUsTKRyrtLSyi/gArSRfFOiBqY5UqICaRYDCvm7177+7Ozj7G70wSSJzlmzk75/WdmTMqLwq3ubKCcGQEOgjgBgKoYACq0YBrKGh+rqrh6gKqqFGVBVCUKJMexqenoba2t937qSmcu3QRmk5aN7yz4tfQGrVzkOG4ermuUBPdzT+4v7wMHYYhMg3k1JkaSJktyQyigwPsdfYRRV0keY7EWpiyRFpWMGJbVQjPDCLQSiGJe9Bxn2lI0VUYao1jcmYGDTJJow6+v3mH860xlkSGcNBOI4oPyBGgv0bKmpIiR7+wPmP7ziyuP37EWi2utK/hdZKgZwyyNEWaW29r8hJK84w0p5yRLBWWNAVRt4vVL9+w+OIlXt27i6+LHzC78BbR7i5y6gUZfRTZ0531EDlrt5VDQWS5Qd9knmJIbP1cg7HG6wViK0lFHwiDHQqms8eZTGqHDg9tdH8XG/y/PDmJG/PP8XC8hR5Pv087cfxLaEq8KEbkT8lAHpTjuIuxdhvzH5dw8+kTzDWb2NneQR3oU3aHh8hFAuQ8WSugbEjxx6fPeHbrNhbmHqDb6bA3gkM9IbapBOCtkYA7OgPeLyHBMpvD8r4HKQtN9qDXHcPbUsd7lxKopGjJR8BGRZJkiPsxqhP7/0MS0R/K9mN3dXgUY7JxNKQMqXGIOGzk04P++E382lgnQ7avZK25e4yA/0JfgggLjxN6gfhI+Srd33PDzQtoycbR4NPwmY9XGbIyl88u2CKi1VWosq5db30N4dkh35q+tRRfI7tMwImJ6MpsruZKyMussgzhxAT+AQRKd557vsR7AAAAAElFTkSuQmCC"; byte[] imageByte = DatatypeConverter.parseBase64Binary(imageString); ImageIcon ofmeetIcon = new ImageIcon(imageByte); - ofmeetButton = new RolloverButton(ofmeetIcon); + ofmeetButton = new RolloverButton(SparkRes.getImageIcon("PADE_ICON")); ofmeetButton.setToolTipText(GraphicUtils.createToolTip("Pade Meetings")); final String roomId = getNode(room.getBareJid().toString()); final String sessionID = roomId + "-" + System.currentTimeMillis(); diff --git a/plugins/roar/src/main/java/org/jivesoftware/spark/roar/RoarPreference.java b/plugins/roar/src/main/java/org/jivesoftware/spark/roar/RoarPreference.java index 5db62975..4938165f 100644 --- a/plugins/roar/src/main/java/org/jivesoftware/spark/roar/RoarPreference.java +++ b/plugins/roar/src/main/java/org/jivesoftware/spark/roar/RoarPreference.java @@ -60,7 +60,7 @@ public class RoarPreference implements Preference { @Override public Icon getIcon() { ClassLoader cl = getClass().getClassLoader(); - return new ImageIcon(cl.getResource("roar-logo.png")); + return new ImageIcon(cl.getResource("roar.png")); } @Override diff --git a/plugins/roar/src/main/resources/roar.png b/plugins/roar/src/main/resources/roar.png new file mode 100644 index 00000000..ee41b968 Binary files /dev/null and b/plugins/roar/src/main/resources/roar.png differ diff --git a/plugins/transferguard/src/main/java/org/jivesoftware/spark/plugins/transfersettings/TransferSettingsPreference.java b/plugins/transferguard/src/main/java/org/jivesoftware/spark/plugins/transfersettings/TransferSettingsPreference.java index 740119d9..20f97e15 100644 --- a/plugins/transferguard/src/main/java/org/jivesoftware/spark/plugins/transfersettings/TransferSettingsPreference.java +++ b/plugins/transferguard/src/main/java/org/jivesoftware/spark/plugins/transfersettings/TransferSettingsPreference.java @@ -70,7 +70,7 @@ public class TransferSettingsPreference implements Preference { * @return the {@link Icon} to show in the preferences ui. */ public javax.swing.Icon getIcon() { - return new ImageIcon(getClass().getResource("/images/knight.png")); + return new ImageIcon(getClass().getResource("/images/guard.png")); } /** diff --git a/plugins/transferguard/src/main/resources/images/guard.png b/plugins/transferguard/src/main/resources/images/guard.png new file mode 100644 index 00000000..a8efdd70 Binary files /dev/null and b/plugins/transferguard/src/main/resources/images/guard.png differ