Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeartwork@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

13 files changed, 120 insertions, 0 deletions

diff --git a/emoticons/greggman.com/Makefile.am b/emoticons/greggman.com/Makefile.am
new file mode 100644
index 00000000..ab037164
--- /dev/null
+++ b/emoticons/greggman.com/Makefile.am
@@ -0,0 +1,4 @@
+icondir = $(datadir)/emoticons/greggman.com
+icon_DATA = biggrin.png confused.png kiss.png oh.png \
+	smile.png sunglasses.png tongue.png unhappy.png \
+	vampire.png wink.png   emoticons.xml
diff --git a/emoticons/greggman.com/README b/emoticons/greggman.com/README
new file mode 100644
index 00000000..789909ca
--- /dev/null
+++ b/emoticons/greggman.com/README
@@ -0,0 +1,8 @@
+ greggman.com emoticons
+
+These Emoticons were found on http://www.greggman.com/pages/emoticons.htm
+and are made downloadable from there as well.
+
+Copyright-Information from that site is:
+"All images not copyright me copyright their respective companies.
+Everything else copyright me."
diff --git a/emoticons/greggman.com/biggrin.png b/emoticons/greggman.com/biggrin.png
new file mode 100644
index 00000000..334c10a1
--- /dev/null
+++ b/emoticons/greggman.com/biggrin.png
diff --git a/emoticons/greggman.com/confused.png b/emoticons/greggman.com/confused.png
new file mode 100644
index 00000000..4b337030
--- /dev/null
+++ b/emoticons/greggman.com/confused.png
diff --git a/emoticons/greggman.com/emoticons.xml b/emoticons/greggman.com/emoticons.xml
new file mode 100644
index 00000000..8b0c8c96
--- /dev/null
+++ b/emoticons/greggman.com/emoticons.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<messaging-emoticon-map >
+
+<emoticon file="smile">
+	<string>:-)</string>
+	<string>:)</string>
+	<string>:o)</string>
+</emoticon>
+
+<emoticon file="wink">
+	<string>;-)</string>
+	<string>;)</string>
+</emoticon>
+
+<emoticon file="unhappy">
+	<string>:-(</string>
+	<string>:(</string>
+</emoticon>
+
+<emoticon file="tongue">
+	<string>:-P</string>
+	<string>:P</string>
+	<string>:-p</string>
+	<string>:p</string>
+</emoticon>
+
+<emoticon file="biggrin">
+	<string>:-D</string>
+	<string>:D</string>
+</emoticon>
+
+
+<emoticon file="cry">
+	<string>:'-(</string>
+	<string>:'(</string>
+	<string>;-(</string>
+	<string>;(</string>
+</emoticon>
+
+<emoticon file="oh">
+	<string>:-O</string>
+	<string>:O</string>
+	<string>:-o</string>
+	<string>:o</string>
+</emoticon>
+
+<emoticon file="sleep">
+	<string>:-Z</string>
+	<string>:Z</string>
+	<string>:-z</string>
+	<string>:z</string>
+</emoticon>
+
+<emoticon file="confused">
+	<string>:-S</string>
+	<string>:S</string>
+	<string>:-s</string>
+	<string>:s</string>
+</emoticon>
+
+<emoticon file="kiss">
+	<string>:-X</string>
+	<string>:X</string>
+	<string>:-x</string>
+	<string>:x</string>
+</emoticon>
+
+<emoticon file="vempire">
+	<string>:-[</string>
+	<string>:[</string>
+</emoticon>
+
+<emoticon file="devil">
+	<string>&gt;:-)</string>
+	<string>&gt;:)</string>
+	<string>}:-&gt;</string>
+	<string>}:&gt;</string>
+</emoticon>
+
+<emoticon file="angel">
+	<string>O:-)</string>
+	<string>O:)</string>
+	<string>o:-)</string>
+	<string>o:)</string>
+</emoticon>
+
+<emoticon file="sunglasses">
+	<string>8-)</string>
+	<string>8)</string>
+</emoticon>
+
+<emoticon file="scream">
+	<string>:-@</string>
+	<string>:@</string>
+	<string></string>
+	<string></string>
+</emoticon>
+
+<emoticon file="smoke">
+	<string>:-Q</string>
+	<string>:Q</string>
+	<string>:-q</string>
+	<string>:q</string>
+</emoticon>
+
+
+</messaging-emoticon-map>
+
diff --git a/emoticons/greggman.com/kiss.png b/emoticons/greggman.com/kiss.png
new file mode 100644
index 00000000..4596beef
--- /dev/null
+++ b/emoticons/greggman.com/kiss.png
diff --git a/emoticons/greggman.com/oh.png b/emoticons/greggman.com/oh.png
new file mode 100644
index 00000000..32cb828d
--- /dev/null
+++ b/emoticons/greggman.com/oh.png
diff --git a/emoticons/greggman.com/smile.png b/emoticons/greggman.com/smile.png
new file mode 100644
index 00000000..c8bdf633
--- /dev/null
+++ b/emoticons/greggman.com/smile.png
diff --git a/emoticons/greggman.com/sunglasses.png b/emoticons/greggman.com/sunglasses.png
new file mode 100644
index 00000000..aef9b39e
--- /dev/null
+++ b/emoticons/greggman.com/sunglasses.png
diff --git a/emoticons/greggman.com/tongue.png b/emoticons/greggman.com/tongue.png
new file mode 100644
index 00000000..d414ac1b
--- /dev/null
+++ b/emoticons/greggman.com/tongue.png
diff --git a/emoticons/greggman.com/unhappy.png b/emoticons/greggman.com/unhappy.png
new file mode 100644
index 00000000..4ae662df
--- /dev/null
+++ b/emoticons/greggman.com/unhappy.png
diff --git a/emoticons/greggman.com/vampire.png b/emoticons/greggman.com/vampire.png
new file mode 100644
index 00000000..bd85068f
--- /dev/null
+++ b/emoticons/greggman.com/vampire.png
diff --git a/emoticons/greggman.com/wink.png b/emoticons/greggman.com/wink.png
new file mode 100644
index 00000000..75c6a883
--- /dev/null
+++ b/emoticons/greggman.com/wink.png