From 9d2894b68e0a4d12c64522a06387866518b64681 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 9 Sep 2010 19:37:03 +0000
Subject: * Added support for using existing KDM background to KDM themer *
 Fixed O2 Enterprise KDM theme

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1173589 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdm/kfrontend/themer/kdmpixmap.cpp                |  15 +++++++++++++--
 kdm/kfrontend/themes/o2_enterprise/Dialog.png     | Bin 5099 -> 5098 bytes
 kdm/kfrontend/themes/o2_enterprise/background.jpg | Bin 965444 -> 0 bytes
 kdm/kfrontend/themes/o2_enterprise/enterprise.xml |   2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)
 delete mode 100644 kdm/kfrontend/themes/o2_enterprise/background.jpg

(limited to 'kdm')

diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp
index f18194f53..02ee5626e 100644
--- a/kdm/kfrontend/themer/kdmpixmap.cpp
+++ b/kdm/kfrontend/themer/kdmpixmap.cpp
@@ -42,8 +42,8 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
 	itemType = "pixmap";
 
 	// Set default values for pixmap (note: strings are already Null)
-	pixmap.normal.tint.setRgb( 0xFFFFFF );
-	pixmap.normal.alpha = 1.0;
+	pixmap.normal.tint.setRgb( 0x800000 );
+	pixmap.normal.alpha = 0.0;
 	pixmap.active.present = false;
 	pixmap.prelight.present = false;
 
@@ -63,6 +63,17 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
 			pixmap.normal.fullpath = fullPath( el.attribute( "file", "" ) );
 			parseColor( el.attribute( "tint", "#ffffff" ), pixmap.normal.tint );
 			pixmap.normal.alpha = el.attribute( "alpha", "1.0" ).toFloat();
+
+			if (el.attribute( "file", "" ) == "@@@KDMBACKGROUND@@@") {
+				// Use the preset KDM background...
+				KStandardDirs *m_pDirs = KGlobal::dirs();
+				KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) );
+				config->setGroup("Desktop0");
+				pixmap.normal.fullpath = m_pDirs->findResource("wallpaper", config->readPathEntry("Wallpaper"));
+				// TODO: Detect when there is no wallpaper and use the background settings instead
+				delete config;
+			}
+
 		} else if (tagName == "active") {
 			pixmap.active.present = true;
 			pixmap.active.fullpath = fullPath( el.attribute( "file", "" ) );
diff --git a/kdm/kfrontend/themes/o2_enterprise/Dialog.png b/kdm/kfrontend/themes/o2_enterprise/Dialog.png
index 47d4db8af..440bf6f43 100644
Binary files a/kdm/kfrontend/themes/o2_enterprise/Dialog.png and b/kdm/kfrontend/themes/o2_enterprise/Dialog.png differ
diff --git a/kdm/kfrontend/themes/o2_enterprise/background.jpg b/kdm/kfrontend/themes/o2_enterprise/background.jpg
deleted file mode 100644
index 7a3f643f8..000000000
Binary files a/kdm/kfrontend/themes/o2_enterprise/background.jpg and /dev/null differ
diff --git a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml
index 11849cc62..42e37f890 100644
--- a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml
+++ b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE greeter SYSTEM "greeter.dtd">
 <greeter>
 	<item type="pixmap" >
-		<normal file="background.jpg" />
+		<normal file="@@@KDMBACKGROUND@@@" />
 		<pos width="100%" x="0" y="0" height="100%" />
 	</item>
 	<item type="pixmap" >
-- 
cgit v1.2.3