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

4 files changed, 16 insertions, 0 deletions

diff --git a/kopete/styles/Konqi/Contents/Resources/Incoming/Content.html b/kopete/styles/Konqi/Contents/Resources/Incoming/Content.html
new file mode 100644
index 00000000..7809c9e7
--- /dev/null
+++ b/kopete/styles/Konqi/Contents/Resources/Incoming/Content.html
@@ -0,0 +1,10 @@
+<div class="contenu_incoming">
+    <div class="corps_message" >
+	<img class="avatar" height="70" src="%userIconPath%"/>
+	<div class="texte" style="direction: %messageDirection%;">
+	<div class="nom">%sender%</div>
+	  (%time{%H:%M:%S}%) : %message%<br>
+	<div id="insert"></div>
+	</div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/kopete/styles/Konqi/Contents/Resources/Incoming/Makefile.am b/kopete/styles/Konqi/Contents/Resources/Incoming/Makefile.am
new file mode 100644
index 00000000..37693a82
--- /dev/null
+++ b/kopete/styles/Konqi/Contents/Resources/Incoming/Makefile.am
@@ -0,0 +1,4 @@
+style_DATA = buddy_icon.png Content.html NextContent.html
+styledir = $(kde_datadir)/kopete/styles/Konqi/Contents/Resources/Incoming
+
+EXTRA_DIST = $(style_DATA)
\ No newline at end of file
diff --git a/kopete/styles/Konqi/Contents/Resources/Incoming/NextContent.html b/kopete/styles/Konqi/Contents/Resources/Incoming/NextContent.html
new file mode 100644
index 00000000..359807b8
--- /dev/null
+++ b/kopete/styles/Konqi/Contents/Resources/Incoming/NextContent.html
@@ -0,0 +1,2 @@
+(%time{%H:%M:%S}%) : %message%
+<div id="insert"></div>
\ No newline at end of file
diff --git a/kopete/styles/Konqi/Contents/Resources/Incoming/buddy_icon.png b/kopete/styles/Konqi/Contents/Resources/Incoming/buddy_icon.png
new file mode 100644
index 00000000..7438838b
--- /dev/null
+++ b/kopete/styles/Konqi/Contents/Resources/Incoming/buddy_icon.png