Mercurial Repositories > eric / file comparison
comparison: Preferences/__init__.py
Preferences/__init__.py
- branch
- 5_5_x
- changeset 3915
- c6aa0bccd7d8
- parent 3847
- 4a946734fd27
- child 3916
- 1d54f7cd2de7
equal
deleted
inserted
replaced
| 3911:73025fe6e982 | 3915:c6aa0bccd7d8 |
|---|---|
| 1508 for b in profiles[name][6]: | 1508 for b in profiles[name][6]: |
| 1509 viewProfiles[name][2].append(QByteArray(b)) | 1509 viewProfiles[name][2].append(QByteArray(b)) |
| 1510 else: | 1510 else: |
| 1511 # use the defaults | 1511 # use the defaults |
| 1512 viewProfiles = prefClass.uiDefaults["ViewProfiles2"] | 1512 viewProfiles = prefClass.uiDefaults["ViewProfiles2"] |
| 1513 # Remove unused setting in Python 2. Otherwise Eric 5.3 | 1513 # Remove unused setting |
| 1514 # would get problems | 1514 prefClass.settings.remove("UI/ViewProfiles") |
| 1515 if sys.version_info[0] == 2: | |
| 1516 prefClass.settings.remove("UI/ViewProfiles") | |
| 1517 return viewProfiles | 1515 return viewProfiles |
| 1518 elif key in ["ToolbarManagerState", "PreviewSplitterState"]: | 1516 elif key in ["ToolbarManagerState", "PreviewSplitterState"]: |
| 1519 state = prefClass.settings.value("UI/" + key) | 1517 state = prefClass.settings.value("UI/" + key) |
| 1520 if state is not None: | 1518 if state is not None: |
| 1521 return state | 1519 return state |
