New smileys pack and some improvements of the smileys box look and feel.

35 files changed, 23 insertions, 19 deletions

diff --git a/resources/images/images.properties b/resources/images/images.properties
index 7a3c9cf..979358e 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -150,23 +150,27 @@ service.gui.buttons.MORE_ACTIONS_ROLLOVER_BUTTON=resources/images/impl/gui/butto
 service.gui.buttons.HIDE_ACTIONS_BUTTON=resources/images/impl/gui/buttons/hideMoreActions.png
 service.gui.buttons.HIDE_ACTIONS_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/hideMoreActionsRollover.png
 
-# Smilies icons
-service.gui.smilies.SMILEY1=resources/images/impl/gui/common/smilies/default/smiley1.gif
-service.gui.smilies.SMILEY2=resources/images/impl/gui/common/smilies/default/smiley2.gif
-service.gui.smilies.SMILEY3=resources/images/impl/gui/common/smilies/default/smiley3.gif
-service.gui.smilies.SMILEY4=resources/images/impl/gui/common/smilies/default/smiley4.gif
-service.gui.smilies.SMILEY5=resources/images/impl/gui/common/smilies/default/smiley5.gif
-service.gui.smilies.SMILEY6=resources/images/impl/gui/common/smilies/default/smiley6.gif
-service.gui.smilies.SMILEY7=resources/images/impl/gui/common/smilies/default/smiley7.gif
-service.gui.smilies.SMILEY8=resources/images/impl/gui/common/smilies/default/smiley8.gif
-service.gui.smilies.SMILEY9=resources/images/impl/gui/common/smilies/default/smiley9.gif
-service.gui.smilies.SMILEY10=resources/images/impl/gui/common/smilies/default/smiley10.gif
-service.gui.smilies.SMILEY11=resources/images/impl/gui/common/smilies/default/smiley11.gif
-service.gui.smilies.SMILEY12=resources/images/impl/gui/common/smilies/default/smiley12.gif
-service.gui.smilies.SMILEY13=resources/images/impl/gui/common/smilies/default/smiley13.gif
-service.gui.smilies.SMILEY14=resources/images/impl/gui/common/smilies/default/smiley14.gif
-service.gui.smilies.SMILEY15=resources/images/impl/gui/common/smilies/default/smiley15.gif
-service.gui.smilies.SMILEY16=resources/images/impl/gui/common/smilies/default/smiley16.gif
+# 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
 
 # Look and Feel images
 service.gui.lookandfeel.CLOSE_TAB_ICON=resources/images/impl/gui/buttons/closeTab.png
diff --git a/resources/images/impl/gui/common/smileys/default/smiley1.gif b/resources/images/impl/gui/common/smileys/default/smiley1.gif
new file mode 100755
index 0000000..5d848a5
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley1.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley10.gif b/resources/images/impl/gui/common/smileys/default/smiley10.gif
new file mode 100755
index 0000000..7203414
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley10.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley11.gif b/resources/images/impl/gui/common/smileys/default/smiley11.gif
new file mode 100755
index 0000000..a68877f
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley11.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley12.gif b/resources/images/impl/gui/common/smileys/default/smiley12.gif
new file mode 100755
index 0000000..1a920b6
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley12.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley13.gif b/resources/images/impl/gui/common/smileys/default/smiley13.gif
new file mode 100644
index 0000000..0dd3d94
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley13.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley14.gif b/resources/images/impl/gui/common/smileys/default/smiley14.gif
new file mode 100644
index 0000000..2455df0
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley14.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley15.gif b/resources/images/impl/gui/common/smileys/default/smiley15.gif
new file mode 100644
index 0000000..b2b0846
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley15.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley16.gif b/resources/images/impl/gui/common/smileys/default/smiley16.gif
new file mode 100644
index 0000000..5a23b2c
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley16.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley17.gif b/resources/images/impl/gui/common/smileys/default/smiley17.gif
new file mode 100644
index 0000000..c0522e8
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley17.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley18.gif b/resources/images/impl/gui/common/smileys/default/smiley18.gif
new file mode 100644
index 0000000..1941b26
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley18.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley19.gif b/resources/images/impl/gui/common/smileys/default/smiley19.gif
new file mode 100644
index 0000000..fec5961
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley19.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley2.gif b/resources/images/impl/gui/common/smileys/default/smiley2.gif
new file mode 100755
index 0000000..f2de9e5
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley2.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley20.gif b/resources/images/impl/gui/common/smileys/default/smiley20.gif
new file mode 100644
index 0000000..c94ef42
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley20.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley3.gif b/resources/images/impl/gui/common/smileys/default/smiley3.gif
new file mode 100755
index 0000000..a672171
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley3.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley4.gif b/resources/images/impl/gui/common/smileys/default/smiley4.gif
new file mode 100755
index 0000000..acd0b34
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley4.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley5.gif b/resources/images/impl/gui/common/smileys/default/smiley5.gif
new file mode 100755
index 0000000..9006435
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley5.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley6.gif b/resources/images/impl/gui/common/smileys/default/smiley6.gif
new file mode 100644
index 0000000..354e4af
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley6.gif
diff --git a/resources/images/impl/gui/common/smilies/default/smiley6.png b/resources/images/impl/gui/common/smileys/default/smiley6.png
index 4f84e72..4f84e72 100644
--- a/resources/images/impl/gui/common/smilies/default/smiley6.png
+++ b/resources/images/impl/gui/common/smileys/default/smiley6.png
diff --git a/resources/images/impl/gui/common/smileys/default/smiley7.gif b/resources/images/impl/gui/common/smileys/default/smiley7.gif
new file mode 100755
index 0000000..3e34dd4
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley7.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley8.gif b/resources/images/impl/gui/common/smileys/default/smiley8.gif
new file mode 100755
index 0000000..797690a
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley8.gif
diff --git a/resources/images/impl/gui/common/smileys/default/smiley9.gif b/resources/images/impl/gui/common/smileys/default/smiley9.gif
new file mode 100755
index 0000000..9713325
--- /dev/null
+++ b/resources/images/impl/gui/common/smileys/default/smiley9.gif
diff --git a/resources/images/impl/gui/common/smilies/default/smiley1.gif b/resources/images/impl/gui/common/smilies/default/smiley1.gif
deleted file mode 100755
index 94828c9..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley1.gif
+++ /dev/null
diff --git a/resources/images/impl/gui/common/smilies/default/smiley10.gif b/resources/images/impl/gui/common/smilies/default/smiley10.gif
deleted file mode 100755
index a5cd16a..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley10.gif
+++ /dev/null
diff --git a/resources/images/impl/gui/common/smilies/default/smiley11.gif b/resources/images/impl/gui/common/smilies/default/smiley11.gif
deleted file mode 100755
index a72078a..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley11.gif
+++ /dev/null
diff --git a/resources/images/impl/gui/common/smilies/default/smiley12.gif b/resources/images/impl/gui/common/smilies/default/smiley12.gif
deleted file mode 100755
index 9375f49..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley12.gif
+++ /dev/null
diff --git a/resources/images/impl/gui/common/smilies/default/smiley2.gif b/resources/images/impl/gui/common/smilies/default/smiley2.gif
deleted file mode 100755
index 3fd56e7..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley2.gif
+++ /dev/null
diff --git a/resources/images/impl/gui/common/smilies/default/smiley3.gif b/resources/images/impl/gui/common/smilies/default/smiley3.gif
deleted file mode 100755
index 720e786..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley3.gif
+++ /dev/null
diff --git a/resources/images/impl/gui/common/smilies/default/smiley4.gif b/resources/images/impl/gui/common/smilies/default/smiley4.gif
deleted file mode 100755
index 07610de..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley4.gif
+++ /dev/null
diff --git a/resources/images/impl/gui/common/smilies/default/smiley5.gif b/resources/images/impl/gui/common/smilies/default/smiley5.gif
deleted file mode 100755
index 32047eb..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley5.gif
+++ /dev/null
diff --git a/resources/images/impl/gui/common/smilies/default/smiley6.gif b/resources/images/impl/gui/common/smilies/default/smiley6.gif
deleted file mode 100644
index 7a2dc9a..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley6.gif
+++ /dev/null
diff --git a/resources/images/impl/gui/common/smilies/default/smiley7.gif b/resources/images/impl/gui/common/smilies/default/smiley7.gif
deleted file mode 100755
index 7fcbf6d..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley7.gif
+++ /dev/null
diff --git a/resources/images/impl/gui/common/smilies/default/smiley8.gif b/resources/images/impl/gui/common/smilies/default/smiley8.gif
deleted file mode 100755
index 98d4297..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley8.gif
+++ /dev/null
diff --git a/resources/images/impl/gui/common/smilies/default/smiley9.gif b/resources/images/impl/gui/common/smilies/default/smiley9.gif
deleted file mode 100755
index a0670ea..0000000
--- a/resources/images/impl/gui/common/smilies/default/smiley9.gif
+++ /dev/null
diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 9988777..65a8b9f 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -682,14 +682,14 @@ plugin.keybindings.CHAT_COPY=Copy
 plugin.keybindings.CHAT_CUT=Cut

 plugin.keybindings.CHAT_NEXT_TAB=Next tab

 plugin.keybindings.CHAT_OPEN_HISTORY=Open history

-plugin.keybindings.CHAT_OPEN_SMILIES=Open smilies

+plugin.keybindings.CHAT_OPEN_SMILIES=Open smileys

 plugin.keybindings.CHAT_PASTE=Paste

 plugin.keybindings.CHAT_PREVIOUS_TAB=Previous tab

 plugin.keybindings.MAIN_NEXT_TAB=Next tab

 plugin.keybindings.MAIN_PREVIOUS_TAB=Previous tab

 plugin.keybindings.MAIN_RENAME=Rename contact

 plugin.keybindings.OPEN_HISTORY=Show History

-plugin.keybindings.OPEN_SMILIES=Show Smilies

+plugin.keybindings.OPEN_SMILIES=Show Smileys

 plugin.keybindings.PLUGIN_NAME=Keybindings

 

 # Notification Configuration Form