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

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/Plotting

Files:

• AddText.py (modified) (1 diff)
• ColorMap.py (modified) (1 diff)
• LinearFit.py (modified) (1 diff)
• MaskEditor.py (modified) (2 diffs)
• PlotProperties.py (modified) (1 diff)
• ScaleProperties.py (modified) (1 diff)
• SetGraphRange.py (modified) (1 diff)
• WindowTitle.py (modified) (2 diffs)

src/sas/qtgui/Plotting/AddText.py

@@ -12 +12 @@
         super(AddText, self).__init__(parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self._font = QtGui.QFont()

src/sas/qtgui/Plotting/ColorMap.py

@@ -28 +28 @@
         self.setupUi(self)
         assert(isinstance(data, Data2D))
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self.data = data

src/sas/qtgui/Plotting/LinearFit.py

@@ -30 +30 @@
 
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
+
         assert(isinstance(max_range, tuple))
         assert(isinstance(fit_range, tuple))

src/sas/qtgui/Plotting/MaskEditor.py

@@ -3 +3 @@
 import numpy as np
 
-from PyQt5 import QtWidgets
+from PyQt5 import QtWidgets, QtCore
 
 from sas.qtgui.Plotting.PlotterData import Data2D
@@ -24 +24 @@
 
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self.data = data

src/sas/qtgui/Plotting/PlotProperties.py

@@ -18 +18 @@
         super(PlotProperties, self).__init__(parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
+
         self.setFixedSize(self.minimumSizeHint())
 

src/sas/qtgui/Plotting/ScaleProperties.py

@@ -27 +27 @@
         super(ScaleProperties, self).__init__(parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         # Set up comboboxes

src/sas/qtgui/Plotting/SetGraphRange.py

@@ -17 +17 @@
 
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
+
         assert(isinstance(x_range, tuple))
         assert(isinstance(y_range, tuple))

src/sas/qtgui/Plotting/WindowTitle.py

@@ -3 +3 @@
 from "Graph_n" to any ASCII text.
 """
-from PyQt5 import QtWidgets
+from PyQt5 import QtWidgets, QtCore
 
 from sas.qtgui.Plotting.UI.WindowTitleUI import Ui_WindowTitle
@@ -12 +12 @@
         super(WindowTitle, self).__init__(parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
+
         self.txtTitle.setText(new_title)