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

Timestamp:

Jan 9, 2019 6:09:39 AM (6 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/MainWindow

Files:

• AboutBox.py (modified) (2 diffs)
• CategoryManager.py (modified) (2 diffs)
• GuiManager.py (modified) (1 diff)
• MainWindow.py (modified) (1 diff)

src/sas/qtgui/MainWindow/AboutBox.py

@@ -1 +1 @@
 import functools
-from PyQt5 import QtWidgets
+from PyQt5 import QtWidgets, QtCore
 
 import sas.sasview
@@ -14 +14 @@
         super(AboutBox, self).__init__(parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self.setWindowTitle("About")

src/sas/qtgui/MainWindow/CategoryManager.py

@@ -135 +135 @@
         super(CategoryManager, self).__init__(parent)
         self.setupUi(self)
+
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self.communicator = manager.communicator()
@@ -327 +330 @@
         super(ChangeCategory, self).__init__(parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self.model = model

src/sas/qtgui/MainWindow/GuiManager.py

@@ -59 +59 @@
         QDialog.__init__(self, parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
+
 
 class GuiManager(object):

src/sas/qtgui/MainWindow/MainWindow.py

@@ -60 +60 @@
     splash.show()
     app.setAttribute(Qt.AA_EnableHighDpiScaling)
+
     # fix for pyinstaller packages app to avoid ReactorAlreadyInstalledError
     import sys