Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- changeset 6783
- d8a0d75aaf01
- parent 6761
- 0b69fe8314e3
- child 6785
- 058d63c537a4
equal
deleted
inserted
replaced
| 6780:7f7453c8e5fc | 6783:d8a0d75aaf01 |
|---|---|
| 210 self.resize(s) | 210 self.resize(s) |
| 211 else: | 211 else: |
| 212 self.restoreGeometry(g) | 212 self.restoreGeometry(g) |
| 213 self.__startup = True | 213 self.__startup = True |
| 214 | 214 |
| 215 self.__proxyFactory = E5NetworkProxyFactory() | |
| 216 if Preferences.getUI("UseSystemProxy"): | 215 if Preferences.getUI("UseSystemProxy"): |
| 217 QNetworkProxyFactory.setUseSystemConfiguration(True) | 216 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 218 else: | 217 else: |
| 218 self.__proxyFactory = E5NetworkProxyFactory() | |
| 219 QNetworkProxyFactory.setApplicationProxyFactory( | 219 QNetworkProxyFactory.setApplicationProxyFactory( |
| 220 self.__proxyFactory) | 220 self.__proxyFactory) |
| 221 QNetworkProxyFactory.setUseSystemConfiguration(False) | 221 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 222 | 222 |
| 223 self.capProject = "" | 223 self.capProject = "" |
| 5871 self.rightSidebar.setDelay(delay) | 5871 self.rightSidebar.setDelay(delay) |
| 5872 | 5872 |
| 5873 if Preferences.getUI("UseSystemProxy"): | 5873 if Preferences.getUI("UseSystemProxy"): |
| 5874 QNetworkProxyFactory.setUseSystemConfiguration(True) | 5874 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 5875 else: | 5875 else: |
| 5876 self.__proxyFactory = E5NetworkProxyFactory() | |
| 5876 QNetworkProxyFactory.setApplicationProxyFactory( | 5877 QNetworkProxyFactory.setApplicationProxyFactory( |
| 5877 self.__proxyFactory) | 5878 self.__proxyFactory) |
| 5878 QNetworkProxyFactory.setUseSystemConfiguration(False) | 5879 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 5879 | 5880 |
| 5880 from HexEdit.HexEditMainWindow import HexEditMainWindow | 5881 from HexEdit.HexEditMainWindow import HexEditMainWindow |
