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

5 files changed, 44 insertions, 0 deletions

diff --git a/kopete/styles/Clean/Contents/Resources/Incoming/Action.html b/kopete/styles/Clean/Contents/Resources/Incoming/Action.html
new file mode 100644
index 00000000..ead5823e
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Incoming/Action.html
@@ -0,0 +1,16 @@
+<div class="KopeteMessage">
+	<div class="IncomingAction" style="direction: %messageDirection%;">
+		<!-- Protocol Icon -->
+		<img class="inActionIcon" src="images/action.png" />
+		<!-- MetaContact display -->
+		<span class="inActionMetacontact">%sender% &#160;</span>
+		<!-- Action message -->
+		<span class="inActionMessage">%message%</span>
+		<!-- Time Display -->
+		<span class="inTime">%time%</span>
+
+	</div>
+	<!-- For support of consecutive messages -->
+	<div id="insert" />
+</div>
+	
diff --git a/kopete/styles/Clean/Contents/Resources/Incoming/Content.html b/kopete/styles/Clean/Contents/Resources/Incoming/Content.html
new file mode 100644
index 00000000..b9c7c90d
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Incoming/Content.html
@@ -0,0 +1,21 @@
+<div class="KopeteMessage">
+	<div class="IncomingMessageHeader" style="border-color: %senderColor%">
+		<!-- Protocol Icon -->
+		<img class="inStatusIcon" src="%senderStatusIcon%" />
+		<!-- Time Display -->
+		<div class="inTime">%time%</div>
+		<!-- MetaContact display -->
+		<div class="inMetacontact">%sender% &#160;</div>
+	</div>
+	<div class="IncomingMessage" style="direction: %messageDirection%;">
+		<!-- Contact photo -->
+		<img class="inUserPicture" src="%userIconPath%" />
+		%message%
+	<!-- For support of consecutive messages -->
+	<div id="insert" />
+		<div style="clear: both;">&nbsp;</div>
+
+	</div>
+
+</div>
+	
diff --git a/kopete/styles/Clean/Contents/Resources/Incoming/Makefile.am b/kopete/styles/Clean/Contents/Resources/Incoming/Makefile.am
new file mode 100644
index 00000000..df31f61c
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Incoming/Makefile.am
@@ -0,0 +1,4 @@
+style_DATA = buddy_icon.png Content.html NextContent.html
+styledir = $(kde_datadir)/kopete/styles/Clean/Contents/Resources/Incoming
+
+EXTRA_DIST = $(style_DATA)
\ No newline at end of file
diff --git a/kopete/styles/Clean/Contents/Resources/Incoming/NextContent.html b/kopete/styles/Clean/Contents/Resources/Incoming/NextContent.html
new file mode 100644
index 00000000..c4196670
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Incoming/NextContent.html
@@ -0,0 +1,3 @@
+<div class="NextIncomingMessage" style="direction: %messageDirection%;">%message%</div>
+<!-- For support of consecutive messages -->
+<div id="insert" />
diff --git a/kopete/styles/Clean/Contents/Resources/Incoming/buddy_icon.png b/kopete/styles/Clean/Contents/Resources/Incoming/buddy_icon.png
new file mode 100644
index 00000000..7e280b74
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Incoming/buddy_icon.png