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, 56 insertions, 0 deletions

diff --git a/kopete/styles/Clear/Contents/Resources/Incoming/Action.html b/kopete/styles/Clear/Contents/Resources/Incoming/Action.html
new file mode 100644
index 00000000..7f37423d
--- /dev/null
+++ b/kopete/styles/Clear/Contents/Resources/Incoming/Action.html
@@ -0,0 +1,16 @@
+<div class="KopeteMessage">
+	<div class="IncomingAction">
+		<span class="IncomingActionBody">
+			<!-- MetaContact display -->
+			<span class="inActionMetacontact">%sender% &#160;</span>
+			<!-- Action message -->
+			<span class="inActionMessage">%message%</span>
+		</span>
+		<!-- Time Display -->
+		<span class="IncomingActionTime">%time%</span>
+
+	</div>
+	<!-- For support of consecutive messages -->
+	<!-- <div id="insert" /> -->
+</div>
+	
diff --git a/kopete/styles/Clear/Contents/Resources/Incoming/Content.html b/kopete/styles/Clear/Contents/Resources/Incoming/Content.html
new file mode 100644
index 00000000..0b17c975
--- /dev/null
+++ b/kopete/styles/Clear/Contents/Resources/Incoming/Content.html
@@ -0,0 +1,33 @@
+<div class="KopeteMessage">
+	<div class="IncomingMessageHeader">
+		<div class="IncomingMessageHeader1">
+			<div class="IncomingMessageHeader2">
+				<!-- MetaContact display -->
+				<span class="inMetacontact">%sender% &#160;</span>
+				<!-- Time Display -->
+				<span class="inTime">%time%</span>
+			</div>
+		</div>
+	</div>
+	<div class="IncomingBody">
+		<div class="IncomingBody1">
+			<div class="IncomingBody2">
+				<div class="inUserPicture">
+				<!-- Contact photo -->
+				<img  width="46" height="46" src="%userIconPath%" />
+				</div>
+				<div class="IncomingMessage"  style="direction: %messageDirection%;">
+				<img src="images/body-inbound-arrow.png" style="padding-bottom: 2px; vertical-align: middle;"/>%message%
+				</div>
+				<!-- For support of consecutive messages -->
+				<div id="insert" />
+			</div>
+		</div>
+	</div>
+	<div class="IncomingFooter">
+		<div class="IncomingFooter1">
+			<div id="IncomingFooter2" />
+		</div>
+	</div>
+
+</div>
\ No newline at end of file
diff --git a/kopete/styles/Clear/Contents/Resources/Incoming/Makefile.am b/kopete/styles/Clear/Contents/Resources/Incoming/Makefile.am
new file mode 100644
index 00000000..2d8694eb
--- /dev/null
+++ b/kopete/styles/Clear/Contents/Resources/Incoming/Makefile.am
@@ -0,0 +1,4 @@
+style_DATA = buddy_icon.png Content.html NextContent.html Action.html
+styledir = $(kde_datadir)/kopete/styles/Clear/Contents/Resources/Incoming
+
+EXTRA_DIST = $(style_DATA)
\ No newline at end of file
diff --git a/kopete/styles/Clear/Contents/Resources/Incoming/NextContent.html b/kopete/styles/Clear/Contents/Resources/Incoming/NextContent.html
new file mode 100644
index 00000000..e6a4b318
--- /dev/null
+++ b/kopete/styles/Clear/Contents/Resources/Incoming/NextContent.html
@@ -0,0 +1,3 @@
+<div class="NextIncomingMessage"><img src="images/body-inbound-arrow.png" style="padding-bottom: 2px; vertical-align: middle;"/>%message%</div>
+<!-- For support of consecutive messages -->
+<div id="insert" />
diff --git a/kopete/styles/Clear/Contents/Resources/Incoming/buddy_icon.png b/kopete/styles/Clear/Contents/Resources/Incoming/buddy_icon.png
new file mode 100644
index 00000000..7e280b74
--- /dev/null
+++ b/kopete/styles/Clear/Contents/Resources/Incoming/buddy_icon.png