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

19 files changed, 276 insertions, 0 deletions

diff --git a/kopete/styles/Clean/Contents/Resources/Footer.html b/kopete/styles/Clean/Contents/Resources/Footer.html
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Footer.html
diff --git a/kopete/styles/Clean/Contents/Resources/Header.html b/kopete/styles/Clean/Contents/Resources/Header.html
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Header.html
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
diff --git a/kopete/styles/Clean/Contents/Resources/Makefile.am b/kopete/styles/Clean/Contents/Resources/Makefile.am
new file mode 100644
index 00000000..3a949700
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS = images Incoming Outgoing
+style_DATA = main.css Footer.html Header.html Status.html
+styledir = $(kde_datadir)/kopete/styles/Clean/Contents/Resources
+
+EXTRA_DIST = $(style_DATA)
\ No newline at end of file
diff --git a/kopete/styles/Clean/Contents/Resources/Outgoing/Action.html b/kopete/styles/Clean/Contents/Resources/Outgoing/Action.html
new file mode 100644
index 00000000..ae5c6043
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Outgoing/Action.html
@@ -0,0 +1,16 @@
+<div class="KopeteMessage">
+	<div class="OutgoingAction" style="direction: %messageDirection%;">
+		<!-- Protocol Icon -->
+		<img class="outActionIcon" src="images/action.png" />
+		<!-- MetaContact display -->
+		<span class="outActionMetacontact">%sender% &#160;</span>
+		<!-- Action message -->
+		<span class="outActionMessage">%message%</span>
+		<!-- Time Display -->
+		<span class="outTime">%time%</span>
+
+	</div>
+	<!-- For support of consecutive messages -->
+	<div id="insert" />
+</div>
+	
diff --git a/kopete/styles/Clean/Contents/Resources/Outgoing/Content.html b/kopete/styles/Clean/Contents/Resources/Outgoing/Content.html
new file mode 100644
index 00000000..d08299bd
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Outgoing/Content.html
@@ -0,0 +1,21 @@
+<div class="KopeteMessage">
+	<div class="OutgoingMessageHeader">
+		<!-- Protocol Icon -->
+		<img class="outStatusIcon" src="%senderStatusIcon%" />
+		<!-- Time Display -->
+		<div class="outTime">%time%</div>
+		<!-- MetaContact display -->
+		<div class="outMetacontact">%sender% &#160;</div>
+	</div>
+	<div class="OutgoingMessage" style="direction: %messageDirection%;">
+		<!-- Contact photo -->
+		<img class="outUserPicture" 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/Outgoing/Makefile.am b/kopete/styles/Clean/Contents/Resources/Outgoing/Makefile.am
new file mode 100644
index 00000000..39f997d3
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Outgoing/Makefile.am
@@ -0,0 +1,4 @@
+style_DATA = buddy_icon.png Content.html NextContent.html
+styledir = $(kde_datadir)/kopete/styles/Clean/Contents/Resources/Outgoing
+
+EXTRA_DIST = $(style_DATA)
diff --git a/kopete/styles/Clean/Contents/Resources/Outgoing/NextContent.html b/kopete/styles/Clean/Contents/Resources/Outgoing/NextContent.html
new file mode 100644
index 00000000..76931ca4
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Outgoing/NextContent.html
@@ -0,0 +1,3 @@
+<div class="NextOutgoingMessage" style="direction: %messageDirection%;">%message%</div>
+<!-- For support of consecutive messages -->
+<div id="insert" />
diff --git a/kopete/styles/Clean/Contents/Resources/Outgoing/buddy_icon.png b/kopete/styles/Clean/Contents/Resources/Outgoing/buddy_icon.png
new file mode 100644
index 00000000..7e280b74
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Outgoing/buddy_icon.png
diff --git a/kopete/styles/Clean/Contents/Resources/Status.html b/kopete/styles/Clean/Contents/Resources/Status.html
new file mode 100644
index 00000000..4e883fd5
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/Status.html
@@ -0,0 +1,10 @@
+<div class="KopeteMessage">
+	<div class="InternalMessageHeader" style="direction: %messageDirection%;">
+		<img class="systemLogo" src="images/internal.png" />
+		
+			<span class="InternalMessage">%message%</span>
+			<div class="InternalMessageHeaderTime">%time%</div>
+		
+		
+	</div>
+</div>
\ No newline at end of file
diff --git a/kopete/styles/Clean/Contents/Resources/images/Makefile.am b/kopete/styles/Clean/Contents/Resources/images/Makefile.am
new file mode 100644
index 00000000..6d97fcaa
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/images/Makefile.am
@@ -0,0 +1,4 @@
+style_DATA = action.png important.png internal.png
+styledir = $(kde_datadir)/kopete/styles/Clean/Contents/Resources/images
+
+EXTRA_DIST = $(style_DATA)
\ No newline at end of file
diff --git a/kopete/styles/Clean/Contents/Resources/images/action.png b/kopete/styles/Clean/Contents/Resources/images/action.png
new file mode 100644
index 00000000..543710fb
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/images/action.png
diff --git a/kopete/styles/Clean/Contents/Resources/images/important.png b/kopete/styles/Clean/Contents/Resources/images/important.png
new file mode 100644
index 00000000..474f63fc
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/images/important.png
diff --git a/kopete/styles/Clean/Contents/Resources/images/internal.png b/kopete/styles/Clean/Contents/Resources/images/internal.png
new file mode 100644
index 00000000..838c38bf
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/images/internal.png
diff --git a/kopete/styles/Clean/Contents/Resources/main.css b/kopete/styles/Clean/Contents/Resources/main.css
new file mode 100644
index 00000000..011cd298
--- /dev/null
+++ b/kopete/styles/Clean/Contents/Resources/main.css
@@ -0,0 +1,169 @@
+.KopeteMessage
+{
+	margin:1.4em .2em 0 .2em;
+}
+
+.IncomingMessageHeader
+{
+	padding-left: 1ex; 
+	padding-right: 1ex;
+	border-bottom: 0.1em solid;
+}
+
+.IncomingMessage
+{
+	padding-left: 1ex;
+	padding-right: 1ex;
+	padding-top: 0.25em;
+}
+
+.NextIncomingMessage
+{
+	padding-left: 1ex;
+	padding-right: 1ex;
+	padding-top: 0.25em;
+	padding-bottom: 0.5em;
+}
+
+.inUserPicture
+{
+	float: left;
+	border: 1px solid #888;
+	height: 4.30em;
+	margin-top: 0.25em;
+	border: 0.1em solid black;
+	margin-left: 0.2em;
+	margin-right: 1ex;
+
+}
+
+.inStatusIcon
+{
+	float: left;
+	padding-right: 1ex;
+}
+
+.inTime
+{
+	float: right;
+}
+.inMetacontact
+{
+	padding-left: 1ex;
+	font-weight: bold;
+}
+
+.IncomingAction
+{
+	padding-left: 1ex; 
+	padding-right: 1ex; 
+	border-bottom: 0.1em dashed #ffafaf;
+}
+.inActionIcon
+{
+	float: left;
+	margin-right: 5px;
+}
+.inActionMetacontact
+{
+	margin-left: 5px;
+	font-weight: bold;
+}
+.inActionMessage
+{
+
+}
+
+.OutgoingMessageHeader
+{
+	padding-left: 1ex; padding-right: 1ex;
+	border-bottom: 0.1em solid #ffafaf;
+}
+
+.OutgoingMessage
+{
+	padding-left: 1ex;
+	padding-right: 1ex;
+	padding-top: 0.25em;
+	padding-bottom: 0.5em;
+}
+
+.NextOutgoingMessage
+{
+	padding-left: 1ex;
+	padding-right: 1ex;
+	padding-top: 0.25em;
+	padding-bottom: 0.5em;
+}
+
+.outUserPicture
+{
+	float: left;
+	border: 1px solid #888;
+	height: 4.30em;
+	margin-top: 0.2em;
+	margin-left: 0.2em;
+	margin-right: 1ex;
+}
+
+.outStatusIcon
+{
+	float: left;
+	padding-right: 1ex;
+}
+
+.outTime
+{
+	float: right;
+}
+.outMetacontact
+{
+	margin-left: 15px;
+	font-weight: bold;
+}
+
+.OutgoingAction
+{
+	padding-left: 1ex; 
+	padding-right: 1ex; 
+	border-bottom: 0.1em dashed #ffafaf;
+}
+.outActionIcon
+{
+	float: left;
+	padding-right: 1ex;
+}
+.outActionMetacontact
+{
+	margin-left: 10px;
+	font-weight: bold;
+}
+.outActionMessage
+{
+}
+
+.InternalMessageHeader
+{
+	padding-left: 1ex; 
+	padding-right: 1ex; 
+	border-bottom: 0.1em dashed #afffaf;
+}
+
+.InternalMessage
+{
+	width: 80%;
+	text-align: left;
+}
+
+.InternalMessageHeaderTime
+{
+	float: right; 
+}
+
+.systemLogo
+{
+	float: left;
+	vertical-align: middle;
+	padding-right: 1ex;
+}
+