Mercurial Repositories > eric / changeset
changeset
Removed some obsolete code in the Preferences file.
Wed, 15 Feb 2017 19:00:55 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 15 Feb 2017 19:00:55 +0100
- changeset 5523
- 4ca7f05b1efe
- parent 5522
- e07d1df4c64a
- child 5524
- b96b6e7cd8a4
Removed some obsolete code in the Preferences file.
| Preferences/__init__.py | file | annotate | diff | comparison | revisions |
--- a/Preferences/__init__.py Tue Feb 14 19:57:58 2017 +0100 +++ b/Preferences/__init__.py Wed Feb 15 19:00:55 2017 +0100 @@ -1855,7 +1855,10 @@ return prefClass.uiDefaults[key] elif key in "ViewProfiles2": profiles = prefClass.settings.value("UI/ViewProfiles2") - if profiles is not None: + if profiles is None: + # use the defaults + viewProfiles = prefClass.uiDefaults["ViewProfiles2"] + else: viewProfiles = {} profiles = json.loads(profiles) for name in ["edit", "debug"]: @@ -1867,37 +1870,6 @@ for bs in profiles[name][2]: viewProfiles[name][2].append( QByteArray.fromBase64(bs.encode("utf-8"))) - else: - # TODO: Remove this branch - # migrate from the old ViewProfiles settings - try: - profiles = prefClass.settings.value("UI/ViewProfiles") - except TypeError: - profiles = None - if profiles is not None: - if isinstance(profiles, basestring): - profiles = eval(profiles) - viewProfiles = {} - for name in ["edit", "debug"]: - viewProfiles[name] = [ - QByteArray(profiles[name][4]), - profiles[name][5][:], - [] - ] - for b in profiles[name][6]: - viewProfiles[name][2].append(QByteArray(b)) - # correct some entries - while (len(viewProfiles[name][1]) < len( - prefClass.uiDefaults["ViewProfiles2"][name][1])): - viewProfiles[name][1].append(True) - while len(viewProfiles[name][2]) < len( - prefClass.uiDefaults["ViewProfiles2"][name][2]): - viewProfiles[name][2].append(QByteArray()) - else: - # use the defaults - viewProfiles = prefClass.uiDefaults["ViewProfiles2"] - # Remove unused setting - prefClass.settings.remove("UI/ViewProfiles") return viewProfiles elif key in ["ToolbarManagerState", "PreviewSplitterState"]: state = prefClass.settings.value("UI/" + key)
