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

23 files changed, 365 insertions, 0 deletions

diff --git a/kopete/styles/Kopete/Contents/Makefile.am b/kopete/styles/Kopete/Contents/Makefile.am
new file mode 100644
index 00000000..6940fe81
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = Resources
\ No newline at end of file
diff --git a/kopete/styles/Kopete/Contents/Resources/Footer.html b/kopete/styles/Kopete/Contents/Resources/Footer.html
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Footer.html
diff --git a/kopete/styles/Kopete/Contents/Resources/Header.html b/kopete/styles/Kopete/Contents/Resources/Header.html
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Header.html
diff --git a/kopete/styles/Kopete/Contents/Resources/Incoming/Action.html b/kopete/styles/Kopete/Contents/Resources/Incoming/Action.html
new file mode 100644
index 00000000..ead5823e
--- /dev/null
+++ b/kopete/styles/Kopete/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/Kopete/Contents/Resources/Incoming/Content.html b/kopete/styles/Kopete/Contents/Resources/Incoming/Content.html
new file mode 100644
index 00000000..2a525c2e
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Incoming/Content.html
@@ -0,0 +1,20 @@
+<div class="KopeteMessage">
+	<div style="padding:0;margin:0;border:none;border-color:%senderColor{180}% %senderColor{140}% %senderColor{140}% %senderColor{180}%;background-color:%senderColor{155}%">
+		<div class="IncomingMessageHeader">
+		<!-- Contact photo -->
+		<img class="inUserPicture" src="%userIconPath%" />
+		<!-- Protocol Icon -->
+		<img class="inStatusIcon" src="%senderStatusIcon%" />
+		<!-- Time Display -->
+		<div class="inTime">%time%</div>
+		<!-- MetaContact display -->
+		<div class="inMetacontact">%sender% &#160;</div>
+	</div>
+	</div>
+	<ul class="IncomingList" style="direction: %messageDirection%;">
+		<li class="IncomingMessage" style="direction: %messageDirection%;">%message%</li>
+		<!-- For support of consecutive messages -->
+		<div id="insert" />
+	</ul>	
+</div>
+	
diff --git a/kopete/styles/Kopete/Contents/Resources/Incoming/Makefile.am b/kopete/styles/Kopete/Contents/Resources/Incoming/Makefile.am
new file mode 100644
index 00000000..30dcce80
--- /dev/null
+++ b/kopete/styles/Kopete/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/Kopete/Contents/Resources/Incoming
+
+EXTRA_DIST = $(style_DATA)
\ No newline at end of file
diff --git a/kopete/styles/Kopete/Contents/Resources/Incoming/NextContent.html b/kopete/styles/Kopete/Contents/Resources/Incoming/NextContent.html
new file mode 100644
index 00000000..69185fec
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Incoming/NextContent.html
@@ -0,0 +1,3 @@
+<li class="NextIncomingMessage" style="direction: %messageDirection%;">%message%</li>
+<!-- For support of consecutive messages -->
+<div id="insert" />
diff --git a/kopete/styles/Kopete/Contents/Resources/Incoming/buddy_icon.png b/kopete/styles/Kopete/Contents/Resources/Incoming/buddy_icon.png
new file mode 100644
index 00000000..7e280b74
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Incoming/buddy_icon.png
diff --git a/kopete/styles/Kopete/Contents/Resources/Makefile.am b/kopete/styles/Kopete/Contents/Resources/Makefile.am
new file mode 100644
index 00000000..fa2fe450
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS = images Incoming Outgoing Variants
+style_DATA = main.css Footer.html Header.html Status.html
+styledir = $(kde_datadir)/kopete/styles/Kopete/Contents/Resources
+
+EXTRA_DIST = $(style_DATA)
\ No newline at end of file
diff --git a/kopete/styles/Kopete/Contents/Resources/Outgoing/Action.html b/kopete/styles/Kopete/Contents/Resources/Outgoing/Action.html
new file mode 100644
index 00000000..ae5c6043
--- /dev/null
+++ b/kopete/styles/Kopete/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/Kopete/Contents/Resources/Outgoing/Content.html b/kopete/styles/Kopete/Contents/Resources/Outgoing/Content.html
new file mode 100644
index 00000000..5ace0f94
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Outgoing/Content.html
@@ -0,0 +1,21 @@
+<div class="KopeteMessage">
+	<div style="padding:0;margin:0;border:none;border-color:%senderColor{180}% %senderColor{140}% %senderColor{140}% %senderColor{180}%;background-color:%senderColor{155}%">
+	<div class="OutgoingMessageHeader">
+		<!-- Contact photo -->
+		<img class="outUserPicture" src="%userIconPath%" />
+		<!-- Protocol Icon -->
+		<img class="outStatusIcon" src="%senderStatusIcon%" />
+		<!-- Time Display -->
+		<div class="outTime">%time%</div>
+		<!-- MetaContact display -->
+		<div class="outMetacontact">%sender% &#160;</div>
+	</div>
+	</div>
+	<ul class="OutgoingList" style="direction: %messageDirection%;">
+		<li class="OutgoingMessage" style="direction: %messageDirection%;">%message%</li>
+		<!-- For support of consecutive messages -->
+		<div id="insert" />
+	</ul>
+</div>
+	
+ 
diff --git a/kopete/styles/Kopete/Contents/Resources/Outgoing/Makefile.am b/kopete/styles/Kopete/Contents/Resources/Outgoing/Makefile.am
new file mode 100644
index 00000000..c7cdf416
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Outgoing/Makefile.am
@@ -0,0 +1,4 @@
+style_DATA = buddy_icon.png Content.html NextContent.html Action.html
+styledir = $(kde_datadir)/kopete/styles/Kopete/Contents/Resources/Outgoing
+
+EXTRA_DIST = $(style_DATA)
diff --git a/kopete/styles/Kopete/Contents/Resources/Outgoing/NextContent.html b/kopete/styles/Kopete/Contents/Resources/Outgoing/NextContent.html
new file mode 100644
index 00000000..8e280a95
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Outgoing/NextContent.html
@@ -0,0 +1,3 @@
+<li class="NextOutgoingMessage" style="direction: %messageDirection%;">%message%</li>
+<!-- For support of consecutive messages -->
+<div id="insert" />
diff --git a/kopete/styles/Kopete/Contents/Resources/Outgoing/buddy_icon.png b/kopete/styles/Kopete/Contents/Resources/Outgoing/buddy_icon.png
new file mode 100644
index 00000000..7e280b74
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Outgoing/buddy_icon.png
diff --git a/kopete/styles/Kopete/Contents/Resources/Status.html b/kopete/styles/Kopete/Contents/Resources/Status.html
new file mode 100644
index 00000000..763da40a
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Status.html
@@ -0,0 +1,10 @@
+<div class="KopeteMessage">
+	<div class="InternalMessageHeader" style="direction: %messageDirection%;">
+		<img class="systemLogo" src="images/system.png" />
+		
+			<span class="InternalMessage">%message%</span>
+			<div class="InternalMessageHeaderTime">%time%</div>
+		
+		
+	</div>
+</div>
\ No newline at end of file
diff --git a/kopete/styles/Kopete/Contents/Resources/Variants/Big_pictures.css b/kopete/styles/Kopete/Contents/Resources/Variants/Big_pictures.css
new file mode 100644
index 00000000..20a8bcaf
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Variants/Big_pictures.css
@@ -0,0 +1,35 @@
+ @import url(../main.css);
+
+ .inUserPicture
+{
+	height: 96px;
+}
+
+.IncomingList, .OutgoingList
+{
+	/*margin-left: 110px;*/
+	margin-left :53px;
+}
+
+.IncomingMessage, .OutgoingMessage
+{
+
+}
+
+.NextIncomingMessage, .NextOutgoingMessage
+{
+
+}
+
+.outUserPicture
+{
+	height: 96px;
+}
+
+.KopeteMessage
+{
+	/*height: 96px;*/
+}
+
+
+
diff --git a/kopete/styles/Kopete/Contents/Resources/Variants/Contact_color.css b/kopete/styles/Kopete/Contents/Resources/Variants/Contact_color.css
new file mode 100644
index 00000000..c6158028
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Variants/Contact_color.css
@@ -0,0 +1,7 @@
+ @import url(../main.css);
+
+.IncomingMessageHeader /*, .OutgoingMessageHeader, .IncomingAction, .OutgoingAction*/
+{
+	background-color:inherit;
+	border-color:inherit;
+}
\ No newline at end of file
diff --git a/kopete/styles/Kopete/Contents/Resources/Variants/Makefile.am b/kopete/styles/Kopete/Contents/Resources/Variants/Makefile.am
new file mode 100644
index 00000000..55d71155
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/Variants/Makefile.am
@@ -0,0 +1,5 @@
+style_DATA = Big_pictures.css Contact_color.css
+
+styledir = $(kde_datadir)/kopete/styles/Kopete/Contents/Resources/Variants
+
+EXTRA_DIST = $(style_DATA)
diff --git a/kopete/styles/Kopete/Contents/Resources/images/Makefile.am b/kopete/styles/Kopete/Contents/Resources/images/Makefile.am
new file mode 100644
index 00000000..57924e13
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/images/Makefile.am
@@ -0,0 +1,4 @@
+style_DATA = action.png important.png system.png
+styledir = $(kde_datadir)/kopete/styles/Kopete/Contents/Resources/images
+
+EXTRA_DIST = $(style_DATA)
\ No newline at end of file
diff --git a/kopete/styles/Kopete/Contents/Resources/images/action.png b/kopete/styles/Kopete/Contents/Resources/images/action.png
new file mode 100644
index 00000000..bc7069d8
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/images/action.png
diff --git a/kopete/styles/Kopete/Contents/Resources/images/important.png b/kopete/styles/Kopete/Contents/Resources/images/important.png
new file mode 100644
index 00000000..474f63fc
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/images/important.png
diff --git a/kopete/styles/Kopete/Contents/Resources/images/system.png b/kopete/styles/Kopete/Contents/Resources/images/system.png
new file mode 100644
index 00000000..98d4b996
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/images/system.png
diff --git a/kopete/styles/Kopete/Contents/Resources/main.css b/kopete/styles/Kopete/Contents/Resources/main.css
new file mode 100644
index 00000000..ce325163
--- /dev/null
+++ b/kopete/styles/Kopete/Contents/Resources/main.css
@@ -0,0 +1,211 @@
+.KopeteMessage
+{
+	margin:1.4em .2em 0 .2em;
+	clear: both;
+}
+
+.IncomingMessageHeader
+{
+	background-color:#dfedff;
+	padding:.1em;
+	border:solid;
+	border-color:#fafafa #d1dfef #d1dfef #fafafa;
+	border-width:2px;
+}
+
+.IncomingList, .OutgoingList
+{
+	margin-left: 5px;
+	padding-left: 40px;
+	padding-right: 5px;
+	padding-top: 0.25em;
+	padding-bottom: 0.5em;
+	line-height: 1.2em;
+	list-style: none;
+}
+
+
+.IncomingMessage, .NextIncomingMessage
+{
+	padding-left: 20px;
+	padding-right: 1ex;
+	padding-top: 0.2em;
+	padding-bottom: 0.2em;
+	line-height: 1.2em;
+	border-style: hidden; /* fix a strange bug*/
+	border-width: 0 0 1px 0;
+}
+
+
+.NextIncomingMessage
+{
+	margin-left: 17px;
+	padding-left: 20px;
+	border: dotted #d1dfef;
+	border-width: 1px 0 0 0;
+}
+
+.inUserPicture
+{
+	float: left;
+	border: 1px solid #888;
+	height: 48px;
+	margin-top: 0.2em;
+	margin-left: 0.2em;
+	margin-right: 1ex;
+}
+
+.inStatusIcon
+{
+	float: left;
+}
+
+.inTime
+{
+	float: right;
+}
+.inMetacontact
+{
+	margin-left: 60px;
+	font-weight: bold;
+}
+
+.IncomingAction
+{
+	border-top: 2px solid #dae5f0; 
+	border-right: 2px solid #aaccf0;
+	border-bottom: 2px solid #aaccf0;
+	border-left: 2px solid #dae5f0;
+	padding: 0.1em; 
+	vertical-align: middle;
+	background-color:#c3d9f0;
+}
+.inActionIcon
+{
+	float: left;
+	margin-right: 5px;
+}
+.inActionMetacontact
+{
+	margin-left: 10px;
+	font-weight: bold;
+}
+.inActionMessage
+{
+	margin-left: 1ex;
+}
+
+.OutgoingMessageHeader
+{
+	background-color:#f5f5f5;
+	padding:.1em;
+	border:solid;
+	border-color:#fafafa #e3e3e3 #e3e3e3 #fafafa;
+	border-width:2px;
+}
+
+.OutgoingMessage, .NextOutgoingMessage
+{
+	padding-left: 20px;
+	padding-right: 1ex;
+	padding-top: 0.2em;
+	padding-bottom: 0.2em;
+	line-height: 1.2em;
+	border-style: hidden; /* fix a strange bug*/
+	border-width: 0 0 1px 0;
+}
+
+.NextOutgoingMessage
+{
+	margin-left: 17px;
+	padding-left: 20px;
+	border: dotted #d1dfef;
+	border-width: 1px 0 0 0;
+}
+
+.outUserPicture
+{
+	float: left;
+	border: 1px solid #888;
+	height: 48px;
+	margin-top: 0.2em;
+	margin-left: 0.2em;
+	margin-right: 1ex;
+}
+
+.outStatusIcon
+{
+	float: left;
+}
+
+.outTime
+{
+	float: right;
+}
+.outMetacontact
+{
+	margin-left: 70px;
+	font-weight: bold;
+}
+
+.OutgoingAction
+{
+	border-top: 2px solid fafafa #cfcfcf; 
+	border-right: 2px solid fafafa #afafaf;
+	border-bottom: 2px solid fafafa #afafaf;
+	border-left: 2px solid fafafa #cfcfcf;
+	padding: 0.1em; 
+	vertical-align: middle;
+	background-color:#dedede;
+}
+.outActionIcon
+{
+	float: left;
+	margin-right: 5px;
+}
+.outActionMetacontact
+{
+	margin-left: 10px;
+	font-weight: bold;
+}
+.outActionMessage
+{
+	margin-left: 5px;
+}
+
+.InternalMessageHeader
+{
+	border-top: 0.1em dashed #afafaf; 
+	border-right: 0.1em dashed #afafaf;
+	border-bottom: 0.1em dashed #afafaf;
+	border-left: 0.1em dashed #afafaf;
+	padding-left: 0.1em; 
+	padding-bottom: 0.1em; 
+	padding-right: 0.1em; 
+	vertical-align: middle;
+}
+
+.InternalMessage
+{
+	width: 80%;
+	text-align: left;
+	font-size: 10px;
+	font-weight: bold;
+	color: #808080;
+}
+
+.InternalMessageHeaderTime
+{
+	font-size: 10px;
+	float: right; 
+	font-weight: normal;
+	margin-right: 1ex;
+}
+
+.systemLogo
+{
+	float: left;
+	margin-right: 1ex;
+	vertical-align: middle;
+}
+