Changeset fbfc488 in sasview for src/sas/qtgui/MainWindow/GuiManager.py

Timestamp:

Nov 9, 2017 6:43:55 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

d6b8a1d

Parents:

7969b9c

git-author:

Piotr Rozyczko <rozyczko@…> (11/03/17 08:58:39)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 06:43:55)

Message:

More Qt5 related fixes.

File:

• src/sas/qtgui/MainWindow/GuiManager.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -8 +8 @@
 from PyQt5.QtWidgets import *
 from PyQt5.QtGui import *
-from PyQt5.QtCore import Qt
+from PyQt5.QtCore import Qt, QLocale
 from PyQt5.QtWebKitWidgets import QWebView
 
@@ -198 +198 @@
 
         # Resize to the workspace height
-        #workspace_height = self._workspace.workspace.sizeHint().height()
-        #perspective_size = self._current_perspective.sizeHint()
+        workspace_height = self._workspace.workspace.sizeHint().height()
+        perspective_size = self._current_perspective.sizeHint()
         #if workspace_height < perspective_size.height():
-        #    perspective_width = perspective_size.width()
-        #    self._current_perspective.resize(perspective_width, workspace_height-10)
+        perspective_width = perspective_size.width()
+        self._current_perspective.resize(perspective_width, workspace_height-10)
 
         self._current_perspective.show()
@@ -592 +592 @@
         self.ipDockWidget.setObjectName("IPythonDockWidget")
         self.ipDockWidget.setWidget(terminal)
-        self._workspace.workspace.addSubWindow(self.ipDockWidget, Qt.RightDockWidgetArea)
+        self._workspace.addDockWidget(Qt.RightDockWidgetArea, self.ipDockWidget)
 
     def actionImage_Viewer(self):