From 9976640d92fdd1991a76d783cf9f5c04ec297659 Mon Sep 17 00:00:00 2001
From: Markus Hitter <mah@jump-ing.de>
Date: Sun, 24 May 2015 16:43:53 +0200
Subject: [PATCH] Configtool: color background matching the background picture.

Actual color is easily changeable in Decoration, as this is a
Singleton.
---
 configtool.py              | 2 ++
 configtool/boardpanel.py   | 2 ++
 configtool/decoration.py   | 3 +++
 configtool/page.py         | 1 +
 configtool/printerpanel.py | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/configtool.py b/configtool.py
index f483d79..2dd4833 100755
--- a/configtool.py
+++ b/configtool.py
@@ -50,6 +50,7 @@ class ConfigFrame(wx.Frame):
     self.deco = Decoration()
 
     panel = wx.Panel(self, -1)
+    panel.SetBackgroundColour(self.deco.getBackgroundColour())
     panel.Bind(wx.EVT_PAINT, self.deco.onPaintBackground)
 
     self.settings = Settings(self, cmd_folder)
@@ -67,6 +68,7 @@ class ConfigFrame(wx.Frame):
 
     self.nb = wx.Notebook(panel, wx.ID_ANY, size = (880, 550),
                           style = wx.BK_DEFAULT)
+    self.nb.SetBackgroundColour(self.deco.getBackgroundColour())
     self.nb.SetFont(self.settings.font)
 
     self.printerFileName = None
diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py
index 8277fd8..065711a 100644
--- a/configtool/boardpanel.py
+++ b/configtool/boardpanel.py
@@ -41,11 +41,13 @@ class BoardPanel(wx.Panel):
     self.candThermPins = []
     self.dir = os.path.join(self.settings.folder, "config")
 
+    self.SetBackgroundColour(self.deco.getBackgroundColour())
     self.Bind(wx.EVT_PAINT, self.deco.onPaintBackground)
     sz = wx.BoxSizer(wx.HORIZONTAL)
 
     self.nb = wx.Notebook(self, wx.ID_ANY, size = (21, 21),
                           style = wx.BK_DEFAULT)
+    self.nb.SetBackgroundColour(self.deco.getBackgroundColour())
     self.nb.SetFont(self.settings.font)
 
     self.pages = []
diff --git a/configtool/decoration.py b/configtool/decoration.py
index ec500b9..4faeea3 100644
--- a/configtool/decoration.py
+++ b/configtool/decoration.py
@@ -29,6 +29,9 @@ class Decoration(object):
       else:
         print "Background picture %s doesn't exist." % backPicPath
 
+  def getBackgroundColour(self):
+    return wx.Colour(237, 237, 237)
+
   # On wxFrames, bind this to wx.EVT_ERASE_BACKGROUND
   # On wxPanels, bind this to wx.EVT_PAINT
   def onPaintBackground(self, evt):
diff --git a/configtool/page.py b/configtool/page.py
index 293b236..6b2069f 100644
--- a/configtool/page.py
+++ b/configtool/page.py
@@ -18,6 +18,7 @@ class Page:
     self.deco = Decoration()
     self.font = font
 
+    self.SetBackgroundColour(self.deco.getBackgroundColour())
     self.Bind(wx.EVT_PAINT, self.deco.onPaintBackground)
 
   def enableAll(self, flag = True):
diff --git a/configtool/printerpanel.py b/configtool/printerpanel.py
index 4b0670f..f7e2f52 100644
--- a/configtool/printerpanel.py
+++ b/configtool/printerpanel.py
@@ -30,11 +30,13 @@ class PrinterPanel(wx.Panel):
     self.heaters = []
     self.dir = os.path.join(self.settings.folder, "config")
 
+    self.SetBackgroundColour(self.deco.getBackgroundColour())
     self.Bind(wx.EVT_PAINT, self.deco.onPaintBackground)
     sz = wx.BoxSizer(wx.HORIZONTAL)
 
     self.nb = wx.Notebook(self, wx.ID_ANY, size = (21, 21),
                           style = wx.BK_DEFAULT)
+    self.nb.SetBackgroundColour(self.deco.getBackgroundColour())
     self.nb.SetFont(self.settings.font)
 
     self.pages = []