mirror of
https://invent.kde.org/network/falkon.git
synced 2024-09-21 17:52:10 +02:00
SpeedDial: Fix to work with QWebChannel
Page thumbnails are not yet implemented, otherwise it more or less works.
This commit is contained in:
David Rosca
parent
15279a3641
commit
fc204b3b46
|
|
@ -245,6 +245,15 @@ MainApplication::MainApplication(int &argc, char** argv)
|
|||
m_webProfile = isPrivate() ? new QWebEngineProfile(this) : QWebEngineProfile::defaultProfile();
|
||||
connect(m_webProfile, &QWebEngineProfile::downloadRequested, this, &MainApplication::downloadRequested);
|
||||
|
||||
// Setup QWebChannel userscript
|
||||
QWebEngineScript script;
|
||||
script.setName(QSL("_qupzilla_webchannel"));
|
||||
script.setInjectionPoint(QWebEngineScript::DocumentCreation);
|
||||
script.setWorldId(QWebEngineScript::MainWorld);
|
||||
script.setRunsOnSubFrames(true);
|
||||
script.setSourceCode(Scripts::setupWebChannel());
|
||||
m_webProfile->scripts()->insert(script);
|
||||
|
||||
QSettings::setDefaultFormat(QSettings::IniFormat);
|
||||
QDesktopServices::setUrlHandler("http", this, "addNewTab");
|
||||
QDesktopServices::setUrlHandler("ftp", this, "addNewTab");
|
||||
|
|
|
|||
|
|
@ -22,5 +22,6 @@
|
|||
<file>html/config.html</file>
|
||||
<file>html/restore.html</file>
|
||||
<file>html/dirlist.html</file>
|
||||
<file>html/qwebchannel.js</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
|
|||
413
src/lib/data/html/qwebchannel.js
Normal file
413
src/lib/data/html/qwebchannel.js
Normal file
|
|
@ -0,0 +1,413 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2015 The Qt Company Ltd.
|
||||
** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
|
||||
** Contact: http://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the QtWebChannel module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL21$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see http://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at http://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 or version 3 as published by the Free
|
||||
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
** following information to ensure the GNU Lesser General Public License
|
||||
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** As a special exception, The Qt Company gives you certain additional
|
||||
** rights. These rights are described in The Qt Company LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
"use strict";
|
||||
|
||||
var QWebChannelMessageTypes = {
|
||||
signal: 1,
|
||||
propertyUpdate: 2,
|
||||
init: 3,
|
||||
idle: 4,
|
||||
debug: 5,
|
||||
invokeMethod: 6,
|
||||
connectToSignal: 7,
|
||||
disconnectFromSignal: 8,
|
||||
setProperty: 9,
|
||||
response: 10,
|
||||
};
|
||||
|
||||
var QWebChannel = function(transport, initCallback)
|
||||
{
|
||||
if (typeof transport !== "object" || typeof transport.send !== "function") {
|
||||
console.error("The QWebChannel expects a transport object with a send function and onmessage callback property." +
|
||||
" Given is: transport: " + typeof(transport) + ", transport.send: " + typeof(transport.send));
|
||||
return;
|
||||
}
|
||||
|
||||
var channel = this;
|
||||
this.transport = transport;
|
||||
|
||||
this.send = function(data)
|
||||
{
|
||||
if (typeof(data) !== "string") {
|
||||
data = JSON.stringify(data);
|
||||
}
|
||||
channel.transport.send(data);
|
||||
}
|
||||
|
||||
this.transport.onmessage = function(message)
|
||||
{
|
||||
var data = message.data;
|
||||
if (typeof data === "string") {
|
||||
data = JSON.parse(data);
|
||||
}
|
||||
switch (data.type) {
|
||||
case QWebChannelMessageTypes.signal:
|
||||
channel.handleSignal(data);
|
||||
break;
|
||||
case QWebChannelMessageTypes.response:
|
||||
channel.handleResponse(data);
|
||||
break;
|
||||
case QWebChannelMessageTypes.propertyUpdate:
|
||||
channel.handlePropertyUpdate(data);
|
||||
break;
|
||||
default:
|
||||
console.error("invalid message received:", message.data);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
this.execCallbacks = {};
|
||||
this.execId = 0;
|
||||
this.exec = function(data, callback)
|
||||
{
|
||||
if (!callback) {
|
||||
// if no callback is given, send directly
|
||||
channel.send(data);
|
||||
return;
|
||||
}
|
||||
if (channel.execId === Number.MAX_VALUE) {
|
||||
// wrap
|
||||
channel.execId = Number.MIN_VALUE;
|
||||
}
|
||||
if (data.hasOwnProperty("id")) {
|
||||
console.error("Cannot exec message with property id: " + JSON.stringify(data));
|
||||
return;
|
||||
}
|
||||
data.id = channel.execId++;
|
||||
channel.execCallbacks[data.id] = callback;
|
||||
channel.send(data);
|
||||
};
|
||||
|
||||
this.objects = {};
|
||||
|
||||
this.handleSignal = function(message)
|
||||
{
|
||||
var object = channel.objects[message.object];
|
||||
if (object) {
|
||||
object.signalEmitted(message.signal, message.args);
|
||||
} else {
|
||||
console.warn("Unhandled signal: " + message.object + "::" + message.signal);
|
||||
}
|
||||
}
|
||||
|
||||
this.handleResponse = function(message)
|
||||
{
|
||||
if (!message.hasOwnProperty("id")) {
|
||||
console.error("Invalid response message received: ", JSON.stringify(message));
|
||||
return;
|
||||
}
|
||||
channel.execCallbacks[message.id](message.data);
|
||||
delete channel.execCallbacks[message.id];
|
||||
}
|
||||
|
||||
this.handlePropertyUpdate = function(message)
|
||||
{
|
||||
for (var i in message.data) {
|
||||
var data = message.data[i];
|
||||
var object = channel.objects[data.object];
|
||||
if (object) {
|
||||
object.propertyUpdate(data.signals, data.properties);
|
||||
} else {
|
||||
console.warn("Unhandled property update: " + data.object + "::" + data.signal);
|
||||
}
|
||||
}
|
||||
channel.exec({type: QWebChannelMessageTypes.idle});
|
||||
}
|
||||
|
||||
this.debug = function(message)
|
||||
{
|
||||
channel.send({type: QWebChannelMessageTypes.debug, data: message});
|
||||
};
|
||||
|
||||
channel.exec({type: QWebChannelMessageTypes.init}, function(data) {
|
||||
for (var objectName in data) {
|
||||
var object = new QObject(objectName, data[objectName], channel);
|
||||
}
|
||||
// now unwrap properties, which might reference other registered objects
|
||||
for (var objectName in channel.objects) {
|
||||
channel.objects[objectName].unwrapProperties();
|
||||
}
|
||||
if (initCallback) {
|
||||
initCallback(channel);
|
||||
}
|
||||
channel.exec({type: QWebChannelMessageTypes.idle});
|
||||
});
|
||||
};
|
||||
|
||||
function QObject(name, data, webChannel)
|
||||
{
|
||||
this.__id__ = name;
|
||||
webChannel.objects[name] = this;
|
||||
|
||||
// List of callbacks that get invoked upon signal emission
|
||||
this.__objectSignals__ = {};
|
||||
|
||||
// Cache of all properties, updated when a notify signal is emitted
|
||||
this.__propertyCache__ = {};
|
||||
|
||||
var object = this;
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
this.unwrapQObject = function(response)
|
||||
{
|
||||
if (response instanceof Array) {
|
||||
// support list of objects
|
||||
var ret = new Array(response.length);
|
||||
for (var i = 0; i < response.length; ++i) {
|
||||
ret[i] = object.unwrapQObject(response[i]);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
if (!response
|
||||
|| !response["__QObject*__"]
|
||||
|| response.id === undefined) {
|
||||
return response;
|
||||
}
|
||||
|
||||
var objectId = response.id;
|
||||
if (webChannel.objects[objectId])
|
||||
return webChannel.objects[objectId];
|
||||
|
||||
if (!response.data) {
|
||||
console.error("Cannot unwrap unknown QObject " + objectId + " without data.");
|
||||
return;
|
||||
}
|
||||
|
||||
var qObject = new QObject( objectId, response.data, webChannel );
|
||||
qObject.destroyed.connect(function() {
|
||||
if (webChannel.objects[objectId] === qObject) {
|
||||
delete webChannel.objects[objectId];
|
||||
// reset the now deleted QObject to an empty {} object
|
||||
// just assigning {} though would not have the desired effect, but the
|
||||
// below also ensures all external references will see the empty map
|
||||
// NOTE: this detour is necessary to workaround QTBUG-40021
|
||||
var propertyNames = [];
|
||||
for (var propertyName in qObject) {
|
||||
propertyNames.push(propertyName);
|
||||
}
|
||||
for (var idx in propertyNames) {
|
||||
delete qObject[propertyNames[idx]];
|
||||
}
|
||||
}
|
||||
});
|
||||
// here we are already initialized, and thus must directly unwrap the properties
|
||||
qObject.unwrapProperties();
|
||||
return qObject;
|
||||
}
|
||||
|
||||
this.unwrapProperties = function()
|
||||
{
|
||||
for (var propertyIdx in object.__propertyCache__) {
|
||||
object.__propertyCache__[propertyIdx] = object.unwrapQObject(object.__propertyCache__[propertyIdx]);
|
||||
}
|
||||
}
|
||||
|
||||
function addSignal(signalData, isPropertyNotifySignal)
|
||||
{
|
||||
var signalName = signalData[0];
|
||||
var signalIndex = signalData[1];
|
||||
object[signalName] = {
|
||||
connect: function(callback) {
|
||||
if (typeof(callback) !== "function") {
|
||||
console.error("Bad callback given to connect to signal " + signalName);
|
||||
return;
|
||||
}
|
||||
|
||||
object.__objectSignals__[signalIndex] = object.__objectSignals__[signalIndex] || [];
|
||||
object.__objectSignals__[signalIndex].push(callback);
|
||||
|
||||
if (!isPropertyNotifySignal && signalName !== "destroyed") {
|
||||
// only required for "pure" signals, handled separately for properties in propertyUpdate
|
||||
// also note that we always get notified about the destroyed signal
|
||||
webChannel.exec({
|
||||
type: QWebChannelMessageTypes.connectToSignal,
|
||||
object: object.__id__,
|
||||
signal: signalIndex
|
||||
});
|
||||
}
|
||||
},
|
||||
disconnect: function(callback) {
|
||||
if (typeof(callback) !== "function") {
|
||||
console.error("Bad callback given to disconnect from signal " + signalName);
|
||||
return;
|
||||
}
|
||||
object.__objectSignals__[signalIndex] = object.__objectSignals__[signalIndex] || [];
|
||||
var idx = object.__objectSignals__[signalIndex].indexOf(callback);
|
||||
if (idx === -1) {
|
||||
console.error("Cannot find connection of signal " + signalName + " to " + callback.name);
|
||||
return;
|
||||
}
|
||||
object.__objectSignals__[signalIndex].splice(idx, 1);
|
||||
if (!isPropertyNotifySignal && object.__objectSignals__[signalIndex].length === 0) {
|
||||
// only required for "pure" signals, handled separately for properties in propertyUpdate
|
||||
webChannel.exec({
|
||||
type: QWebChannelMessageTypes.disconnectFromSignal,
|
||||
object: object.__id__,
|
||||
signal: signalIndex
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Invokes all callbacks for the given signalname. Also works for property notify callbacks.
|
||||
*/
|
||||
function invokeSignalCallbacks(signalName, signalArgs)
|
||||
{
|
||||
var connections = object.__objectSignals__[signalName];
|
||||
if (connections) {
|
||||
connections.forEach(function(callback) {
|
||||
callback.apply(callback, signalArgs);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
this.propertyUpdate = function(signals, propertyMap)
|
||||
{
|
||||
// update property cache
|
||||
for (var propertyIndex in propertyMap) {
|
||||
var propertyValue = propertyMap[propertyIndex];
|
||||
object.__propertyCache__[propertyIndex] = propertyValue;
|
||||
}
|
||||
|
||||
for (var signalName in signals) {
|
||||
// Invoke all callbacks, as signalEmitted() does not. This ensures the
|
||||
// property cache is updated before the callbacks are invoked.
|
||||
invokeSignalCallbacks(signalName, signals[signalName]);
|
||||
}
|
||||
}
|
||||
|
||||
this.signalEmitted = function(signalName, signalArgs)
|
||||
{
|
||||
invokeSignalCallbacks(signalName, signalArgs);
|
||||
}
|
||||
|
||||
function addMethod(methodData)
|
||||
{
|
||||
var methodName = methodData[0];
|
||||
var methodIdx = methodData[1];
|
||||
object[methodName] = function() {
|
||||
var args = [];
|
||||
var callback;
|
||||
for (var i = 0; i < arguments.length; ++i) {
|
||||
if (typeof arguments[i] === "function")
|
||||
callback = arguments[i];
|
||||
else
|
||||
args.push(arguments[i]);
|
||||
}
|
||||
|
||||
webChannel.exec({
|
||||
"type": QWebChannelMessageTypes.invokeMethod,
|
||||
"object": object.__id__,
|
||||
"method": methodIdx,
|
||||
"args": args
|
||||
}, function(response) {
|
||||
if (response !== undefined) {
|
||||
var result = object.unwrapQObject(response);
|
||||
if (callback) {
|
||||
(callback)(result);
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
function bindGetterSetter(propertyInfo)
|
||||
{
|
||||
var propertyIndex = propertyInfo[0];
|
||||
var propertyName = propertyInfo[1];
|
||||
var notifySignalData = propertyInfo[2];
|
||||
// initialize property cache with current value
|
||||
// NOTE: if this is an object, it is not directly unwrapped as it might
|
||||
// reference other QObject that we do not know yet
|
||||
object.__propertyCache__[propertyIndex] = propertyInfo[3];
|
||||
|
||||
if (notifySignalData) {
|
||||
if (notifySignalData[0] === 1) {
|
||||
// signal name is optimized away, reconstruct the actual name
|
||||
notifySignalData[0] = propertyName + "Changed";
|
||||
}
|
||||
addSignal(notifySignalData, true);
|
||||
}
|
||||
|
||||
Object.defineProperty(object, propertyName, {
|
||||
configurable: true,
|
||||
get: function () {
|
||||
var propertyValue = object.__propertyCache__[propertyIndex];
|
||||
if (propertyValue === undefined) {
|
||||
// This shouldn't happen
|
||||
console.warn("Undefined value in property cache for property \"" + propertyName + "\" in object " + object.__id__);
|
||||
}
|
||||
|
||||
return propertyValue;
|
||||
},
|
||||
set: function(value) {
|
||||
if (value === undefined) {
|
||||
console.warn("Property setter for " + propertyName + " called with undefined value!");
|
||||
return;
|
||||
}
|
||||
object.__propertyCache__[propertyIndex] = value;
|
||||
webChannel.exec({
|
||||
"type": QWebChannelMessageTypes.setProperty,
|
||||
"object": object.__id__,
|
||||
"property": propertyIndex,
|
||||
"value": value
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
data.methods.forEach(addMethod);
|
||||
|
||||
data.properties.forEach(bindGetterSetter);
|
||||
|
||||
data.signals.forEach(function(signal) { addSignal(signal, false); });
|
||||
|
||||
for (var name in data.enums) {
|
||||
object[name] = data.enums[name];
|
||||
}
|
||||
}
|
||||
|
||||
//required for use with nodejs
|
||||
if (typeof module === 'object') {
|
||||
module.exports = {
|
||||
QWebChannel: QWebChannel
|
||||
};
|
||||
}
|
||||
|
|
@ -158,27 +158,29 @@ function boxEdited() {
|
|||
if (editingId == -1)
|
||||
return;
|
||||
|
||||
var box = document.getElementById('quickdial').getElementsByTagName('div')[editingId];
|
||||
var a = box.getElementsByTagName('a')[0];
|
||||
var originalUrl = a.getAttribute('href');
|
||||
setBoxUrl(editingId, external.speedDial.urlFromUserInput($('#formUrl').attr("value")));
|
||||
setBoxTitle(editingId, $('#formTitle').attr("value"));
|
||||
var changedUrl = a.getAttribute('href');
|
||||
var fetchTitleChecked = document.getElementById('fetchTitle').checked;
|
||||
external.speedDial.urlFromUserInput($('#formUrl').attr("value"), function(newUrl) {
|
||||
var box = document.getElementById('quickdial').getElementsByTagName('div')[editingId];
|
||||
var a = box.getElementsByTagName('a')[0];
|
||||
var originalUrl = a.getAttribute('href');
|
||||
setBoxUrl(editingId, newUrl);
|
||||
setBoxTitle(editingId, $('#formTitle').attr("value"));
|
||||
var changedUrl = a.getAttribute('href');
|
||||
var fetchTitleChecked = document.getElementById('fetchTitle').checked;
|
||||
|
||||
if (fetchTitleChecked || (originalUrl != changedUrl && changedUrl !== '') ) {
|
||||
var img = box.getElementsByTagName('img')[0];
|
||||
img.setAttribute('src', LOADING_IMAGE);
|
||||
if (fetchTitleChecked || (originalUrl != changedUrl && changedUrl !== '') ) {
|
||||
var img = box.getElementsByTagName('img')[0];
|
||||
img.setAttribute('src', LOADING_IMAGE);
|
||||
|
||||
$('#fadeOverlay').fadeOut("slow", function() {
|
||||
$("#fadeOverlay").remove();
|
||||
external.speedDial.loadThumbnail(a.getAttribute('href'), fetchTitleChecked);
|
||||
external.speedDial.removeImageForUrl(a.getAttribute('href'));
|
||||
});
|
||||
} else {
|
||||
hideEditBox();
|
||||
}
|
||||
external.speedDial.changed(allPages());
|
||||
$('#fadeOverlay').fadeOut("slow", function() {
|
||||
$("#fadeOverlay").remove();
|
||||
external.speedDial.loadThumbnail(a.getAttribute('href'), fetchTitleChecked);
|
||||
external.speedDial.removeImageForUrl(a.getAttribute('href'));
|
||||
});
|
||||
} else {
|
||||
hideEditBox();
|
||||
}
|
||||
external.speedDial.changed(allPages());
|
||||
});
|
||||
}
|
||||
|
||||
function allPages() {
|
||||
|
|
@ -344,10 +346,11 @@ function alignPage() {
|
|||
}
|
||||
|
||||
function bgImageSel() {
|
||||
var img = external.speedDial.getOpenFileName();
|
||||
if (img) {
|
||||
document.getElementById('BgImgHold').value = img;
|
||||
}
|
||||
external.speedDial.getOpenFileName(function(img) {
|
||||
if (img) {
|
||||
document.getElementById('BgImgHold').value = img;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function saveSettings() {
|
||||
|
|
@ -423,22 +426,37 @@ $(document).ready(function () {
|
|||
<a onClick="addSpeedDial()" title="%ADD-TITLE%" class="add"></a>
|
||||
|
||||
<script type="text/javascript">
|
||||
%INITIAL-SCRIPT%
|
||||
|
||||
alignPage();
|
||||
function init()
|
||||
{
|
||||
%INITIAL-SCRIPT%
|
||||
external.speedDial.pagesChanged.connect(function() {
|
||||
window.location.reload();
|
||||
});
|
||||
|
||||
alignPage();
|
||||
|
||||
$(window).resize(function() { alignPage(); });
|
||||
$("div").disableSelection();
|
||||
$("#quickdial").sortable({
|
||||
revert: true,
|
||||
cursor: 'move',
|
||||
containment: 'document',
|
||||
opacity: 0.8,
|
||||
distance: 40,
|
||||
update: function(event, ui) {
|
||||
external.speedDial.changed(allPages());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Initialize
|
||||
if (window.external) {
|
||||
init();
|
||||
} else {
|
||||
document.addEventListener('qz_external_created', init);
|
||||
}
|
||||
|
||||
$(window).resize(function() { alignPage(); });
|
||||
$("div").disableSelection();
|
||||
$("#quickdial").sortable({
|
||||
revert: true,
|
||||
cursor: 'move',
|
||||
containment: 'document',
|
||||
opacity: 0.8,
|
||||
distance: 40,
|
||||
update: function(event, ui) {
|
||||
external.speedDial.changed(allPages());
|
||||
}
|
||||
});
|
||||
</script>
|
||||
<div id="fadeOverlay2" class="overlay" style="display:none;">
|
||||
<div id="settingsBox">
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ void SpeedDial::saveSettings()
|
|||
{
|
||||
ENSURE_LOADED;
|
||||
|
||||
if (m_webPages.isEmpty()) {
|
||||
if (m_pages.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -103,7 +103,7 @@ SpeedDial::Page SpeedDial::pageForUrl(const QUrl &url)
|
|||
|
||||
const QString urlString = url.toString();
|
||||
|
||||
foreach (const Page &page, m_webPages) {
|
||||
foreach (const Page &page, m_pages) {
|
||||
if (page.url == urlString) {
|
||||
return page;
|
||||
}
|
||||
|
|
@ -116,18 +116,11 @@ QUrl SpeedDial::urlForShortcut(int key)
|
|||
{
|
||||
ENSURE_LOADED;
|
||||
|
||||
if (key < 0 || m_webPages.count() <= key) {
|
||||
if (key < 0 || m_pages.count() <= key) {
|
||||
return QUrl();
|
||||
}
|
||||
|
||||
return QUrl::fromEncoded(m_webPages.at(key).url.toUtf8());
|
||||
}
|
||||
|
||||
void SpeedDial::addWebPage(QWebEnginePage *page)
|
||||
{
|
||||
if (!m_pages.contains(page)) {
|
||||
m_pages.append(page);
|
||||
}
|
||||
return QUrl::fromEncoded(m_pages.at(key).url.toUtf8());
|
||||
}
|
||||
|
||||
void SpeedDial::addPage(const QUrl &url, const QString &title)
|
||||
|
|
@ -142,13 +135,9 @@ void SpeedDial::addPage(const QUrl &url, const QString &title)
|
|||
page.title = escapeTitle(title);
|
||||
page.url = escapeUrl(url.toString());
|
||||
|
||||
m_webPages.append(page);
|
||||
m_pages.append(page);
|
||||
m_regenerateScript = true;
|
||||
|
||||
foreach (QWebEnginePage *page, pages()) {
|
||||
page->triggerAction(QWebEnginePage::Reload);
|
||||
}
|
||||
|
||||
emit pagesChanged();
|
||||
}
|
||||
|
||||
|
|
@ -161,13 +150,9 @@ void SpeedDial::removePage(const Page &page)
|
|||
}
|
||||
|
||||
removeImageForUrl(page.url);
|
||||
m_webPages.removeAll(page);
|
||||
m_pages.removeAll(page);
|
||||
m_regenerateScript = true;
|
||||
|
||||
foreach (QWebEnginePage *page, pages()) {
|
||||
page->triggerAction(QWebEnginePage::Reload);
|
||||
}
|
||||
|
||||
emit pagesChanged();
|
||||
}
|
||||
|
||||
|
|
@ -217,11 +202,12 @@ QString SpeedDial::initialScript()
|
|||
m_regenerateScript = false;
|
||||
m_initialScript.clear();
|
||||
|
||||
foreach (const Page &page, m_webPages) {
|
||||
foreach (const Page &page, m_pages) {
|
||||
QString imgSource = m_thumbnailsDir + QCryptographicHash::hash(page.url.toUtf8(), QCryptographicHash::Md4).toHex() + ".png";
|
||||
|
||||
if (!QFile(imgSource).exists()) {
|
||||
imgSource = "qrc:html/loading.gif";
|
||||
//imgSource = "qrc:html/loading.gif";
|
||||
imgSource = "qrc:html/broken-page.png";
|
||||
|
||||
if (page.url.isEmpty()) {
|
||||
imgSource.clear();
|
||||
|
|
@ -244,7 +230,7 @@ void SpeedDial::changed(const QString &allPages)
|
|||
}
|
||||
|
||||
const QStringList entries = allPages.split(QLatin1String("\";"), QString::SkipEmptyParts);
|
||||
m_webPages.clear();
|
||||
m_pages.clear();
|
||||
|
||||
foreach (const QString &entry, entries) {
|
||||
if (entry.isEmpty()) {
|
||||
|
|
@ -260,7 +246,7 @@ void SpeedDial::changed(const QString &allPages)
|
|||
page.url = tmp.at(0).mid(5);
|
||||
page.title = tmp.at(1).mid(7);
|
||||
|
||||
m_webPages.append(page);
|
||||
m_pages.append(page);
|
||||
}
|
||||
|
||||
m_regenerateScript = true;
|
||||
|
|
@ -388,28 +374,11 @@ QString SpeedDial::escapeUrl(QString url) const
|
|||
return url;
|
||||
}
|
||||
|
||||
QList<QWebEnginePage*> SpeedDial::pages()
|
||||
{
|
||||
QList<QWebEnginePage*> list;
|
||||
|
||||
for (int i = 0; i < m_pages.count(); i++) {
|
||||
QWebEnginePage *page = m_pages.at(i).data();
|
||||
if (!page || page->url().toString() != QLatin1String("qupzilla:speeddial")) {
|
||||
m_pages.removeAt(i);
|
||||
i--;
|
||||
continue;
|
||||
}
|
||||
list.append(page);
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
QString SpeedDial::generateAllPages()
|
||||
{
|
||||
QString allPages;
|
||||
|
||||
foreach (const Page &page, m_webPages) {
|
||||
foreach (const Page &page, m_pages) {
|
||||
const QString string = QString("url:\"%1\"|title:\"%2\";").arg(page.url, page.title);
|
||||
allPages.append(string);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ public:
|
|||
Page pageForUrl(const QUrl &url);
|
||||
QUrl urlForShortcut(int key);
|
||||
|
||||
void addWebPage(QWebEnginePage *page);
|
||||
void addPage(const QUrl &url, const QString &title);
|
||||
void removePage(const Page &page);
|
||||
|
||||
|
|
@ -88,7 +87,6 @@ private:
|
|||
QString escapeTitle(QString string) const;
|
||||
QString escapeUrl(QString url) const;
|
||||
|
||||
QList<QWebEnginePage*> pages();
|
||||
QString generateAllPages();
|
||||
|
||||
QString m_initialScript;
|
||||
|
|
@ -99,8 +97,7 @@ private:
|
|||
int m_sizeOfSpeedDials;
|
||||
int m_sdcentered;
|
||||
|
||||
QList<QPointer<QWebEnginePage> > m_pages;
|
||||
QList<Page> m_webPages;
|
||||
QList<Page> m_pages;
|
||||
AutoSaver* m_autoSaver;
|
||||
|
||||
bool m_loaded;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
* ============================================================ */
|
||||
|
||||
#include "scripts.h"
|
||||
#include "qztools.h"
|
||||
|
||||
QString Scripts::setCss(const QString &css)
|
||||
{
|
||||
|
|
@ -32,3 +33,17 @@ QString Scripts::setCss(const QString &css)
|
|||
style.replace(QL1S("\n"), QL1S("\\n"));
|
||||
return source.arg(style);
|
||||
}
|
||||
|
||||
QString Scripts::setupWebChannel()
|
||||
{
|
||||
QString source = QL1S("(function() {"
|
||||
"%1"
|
||||
"var channel = new QWebChannel(qt.webChannelTransport, function(channel) {"
|
||||
"window.external = channel.objects.qz_object;"
|
||||
"var event = new Event('qz_external_created');"
|
||||
"document.dispatchEvent(event);"
|
||||
"});"
|
||||
"})()");
|
||||
|
||||
return source.arg(QzTools::readAllFileContents(QSL(":/html/qwebchannel.js")));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ class QUPZILLA_EXPORT Scripts
|
|||
{
|
||||
public:
|
||||
static QString setCss(const QString &css);
|
||||
static QString setupWebChannel();
|
||||
};
|
||||
|
||||
#endif // SCRIPTS_H
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
ExternalJsObject::ExternalJsObject(QObject* parent)
|
||||
: QObject(parent)
|
||||
, m_onSpeedDial(false)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -40,14 +39,5 @@ int ExternalJsObject::IsSearchProviderInstalled(const QString &engineURL)
|
|||
|
||||
QObject* ExternalJsObject::speedDial() const
|
||||
{
|
||||
#if QTWEBENGINE_DISABLED
|
||||
return m_onSpeedDial ? mApp->plugins()->speedDial() : 0;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
void ExternalJsObject::setOnSpeedDial(bool on)
|
||||
{
|
||||
m_onSpeedDial = on;
|
||||
return mApp->plugins()->speedDial();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
class ExternalJsObject : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QObject* speedDial READ speedDial)
|
||||
Q_PROPERTY(QObject* speedDial READ speedDial CONSTANT)
|
||||
|
||||
public:
|
||||
explicit ExternalJsObject(QObject* parent = 0);
|
||||
|
|
@ -32,13 +32,8 @@ public slots:
|
|||
void AddSearchProvider(const QString &engineUrl);
|
||||
int IsSearchProviderInstalled(const QString &engineURL);
|
||||
|
||||
QObject* speedDial() const;
|
||||
|
||||
public:
|
||||
void setOnSpeedDial(bool on);
|
||||
|
||||
private:
|
||||
bool m_onSpeedDial;
|
||||
QObject* speedDial() const;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -66,6 +66,9 @@
|
|||
#include <QMessageBox>
|
||||
#include <QFileDialog>
|
||||
#include <QCheckBox>
|
||||
#include <QWebChannel>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
QString WebPage::s_lastUploadLocation = QDir::homePath();
|
||||
QUrl WebPage::s_lastUnsupportedUrl;
|
||||
|
|
@ -87,38 +90,9 @@ WebPage::WebPage(QObject* parent)
|
|||
connect(this, &QWebEnginePage::featurePermissionRequested, this, &WebPage::featurePermissionRequested);
|
||||
connect(this, &QWebEnginePage::windowCloseRequested, this, &WebPage::windowCloseRequested);
|
||||
|
||||
#if QTWEBENGINE_DISABLED
|
||||
m_javaScriptEnabled = QWebEngineSettings::globalSettings()->testAttribute(QWebEngineSettings::JavascriptEnabled);
|
||||
|
||||
m_networkProxy = new NetworkManagerProxy(this);
|
||||
m_networkProxy->setPrimaryNetworkAccessManager(mApp->networkManager());
|
||||
m_networkProxy->setPage(this);
|
||||
setNetworkAccessManager(m_networkProxy);
|
||||
|
||||
setForwardUnsupportedContent(true);
|
||||
setPluginFactory(new WebPluginFactory(this));
|
||||
history()->setMaximumItemCount(20);
|
||||
|
||||
connect(this, SIGNAL(unsupportedContent(QNetworkReply*)), this, SLOT(handleUnsupportedContent(QNetworkReply*)));
|
||||
connect(this, SIGNAL(printRequested(QWebFrame*)), this, SLOT(printFrame(QWebFrame*)));
|
||||
|
||||
frameCreated(mainFrame());
|
||||
connect(this, SIGNAL(frameCreated(QWebFrame*)), this, SLOT(frameCreated(QWebFrame*)));
|
||||
|
||||
connect(this, SIGNAL(databaseQuotaExceeded(QWebFrame*,QString)),
|
||||
this, SLOT(dbQuotaExceeded(QWebFrame*)));
|
||||
|
||||
connect(mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(addJavaScriptObject()));
|
||||
|
||||
#if QTWEBKIT_FROM_2_3
|
||||
connect(this, SIGNAL(applicationCacheQuotaExceeded(QWebSecurityOrigin*,quint64,quint64)),
|
||||
this, SLOT(appCacheQuotaExceeded(QWebSecurityOrigin*,quint64)));
|
||||
#elif QTWEBKIT_FROM_2_2
|
||||
connect(this, SIGNAL(applicationCacheQuotaExceeded(QWebSecurityOrigin*,quint64)),
|
||||
this, SLOT(appCacheQuotaExceeded(QWebSecurityOrigin*,quint64)));
|
||||
#endif
|
||||
|
||||
#endif
|
||||
QWebChannel *channel = new QWebChannel(this);
|
||||
channel->registerObject(QSL("qz_object"), new ExternalJsObject(this));
|
||||
setWebChannel(channel);
|
||||
}
|
||||
|
||||
WebPage::~WebPage()
|
||||
|
|
@ -1091,7 +1065,7 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte
|
|||
}
|
||||
#endif
|
||||
|
||||
bool WebPage::javaScriptPrompt(QUrl securityOrigin, const QString &msg, const QString &defaultValue, QString* result)
|
||||
bool WebPage::javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, const QString &defaultValue, QString* result)
|
||||
{
|
||||
#ifndef NONBLOCK_JS_DIALOGS
|
||||
return QWebEnginePage::javaScriptPrompt(securityOrigin, msg, defaultValue, result);
|
||||
|
|
@ -1135,7 +1109,7 @@ bool WebPage::javaScriptPrompt(QUrl securityOrigin, const QString &msg, const QS
|
|||
#endif
|
||||
}
|
||||
|
||||
bool WebPage::javaScriptConfirm(QUrl securityOrigin, const QString &msg)
|
||||
bool WebPage::javaScriptConfirm(const QUrl &securityOrigin, const QString &msg)
|
||||
{
|
||||
#ifndef NONBLOCK_JS_DIALOGS
|
||||
return QWebEnginePage::javaScriptConfirm(securityOrigin, msg);
|
||||
|
|
@ -1175,7 +1149,7 @@ bool WebPage::javaScriptConfirm(QUrl securityOrigin, const QString &msg)
|
|||
#endif
|
||||
}
|
||||
|
||||
void WebPage::javaScriptAlert(QUrl securityOrigin, const QString &msg)
|
||||
void WebPage::javaScriptAlert(const QUrl &securityOrigin, const QString &msg)
|
||||
{
|
||||
Q_UNUSED(securityOrigin)
|
||||
|
||||
|
|
@ -1228,6 +1202,28 @@ void WebPage::javaScriptAlert(QUrl securityOrigin, const QString &msg)
|
|||
#endif
|
||||
}
|
||||
|
||||
void WebPage::javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID)
|
||||
{
|
||||
switch (level) {
|
||||
case InfoMessageLevel:
|
||||
std::cout << "I";
|
||||
break;
|
||||
|
||||
case WarningMessageLevel:
|
||||
std::cout << "W";
|
||||
break;
|
||||
|
||||
case ErrorMessageLevel:
|
||||
std::cout << "E";
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
std::cout << " " << lineNumber << ": " << message.toStdString() << " (" << sourceID.toStdString() << ")" << std::endl;
|
||||
}
|
||||
|
||||
void WebPage::setJavaScriptEnabled(bool enabled)
|
||||
{
|
||||
#if QTWEBENGINE_DISABLED
|
||||
|
|
|
|||
|
|
@ -57,9 +57,10 @@ public:
|
|||
void setSSLCertificate(const QSslCertificate &cert);
|
||||
QSslCertificate sslCertificate();
|
||||
|
||||
bool javaScriptPrompt(QUrl securityOrigin, const QString &msg, const QString &defaultValue, QString* result);
|
||||
bool javaScriptConfirm(QUrl securityOrigin, const QString &msg);
|
||||
void javaScriptAlert(QUrl securityOrigin, const QString &msg);
|
||||
bool javaScriptPrompt(const QUrl &securityOrigin, const QString &msg, const QString &defaultValue, QString* result) Q_DECL_OVERRIDE;
|
||||
bool javaScriptConfirm(const QUrl &securityOrigin, const QString &msg) Q_DECL_OVERRIDE;
|
||||
void javaScriptAlert(const QUrl &securityOrigin, const QString &msg) Q_DECL_OVERRIDE;
|
||||
void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID);
|
||||
|
||||
void setJavaScriptEnabled(bool enabled);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user