pidgin: fe75e37d: Add a simple theme that replicates our c...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: fe75e37dc741b6d8fe0638f7e673858552a76caf
Parent:   125b55788ece2c1ce3d60f9fa96e9e58cb324a44
Author:   qulogic at pidgin.im
Date:     03/03/12 20:32:16
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fe75e37dc741b6d8fe0638f7e673858552a76caf

Changelog: 

Add a simple theme that replicates our current look.

Changes against parent 125b55788ece2c1ce3d60f9fa96e9e58cb324a44

  added    pidgin/themes/Contents
  added    pidgin/themes/Contents/Resources
  added    pidgin/themes/Contents/Resources/Variants
  added    pidgin/themes/Contents/Info.plist
  added    pidgin/themes/Contents/Resources/Content.html
  added    pidgin/themes/Contents/Resources/Status.html
  added    pidgin/themes/Contents/Resources/main.css
  patched  pidgin/gtkconv-theme.c
  patched  pidgin/themes/Makefile.am

-------------- next part --------------
============================================================
--- pidgin/gtkconv-theme.c	bb1cbf344e82f7a46c4ea4535da27026f4af6923
+++ pidgin/gtkconv-theme.c	095007e86e55e23123b49dd73d8d00358edbf0bd
@@ -123,7 +123,7 @@ get_template_path(const char *dir)
 
 	if (!g_file_test(file, G_FILE_TEST_EXISTS)) {
 		g_free(file);
-		file = g_build_filename(DATADIR, "pidgin", "theme", "conversation", "Template.html", NULL);
+		file = g_build_filename(DATADIR, "pidgin", "theme", "Template.html", NULL);
 	}
 
 	return file;
============================================================
--- pidgin/themes/Makefile.am	87f484f21401c03ad9149836a2695e6a6caa5c72
+++ pidgin/themes/Makefile.am	86fd3035fe86267484d2903877fc07fa8343e0ea
@@ -1,6 +1,18 @@
 
-themetemplatedir = $(datadir)/pidgin/theme/conversation
+themetemplatedir = $(datadir)/pidgin/theme
 themetemplate_DATA = Template.html
+themecontentsdir = $(themetemplatedir)/Contents
+themecontents_DATA = Contents/Info.plist
+themeresourcesdir = $(themecontentsdir)/Resources
+themeresources_DATA = Contents/Resources/Content.html \
+                      Contents/Resources/Status.html \
+                      Contents/Resources/main.css
+themevariantsdir = $(themeresourcesdir)/Variants
+themevariants_DATA =
 
-EXTRA_DIST = $(themetemplate_DATA)
+EXTRA_DIST = \
+	$(themetemplate_DATA) \
+	$(themecontents_DATA) \
+	$(themeresources_DATA) \
+	$(themevariants_DATA)
 
============================================================
--- /dev/null	
+++ pidgin/themes/Contents/Info.plist	47c4b05387734643eb04983d51d7a8081a2a2931
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>MessageViewVersion</key>
+	<integer>4</integer>
+	<key>CFBundleName</key>
+	<string>Default</string>
+	<key>CFBundleIdentifier</key>
+	<string>im.pidgin.Default.style</string>
+	<key>DefaultFontFamily</key>
+	<string>sans-serif</string>
+	<key>DefaultFontSize</key>
+	<integer>11</integer>
+</dict>
+</plist>
============================================================
--- /dev/null	
+++ pidgin/themes/Contents/Resources/Content.html	26e42222a33d08191982600917270f4df5deeec9
@@ -0,0 +1,6 @@
+<div class="x-container %messageClasses% %messageDirection%">
+	<abbr class="x-time" title="%time{yyyy-MM-ddTHH:mm:ssZZ}%">(%time%)</abbr>
+	<div class="x-sender">%sender%:</div>
+	<div class="x-message">%message%</div>
+</div>
+<div id="insert"></div>
============================================================
--- /dev/null	
+++ pidgin/themes/Contents/Resources/Status.html	6f7736a1ab0e37f5527d026f32fcf9d9f8b15663
@@ -0,0 +1,5 @@
+<div class="x-status_container %messageClasses% %messageDirection%">
+	<abbr class="x-time" title="%time{yyyy-MM-ddTHH:mm:ssZZ}%">%time%</abbr>
+	<div class="x-message">%message%</div>
+</div>
+<div id="insert"></div>
============================================================
--- /dev/null	
+++ pidgin/themes/Contents/Resources/main.css	5863b86697145e341b56fe7029ec7bfa3933c4b9
@@ -0,0 +1,61 @@
+body {
+	word-wrap: break-word;
+	word-break: break-word;
+}
+
+.x-container,
+.x-status_container
+{
+	line-height: 1.3em;
+	margin-bottom: 6px;
+}
+
+.x-container .x-time,
+.x-status_container .x-time
+{
+	display: inline;
+}
+
+.x-container .x-sender
+{
+	display: inline;
+	font-weight: bold;
+}
+
+.x-container .x-message,
+.x-status_container .x-message
+{
+	display: inline;
+}
+
+/* Colour-ify things */
+
+.x-container.incoming .x-time,
+.x-container.incoming .x-sender
+{
+	color: #cc0000;
+}
+
+.x-container.outgoing .x-time,
+.x-container.outgoing .x-sender
+{
+	color: #204a87;
+}
+
+.x-container.mention .x-time,
+.x-container.mention .x-sender
+{
+	color: #AF7F00;
+}
+
+.x-status_container
+{
+	color: #777777;
+}
+
+.x-status_container.error
+{
+	color: #ff0000;
+	font-weight: bold;
+}
+