mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 02:36:34 +01:00
Fixed loading empty page upon closing last tab.
This commit is contained in:
parent
310294d8ed
commit
2ea51405fd
@ -356,6 +356,7 @@ void MainApplication::loadSettings()
|
|||||||
|
|
||||||
m_websettings->setUserStyleSheetUrl(userStyleSheet);
|
m_websettings->setUserStyleSheetUrl(userStyleSheet);
|
||||||
m_websettings->setWebGraphic(QWebSettings::DefaultFrameIconGraphic, IconProvider::fromTheme("text-plain").pixmap(16, 16));
|
m_websettings->setWebGraphic(QWebSettings::DefaultFrameIconGraphic, IconProvider::fromTheme("text-plain").pixmap(16, 16));
|
||||||
|
m_websettings->setWebGraphic(QWebSettings::MissingImageGraphic, QPixmap());
|
||||||
|
|
||||||
// Allows to load files from qrc: scheme in qupzilla: pages
|
// Allows to load files from qrc: scheme in qupzilla: pages
|
||||||
QWebSecurityOrigin::addLocalScheme("qupzilla");
|
QWebSecurityOrigin::addLocalScheme("qupzilla");
|
||||||
|
@ -1090,6 +1090,7 @@ void QupZilla::loadFolderBookmarks(Menu* menu)
|
|||||||
|
|
||||||
void QupZilla::loadAddress(const QUrl &url)
|
void QupZilla::loadAddress(const QUrl &url)
|
||||||
{
|
{
|
||||||
|
weView()->setFocus();
|
||||||
weView()->load(url);
|
weView()->load(url);
|
||||||
locationBar()->setText(url.toEncoded());
|
locationBar()->setText(url.toEncoded());
|
||||||
}
|
}
|
||||||
|
@ -202,7 +202,7 @@ void LocationBar::showUrl(const QUrl &url)
|
|||||||
|
|
||||||
QString encodedUrl = url.toEncoded();
|
QString encodedUrl = url.toEncoded();
|
||||||
|
|
||||||
if (url.toString() == "qupzilla:speeddial") {
|
if (url.toString() == "qupzilla:speeddial" || url.toString() == "about:blank") {
|
||||||
encodedUrl = "";
|
encodedUrl = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,8 +48,6 @@ PopupWebPage::PopupWebPage(QWebPage::WebWindowType type, QupZilla* mainClass)
|
|||||||
connect(this, SIGNAL(loadProgress(int)), this, SLOT(slotLoadProgress(int)));
|
connect(this, SIGNAL(loadProgress(int)), this, SLOT(slotLoadProgress(int)));
|
||||||
connect(this, SIGNAL(loadFinished(bool)), this, SLOT(slotLoadFinished(bool)));
|
connect(this, SIGNAL(loadFinished(bool)), this, SLOT(slotLoadFinished(bool)));
|
||||||
|
|
||||||
settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, false);
|
|
||||||
|
|
||||||
QTimer::singleShot(0, this, SLOT(checkBehaviour()));
|
QTimer::singleShot(0, this, SLOT(checkBehaviour()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -360,8 +360,9 @@ void TabWidget::closeTab(int index)
|
|||||||
|
|
||||||
if (count() == 1) {
|
if (count() == 1) {
|
||||||
if (m_dontQuitWithOneTab) {
|
if (m_dontQuitWithOneTab) {
|
||||||
webView->load(m_urlOnNewTab);
|
webView->setUrl(m_urlOnNewTab);
|
||||||
webPage->history()->clear();
|
webPage->history()->clear();
|
||||||
|
p_QupZilla->updateLoadingActions();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
Loading…
Reference in New Issue
Block a user