aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--resources/images/images.properties45
-rw-r--r--resources/images/impl/gui/buttons/addContactSmallPressed.pngbin1522 -> 1615 bytes
-rw-r--r--resources/images/impl/gui/buttons/addContactSmallRollover.pngbin0 -> 1522 bytes
-rw-r--r--resources/images/impl/gui/buttons/callSmallPressed.pngbin1592 -> 1704 bytes
-rw-r--r--resources/images/impl/gui/buttons/callSmallRollover.pngbin0 -> 1592 bytes
-rw-r--r--resources/images/impl/gui/buttons/callVideoSmallPressed.pngbin1430 -> 1516 bytes
-rw-r--r--resources/images/impl/gui/buttons/callVideoSmallRollover.pngbin0 -> 1430 bytes
-rw-r--r--resources/images/impl/gui/buttons/chatSmallPressed.pngbin1596 -> 1697 bytes
-rw-r--r--resources/images/impl/gui/buttons/chatSmallRollover.pngbin0 -> 1596 bytes
-rw-r--r--resources/images/impl/gui/buttons/desktopSharingSmallPressed.pngbin1494 -> 1604 bytes
-rw-r--r--resources/images/impl/gui/buttons/desktopSharingSmallRollover.pngbin0 -> 1494 bytes
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java26
-rw-r--r--src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java31
13 files changed, 62 insertions, 40 deletions
diff --git a/resources/images/images.properties b/resources/images/images.properties
index f041b59..bbb4e8b 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -119,16 +119,21 @@ service.gui.buttons.MERGE_CALL_BUTTON_BG=resources/images/impl/gui/buttons/merge
service.gui.buttons.CALL_VIDEO_BUTTON_BG=resources/images/impl/gui/buttons/videoCallButton.png
service.gui.buttons.CALL_BUTTON_SMALL=resources/images/impl/gui/buttons/callSmall.png
service.gui.buttons.CALL_BUTTON_SMALL_PRESSED=resources/images/impl/gui/buttons/callSmallPressed.png
+service.gui.buttons.CALL_BUTTON_SMALL_ROLLOVER=resources/images/impl/gui/buttons/callSmallRollover.png
service.gui.buttons.CALL_VIDEO_BUTTON_SMALL=resources/images/impl/gui/buttons/callVideoSmall.png
service.gui.buttons.CALL_VIDEO_BUTTON_SMALL_PRESSED=resources/images/impl/gui/buttons/callVideoSmallPressed.png
+service.gui.buttons.CALL_VIDEO_BUTTON_SMALL_ROLLOVER=resources/images/impl/gui/buttons/callVideoSmallRollover.png
service.gui.buttons.DESKTOP_BUTTON_SMALL=resources/images/impl/gui/buttons/desktopSharingSmall.png
service.gui.buttons.DESKTOP_BUTTON_SMALL_PRESSED=resources/images/impl/gui/buttons/desktopSharingSmallPressed.png
+service.gui.buttons.DESKTOP_BUTTON_SMALL_ROLLOVER=resources/images/impl/gui/buttons/desktopSharingSmallRollover.png
service.gui.buttons.CALL_DESKTOP_BUTTON=resources/images/impl/gui/buttons/callDesktopSharing.png
service.gui.buttons.CHAT_BUTTON_SMALL=resources/images/impl/gui/buttons/chatSmall.png
service.gui.buttons.CHAT_BUTTON_SMALL_PRESSED=resources/images/impl/gui/buttons/chatSmallPressed.png
+service.gui.buttons.CHAT_BUTTON_SMALL_ROLLOVER=resources/images/impl/gui/buttons/chatSmallRollover.png
service.gui.buttons.CHAT_BUTTON_SMALL_WHITE=resources/images/impl/gui/buttons/chatSmallWhite.png
service.gui.buttons.ADD_CONTACT_BUTTON_SMALL=resources/images/impl/gui/buttons/addContactSmall.png
service.gui.buttons.ADD_CONTACT_BUTTON_SMALL_PRESSED=resources/images/impl/gui/buttons/addContactSmallPressed.png
+service.gui.buttons.ADD_CONTACT_BUTTON_SMALL_ROLLOVER=resources/images/impl/gui/buttons/addContactSmallRollover.png
service.gui.buttons.HANGUP_BUTTON_BG=resources/images/impl/gui/buttons/hangupButton.png
service.gui.buttons.ADD_TO_CALL_BUTTON=resources/images/impl/gui/buttons/addToCall.png
service.gui.buttons.CALL_SETTING_BUTTON_BG=resources/images/impl/gui/buttons/callSettingButton.png
@@ -229,26 +234,26 @@ service.gui.soundlevel.SOUND_SETTING_BUTTON_BG=resources/images/impl/gui/common/
service.gui.soundlevel.SOUND_SETTING_BUTTON_PRESSED=resources/images/impl/gui/common/soundlevel/volumeButtonPressed.png
# Smileys icons
-service.gui.smileys.SMILEY1=resources/images/impl/gui/common/smileys/default/smiley1.gif
-service.gui.smileys.SMILEY2=resources/images/impl/gui/common/smileys/default/smiley2.gif
-service.gui.smileys.SMILEY3=resources/images/impl/gui/common/smileys/default/smiley3.gif
-service.gui.smileys.SMILEY4=resources/images/impl/gui/common/smileys/default/smiley4.gif
-service.gui.smileys.SMILEY5=resources/images/impl/gui/common/smileys/default/smiley5.gif
-service.gui.smileys.SMILEY6=resources/images/impl/gui/common/smileys/default/smiley6.gif
-service.gui.smileys.SMILEY7=resources/images/impl/gui/common/smileys/default/smiley7.gif
-service.gui.smileys.SMILEY8=resources/images/impl/gui/common/smileys/default/smiley8.gif
-service.gui.smileys.SMILEY9=resources/images/impl/gui/common/smileys/default/smiley9.gif
-service.gui.smileys.SMILEY10=resources/images/impl/gui/common/smileys/default/smiley10.gif
-service.gui.smileys.SMILEY11=resources/images/impl/gui/common/smileys/default/smiley11.gif
-service.gui.smileys.SMILEY12=resources/images/impl/gui/common/smileys/default/smiley12.gif
-service.gui.smileys.SMILEY13=resources/images/impl/gui/common/smileys/default/smiley13.gif
-service.gui.smileys.SMILEY14=resources/images/impl/gui/common/smileys/default/smiley14.gif
-service.gui.smileys.SMILEY15=resources/images/impl/gui/common/smileys/default/smiley15.gif
-service.gui.smileys.SMILEY16=resources/images/impl/gui/common/smileys/default/smiley16.gif
-service.gui.smileys.SMILEY17=resources/images/impl/gui/common/smileys/default/smiley17.gif
-service.gui.smileys.SMILEY18=resources/images/impl/gui/common/smileys/default/smiley18.gif
-service.gui.smileys.SMILEY19=resources/images/impl/gui/common/smileys/default/smiley19.gif
-service.gui.smileys.SMILEY20=resources/images/impl/gui/common/smileys/default/smiley20.gif
+service.gui.smileys.SMILEY1=resources/images/impl/gui/common/smileys/simple/smiley1.png
+service.gui.smileys.SMILEY2=resources/images/impl/gui/common/smileys/simple/smiley2.png
+service.gui.smileys.SMILEY3=resources/images/impl/gui/common/smileys/simple/smiley3.png
+service.gui.smileys.SMILEY4=resources/images/impl/gui/common/smileys/simple/smiley4.png
+service.gui.smileys.SMILEY5=resources/images/impl/gui/common/smileys/simple/smiley5.png
+service.gui.smileys.SMILEY6=resources/images/impl/gui/common/smileys/simple/smiley6.png
+service.gui.smileys.SMILEY7=resources/images/impl/gui/common/smileys/simple/smiley7.png
+service.gui.smileys.SMILEY8=resources/images/impl/gui/common/smileys/simple/smiley8.png
+service.gui.smileys.SMILEY9=resources/images/impl/gui/common/smileys/simple/smiley9.png
+service.gui.smileys.SMILEY10=resources/images/impl/gui/common/smileys/simple/smiley10.png
+service.gui.smileys.SMILEY11=resources/images/impl/gui/common/smileys/simple/smiley11.png
+service.gui.smileys.SMILEY12=resources/images/impl/gui/common/smileys/simple/smiley12.png
+service.gui.smileys.SMILEY13=resources/images/impl/gui/common/smileys/simple/smiley13.png
+service.gui.smileys.SMILEY14=resources/images/impl/gui/common/smileys/simple/smiley14.png
+service.gui.smileys.SMILEY15=resources/images/impl/gui/common/smileys/simple/smiley15.png
+service.gui.smileys.SMILEY16=resources/images/impl/gui/common/smileys/simple/smiley16.png
+service.gui.smileys.SMILEY17=resources/images/impl/gui/common/smileys/simple/smiley17.png
+service.gui.smileys.SMILEY18=resources/images/impl/gui/common/smileys/simple/smiley18.png
+service.gui.smileys.SMILEY19=resources/images/impl/gui/common/smileys/simple/smiley19.png
+service.gui.smileys.SMILEY20=resources/images/impl/gui/common/smileys/simple/smiley20.png
# Look and Feel images
service.gui.lookandfeel.CLOSE_TAB_ICON=resources/images/impl/gui/buttons/closeTab.png
diff --git a/resources/images/impl/gui/buttons/addContactSmallPressed.png b/resources/images/impl/gui/buttons/addContactSmallPressed.png
index 774551d..c9f86bd 100644
--- a/resources/images/impl/gui/buttons/addContactSmallPressed.png
+++ b/resources/images/impl/gui/buttons/addContactSmallPressed.png
Binary files differ
diff --git a/resources/images/impl/gui/buttons/addContactSmallRollover.png b/resources/images/impl/gui/buttons/addContactSmallRollover.png
new file mode 100644
index 0000000..774551d
--- /dev/null
+++ b/resources/images/impl/gui/buttons/addContactSmallRollover.png
Binary files differ
diff --git a/resources/images/impl/gui/buttons/callSmallPressed.png b/resources/images/impl/gui/buttons/callSmallPressed.png
index 8a32ec6..d2c587e 100644
--- a/resources/images/impl/gui/buttons/callSmallPressed.png
+++ b/resources/images/impl/gui/buttons/callSmallPressed.png
Binary files differ
diff --git a/resources/images/impl/gui/buttons/callSmallRollover.png b/resources/images/impl/gui/buttons/callSmallRollover.png
new file mode 100644
index 0000000..8a32ec6
--- /dev/null
+++ b/resources/images/impl/gui/buttons/callSmallRollover.png
Binary files differ
diff --git a/resources/images/impl/gui/buttons/callVideoSmallPressed.png b/resources/images/impl/gui/buttons/callVideoSmallPressed.png
index 74c4adc..fb62d31 100644
--- a/resources/images/impl/gui/buttons/callVideoSmallPressed.png
+++ b/resources/images/impl/gui/buttons/callVideoSmallPressed.png
Binary files differ
diff --git a/resources/images/impl/gui/buttons/callVideoSmallRollover.png b/resources/images/impl/gui/buttons/callVideoSmallRollover.png
new file mode 100644
index 0000000..74c4adc
--- /dev/null
+++ b/resources/images/impl/gui/buttons/callVideoSmallRollover.png
Binary files differ
diff --git a/resources/images/impl/gui/buttons/chatSmallPressed.png b/resources/images/impl/gui/buttons/chatSmallPressed.png
index 99bac44..4a41c5a 100644
--- a/resources/images/impl/gui/buttons/chatSmallPressed.png
+++ b/resources/images/impl/gui/buttons/chatSmallPressed.png
Binary files differ
diff --git a/resources/images/impl/gui/buttons/chatSmallRollover.png b/resources/images/impl/gui/buttons/chatSmallRollover.png
new file mode 100644
index 0000000..99bac44
--- /dev/null
+++ b/resources/images/impl/gui/buttons/chatSmallRollover.png
Binary files differ
diff --git a/resources/images/impl/gui/buttons/desktopSharingSmallPressed.png b/resources/images/impl/gui/buttons/desktopSharingSmallPressed.png
index 4d336c0..e1bbb87 100644
--- a/resources/images/impl/gui/buttons/desktopSharingSmallPressed.png
+++ b/resources/images/impl/gui/buttons/desktopSharingSmallPressed.png
Binary files differ
diff --git a/resources/images/impl/gui/buttons/desktopSharingSmallRollover.png b/resources/images/impl/gui/buttons/desktopSharingSmallRollover.png
new file mode 100644
index 0000000..4d336c0
--- /dev/null
+++ b/resources/images/impl/gui/buttons/desktopSharingSmallRollover.png
Binary files differ
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
index d959779..03d71eb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
@@ -1460,15 +1460,15 @@ public class ContactListTreeCellRenderer
callButton.setIconImage(ImageLoader.getImage(
ImageLoader.CALL_BUTTON_SMALL));
callButton.setRolloverImage(ImageLoader.getImage(
- ImageLoader.CALL_BUTTON_SMALL_PRESSED));
+ ImageLoader.CALL_BUTTON_SMALL_ROLLOVER));
callButton.setPressedImage(ImageLoader.getImage(
ImageLoader.CALL_BUTTON_SMALL_PRESSED));
chatButton.setIconImage(ImageLoader.getImage(
ImageLoader.CHAT_BUTTON_SMALL));
- chatButton.setPressedImage(ImageLoader.getImage(
- ImageLoader.CHAT_BUTTON_SMALL_PRESSED));
chatButton.setRolloverImage(ImageLoader.getImage(
+ ImageLoader.CHAT_BUTTON_SMALL_ROLLOVER));
+ chatButton.setPressedImage(ImageLoader.getImage(
ImageLoader.CHAT_BUTTON_SMALL_PRESSED));
msgReceivedImage
@@ -1486,38 +1486,24 @@ public class ContactListTreeCellRenderer
if (contactForegroundProperty > -1)
contactForegroundColor = new Color(contactForegroundProperty);
- callVideoButton.setIconImage(ImageLoader.getImage(
- ImageLoader.CALL_VIDEO_BUTTON_SMALL));
- callVideoButton.setRolloverImage(ImageLoader.getImage(
- ImageLoader.CALL_VIDEO_BUTTON_SMALL_PRESSED));
- callVideoButton.setPressedImage(ImageLoader.getImage(
- ImageLoader.CALL_VIDEO_BUTTON_SMALL_PRESSED));
-
- desktopSharingButton.setIconImage(ImageLoader.getImage(
- ImageLoader.DESKTOP_BUTTON_SMALL));
- desktopSharingButton.setRolloverImage(ImageLoader.getImage(
- ImageLoader.DESKTOP_BUTTON_SMALL_PRESSED));
- desktopSharingButton.setPressedImage(ImageLoader.getImage(
- ImageLoader.DESKTOP_BUTTON_SMALL_PRESSED));
-
callVideoButton.setIconImage(
ImageLoader.getImage(ImageLoader.CALL_VIDEO_BUTTON_SMALL));
callVideoButton.setRolloverImage(
- ImageLoader.getImage(ImageLoader.CALL_VIDEO_BUTTON_SMALL_PRESSED));
+ ImageLoader.getImage(ImageLoader.CALL_VIDEO_BUTTON_SMALL_ROLLOVER));
callVideoButton.setPressedImage(
ImageLoader.getImage(ImageLoader.CALL_VIDEO_BUTTON_SMALL_PRESSED));
desktopSharingButton.setIconImage(
ImageLoader.getImage(ImageLoader.DESKTOP_BUTTON_SMALL));
desktopSharingButton.setRolloverImage(
- ImageLoader.getImage(ImageLoader.DESKTOP_BUTTON_SMALL_PRESSED));
+ ImageLoader.getImage(ImageLoader.DESKTOP_BUTTON_SMALL_ROLLOVER));
desktopSharingButton.setPressedImage(
ImageLoader.getImage(ImageLoader.DESKTOP_BUTTON_SMALL_PRESSED));
addContactButton.setIconImage(
ImageLoader.getImage(ImageLoader.ADD_CONTACT_BUTTON_SMALL));
addContactButton.setRolloverImage(
- ImageLoader.getImage(ImageLoader.ADD_CONTACT_BUTTON_SMALL_PRESSED));
+ ImageLoader.getImage(ImageLoader.ADD_CONTACT_BUTTON_SMALL_ROLLOVER));
addContactButton.setPressedImage(
ImageLoader.getImage(ImageLoader.ADD_CONTACT_BUTTON_SMALL_PRESSED));
}
diff --git a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
index c19654e..353e3aa 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
@@ -216,6 +216,12 @@ public class ImageLoader
/**
* The call button small pressed image.
*/
+ public static final ImageID CALL_BUTTON_SMALL_ROLLOVER
+ = new ImageID("service.gui.buttons.CALL_BUTTON_SMALL_ROLLOVER");
+
+ /**
+ * The call button small pressed image.
+ */
public static final ImageID CALL_BUTTON_SMALL_PRESSED
= new ImageID("service.gui.buttons.CALL_BUTTON_SMALL_PRESSED");
@@ -228,6 +234,12 @@ public class ImageLoader
/**
* The desktop sharing button small pressed image.
*/
+ public static final ImageID DESKTOP_BUTTON_SMALL_ROLLOVER
+ = new ImageID("service.gui.buttons.DESKTOP_BUTTON_SMALL_ROLLOVER");
+
+ /**
+ * The desktop sharing button small pressed image.
+ */
public static final ImageID DESKTOP_BUTTON_SMALL_PRESSED
= new ImageID("service.gui.buttons.DESKTOP_BUTTON_SMALL_PRESSED");
@@ -246,6 +258,12 @@ public class ImageLoader
/**
* The call button small pressed image.
*/
+ public static final ImageID CALL_VIDEO_BUTTON_SMALL_ROLLOVER
+ = new ImageID("service.gui.buttons.CALL_VIDEO_BUTTON_SMALL_ROLLOVER");
+
+ /**
+ * The call button small pressed image.
+ */
public static final ImageID CALL_VIDEO_BUTTON_SMALL_PRESSED
= new ImageID("service.gui.buttons.CALL_VIDEO_BUTTON_SMALL_PRESSED");
@@ -260,6 +278,13 @@ public class ImageLoader
* The add contact button small pressed image, shown when an external source
* contact is selected and add contact button is pressed.
*/
+ public static final ImageID ADD_CONTACT_BUTTON_SMALL_ROLLOVER
+ = new ImageID("service.gui.buttons.ADD_CONTACT_BUTTON_SMALL_ROLLOVER");
+
+ /**
+ * The add contact button small pressed image, shown when an external source
+ * contact is selected and add contact button is pressed.
+ */
public static final ImageID ADD_CONTACT_BUTTON_SMALL_PRESSED
= new ImageID("service.gui.buttons.ADD_CONTACT_BUTTON_SMALL_PRESSED");
@@ -324,6 +349,12 @@ public class ImageLoader
= new ImageID("service.gui.buttons.CHAT_BUTTON_SMALL_PRESSED");
/**
+ * The chat button small pressed image.
+ */
+ public static final ImageID CHAT_BUTTON_SMALL_ROLLOVER
+ = new ImageID("service.gui.buttons.CHAT_BUTTON_SMALL_ROLLOVER");
+
+ /**
* The hangup button image.
*/
public static final ImageID HANGUP_BUTTON_BG
generated by cgit v1.1 at 2024-12-22 23:13:05 +0000