Mercurial Repositories > eric / file diff

--- a/eric7/UI/UserInterface.py	Mon May 17 19:58:15 2021 +0200
+++ b/eric7/UI/UserInterface.py	Tue May 18 18:19:47 2021 +0200
@@ -237,7 +237,7 @@
         self.__setWindowCaption()
         
         # load the view profiles
-        self.profiles = Preferences.getUI("ViewProfiles2")
+        self.profiles = Preferences.getUI("ViewProfiles")
         
         # Generate the conda interface
         from CondaInterface.Conda import Conda
@@ -4416,14 +4416,16 @@
                     self.profiles[self.currentProfile][2][0] = state
                     state = self.verticalSplitter.saveState()
                     self.profiles[self.currentProfile][2][1] = state
+                    state = self.rightSplitter.saveState()
+                    self.profiles[self.currentProfile][2][2] = state
+                    
                     state = self.leftSidebar.saveState()
-                    self.profiles[self.currentProfile][2][2] = state
+                    self.profiles[self.currentProfile][2][3] = state
                     state = self.bottomSidebar.saveState()
-                    self.profiles[self.currentProfile][2][3] = state
-                    state = self.rightSplitter.saveState()
                     self.profiles[self.currentProfile][2][4] = state
                     state = self.rightSidebar.saveState()
                     self.profiles[self.currentProfile][2][5] = state
+            
             # step 2: save the visibility of the windows of the active profile
             if self.__layoutType == "Toolboxes":
                 self.profiles[self.currentProfile][1][0] = (
@@ -4445,7 +4447,7 @@
                 self.profiles[self.currentProfile][1][2] = (
                     self.rightSidebar.isVisible()
                 )
-            Preferences.setUI("ViewProfiles2", self.profiles)
+            Preferences.setUI("ViewProfiles", self.profiles)
     
     def __activateViewProfile(self, name, save=True):
         """
@@ -4473,15 +4475,16 @@
                         self.verticalSplitter.restoreState(state)
                     state = self.profiles[name][2][2]
                     if not state.isEmpty():
-                        self.leftSidebar.restoreState(state)
+                        self.rightSplitter.restoreState(state)
+                    
                     state = self.profiles[name][2][3]
-                    if not state.isEmpty():
-                        self.bottomSidebar.restoreState(state)
+                    if state:
+                        self.leftSidebar.restoreState(state)
                     state = self.profiles[name][2][4]
-                    if not state.isEmpty():
-                        self.rightSplitter.restoreState(state)
+                    if state:
+                        self.bottomSidebar.restoreState(state)
                     state = self.profiles[name][2][5]
-                    if not state.isEmpty():
+                    if state:
                         self.rightSidebar.restoreState(state)
                 
                 if self.__layoutType == "Toolboxes":
@@ -6270,7 +6273,7 @@
             edit, debug = dlg.getVisibilities()
             self.profiles['edit'][1] = edit
             self.profiles['debug'][1] = debug
-            Preferences.setUI("ViewProfiles2", self.profiles)
+            Preferences.setUI("ViewProfiles", self.profiles)
             if self.currentProfile == "edit":
                 self.__setEditProfile(False)
             elif self.currentProfile == "debug":
@@ -6307,7 +6310,7 @@
             self.tr("Keyboard Shortcuts File (*.ekj);;"
                     "XML Keyboard Shortcuts File (*.e4k)"),
             "",
-            E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
+            E5FileDialog.DontConfirmOverwrite)
         
         if not fn:
             return