Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-22 02:02:10 +02:00
Code Releases Activity

Merge branch 'v2.1'

Browse Source
This commit is contained in:
David Rosca 2017-02-07 15:08:25 +01:00
commit 3dd36b37ef
4 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/data/html/speeddial.html
View File

@ -178,12 +178,12 @@ function boxEdited() {
if (editingId == -1) if (editingId == -1)
return; return;
external.speedDial.urlFromUserInput($('#formUrl').attr("value"), function(newUrl) { external.speedDial.urlFromUserInput($('#formUrl').val(), function(newUrl) {
var box = document.getElementById('quickdial').getElementsByTagName('div')[editingId]; var box = document.getElementById('quickdial').getElementsByTagName('div')[editingId];
var a = box.getElementsByTagName('a')[0]; var a = box.getElementsByTagName('a')[0];
var originalUrl = a.getAttribute('href'); var originalUrl = a.getAttribute('href');
setBoxUrl(editingId, newUrl); setBoxUrl(editingId, newUrl);
setBoxTitle(editingId, $('#formTitle').attr("value")); setBoxTitle(editingId, $('#formTitle').val());
var changedUrl = a.getAttribute('href'); var changedUrl = a.getAttribute('href');
var fetchTitleChecked = document.getElementById('fetchTitle').checked; var fetchTitleChecked = document.getElementById('fetchTitle').checked;

10
src/lib/plugins/speeddial.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - Qt web browser
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -264,10 +264,6 @@ void SpeedDial::changed(const QString &allPages)
void SpeedDial::loadThumbnail(const QString &url, bool loadTitle) void SpeedDial::loadThumbnail(const QString &url, bool loadTitle)
{ {
if (url.isEmpty()) {
return;
}
PageThumbnailer* thumbnailer = new PageThumbnailer(this); PageThumbnailer* thumbnailer = new PageThumbnailer(this);
thumbnailer->setUrl(QUrl::fromEncoded(url.toUtf8())); thumbnailer->setUrl(QUrl::fromEncoded(url.toUtf8()));
thumbnailer->setLoadTitle(loadTitle); thumbnailer->setLoadTitle(loadTitle);
@ -342,7 +338,7 @@ void SpeedDial::thumbnailCreated(const QPixmap &pixmap)
QString fileName = m_thumbnailsDir + QCryptographicHash::hash(url.toUtf8(), QCryptographicHash::Md4).toHex() + ".png"; QString fileName = m_thumbnailsDir + QCryptographicHash::hash(url.toUtf8(), QCryptographicHash::Md4).toHex() + ".png";
if (pixmap.isNull()) { if (pixmap.isNull()) {
fileName = "qrc:/html/broken-page.png"; fileName = ":/html/broken-page.png";
title = tr("Unable to load"); title = tr("Unable to load");
} }
else { else {

12
src/lib/tools/pagethumbnailer.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - Qt web browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -17,6 +17,7 @@
* ============================================================ */ * ============================================================ */
#include "pagethumbnailer.h" #include "pagethumbnailer.h"
#include "scripts.h" #include "scripts.h"
#include "webview.h"
#include <QTimer> #include <QTimer>
#include <QApplication> #include <QApplication>
@ -77,11 +78,10 @@ QString PageThumbnailer::title()
void PageThumbnailer::start() void PageThumbnailer::start()
{ {
if (m_view->rootObject()) { if (m_view->rootObject() && WebView::isUrlValid(m_url)) {
m_view->rootObject()->setProperty("url", m_url); m_view->rootObject()->setProperty("url", m_url);
} } else {
else { QTimer::singleShot(500, this, [this]() {
QTimer::singleShot(0, this, [this]() {
emit thumbnailCreated(QPixmap()); emit thumbnailCreated(QPixmap());
}); });
} }

16
windows/installer.nsi
View File

@ -166,12 +166,11 @@ notRunning:
SetOutPath "$INSTDIR\translations\qtwebengine_locales" SetOutPath "$INSTDIR\translations\qtwebengine_locales"
File "translations\qtwebengine_locales\*" File "translations\qtwebengine_locales\*"
SetOutPath "$INSTDIR\hunspell\doc" SetOutPath "$INSTDIR\qtwebengine_dictionaries\doc"
File "wininstall\hunspell\doc\*" File "qtwebengine_dictionaries\doc\README-en-US.txt"
SetOutPath "$INSTDIR\hunspell" SetOutPath "$INSTDIR\qtwebengine_dictionaries"
File "wininstall\hunspell\en_US.aff" File "qtwebengine_dictionaries\en_US.bdic"
File "wininstall\hunspell\en_US.dic"
call RegisterCapabilities call RegisterCapabilities
SectionEnd SectionEnd
@ -219,9 +218,10 @@ SectionGroupEnd
Section $(TITLE_SecTranslations) SecTranslations Section $(TITLE_SecTranslations) SecTranslations
SetOutPath "$INSTDIR\locale" SetOutPath "$INSTDIR\locale"
File "locale\*.qm" File "locale\*.qm"
SetOutPath "$INSTDIR\hunspell" SetOutPath "$INSTDIR\qtwebengine_dictionaries\doc"
File "wininstall\hunspell\*.aff" File "qtwebengine_dictionaries\doc\*"
File "wininstall\hunspell\*.dic" SetOutPath "$INSTDIR\qtwebengine_dictionaries"
File "qtwebengine_dictionaries\*.bdic"
SectionEnd SectionEnd
Section $(TITLE_SecPlugins) SecPlugins Section $(TITLE_SecPlugins) SecPlugins