Implement support for deleting a previously added widget. Only QListBox and QButtonGroup are currently supported.

Author: lucasvr

src/cwizard.py

@@ -901,12 +901,23 @@ def processKey(self, key) :
    def __registerField(self, name, widget) :
       self.fields[name] = widget
 
+   def __unregisterField(self, name) :
+      w = None
+      if name and name in self.fields :
+         w = self.fields[name]
+         del self.fields[name]
+      return w
+
    def __registerFocus(self, widget) :
       self.focusWidgets.append(widget)
       if self.focus == -1 :
          self.focus = 0
          widget.inside = True
 
+   def __unregisterFocus(self, widget) :
+      if widget and widget in self.focusWidgets :
+         self.focusWidgets.remove(widget)
+
    def setTitle(self, title) :
       self.title = title
 
@@ -917,6 +928,12 @@ def __addWidget(self, fieldName, w = None, focus = True):
          self.__registerFocus(w)
       self.widgets.append(w)
 
+   def delWidget(self, fieldName) :
+      w = self.__unregisterField(fieldName)
+      if w :
+         self.__unregisterFocus(w)
+         self.widgets.remove(w)
+
    def addLabel(self, fieldName, label, defaultValue = '', tooltip = "I DON'T HAVE A TOOLTIP", callBack = None) :
       w = CursesLabel(label)
       self.__addWidget(fieldName, w, False)

src/qtwizard.py

@@ -106,14 +106,25 @@ def __init__(self, title = "I DON'T HAVE A NAME"):
 		self.rowsCount = 0
 		self.setTitle(title)
 		self.fieldsTypes = {}
+		self.fieldsContainer = {}
 
 		self.widget.setTitle(title)
 
 		self.nextCB = None
 
-	def __registerField(self, name, widget, fieldType):
+	def __registerField(self, name, widget, fieldType, container=None):
 		self.fields[name] = widget
 		self.fieldsTypes[name] = fieldType
+		self.fieldsContainer[name] = container
+
+	def __unregisterField(self, name):
+		container = None
+		if name and name in self.fields:
+			container = self.fieldsContainer[name]
+			del self.fields[name]
+			del self.fieldsTypes[name]
+			del self.fieldsContainer[name]
+		return container
 
 	def onValidate(self, nextCB):
 		self.nextCB = nextCB
@@ -266,6 +277,11 @@ def __addWidget(self, widget, row=-1, column=-1):
 		if row >= self.rowsCount:
 			self.rowsCount = row + 1
 
+	def delWidget(self, fieldName):
+		# Not supported on every QtWidget
+		container = self.__unregisterField(fieldName)
+		if container:
+			self.pageLayout.removeWidget(container)
 
 	def setTitle(self,title):
 		self.widget.setWindowTitle(title)
@@ -422,7 +438,7 @@ def addBoxList(self, fieldName, label='', defaultValueTuple=([],''), toolTip='',
 			tableView.item(selectedIndex, 0).setSelected(True)
 
 		if fieldName:
-			self.__registerField(fieldName, tableView, 'QListBox')
+			self.__registerField(fieldName, tableView, 'QListBox', w)
 
 		self.__addWidget(w)
 
@@ -478,7 +494,7 @@ def addRadioList(self, fieldName, label='', defaultValueTuple=([],''), toolTip='
 		buttonGroup.buttonReleased.connect(self.widget.completeChanged)
 
 		if fieldName:
-			self.__registerField(fieldName, buttonGroup, 'QButtonGroup')
+			self.__registerField(fieldName, buttonGroup, 'QButtonGroup', w)
 
 		self.__addWidget(w)