Configtool: let the parsing method decide about values.

Shouldn't cause functional change.

So far, values commented out are still ignored, which is why the
used regexp changed. This will hopefully change in the future,
so a configuration can remember disabled values, too.

configtool/boardpanel.py

@@ -314,8 +314,8 @@ class BoardPanel(wx.Panel):
       if self.parseCandidateValues(ln):
         continue
 
-      elif ln.lstrip().startswith("#define"):
-        self.parseDefineValue(ln)
+      elif self.parseDefineValue(ln):
+        continue
 
       else:
         m = reDefTS.search(ln)
@@ -385,24 +385,26 @@ class BoardPanel(wx.Panel):
           tt = re.findall(reDefQSm2, t[1])
           if len(tt) == 1:
             self.cfgValues[t[0]] = tt[0]
-            return
+            return True
           elif len(tt) > 1:
             self.cfgValues[t[0]] = tt
-            return
+            return True
 
-    m = reDefine.search(ln)
+    m = reDefineBL.search(ln)
     if m:
       t = m.groups()
       if len(t) == 2:
         self.cfgValues[t[0]] = t[1]
-        return
+        return True
 
-    m = reDefBool.search(ln)
+    m = reDefBoolBL.search(ln)
     if m:
       t = m.groups()
       if len(t) == 1:
         self.cfgValues[t[0]] = True
-        return
+        return True
+
+    return False
 
   def parseCandidateValues(self, ln):
     m = reCandThermPins.match(ln)

configtool/printerpanel.py

@@ -255,7 +255,8 @@ class PrinterPanel(wx.Panel):
         ln = prevLines + ln
         prevLines = ""
 
-      self.parseDefineValue(ln)
+      if self.parseDefineValue(ln):
+        continue
 
     if os.path.basename(fn) in protectedFiles:
       self.parent.enableSavePrinter(False, True)
@@ -288,7 +289,6 @@ class PrinterPanel(wx.Panel):
     return False
 
   def parseDefineValue(self, ln):
-    if ln.lstrip().startswith("#define"):
     m = reDefQS.search(ln)
     if m:
       t = m.groups()
@@ -299,24 +299,26 @@ class PrinterPanel(wx.Panel):
           tt = re.findall(reDefQSm2, t[1])
           if len(tt) == 1:
             self.cfgValues[t[0]] = tt[0]
-              return
+            return True
           elif len(tt) > 1:
             self.cfgValues[t[0]] = tt
-              return
+            return True
 
-      m = reDefine.search(ln)
+    m = reDefineBL.search(ln)
     if m:
       t = m.groups()
       if len(t) == 2:
         self.cfgValues[t[0]] = t[1]
-          return
+        return True
 
-      m = reDefBool.search(ln)
+    m = reDefBoolBL.search(ln)
     if m:
       t = m.groups()
       if len(t) == 1:
         self.cfgValues[t[0]] = True
-          return
+        return True
+
+    return False
 
   def onSaveConfig(self, evt):
     path = self.configFile