Changeset 33c0561 in sasview for src/sas/qtgui/Utilities

Timestamp:

Jan 9, 2019 6:09:39 AM (5 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

cf9f39e

Parents:

bbcf9f0

Message:

Replace Apply button menu driven functionality with additional button.
Removed Cancel.
Removed the window system context help button from all affected widgets.
SASVIEW-1239

Location:

src/sas/qtgui/Utilities

Files:

• AddMultEditor.py (modified) (1 diff)
• ModelEditor.py (modified) (1 diff)
• PluginManager.py (modified) (2 diffs)
• ReportDialog.py (modified) (2 diffs)
• TabbedModelEditor.py (modified) (2 diffs)

src/sas/qtgui/Utilities/AddMultEditor.py

@@ -56 +56 @@
 
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         #  uncheck self.chkOverwrite

src/sas/qtgui/Utilities/ModelEditor.py

@@ -15 +15 @@
         super(ModelEditor, self).__init__(parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self.is_python = is_python

src/sas/qtgui/Utilities/PluginManager.py

@@ -3 +3 @@
 from shutil import copyfile
 
-from PyQt5 import QtWidgets
+from PyQt5 import QtWidgets, QtCore
 
 from sas.sascalc.fit import models
@@ -21 +21 @@
         super(PluginManager, self).__init__(parent._parent)
         self.setupUi(self)
+
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self.parent = parent

src/sas/qtgui/Utilities/ReportDialog.py

@@ -6 +6 @@
 from xhtml2pdf import pisa
 
-from PyQt5 import QtWidgets
+from PyQt5 import QtWidgets, QtCore
 from PyQt5 import QtPrintSupport
 
@@ -23 +23 @@
         super(ReportDialog, self).__init__(parent._parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         assert isinstance(report_list, list)

src/sas/qtgui/Utilities/TabbedModelEditor.py

@@ -6 +6 @@
 import traceback
 
-from PyQt5 import QtWidgets
+from PyQt5 import QtWidgets, QtCore
 
 from sas.sascalc.fit import models
@@ -28 +28 @@
 
         self.setupUi(self)
+
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         # globals