Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- branch
- maintenance
- changeset 6569
- b4aeb61b3e3c
- parent 6487
- d3ca83d691e7
- parent 6555
- 923cf7e19ec3
- child 6602
- 331ac8f99cf8
equal
deleted
inserted
replaced
| 6542:dac410f3aff4 | 6569:b4aeb61b3e3c |
|---|---|
| 220 else: | 220 else: |
| 221 self.restoreGeometry(g) | 221 self.restoreGeometry(g) |
| 222 self.__startup = True | 222 self.__startup = True |
| 223 | 223 |
| 224 self.__proxyFactory = E5NetworkProxyFactory() | 224 self.__proxyFactory = E5NetworkProxyFactory() |
| 225 QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) | 225 if Preferences.getUI("UseSystemProxy"): |
| 226 QNetworkProxyFactory.setUseSystemConfiguration( | 226 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 227 Preferences.getUI("UseSystemProxy")) | 227 else: |
| 228 QNetworkProxyFactory.setApplicationProxyFactory( | |
| 229 self.__proxyFactory) | |
| 230 QNetworkProxyFactory.setUseSystemConfiguration(False) | |
| 228 | 231 |
| 229 self.capProject = "" | 232 self.capProject = "" |
| 230 self.capEditor = "" | 233 self.capEditor = "" |
| 231 self.captionShowsFilename = Preferences.getUI("CaptionShowsFilename") | 234 self.captionShowsFilename = Preferences.getUI("CaptionShowsFilename") |
| 232 | 235 |
| 3176 | 3179 |
| 3177 self.viewmanager.setSbInfo( | 3180 self.viewmanager.setSbInfo( |
| 3178 self.sbLine, self.sbPos, self.sbWritable, self.sbEncoding, | 3181 self.sbLine, self.sbPos, self.sbWritable, self.sbEncoding, |
| 3179 self.sbLanguage, self.sbEol, self.sbZoom) | 3182 self.sbLanguage, self.sbEol, self.sbZoom) |
| 3180 | 3183 |
| 3181 from VCS.StatusMonitorLed import StatusMonitorLed | 3184 from VCS.StatusMonitorLed import StatusMonitorLedWidget |
| 3182 self.sbVcsMonitorLed = StatusMonitorLed(self.project, self.__statusBar) | 3185 self.sbVcsMonitorLed = StatusMonitorLedWidget( |
| 3186 self.project, self.__statusBar) | |
| 3183 self.__statusBar.addPermanentWidget(self.sbVcsMonitorLed) | 3187 self.__statusBar.addPermanentWidget(self.sbVcsMonitorLed) |
| 3184 | 3188 |
| 3185 self.networkIcon = E5NetworkIcon(self.__statusBar) | 3189 self.networkIcon = E5NetworkIcon(self.__statusBar) |
| 3186 self.__statusBar.addPermanentWidget(self.networkIcon) | 3190 self.__statusBar.addPermanentWidget(self.networkIcon) |
| 3187 self.networkIcon.onlineStateChanged.connect(self.onlineStateChanged) | 3191 self.networkIcon.onlineStateChanged.connect(self.onlineStateChanged) |
| 5817 delay = Preferences.getUI("SidebarDelay") | 5821 delay = Preferences.getUI("SidebarDelay") |
| 5818 self.leftSidebar.setDelay(delay) | 5822 self.leftSidebar.setDelay(delay) |
| 5819 self.bottomSidebar.setDelay(delay) | 5823 self.bottomSidebar.setDelay(delay) |
| 5820 self.rightSidebar.setDelay(delay) | 5824 self.rightSidebar.setDelay(delay) |
| 5821 | 5825 |
| 5822 QNetworkProxyFactory.setUseSystemConfiguration( | 5826 if Preferences.getUI("UseSystemProxy"): |
| 5823 Preferences.getUI("UseSystemProxy")) | 5827 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 5828 else: | |
| 5829 QNetworkProxyFactory.setApplicationProxyFactory( | |
| 5830 self.__proxyFactory) | |
| 5831 QNetworkProxyFactory.setUseSystemConfiguration(False) | |
| 5824 | 5832 |
| 5825 from HexEdit.HexEditMainWindow import HexEditMainWindow | 5833 from HexEdit.HexEditMainWindow import HexEditMainWindow |
| 5826 for hexEditor in HexEditMainWindow.windows: | 5834 for hexEditor in HexEditMainWindow.windows: |
| 5827 hexEditor.preferencesChanged() | 5835 hexEditor.preferencesChanged() |
| 5828 | 5836 |
