Updates smileys.

13 years ago · c740b315b8
parent 037be1e08e
commit c740b315b8
23 changed files with 3 additions and 2 deletions
--- a/resources/images/impl/gui/common/smileys/default/smiley1.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley1.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley10.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley10.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley11.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley11.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley12.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley12.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley13.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley13.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley14.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley14.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley15.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley15.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley16.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley16.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley17.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley17.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley18.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley18.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley19.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley19.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley2.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley2.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley20.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley20.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley3.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley3.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley4.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley4.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley5.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley5.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley6.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley6.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley6.png
+++ b/resources/images/impl/gui/common/smileys/default/smiley6.png
--- a/resources/images/impl/gui/common/smileys/default/smiley7.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley7.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley8.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley8.gif
--- a/resources/images/impl/gui/common/smileys/default/smiley9.gif
+++ b/resources/images/impl/gui/common/smileys/default/smiley9.gif
--- a/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java
@ -218,7 +218,8 @@ public void mouseEntered(MouseEvent e)
        smileyItem.setIcon(imageIcon);

        smileyDescriptionLabel.setText(smiley.getDescription());
-        smileyTextLabel.setText(smiley.getDefaultString());
+        smileyTextLabel.setText(
+            "<html>" + smiley.getDefaultString() + "</html>");
    }

    /**
--- a/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java
+++ b/src/net/java/sip/communicator/impl/replacement/smiley/Resources.java
@ -52,7 +52,7 @@ public static Collection<Smiley> getDefaultSmileyPack()
                            ":~-(", ":~(", "(upset)" }, "Upset"));

        defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY6",
-            new String[] {"(L)" , "(l)", "(H)", "(h)"}, "In love"));
+            new String[] {"&lt;3", "(L)" , "(l)", "(H)", "(h)"}, "In love"));

        defaultSmileyList.add(new SmileyImpl("service.gui.smileys.SMILEY7",
            new String[] {"(blush)"}, "Blushing"));