From 8b9ddfe4f391b6532ad74765391638ff0e4af11d Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Mon, 11 Oct 2010 12:46:39 +0100
Subject: Switch to using installed branding images for the backing items.

---
 framework/source/services/backingwindow.cxx | 12 +++++++-----
 framework/source/services/fwk_services.src  | 20 --------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

(limited to 'framework')

diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 73dc9ac8103d..3b22b0ed72c6 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -408,7 +408,9 @@ void BackingWindow::initBackground()
     if( !! maBackgroundMiddle )
         aMiddleSize = maBackgroundMiddle.GetSizePixel();
     // load middle segment
-    maBackgroundMiddle = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_MIDDLE ) );
+
+    Application::LoadBrandBitmap ("shell/backing_space", maBackgroundMiddle);
+
     // and scale it to previous size
     if( aMiddleSize.Width() && aMiddleSize.Height() )
         maBackgroundMiddle.Scale( aMiddleSize );
@@ -416,13 +418,13 @@ void BackingWindow::initBackground()
     if( GetSettings().GetLayoutRTL() )
     {
         // replace images by RTL versions
-        maBackgroundLeft = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RTL_RIGHT ) );
-        maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RTL_LEFT) );
+        Application::LoadBrandBitmap ("shell/backing_rtl_right", maBackgroundLeft);
+        Application::LoadBrandBitmap ("shell/backing_rtl_left", maBackgroundRight);
     }
     else
     {
-        maBackgroundLeft = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_LEFT ) );
-        maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT ) );
+        Application::LoadBrandBitmap ("shell/backing_left", maBackgroundLeft);
+        Application::LoadBrandBitmap ("shell/backing_right", maBackgroundRight);
     }
     maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId( BMP_BACKING_EXT ) ) );
     maToolbox.SetItemImage( nItemId_Info, BitmapEx( FwkResId( BMP_BACKING_INFO ) ) );
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index ef037c75778a..bdbe81bc7fb3 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -73,26 +73,6 @@ Window DLG_BACKING
 
 Resource RES_BACKING_IMAGES
 {
-    Bitmap BMP_BACKING_BACKGROUND_LEFT
-    {
-        File = "backing.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_MIDDLE
-    {
-        File = "backing_space.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RIGHT
-    {
-        File = "backing_right.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT
-    {
-        File = "backing_rtl_left.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT
-    {
-        File = "backing_rtl_right.png";
-    };
     Bitmap BMP_BACKING_EXT
     {
         File = "extension.png";
-- 
cgit