Fix up the FiltersViews as this code is now being actively used.

minixs/gui/qthelpers/qtfilterview.py

@@ -16,7 +16,7 @@ class FilterView(qtWidgets.QWidget):
     classdocs
     '''
 
-    filterChanged = pyqtSignal(name="filterChanged")
+    filterChanged = pyqtSignal(object, name="filterChanged")
     
     def __init__(self, *args, **kwargs):
         '''
@@ -43,9 +43,18 @@ class FilterView(qtWidgets.QWidget):
     def getValue(self):
         return None
 
+    def isEnabled(self):
+        return self.enableBox.isEnabled()
+    
+    def text(self):
+        return self.enableBox.text()
+    
+    def filterEnabled(self):
+        return self.enableBox.isChecked()
+    
     def filterEnableChanged(self, enabled):
         self.valueWidget.setEnabled(enabled)
-        self.filterChanged.emit()
+        self.filterChanged.emit(self)
         
 class IntFilterView(FilterView):
     
@@ -67,7 +76,7 @@ class IntFilterView(FilterView):
     
     @pyqtSlot(int)
     def handleValueChanged(self, value):
-        self.filterChanged.emit()
+        self.filterChanged.emit(self)
         
 class StringFilterView(FilterView):
     
@@ -79,6 +88,7 @@ class StringFilterView(FilterView):
         self.valueWidget.setEnabled(self.filter.default_enabled)
         self.enableBox.setChecked(self.filter.default_enabled)
         self.valueWidget.editingFinished.connect(self.handleValueChanged)
+
     def setValue(self, value):
         self.valueWidget.setText(value)
         
@@ -87,7 +97,7 @@ class StringFilterView(FilterView):
 
     @pyqtSlot()
     def handleValueChanged(self):
-        self.filterChanged.emit()
+        self.filterChanged.emit(self)
         
     
 class ChoiceFilterView(FilterView):
@@ -104,18 +114,20 @@ class ChoiceFilterView(FilterView):
         self.layout.addWidget(self.valueWidget)
 #        self.valueWidget.setCurrentIndex(self.filter.default_val[0])
         self.valueWidget.setEnabled(self.filter.default_enabled)
+        self.valueWidget.setCurrentIndex(0)
         self.enableBox.setChecked(self.filter.default_enabled)
         
         self.valueWidget.currentIndexChanged.connect(self.handleValueChanged)
+
     def setValue(self, value):
         self.valueWidget.setCurrentIndex(value)
 
     def getValue(self):
-        self.valueWidget.currentText()
+        return self.valueWidget.currentText()
         
     @pyqtSlot(int)
     def handleValueChanged(self, selectionIndex):
-        self.filterChanged.emit()
+        self.filterChanged.emit(self)
         
         
 REGISTRY = []