WebEngine: Don't save title if generated from URL

This commit is contained in:
Florian Bruhin 2016-08-18 18:05:48 +02:00
parent 4b7a3db0eb
commit dfed2f9c9c
3 changed files with 22 additions and 4 deletions

View File

@ -638,9 +638,7 @@ class AbstractTab(QWidget):
@pyqtSlot()
def _on_history_trigger(self):
"""Emit add_history_item when triggered by backend-specific signal."""
url = self.url()
requested_url = self.url(requested=True)
self.add_history_item.emit(url, requested_url, self.title())
raise NotImplementedError
@pyqtSlot(int)
def _on_load_progress(self, perc):

View File

@ -24,7 +24,7 @@
import functools
from PyQt5.QtCore import pyqtSlot, Qt, QEvent, QPoint
from PyQt5.QtCore import pyqtSlot, Qt, QEvent, QPoint, QUrl
from PyQt5.QtGui import QKeyEvent, QIcon
from PyQt5.QtWidgets import QApplication
# pylint: disable=no-name-in-module,import-error,useless-suppression
@ -487,6 +487,20 @@ class WebEngineTab(browsertab.AbstractTab):
def clear_ssl_errors(self):
log.stub()
@pyqtSlot()
def _on_history_trigger(self):
url = self.url()
requested_url = self.url(requested=True)
# Don't save the title if it's generated from the URL
title = self.title()
title_url = QUrl(url)
title_url.setScheme('')
if title == title_url.toDisplayString(QUrl.RemoveScheme).strip('/'):
title = ""
self.add_history_item.emit(url, requested_url, title)
def _connect_signals(self):
view = self._widget
page = view.page()

View File

@ -640,6 +640,12 @@ class WebKitTab(browsertab.AbstractTab):
nam = self._widget.page().networkAccessManager()
nam.clear_all_ssl_errors()
@pyqtSlot()
def _on_history_trigger(self):
url = self.url()
requested_url = self.url(requested=True)
self.add_history_item.emit(url, requested_url, self.title())
def set_html(self, html, base_url):
self._widget.setHtml(html, base_url)