Changes in src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py [9c207f5:cf9f39e] in sasview

File:

• src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py (modified) (6 diffs)

src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py

@@ -26 +26 @@
     constraintReadySignal = QtCore.pyqtSignal(tuple)
     def __init__(self, parent=None, tabs=None):
-        super(ComplexConstraint, self).__init__()
+        super(ComplexConstraint, self).__init__(parent)
 
         self.setupUi(self)
         self.setModal(True)
+
+        # disable the context help icon
+        windowFlags = self.windowFlags()
+        self.setWindowFlags(windowFlags & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         # Useful globals
@@ -61 +65 @@
         self.cmdOK.clicked.connect(self.onApply)
         self.cmdHelp.clicked.connect(self.onHelp)
+        self.cmdAddAll.clicked.connect(self.onSetAll)
+
         self.txtConstraint.editingFinished.connect(self.validateFormula)
         self.cbModel1.currentIndexChanged.connect(self.onModelIndexChange)
@@ -78 +84 @@
         self.setupParamWidgets()
 
+
         self.setupMenu()
 
     def setupMenu(self):
-        # Add menu to the Apply button, if necessary
+        # Show Add All button, if necessary
         if self.cbModel1.currentText() ==self.cbModel2.currentText():
-            self.cmdOK.setArrowType(QtCore.Qt.NoArrow)
-            self.cmdOK.setPopupMode(QtWidgets.QToolButton.DelayedPopup)
-            self.cmdOK.setMenu(None)
-            return
-        self.all_menu   = QtWidgets.QMenu()
-        self.actionAddAll = QtWidgets.QAction(self)
-        self.actionAddAll.setObjectName("actionAddAll")
-        self.actionAddAll.setText(QtCore.QCoreApplication.translate("self", "Add all"))
-        ttip = "Add constraints between all identically named parameters in both fitpages"
-        self.actionAddAll.setToolTip(ttip)
-        self.actionAddAll.triggered.connect(self.onSetAll)
-        self.all_menu.addAction(self.actionAddAll)
-        # https://bugreports.qt.io/browse/QTBUG-13663
-        self.all_menu.setToolTipsVisible(True)
-        self.cmdOK.setPopupMode(QtWidgets.QToolButton.MenuButtonPopup)
-        self.cmdOK.setArrowType(QtCore.Qt.DownArrow)
-        self.cmdOK.setMenu(self.all_menu)
+            self.cmdAddAll.setVisible(False)
+        else:
+            self.cmdAddAll.setVisible(True)
+        return
 
     def setupParamWidgets(self):
@@ -127 +121 @@
         if len(items1)==0:
             self.cmdOK.setEnabled(False)
+            self.cmdAddAll.setEnabled(False)
             txt = "No parameters in model "+self.tab_names[0] +\
                 " are available for constraining."
@@ -132 +127 @@
         else:
             self.cmdOK.setEnabled(True)
+            self.cmdAddAll.setEnabled(True)
             txt = ""
             self.lblWarning.setText(txt)
@@ -193 +189 @@
         if not formula_is_valid:
             self.cmdOK.setEnabled(False)
+            self.cmdAddAll.setEnabled(False)
             self.txtConstraint.setStyleSheet("QLineEdit {background-color: red;}")
         else:
             self.cmdOK.setEnabled(True)
+            self.cmdAddAll.setEnabled(True)
             self.txtConstraint.setStyleSheet("QLineEdit {background-color: white;}")