Mercurial Repositories > eric / file comparison
comparison: eric6/WebBrowser/WebBrowserWindow.py
eric6/WebBrowser/WebBrowserWindow.py
- changeset 8260
- 2161475d9639
- parent 8243
- cc717c2ae956
- child 8265
- 0090cfa83159
equal
deleted
inserted
replaced
| 8259:2bbec88047dd | 8260:2161475d9639 |
|---|---|
| 294 Qt.DockWidgetArea.TopDockWidgetArea) | 294 Qt.DockWidgetArea.TopDockWidgetArea) |
| 295 self.__javascriptConsoleDock.setWidget(self.__javascriptConsole) | 295 self.__javascriptConsoleDock.setWidget(self.__javascriptConsole) |
| 296 self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, | 296 self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, |
| 297 self.__javascriptConsoleDock) | 297 self.__javascriptConsoleDock) |
| 298 | 298 |
| 299 if Preferences.getWebBrowser("SaveGeometry"): | 299 g = ( |
| 300 g = Preferences.getGeometry("WebBrowserGeometry") | 300 Preferences.getGeometry("WebBrowserGeometry") |
| 301 else: | 301 if Preferences.getWebBrowser("SaveGeometry") else |
| 302 g = QByteArray() | 302 QByteArray() |
| 303 ) | |
| 303 if g.isEmpty(): | 304 if g.isEmpty(): |
| 304 s = QSize(800, 800) | 305 s = QSize(800, 800) |
| 305 self.resize(s) | 306 self.resize(s) |
| 306 else: | 307 else: |
| 307 self.restoreGeometry(g) | 308 self.restoreGeometry(g) |
| 4112 Private slot to populate the text encoding menu. | 4113 Private slot to populate the text encoding menu. |
| 4113 """ | 4114 """ |
| 4114 self.__textEncodingMenu.clear() | 4115 self.__textEncodingMenu.clear() |
| 4115 | 4116 |
| 4116 defaultTextEncoding = self.webSettings().defaultTextEncoding().lower() | 4117 defaultTextEncoding = self.webSettings().defaultTextEncoding().lower() |
| 4117 if defaultTextEncoding in Utilities.supportedCodecs: | 4118 currentCodec = ( |
| 4118 currentCodec = defaultTextEncoding | 4119 defaultTextEncoding |
| 4119 else: | 4120 if defaultTextEncoding in Utilities.supportedCodecs else |
| 4120 currentCodec = "" | 4121 "" |
| 4122 ) | |
| 4121 | 4123 |
| 4122 isoCodecs = [] | 4124 isoCodecs = [] |
| 4123 winCodecs = [] | 4125 winCodecs = [] |
| 4124 uniCodecs = [] | 4126 uniCodecs = [] |
| 4125 cpCodecs = [] | 4127 cpCodecs = [] |
| 4995 if not ext: | 4997 if not ext: |
| 4996 ex = selectedFilter.split("(*")[1].split(")")[0] | 4998 ex = selectedFilter.split("(*")[1].split(")")[0] |
| 4997 if ex: | 4999 if ex: |
| 4998 fn += ex | 5000 fn += ex |
| 4999 | 5001 |
| 5000 if os.path.exists(fn): | 5002 ok = ( |
| 5001 ok = E5MessageBox.yesNo( | 5003 E5MessageBox.yesNo( |
| 5002 self, | 5004 self, |
| 5003 self.tr("Export Keyboard Shortcuts"), | 5005 self.tr("Export Keyboard Shortcuts"), |
| 5004 self.tr("""<p>The keyboard shortcuts file <b>{0}</b> exists""" | 5006 self.tr("""<p>The keyboard shortcuts file <b>{0}</b> exists""" |
| 5005 """ already. Overwrite it?</p>""").format(fn)) | 5007 """ already. Overwrite it?</p>""").format(fn)) |
| 5006 else: | 5008 if os.path.exists(fn) else |
| 5007 ok = True | 5009 True |
| 5010 ) | |
| 5008 | 5011 |
| 5009 if ok: | 5012 if ok: |
| 5010 from Preferences import Shortcuts | 5013 from Preferences import Shortcuts |
| 5011 Shortcuts.exportShortcuts(fn, helpViewer=self) | 5014 Shortcuts.exportShortcuts(fn, helpViewer=self) |
| 5012 | 5015 |
