From cd1eb4e2503f5baab8abcc13351373207399202d Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Thu, 16 Jul 2015 19:16:20 +0200 Subject: [PATCH] Configtool: move board/printer.metadata to configtool/ ... and rename it to board/printer.generic.h. --- config/board.metadata => configtool/board.generic.h | 0 configtool/boardpanel.py | 4 ++-- config/printer.metadata => configtool/printer.generic.h | 0 configtool/printerpanel.py | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename config/board.metadata => configtool/board.generic.h (100%) rename config/printer.metadata => configtool/printer.generic.h (100%) diff --git a/config/board.metadata b/configtool/board.generic.h similarity index 100% rename from config/board.metadata rename to configtool/board.generic.h diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py index 3fcff6d..06e8fbd 100644 --- a/configtool/boardpanel.py +++ b/configtool/boardpanel.py @@ -40,7 +40,7 @@ class BoardPanel(wx.Panel): self.candHeatPins = [] self.candThermPins = [] self.dir = os.path.join(self.settings.folder, "config") - self.cfgDir = os.path.join(self.settings.folder, "config") + self.cfgDir = os.path.join(self.settings.folder, "configtool") self.SetBackgroundColour(self.deco.getBackgroundColour()) self.Bind(wx.EVT_PAINT, self.deco.onPaintBackground) @@ -221,7 +221,7 @@ class BoardPanel(wx.Panel): return def loadConfigFile(self, fn): - cfgFn = os.path.join(self.cfgDir, "board.metadata") + cfgFn = os.path.join(self.cfgDir, "board.generic.h") try: self.cfgBuffer = list(open(cfgFn)) except: diff --git a/config/printer.metadata b/configtool/printer.generic.h similarity index 100% rename from config/printer.metadata rename to configtool/printer.generic.h diff --git a/configtool/printerpanel.py b/configtool/printerpanel.py index b976a2f..b1038a2 100644 --- a/configtool/printerpanel.py +++ b/configtool/printerpanel.py @@ -29,7 +29,7 @@ class PrinterPanel(wx.Panel): self.cfgValues = {} self.heaters = [] self.dir = os.path.join(self.settings.folder, "config") - self.cfgDir = os.path.join(self.settings.folder, "config") + self.cfgDir = os.path.join(self.settings.folder, "configtool") self.SetBackgroundColour(self.deco.getBackgroundColour()) self.Bind(wx.EVT_PAINT, self.deco.onPaintBackground) @@ -182,7 +182,7 @@ class PrinterPanel(wx.Panel): return def loadConfigFile(self, fn): - cfgFn = os.path.join(self.cfgDir, "printer.metadata") + cfgFn = os.path.join(self.cfgDir, "printer.generic.h") try: self.cfgBuffer = list(open(cfgFn)) except: