eric6/WebBrowser/TabManager/TabManagerWidget.py

changeset 7270
41d09cf20415
parent 7229
53054eb5b15a
child 7360
9190402e4505
equal deleted inserted replaced
7269:0c63ea7f94bd 7270:41d09cf20415
15 15
16 import os 16 import os
17 import collections 17 import collections
18 18
19 from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QTimer, QRect 19 from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QTimer, QRect
20 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QTreeWidget, \ 20 from PyQt5.QtWidgets import (
21 QTreeWidgetItem, QMenu, QStyle, QAction 21 QWidget, QVBoxLayout, QTreeWidget, QTreeWidgetItem, QMenu, QStyle, QAction
22 )
22 23
23 import E5Network 24 import E5Network
24 from E5Network import E5TldExtractor 25 from E5Network import E5TldExtractor
25 26
26 from E5Gui.E5Application import e5App 27 from E5Gui.E5Application import e5App
131 if folder is None: 132 if folder is None:
132 return 133 return
133 134
134 for mainWin in browsersDict: 135 for mainWin in browsersDict:
135 for browser in browsersDict[mainWin]: 136 for browser in browsersDict[mainWin]:
136 if not browser.url().isEmpty() and \ 137 if (
137 not browser.url().scheme() == "eric": 138 not browser.url().isEmpty() and
139 not browser.url().scheme() == "eric"
140 ):
138 bookmark = BookmarkNode(BookmarkNode.Bookmark) 141 bookmark = BookmarkNode(BookmarkNode.Bookmark)
139 bookmark.url = bytes(browser.url().toEncoded()).decode() 142 bookmark.url = bytes(browser.url().toEncoded()).decode()
140 bookmark.title = browser.title() 143 bookmark.title = browser.title()
141 144
142 self.__mw.bookmarksManager().addBookmark(folder, bookmark) 145 self.__mw.bookmarksManager().addBookmark(folder, bookmark)
178 181
179 if useHostName or E5Network.isValidAddress(host): 182 if useHostName or E5Network.isValidAddress(host):
180 if host.lower().startswith("www."): 183 if host.lower().startswith("www."):
181 host = host[4:] 184 host = host[4:]
182 else: 185 else:
183 registeredDomain = \ 186 registeredDomain = (
184 TabManagerWidget._tldExtractor.registrableDomain(host) 187 TabManagerWidget._tldExtractor.registrableDomain(host)
188 )
185 if registeredDomain: 189 if registeredDomain:
186 host = registeredDomain 190 host = registeredDomain
187 191
188 return host + appendStr 192 return host + appendStr
189 193
391 for index in range(self.__tree.topLevelItemCount()): 395 for index in range(self.__tree.topLevelItemCount()):
392 winItem = self.__tree.topLevelItem(index) 396 winItem = self.__tree.topLevelItem(index)
393 397
394 for row in range(winItem.childCount()): 398 for row in range(winItem.childCount()):
395 tabItem = winItem.child(row) 399 tabItem = winItem.child(row)
396 if tabItem.data(0, TabManagerWidget.WebBrowserRole) in \ 400 if tabItem.data(0, TabManagerWidget.WebBrowserRole) in (
397 selectedBrowsers: 401 selectedBrowsers
402 ):
398 tabItem.setCheckState(0, Qt.Checked) 403 tabItem.setCheckState(0, Qt.Checked)
399 404
400 self.__tree.expandAll() 405 self.__tree.expandAll()
401 self.__isRefreshing = False 406 self.__isRefreshing = False
402 self.__waitForRefresh = False 407 self.__waitForRefresh = False
588 windowFrameGeometry = window.frameGeometry() 593 windowFrameGeometry = window.frameGeometry()
589 if (desktopGeometry.width() - windowFrameGeometry.right() - 1 > 594 if (desktopGeometry.width() - windowFrameGeometry.right() - 1 >
590 self.frameGeometry().width()): 595 self.frameGeometry().width()):
591 x = windowFrameGeometry.right() + 1 596 x = windowFrameGeometry.right() + 1
592 else: 597 else:
593 x = windowFrameGeometry.x() - 1 \ 598 x = windowFrameGeometry.x() - 1 - self.frameGeometry().width()
594 - self.frameGeometry().width()
595 599
596 newGeo = QRect(x, y, self.width(), window.height()) 600 newGeo = QRect(x, y, self.width(), window.height())
597 self.setGeometry(newGeo) 601 self.setGeometry(newGeo)
598 602
599 self.activateWindow() 603 self.activateWindow()

eric ide

mercurial