From 7a18217dee762a9eee2ebc919799e6bc9b8ee66d Mon Sep 17 00:00:00 2001
From: Markus Hitter <mah@jump-ing.de>
Date: Sun, 29 May 2016 19:17:25 +0200
Subject: [PATCH] Configtool: move choices value insertion to the parent class.

This shouldn't change behaviour.
---
 configtool/communicationspage.py |  2 --
 configtool/miscellaneouspage.py  |  7 -------
 configtool/page.py               |  7 +++++++
 configtool/pinoutspage.py        | 10 ----------
 configtool/sensorpage.py         |  7 -------
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/configtool/communicationspage.py b/configtool/communicationspage.py
index ea04b58..5b3996a 100644
--- a/configtool/communicationspage.py
+++ b/configtool/communicationspage.py
@@ -47,8 +47,6 @@ class CommunicationsPage(wx.Panel, Page):
 
     k = 'BAUD'
     self.setChoice(k, cfgValues, self.defaultBaud)
-    if k in cfgValues.keys():
-      self.choicesOriginal[k] = cfgValues[k]
 
     if self.checkBoxes['USB_SERIAL'].IsChecked():
       self.checkBoxes['XONXOFF'].Enable(False)
diff --git a/configtool/miscellaneouspage.py b/configtool/miscellaneouspage.py
index 4dbce93..545a161 100644
--- a/configtool/miscellaneouspage.py
+++ b/configtool/miscellaneouspage.py
@@ -238,13 +238,6 @@ class MiscellaneousPage(wx.Panel, Page):
       v = 0
     self.choices[k].SetSelection(v)
 
-  def insertValues(self, cfgValues):
-    Page.insertValues(self, cfgValues)
-
-    for k in self.choices.keys():
-      if k in cfgValues.keys():
-        self.choicesOriginal[k] = cfgValues[k]
-
   def getValues(self):
     result = Page.getValues(self)
 
diff --git a/configtool/page.py b/configtool/page.py
index 6625141..3f04f31 100644
--- a/configtool/page.py
+++ b/configtool/page.py
@@ -260,6 +260,13 @@ class Page:
       else:
         print "Key " + k + " not found in config data."
 
+    for k in self.choices.keys():
+      if k in cfgValues.keys():
+        self.choicesOriginal[k] = cfgValues[k]
+        self.setChoice(k, cfgValues, "-")
+      else:
+        print "Key " + k + " not found in config data."
+
     for k in self.boolChoices.keys():
       choice = self.boolChoices[k]
 
diff --git a/configtool/pinoutspage.py b/configtool/pinoutspage.py
index 803c733..7282969 100644
--- a/configtool/pinoutspage.py
+++ b/configtool/pinoutspage.py
@@ -178,16 +178,6 @@ class PinoutsPage(wx.Panel, Page):
     self.assertModified(True)
     evt.Skip()
 
-  def insertValues(self, cfgValues):
-    Page.insertValues(self, cfgValues)
-
-    for k in self.choices.keys():
-      if k in cfgValues.keys():
-        self.choicesOriginal[k] = cfgValues[k]
-        self.setChoice(k, cfgValues, "-")
-      else:
-        print "Key " + k + " not found in config data."
-
   def getValues(self):
     result = Page.getValues(self)
 
diff --git a/configtool/sensorpage.py b/configtool/sensorpage.py
index a7b195f..25757b3 100644
--- a/configtool/sensorpage.py
+++ b/configtool/sensorpage.py
@@ -151,13 +151,6 @@ class SensorsPage(wx.Panel, Page):
   def insertValues(self, cfgValues):
     Page.insertValues(self, cfgValues)
 
-    for k in self.choices.keys():
-      if k in cfgValues.keys():
-        self.choicesOriginal[k] = cfgValues[k]
-        self.setChoice(k, cfgValues, "-")
-      else:
-        print "Key " + k + " not found in config data."
-
     self.bAdd.Enable(True)
 
   def setSensors(self, sensors):