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/kdelibs@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

43 files changed, 187 insertions, 0 deletions

diff --git a/pics/emoticons/Makefile.am b/pics/emoticons/Makefile.am
new file mode 100644
index 000000000..7b43d7ed1
--- /dev/null
+++ b/pics/emoticons/Makefile.am
@@ -0,0 +1,2 @@
+icondir = $(datadir)/emoticons/Default
+icon_DATA = angry.png bat.png beer.png biggrin.png cake.png camera.png cat.png clock.png cocktail.png confused.png cry.png cup.png dog.png email.png embarassed.png emoticons.xml film.png kiss.png lightbulb.png love.png note.png oh.png omg.png phone.png present.png rose.png sad.png shade.png sleep.png smile.png star.png teeth.png thumbs_down.png thumbs_up.png tongue.png unhappy.png unlove.png wilted_rose.png wink.png foot_in_mouth.png innocent.png undecided.png
diff --git a/pics/emoticons/angry.png b/pics/emoticons/angry.png
new file mode 100644
index 000000000..685004fa4
--- /dev/null
+++ b/pics/emoticons/angry.png
diff --git a/pics/emoticons/bat.png b/pics/emoticons/bat.png
new file mode 100644
index 000000000..116eeaaa5
--- /dev/null
+++ b/pics/emoticons/bat.png
diff --git a/pics/emoticons/beer.png b/pics/emoticons/beer.png
new file mode 100644
index 000000000..4f070d366
--- /dev/null
+++ b/pics/emoticons/beer.png
diff --git a/pics/emoticons/biggrin.png b/pics/emoticons/biggrin.png
new file mode 100644
index 000000000..aebbd838d
--- /dev/null
+++ b/pics/emoticons/biggrin.png
diff --git a/pics/emoticons/cake.png b/pics/emoticons/cake.png
new file mode 100644
index 000000000..a4c647b9d
--- /dev/null
+++ b/pics/emoticons/cake.png
diff --git a/pics/emoticons/camera.png b/pics/emoticons/camera.png
new file mode 100644
index 000000000..87229eaf3
--- /dev/null
+++ b/pics/emoticons/camera.png
diff --git a/pics/emoticons/cat.png b/pics/emoticons/cat.png
new file mode 100644
index 000000000..8bcbf8bc3
--- /dev/null
+++ b/pics/emoticons/cat.png
diff --git a/pics/emoticons/clock.png b/pics/emoticons/clock.png
new file mode 100644
index 000000000..bc2963a33
--- /dev/null
+++ b/pics/emoticons/clock.png
diff --git a/pics/emoticons/cocktail.png b/pics/emoticons/cocktail.png
new file mode 100644
index 000000000..df4856d11
--- /dev/null
+++ b/pics/emoticons/cocktail.png
diff --git a/pics/emoticons/confused.png b/pics/emoticons/confused.png
new file mode 100644
index 000000000..c6b495aba
--- /dev/null
+++ b/pics/emoticons/confused.png
diff --git a/pics/emoticons/cry.png b/pics/emoticons/cry.png
new file mode 100644
index 000000000..69ce50c8c
--- /dev/null
+++ b/pics/emoticons/cry.png
diff --git a/pics/emoticons/cup.png b/pics/emoticons/cup.png
new file mode 100644
index 000000000..6df581ea5
--- /dev/null
+++ b/pics/emoticons/cup.png
diff --git a/pics/emoticons/dog.png b/pics/emoticons/dog.png
new file mode 100644
index 000000000..66810c7b6
--- /dev/null
+++ b/pics/emoticons/dog.png
diff --git a/pics/emoticons/email.png b/pics/emoticons/email.png
new file mode 100644
index 000000000..728f5a3ed
--- /dev/null
+++ b/pics/emoticons/email.png
diff --git a/pics/emoticons/embarassed.png b/pics/emoticons/embarassed.png
new file mode 100644
index 000000000..3dc100b10
--- /dev/null
+++ b/pics/emoticons/embarassed.png
diff --git a/pics/emoticons/emoticons.xml b/pics/emoticons/emoticons.xml
new file mode 100644
index 000000000..dad55e221
--- /dev/null
+++ b/pics/emoticons/emoticons.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0"?>
+<messaging-emoticon-map >
+
+<emoticon file="angry">
+	<string>:-@</string>
+	<string>:@</string>
+	<string>&gt;:-(</string>
+	<string>&gt;:(</string>
+</emoticon>
+
+<emoticon file="bat">
+	<string>:-[</string>
+	<string>:[</string>
+</emoticon>
+
+<emoticon file="beer">
+	<string>(B)</string>
+	<string>(b)</string>
+</emoticon>
+
+<emoticon file="cake">
+	<string>(^)</string>
+</emoticon>
+
+<emoticon file="camera">
+	<string>(P)</string>
+	<string>(p)</string>
+</emoticon>
+
+<emoticon file="cat">
+	<string>(@)</string>
+</emoticon>
+
+<emoticon file="clock">
+	<string>(O)</string>
+	<string>(o)</string>
+</emoticon>
+
+<emoticon file="cocktail">
+	<string>(D)</string>
+	<string>(d)</string>
+</emoticon>
+
+<emoticon file="confused">
+	<string>:-S</string>
+	<string>:S</string>
+	<string>:-s</string>
+	<string>:s</string>
+</emoticon>
+
+<emoticon file="cry">
+	<string>:'(</string>
+	<string>:'-(</string>
+	<string>;-(</string>
+	<string>;(</string>
+</emoticon>
+
+<emoticon file="cup">
+	<string>(C)</string>
+	<string>(c)</string>
+</emoticon>
+
+<emoticon file="dog">
+	<string>(&amp;)</string>
+</emoticon>
+
+<emoticon file="embarassed">
+	<string>:-$</string>
+	<string>:$</string>
+</emoticon>
+
+<emoticon file="email">
+	<string>(E)</string>
+	<string>(e)</string>
+</emoticon>
+
+<emoticon file="film">
+	<string>(~)</string>
+</emoticon>
+
+<emoticon file="kiss">
+	<string>(K)</string>
+	<string>(k)</string>
+	<string>:-X</string>
+	<string>:X</string>
+	<string>:-x</string>
+	<string>:x</string>
+</emoticon>
+
+<emoticon file="lightbulb">
+	<string>(I)</string>
+	<string>(i)</string>
+</emoticon>
+
+<emoticon file="love">
+	<string>(L)</string>
+	<string>(l)</string>
+</emoticon>
+
+<emoticon file="note">
+	<string>(8)</string>
+</emoticon>
+
+<emoticon file="omg">
+	<string>:-O</string>
+	<string>:O</string>
+	<string>:-o</string>
+	<string>:o</string>
+</emoticon>
+
+<emoticon file="phone">
+	<string>(T)</string>
+	<string>(t)</string>
+</emoticon>
+
+<emoticon file="present">
+	<string>(G)</string>
+	<string>(g)</string>
+</emoticon>
+
+<emoticon file="rose">
+	<string>(F)</string>
+	<string>(f)</string>
+</emoticon>
+
+<emoticon file="sad">
+	<string>:-(</string>
+	<string>:(</string>
+</emoticon>
+
+<emoticon file="shade">
+	<string>(H)</string>
+	<string>(h)</string>
+	<string>8-)</string>
+	<string>8)</string>
+</emoticon>
+
+<emoticon file="smile">
+	<string>:-)</string>
+	<string>:)</string>
+	<string>:o)</string>
+</emoticon>
+
+<emoticon file="star">
+	<string>(*)</string>
+</emoticon>
+
+<emoticon file="teeth">
+	<string>:-D</string>
+	<string>:D</string>
+</emoticon>
+
+<emoticon file="thumbs_down">
+	<string>(N)</string>
+	<string>(n)</string>
+</emoticon>
+
+<emoticon file="thumbs_up">
+	<string>(Y)</string>
+	<string>(y)</string>
+</emoticon>
+
+<emoticon file="tongue">
+	<string>:-P</string>
+	<string>:P</string>
+	<string>:-p</string>
+	<string>:p</string>
+</emoticon>
+
+<emoticon file="unlove">
+	<string>(U)</string>
+	<string>(u)</string>
+</emoticon>
+
+<emoticon file="wilted_rose">
+	<string>(W)</string>
+	<string>(w)</string>
+</emoticon>
+
+<emoticon file="wink">
+	<string>;-)</string>
+	<string>;)</string>
+</emoticon>
+
+</messaging-emoticon-map>
diff --git a/pics/emoticons/film.png b/pics/emoticons/film.png
new file mode 100644
index 000000000..95e7d3c0c
--- /dev/null
+++ b/pics/emoticons/film.png
diff --git a/pics/emoticons/foot_in_mouth.png b/pics/emoticons/foot_in_mouth.png
new file mode 100644
index 000000000..b066d3f64
--- /dev/null
+++ b/pics/emoticons/foot_in_mouth.png
diff --git a/pics/emoticons/innocent.png b/pics/emoticons/innocent.png
new file mode 100644
index 000000000..6bb845615
--- /dev/null
+++ b/pics/emoticons/innocent.png
diff --git a/pics/emoticons/kiss.png b/pics/emoticons/kiss.png
new file mode 100644
index 000000000..973626377
--- /dev/null
+++ b/pics/emoticons/kiss.png
diff --git a/pics/emoticons/lightbulb.png b/pics/emoticons/lightbulb.png
new file mode 100644
index 000000000..5dd5860ac
--- /dev/null
+++ b/pics/emoticons/lightbulb.png
diff --git a/pics/emoticons/love.png b/pics/emoticons/love.png
new file mode 100644
index 000000000..084c4543c
--- /dev/null
+++ b/pics/emoticons/love.png
diff --git a/pics/emoticons/note.png b/pics/emoticons/note.png
new file mode 100644
index 000000000..d6d9cd948
--- /dev/null
+++ b/pics/emoticons/note.png
diff --git a/pics/emoticons/oh.png b/pics/emoticons/oh.png
new file mode 100644
index 000000000..e4dda5768
--- /dev/null
+++ b/pics/emoticons/oh.png
diff --git a/pics/emoticons/omg.png b/pics/emoticons/omg.png
new file mode 100644
index 000000000..9e16d5323
--- /dev/null
+++ b/pics/emoticons/omg.png
diff --git a/pics/emoticons/phone.png b/pics/emoticons/phone.png
new file mode 100644
index 000000000..e680956fc
--- /dev/null
+++ b/pics/emoticons/phone.png
diff --git a/pics/emoticons/present.png b/pics/emoticons/present.png
new file mode 100644
index 000000000..76b65c0f9
--- /dev/null
+++ b/pics/emoticons/present.png
diff --git a/pics/emoticons/rose.png b/pics/emoticons/rose.png
new file mode 100644
index 000000000..6bdabc8ff
--- /dev/null
+++ b/pics/emoticons/rose.png
diff --git a/pics/emoticons/sad.png b/pics/emoticons/sad.png
new file mode 100644
index 000000000..34ecdb82a
--- /dev/null
+++ b/pics/emoticons/sad.png
diff --git a/pics/emoticons/shade.png b/pics/emoticons/shade.png
new file mode 100644
index 000000000..9ebffa757
--- /dev/null
+++ b/pics/emoticons/shade.png
diff --git a/pics/emoticons/sleep.png b/pics/emoticons/sleep.png
new file mode 100644
index 000000000..5ce5e27cf
--- /dev/null
+++ b/pics/emoticons/sleep.png
diff --git a/pics/emoticons/smile.png b/pics/emoticons/smile.png
new file mode 100644
index 000000000..49d678dd8
--- /dev/null
+++ b/pics/emoticons/smile.png
diff --git a/pics/emoticons/star.png b/pics/emoticons/star.png
new file mode 100644
index 000000000..1064002c1
--- /dev/null
+++ b/pics/emoticons/star.png
diff --git a/pics/emoticons/teeth.png b/pics/emoticons/teeth.png
new file mode 100644
index 000000000..8c1d69728
--- /dev/null
+++ b/pics/emoticons/teeth.png
diff --git a/pics/emoticons/thumbs_down.png b/pics/emoticons/thumbs_down.png
new file mode 100644
index 000000000..cb963d2cc
--- /dev/null
+++ b/pics/emoticons/thumbs_down.png
diff --git a/pics/emoticons/thumbs_up.png b/pics/emoticons/thumbs_up.png
new file mode 100644
index 000000000..78a15e464
--- /dev/null
+++ b/pics/emoticons/thumbs_up.png
diff --git a/pics/emoticons/tongue.png b/pics/emoticons/tongue.png
new file mode 100644
index 000000000..ce1371ea9
--- /dev/null
+++ b/pics/emoticons/tongue.png
diff --git a/pics/emoticons/undecided.png b/pics/emoticons/undecided.png
new file mode 100644
index 000000000..a5a1f2294
--- /dev/null
+++ b/pics/emoticons/undecided.png
diff --git a/pics/emoticons/unhappy.png b/pics/emoticons/unhappy.png
new file mode 100644
index 000000000..f9a4ead89
--- /dev/null
+++ b/pics/emoticons/unhappy.png
diff --git a/pics/emoticons/unlove.png b/pics/emoticons/unlove.png
new file mode 100644
index 000000000..1421a4d1e
--- /dev/null
+++ b/pics/emoticons/unlove.png
diff --git a/pics/emoticons/wilted_rose.png b/pics/emoticons/wilted_rose.png
new file mode 100644
index 000000000..f4ea1af87
--- /dev/null
+++ b/pics/emoticons/wilted_rose.png
diff --git a/pics/emoticons/wink.png b/pics/emoticons/wink.png
new file mode 100644
index 000000000..a63d71702
--- /dev/null
+++ b/pics/emoticons/wink.png