Ignore:
Timestamp:
Nov 9, 2017 8:43:07 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:
fbfc488
Parents:
4992ff2
git-author:
Piotr Rozyczko <rozyczko@…> (10/31/17 10:00:59)
git-committer:
Piotr Rozyczko <rozyczko@…> (11/09/17 08:43:07)
Message:

More functionality conversion

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/MainWindow/GuiManager.py

    r4992ff2 r7969b9c  
    7777 
    7878        # Invoke the initial perspective 
    79         self.perspectiveChanged("Fitting") 
     79        #self.perspectiveChanged("Fitting") 
    8080        self.addWidgets() 
    8181 
     
    9191        # Set up the status bar 
    9292        self.statusBarSetup() 
    93  
    9493        # Show the Welcome panel 
    9594        self.welcomePanel = WelcomePanel() 
     
    117116 
    118117        self.dockedFilesWidget = QDockWidget("Data Explorer", self._workspace) 
    119         self.dockedFilesWidget.setFloating(True) 
     118        self.dockedFilesWidget.setFloating(False) 
    120119        self.dockedFilesWidget.setWidget(self.filesWidget) 
    121120 
    122121        # Disable maximize/minimize and close buttons 
    123122        self.dockedFilesWidget.setFeatures(QDockWidget.NoDockWidgetFeatures) 
    124         self.dockedFilesWidget.setFeatures(Qt.LeftDockWidgetArea) 
    125  
    126         self._workspace.workspace.addDockWidget(Qt.LeftDockWidgetArea, self.dockedFilesWidget) 
     123 
     124        #self._workspace.workspace.addDockWidget(Qt.LeftDockWidgetArea, self.dockedFilesWidget) 
     125        self._workspace.addDockWidget(Qt.LeftDockWidgetArea, self.dockedFilesWidget) 
    127126 
    128127        # Add the console window as another docked widget 
     
    132131        self.listWidget = QTextBrowser() 
    133132        self.logDockWidget.setWidget(self.listWidget) 
    134         self._workspace.workspace.addDockWidget(Qt.BottomDockWidgetAre, self.logDockWidget)  
     133        self._workspace.addDockWidget(Qt.BottomDockWidgetArea, self.logDockWidget) 
    135134 
    136135        # Add other, minor widgets 
     
    199198 
    200199        # Resize to the workspace height 
    201         workspace_height = self._workspace.workspace.sizeHint().height() 
    202         perspective_size = self._current_perspective.sizeHint() 
    203         if workspace_height < perspective_size.height(): 
    204             perspective_width = perspective_size.width() 
    205             self._current_perspective.resize(perspective_width, workspace_height-10) 
     200        #workspace_height = self._workspace.workspace.sizeHint().height() 
     201        #perspective_size = self._current_perspective.sizeHint() 
     202        #if workspace_height < perspective_size.height(): 
     203        #    perspective_width = perspective_size.width() 
     204        #    self._current_perspective.resize(perspective_width, workspace_height-10) 
     205 
    206206        self._current_perspective.show() 
    207207 
Note: See TracChangeset for help on using the changeset viewer.