Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Fixed loading empty page upon closing last tab.

Browse Source
This commit is contained in:
nowrep 2012-01-22 16:28:11 +01:00
parent 310294d8ed
commit 2ea51405fd
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/mainapplication.cpp
View File

@ -356,6 +356,7 @@ void MainApplication::loadSettings()
m_websettings->setUserStyleSheetUrl(userStyleSheet);
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
QWebSecurityOrigin::addLocalScheme("qupzilla");

1
src/app/qupzilla.cpp
View File

@ -1090,6 +1090,7 @@ void QupZilla::loadFolderBookmarks(Menu* menu)
void QupZilla::loadAddress(const QUrl &url)
{
weView()->setFocus();
weView()->load(url);
locationBar()->setText(url.toEncoded());
}

2
src/navigation/locationbar.cpp
View File

@ -202,7 +202,7 @@ void LocationBar::showUrl(const QUrl &url)
QString encodedUrl = url.toEncoded();
if (url.toString() == "qupzilla:speeddial") {
if (url.toString() == "qupzilla:speeddial" || url.toString() == "about:blank") {
encodedUrl = "";
}

2
src/popupwindow/popupwebpage.cpp
View File

@ -48,8 +48,6 @@ PopupWebPage::PopupWebPage(QWebPage::WebWindowType type, QupZilla* mainClass)
connect(this, SIGNAL(loadProgress(int)), this, SLOT(slotLoadProgress(int)));
connect(this, SIGNAL(loadFinished(bool)), this, SLOT(slotLoadFinished(bool)));
settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, false);
QTimer::singleShot(0, this, SLOT(checkBehaviour()));
}

3
src/webview/tabwidget.cpp
View File

@ -360,8 +360,9 @@ void TabWidget::closeTab(int index)
if (count() == 1) {
if (m_dontQuitWithOneTab) {
webView->load(m_urlOnNewTab);
webView->setUrl(m_urlOnNewTab);
webPage->history()->clear();
p_QupZilla->updateLoadingActions();
return;
}
else {