qtvcp -macroTab: honour legacy radio button definitions

And fix setting of true state

Author: c-morley

docs/src/gui/qtvcp-widgets.adoc

@@ -1363,10 +1363,13 @@ This must be the _second line_ in the O-word file.
 
 It is a *comma separated list of the default values for each variable* in the O-word function.
 
-If you use the word `radiotrue` or `radiofalse` in the list, a `*radiobutton*` will be shown. +
+If you use the word `radiotrue`, `radiofalse`, `true` or `false` in the list, a `*radiobutton*` will be shown. +
 If you use the word `checktrue` or `checkfalse` in the list, a `*checkbox*` will be shown. +
-If you use the word `true` or `false` in the list, a `*Checkable Pushbutton*` will be shown. +
-If the default has a decimal, macroTab assumes ypu want a float value otherwise an integer.
+If you use the word `buttontrue` or `buttonfalse` in the list, a `*Checkable Pushbutton*` will be shown. +
+If the default has a decimal, macroTab assumes you want a float value otherwise an integer.
+
+NOTE: When using radiobuttons, only set one radiobutton as true. Radio button are used for exclusive 
+choices.
 
 .`MACROIMAGE`
 

lib/python/qtvcp/widgets/macro_widget.py

@@ -246,27 +246,30 @@ def checkIfFloat(val):
                         l = QtWidgets.QLabel(name[0])
 
                         # make appropriate entries:
-                        # radio buttons?
+                        # radio/check/push buttons?
                         if 'false' in name[1].lower() or 'true' in name[1].lower():
                             if 'check' in name[1].lower():
                                 self['%s%d' % (tName, n)] = QtWidgets.QCheckBox()
-                                if name[1].lower() == 'true':
+                                if 'true' in name[1].lower():
                                     self['%s%d' % (tName, n)].setChecked(True)
                             elif 'radio' in name[1].lower():
                                 self['%s%d' % (tName, n)] = QtWidgets.QRadioButton()
-                                if name[1].lower() == 'true':
+                                if 'true' in name[1].lower():
                                     self['%s%d' % (tName, n)].setChecked(True)
-                            else:
+                            elif 'button' in name[1].lower():
                                 self['%s%d' % (tName, n)] = QtWidgets.QPushButton()
                                 self['%s%d' % (tName, n)].setCheckable(True)
-                                if name[1].lower() == 'true':
+                                if 'true' in name[1].lower():
+                                    self['%s%d' % (tName, n)].setChecked(True)
+                            # legacy default
+                            else:
+                                self['%s%d' % (tName, n)] = QtWidgets.QRadioButton()
+                                if 'true' in name[1].lower():
                                     self['%s%d' % (tName, n)].setChecked(True)
 
                         # line edits that will pop an entry dialog:
                         else:
                             if checkIfFloat(name[1]):
-                                #self['%s%d' % (tName, n)] = QtWidgets.QLineEdit()
-                                #self['%s%d' % (tName, n)].setText(name[1])
                                 self['%s%d' % (tName, n)] = TouchDoubleSpinBox()
                                 self['%s%d' % (tName, n)].callDialog = self.getNumbers
                                 self['%s%d' % (tName, n)].setValue(float(name[1]))
@@ -285,7 +288,6 @@ def checkIfFloat(val):
 
                             self['%s%d' % (tName, n)]._label = name[0]
                             self['%s%d' % (tName, n)]._tabName = tName
-                            #self.set_style(self['%s%d' % (tName, n)])
                             self['%s%d' % (tName, n)].keyboard_type = 'numeric'
 
                         hbox2.addWidget(l)