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

[Fix:] Crash in Web Inspector + User Style Sheet loading

Browse Source 
- also reverted .ico favicon change, using .png favicon
  again (it SHOULD display correctly in ubuntu now)
This commit is contained in:
nowrep 2011-12-07 13:54:06 +01:00
parent 529d8e16dc
commit 6c5aefefb8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/mainapplication.cpp
View File

@ -240,7 +240,7 @@ void MainApplication::loadSettings()
bool xssAuditing = settings.value("XSSAuditing", false).toBool(); bool xssAuditing = settings.value("XSSAuditing", false).toBool();
int maxCachedPages = settings.value("maximumCachedPages", 3).toInt(); int maxCachedPages = settings.value("maximumCachedPages", 3).toInt();
int scrollingLines = settings.value("wheelScrollLines", wheelScrollLines()).toInt(); int scrollingLines = settings.value("wheelScrollLines", wheelScrollLines()).toInt();
QUrl userStyleSheet = settings.value("userStyleSheet", QUrl()).toUrl(); QUrl userStyleSheet = QUrl::fromLocalFile(settings.value("userStyleSheet", "").toString());
m_defaultZoom = settings.value("DefaultZoom", 100).toInt(); m_defaultZoom = settings.value("DefaultZoom", 100).toInt();
settings.endGroup(); settings.endGroup();

8
src/network/qupzillaschemehandler.cpp
View File

@ -117,7 +117,7 @@ QString QupZillaSchemeReply::reportbugPage()
{ {
QString page; QString page;
page.append(qz_readAllFileContents(":html/reportbug.html")); page.append(qz_readAllFileContents(":html/reportbug.html"));
page.replace("%FAVICON%", "qrc:html/qupzilla.ico"); page.replace("%FAVICON%", "qrc:icons/qupzilla.png");
page.replace("%BOX-BORDER%", "qrc:html/box-border.png"); page.replace("%BOX-BORDER%", "qrc:html/box-border.png");
page.replace("%TITLE%", tr("Report Issue")); page.replace("%TITLE%", tr("Report Issue"));
@ -137,7 +137,7 @@ QString QupZillaSchemeReply::startPage()
{ {
QString page; QString page;
page.append(qz_readAllFileContents(":html/start.html")); page.append(qz_readAllFileContents(":html/start.html"));
page.replace("%FAVICON%", "qrc:html/qupzilla.ico"); page.replace("%FAVICON%", "qrc:icons/qupzilla.png");
page.replace("%BOX-BORDER%", "qrc:html/box-border.png"); page.replace("%BOX-BORDER%", "qrc:html/box-border.png");
page.replace("%ABOUT-IMG%", "qrc:icons/other/about.png"); page.replace("%ABOUT-IMG%", "qrc:icons/other/about.png");
@ -154,7 +154,7 @@ QString QupZillaSchemeReply::aboutPage()
{ {
QString page; QString page;
page.append(qz_readAllFileContents(":html/about.html")); page.append(qz_readAllFileContents(":html/about.html"));
page.replace("%FAVICON%", "qrc:html/qupzilla.ico"); page.replace("%FAVICON%", "qrc:icons/qupzilla.png");
page.replace("%BOX-BORDER%", "qrc:html/box-border.png"); page.replace("%BOX-BORDER%", "qrc:html/box-border.png");
page.replace("%ABOUT-IMG%", "qrc:icons/other/about.png"); page.replace("%ABOUT-IMG%", "qrc:icons/other/about.png");
page.replace("%COPYRIGHT-INCLUDE%", qz_readAllFileContents(":html/copyright")); page.replace("%COPYRIGHT-INCLUDE%", qz_readAllFileContents(":html/copyright"));
@ -206,7 +206,7 @@ QString QupZillaSchemeReply::speeddialPage()
{ {
QString page; QString page;
page.append(qz_readAllFileContents(":html/speeddial.html")); page.append(qz_readAllFileContents(":html/speeddial.html"));
page.replace("%FAVICON%", "qrc:html/qupzilla.ico"); page.replace("%FAVICON%", "qrc:icons/qupzilla.png");
page.replace("%IMG_PLUS%", "qrc:html/plus.png"); page.replace("%IMG_PLUS%", "qrc:html/plus.png");
page.replace("%BOX-BORDER%", "qrc:html/box-border-small.png"); page.replace("%BOX-BORDER%", "qrc:html/box-border-small.png");
page.replace("%IMG_CLOSE%", "qrc:html/close.png"); page.replace("%IMG_CLOSE%", "qrc:html/close.png");

2
src/webview/webinspectordockwidget.cpp
View File

@ -37,7 +37,7 @@ WebInspectorDockWidget::WebInspectorDockWidget(QupZilla* mainClass)
void WebInspectorDockWidget::close() void WebInspectorDockWidget::close()
{ {
m_inspector->deleteLater(); delete m_inspector;
p_QupZilla->weView()->webTab()->setInspectorVisible(false); p_QupZilla->weView()->webTab()->setInspectorVisible(false);
hide(); hide();