Mercurial Repositories > eric / changeset
changeset
Fixed a few issues.
Sat, 06 Mar 2010 16:56:51 +0000
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 06 Mar 2010 16:56:51 +0000
- changeset 137
- 9b3f3e8fc798
- parent 136
- 97b55dcbafdf
- child 138
- dfbf0385687c
Fixed a few issues.
--- a/Documentation/Source/eric5.UI.UserInterface.html Sat Mar 06 12:13:00 2010 +0000 +++ b/Documentation/Source/eric5.UI.UserInterface.html Sat Mar 06 16:56:51 2010 +0000 @@ -179,7 +179,7 @@ <td>Private slot to handle the activation of the file browser.</td> </tr><tr> <td><a href="#UserInterface.__activateDebugViewer">__activateDebugViewer</a></td> -<td>Private slot to handle the activation of the debug browser.</td> +<td>Private slot to handle the activation of the debug viewer.</td> </tr><tr> <td><a href="#UserInterface.__activateLogViewer">__activateLogViewer</a></td> <td>Private slot to handle the activation of the Log Viewer.</td> @@ -759,7 +759,7 @@ <h4>UserInterface.__activateDebugViewer</h4> <b>__activateDebugViewer</b>(<i></i>) <p> - Private slot to handle the activation of the debug browser. + Private slot to handle the activation of the debug viewer. </p><a NAME="UserInterface.__activateLogViewer" ID="UserInterface.__activateLogViewer"></a> <h4>UserInterface.__activateLogViewer</h4> <b>__activateLogViewer</b>(<i></i>)
--- a/E5Gui/E5SideBar.py Sat Mar 06 12:13:00 2010 +0000 +++ b/E5Gui/E5SideBar.py Sat Mar 06 16:56:51 2010 +0000 @@ -103,7 +103,8 @@ else: self.__minSize = self.minimumWidth() self.__maxSize = self.maximumWidth() - self.splitterSizes = self.splitter.sizes() + if self.splitter: + self.splitterSizes = self.splitter.sizes() self.__stackedWidget.hide() @@ -125,7 +126,8 @@ else: self.setMinimumWidth(self.__minSize) self.setMaximumWidth(self.__maxSize) - self.splitter.setSizes(self.splitterSizes) + if self.splitter: + self.splitter.setSizes(self.splitterSizes) def isMinimized(self): """ @@ -442,7 +444,8 @@ @return saved state as a byte array (QByteArray) """ if len(self.splitterSizes) == 0: - self.splitterSizes = self.splitter.sizes() + if self.splitter: + self.splitterSizes = self.splitter.sizes() self.__bigSize = self.size() if self.__orientation in [E5SideBar.North, E5SideBar.South]: self.__minSize = self.minimumHeight()
--- a/Preferences/__init__.py Sat Mar 06 12:13:00 2010 +0000 +++ b/Preferences/__init__.py Sat Mar 06 16:56:51 2010 +0000 @@ -116,39 +116,39 @@ # Templates-Viewer, Multiproject-Viewer, Terminal "ViewProfiles" : { "edit" : [ - # visibility (0) - [ True, False, False, True, True, True, True, True, True], - # saved state main window with dock windows (1) - b"", - # saved states floating windows (2) - [b"", b"", b"", b"", b"", b"", b"", b"", b""], - # saved state main window with floating windows (3) - b"", - # saved state main window with toolbox windows (4) - b"", - # visibility of the toolboxes (5) - [ True, True], - # saved states of the splitters and sidebars of the - # sidebars layout (6) - [b"", b"", b"", b""], - ], + # visibility (0) + [ True, False, False, True, True, True, True, True, True], + # saved state main window with dock windows (1) + b"", + # saved states floating windows (2) + [b"", b"", b"", b"", b"", b"", b"", b"", b""], + # saved state main window with floating windows (3) + b"", + # saved state main window with toolbox windows (4) + b"", + # visibility of the toolboxes/sidebars (5) + [ True, True], + # saved states of the splitters and sidebars of the + # sidebars layout (6) + [b"", b"", b"", b""], + ], "debug" : [ - # visibility (0) - [ False, False, True, True, True, True, False, False, True], - # saved state main window with dock windows (1) - b"", - # saved states floating windows (2) - [b"", b"", b"", b"", b"", b"", b"", b"", b""], - # saved state main window with floating windows (3) - b"", - # saved state main window with toolbox windows (4) - b"", - # visibility of the toolboxes (5) - [ False, True], - # saved states of the splitters and sidebars of the - # sidebars layout (6) - [b"", b"", b"", b""], - ], + # visibility (0) + [ False, False, True, True, True, True, False, False, True], + # saved state main window with dock windows (1) + b"", + # saved states floating windows (2) + [b"", b"", b"", b"", b"", b"", b"", b"", b""], + # saved state main window with floating windows (3) + b"", + # saved state main window with toolbox windows (4) + b"", + # visibility of the toolboxes/sidebars (5) + [ False, True], + # saved states of the splitters and sidebars of the + # sidebars layout (6) + [b"", b"", b"", b""], + ], }, "ToolbarManagerState" : QtCore.QByteArray(), "ShowSplash" : True, @@ -1085,6 +1085,16 @@ if vpLength < len(prefClass.uiDefaults["ViewProfiles"][name]): viewProfiles[name].extend( prefClass.uiDefaults["ViewProfiles"][name][vpLength:]) + + # adjust entries for toolboxes and sidebars + vpLength = len(viewProfiles[name][5]) + if vpLength < len(prefClass.uiDefaults["ViewProfiles"][name][5]): + viewProfiles[name][5].extend(\ + prefClass.uiDefaults["ViewProfiles"][name][5][vpLength:]) + vpLength = len(viewProfiles[name][6]) + if vpLength < len(prefClass.uiDefaults["ViewProfiles"][name][6]): + viewProfiles[name][6].extend(\ + prefClass.uiDefaults["ViewProfiles"][name][6][vpLength:]) else: viewProfiles = prefClass.uiDefaults["ViewProfiles"] return viewProfiles
--- a/UI/UserInterface.py Sat Mar 06 12:13:00 2010 +0000 +++ b/UI/UserInterface.py Sat Mar 06 16:56:51 2010 +0000 @@ -980,8 +980,7 @@ UI.PixmapCache.getIcon("logViewer.png"), self.trUtf8("Log-Viewer")) - self.windows = [None, None, self.debugViewerDock, - None, None, None, None, None] + self.windows = [None, None, self.debugViewerDock, None, None, None, None, None] if self.embeddedShell: self.shell = self.debugViewer.shell @@ -3195,6 +3194,12 @@ for window, i in zip(self.windows, list(range(len(self.windows)))): if window is not None: self.profiles[self.currentProfile][0][i] = window.isVisible() + if self.layout == "Toolboxes": + self.profiles[self.currentProfile][5][0] = self.vToolboxDock.isVisible() + self.profiles[self.currentProfile][5][1] = self.hToolboxDock.isVisible() + elif self.layout == "Sidebars": + self.profiles[self.currentProfile][5][0] = self.leftSidebar.isVisible() + self.profiles[self.currentProfile][5][1] = self.bottomSidebar.isVisible() Preferences.setUI("ViewProfiles", self.profiles) def __activateViewProfile(self, name, save = True): @@ -3390,7 +3395,7 @@ def __activateDebugViewer(self): """ - Private slot to handle the activation of the debug browser. + Private slot to handle the activation of the debug viewer. """ if self.layout in ["DockWindows", "Toolboxes", "Sidebars"]: self.debugViewerDock.show()
