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

Replace some QupZilla leftovers with Falkon

Browse Source
This commit is contained in:
David Rosca 2018-01-24 17:15:26 +01:00
parent f315b0e3dc
commit 41775c3a20
23 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autotests/adblocktest.cpp
View File

@ -1,5 +1,5 @@
/* ============================================================
* QupZilla - WebKit based browser
* Falkon - Qt web browser
* Copyright (C) 2013 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify

2
autotests/adblocktest.h
View File

@ -1,5 +1,5 @@
/* ============================================================
* QupZilla - WebKit based browser
* Falkon - Qt web browser
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify

2
autotests/cookiestest.cpp
View File

@ -1,5 +1,5 @@
/* ============================================================
* QupZilla - WebKit based browser
* Falkon - Qt web browser
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify

2
autotests/cookiestest.h
View File

@ -1,5 +1,5 @@
/* ============================================================
* QupZilla - WebKit based browser
* Falkon - Qt web browser
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify

42
autotests/passwordbackendtest.cpp
View File

@ -83,7 +83,7 @@ void PasswordBackendTest::storeTest()
/* Basic password entry */
PasswordEntry entry;
entry.host = "org.qupzilla.google.com";
entry.host = "org.falkon.google.com";
entry.username = "user1";
entry.password = "pass1";
entry.data = "entry1-data=23&username=user1&password=pass1";
@ -91,20 +91,20 @@ void PasswordBackendTest::storeTest()
m_backend->addEntry(entry);
// Check entry that may be stored in cache
PasswordEntry stored = m_backend->getEntries(QUrl("org.qupzilla.google.com")).constFirst();
PasswordEntry stored = m_backend->getEntries(QUrl("org.falkon.google.com")).constFirst();
QVERIFY(compareEntries(stored, entry) == true);
reloadBackend();
// Check entry retrieved from backend engine
QVERIFY(!m_backend->getEntries(QUrl("org.qupzilla.google.com")).isEmpty());
stored = m_backend->getEntries(QUrl("org.qupzilla.google.com")).constFirst();
QVERIFY(!m_backend->getEntries(QUrl("org.falkon.google.com")).isEmpty());
stored = m_backend->getEntries(QUrl("org.falkon.google.com")).constFirst();
QVERIFY(compareEntries(stored, entry) == true);
/* UTF-8 password entry */
PasswordEntry entry2;
entry2.host = "org.qupzilla.qupzilla.com";
entry2.host = "org.falkon.falkon.com";
entry2.username = QString::fromUtf8("+ě ++ éí§`]|~đ11 +!:");
entry2.password = QString::fromUtf8("+ěš asn~đ°#&# |€");
entry2.data = "use%C2%B6+_nam%C4%8D=%2B%C4%9B+%2B%2B+%C3%A9%C3%AD%C2%A7%60%5D%7C%7E%C4%9111+%2B%21%3A"
@ -113,28 +113,28 @@ void PasswordBackendTest::storeTest()
m_backend->addEntry(entry2);
// Check entry that may be stored in cache
PasswordEntry stored2 = m_backend->getEntries(QUrl("org.qupzilla.qupzilla.com")).constFirst();
PasswordEntry stored2 = m_backend->getEntries(QUrl("org.falkon.falkon.com")).constFirst();
QVERIFY(compareEntries(stored2, entry2) == true);
reloadBackend();
// Check entry retrieved from backend engine
stored2 = m_backend->getEntries(QUrl("org.qupzilla.qupzilla.com")).constFirst();
stored2 = m_backend->getEntries(QUrl("org.falkon.falkon.com")).constFirst();
QVERIFY(compareEntries(stored2, entry2) == true);
/* Cleanup */
// Local cleanup
m_backend->removeEntry(stored);
QCOMPARE(m_backend->getEntries(QUrl("org.qupzilla.google.com")).count(), 0);
QCOMPARE(m_backend->getEntries(QUrl("org.falkon.google.com")).count(), 0);
m_backend->removeEntry(stored2);
QCOMPARE(m_backend->getEntries(QUrl("org.qupzilla.qupzilla.com")).count(), 0);
QCOMPARE(m_backend->getEntries(QUrl("org.falkon.falkon.com")).count(), 0);
reloadBackend();
// Backend engine cleanup
QCOMPARE(m_backend->getEntries(QUrl("org.qupzilla.google.com")).count(), 0);
QCOMPARE(m_backend->getEntries(QUrl("org.qupzilla.qupzilla.com")).count(), 0);
QCOMPARE(m_backend->getEntries(QUrl("org.falkon.google.com")).count(), 0);
QCOMPARE(m_backend->getEntries(QUrl("org.falkon.falkon.com")).count(), 0);
}
void PasswordBackendTest::removeAllTest()
@ -142,7 +142,7 @@ void PasswordBackendTest::removeAllTest()
reloadBackend();
PasswordEntry entry;
entry.host = "org.qupzilla.google.com";
entry.host = "org.falkon.google.com";
entry.username = "user1";
entry.password = "pass1";
entry.data = "entry1-data=23&username=user1&password=pass1";
@ -166,9 +166,9 @@ void PasswordBackendTest::removeAllTest()
entry.username.append("s");
m_backend->addEntry(entry);
QCOMPARE(m_backend->getEntries(QUrl("org.qupzilla.google.com")).count(), 7);
QCOMPARE(m_backend->getEntries(QUrl("org.falkon.google.com")).count(), 7);
reloadBackend();
QCOMPARE(m_backend->getEntries(QUrl("org.qupzilla.google.com")).count(), 7);
QCOMPARE(m_backend->getEntries(QUrl("org.falkon.google.com")).count(), 7);
m_backend->removeAll();
@ -182,7 +182,7 @@ void PasswordBackendTest::updateLastUsedTest()
reloadBackend();
PasswordEntry entry;
entry.host = "org.qupzilla.google.com";
entry.host = "org.falkon.google.com";
entry.username = "user1";
entry.password = "pass1";
entry.data = "entry1-data=23&username=user1&password=pass1";
@ -197,14 +197,14 @@ void PasswordBackendTest::updateLastUsedTest()
entry.username.append("s");
m_backend->addEntry(entry);
QVERIFY(!m_backend->getEntries(QUrl("org.qupzilla.google.com")).isEmpty());
QVERIFY(compareEntries(entry, m_backend->getEntries(QUrl("org.qupzilla.google.com")).constFirst()));
QVERIFY(!m_backend->getEntries(QUrl("org.falkon.google.com")).isEmpty());
QVERIFY(compareEntries(entry, m_backend->getEntries(QUrl("org.falkon.google.com")).constFirst()));
reloadBackend();
QVERIFY(!m_backend->getEntries(QUrl("org.qupzilla.google.com")).isEmpty());
QVERIFY(compareEntries(entry, m_backend->getEntries(QUrl("org.qupzilla.google.com")).constFirst()));
QVERIFY(!m_backend->getEntries(QUrl("org.falkon.google.com")).isEmpty());
QVERIFY(compareEntries(entry, m_backend->getEntries(QUrl("org.falkon.google.com")).constFirst()));
m_backend->removeEntry(m_backend->getEntries(QUrl("org.qupzilla.google.com")).constFirst());
m_backend->removeEntry(m_backend->getEntries(QUrl("org.qupzilla.google.com")).constFirst());
m_backend->removeEntry(m_backend->getEntries(QUrl("org.falkon.google.com")).constFirst());
m_backend->removeEntry(m_backend->getEntries(QUrl("org.falkon.google.com")).constFirst());
QCOMPARE(m_backend->getAllEntries().count(), 0);
reloadBackend();

6
autotests/qztoolstest.cpp
View File

@ -1,5 +1,5 @@
/* ============================================================
* QupZilla - WebKit based browser
* Falkon - Qt web browser
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
@ -23,7 +23,7 @@
void QzToolsTest::initTestCase()
{
m_tmpPath = QDir::tempPath() + QL1S("/qupzilla-test/qztoolstest");
m_tmpPath = QDir::tempPath() + QL1S("/falkon-test/qztoolstest");
QDir().mkpath(m_tmpPath);
QVERIFY(QDir(m_tmpPath).exists());
@ -171,7 +171,7 @@ public:
{
QFile file(name);
file.open(QFile::WriteOnly);
file.write(QByteArrayLiteral("qupzilla-test"));
file.write(QByteArrayLiteral("falkon-test"));
file.close();
}

2
autotests/qztoolstest.h
View File

@ -1,5 +1,5 @@
/* ============================================================
* QupZilla - WebKit based browser
* Falkon - Qt web browser
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify

2
autotests/updatertest.cpp
View File

@ -1,5 +1,5 @@
/* ============================================================
* QupZilla - WebKit based browser
* Falkon - Qt web browser
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify

2
autotests/updatertest.h
View File

@ -1,5 +1,5 @@
/* ============================================================
* QupZilla - WebKit based browser
* Falkon - Qt web browser
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify

6
mac/create_dmg.scpt
View File

@ -1,5 +1,5 @@
tell application "Finder"
tell disk "QupZilla"
tell disk "Falkon"
open
# Set some defaults
set current view of container window to icon view
@ -18,12 +18,12 @@ tell application "Finder"
set arrangement of theViewOptions to not arranged
# Set background image in HFS+ format referenced from image bundle
set background picture of theViewOptions to file ".background:qupzilla-dmg-background.png"
set background picture of theViewOptions to file ".background:dmg-background.png"
# Align the icons to the background mask
set icon size of theViewOptions to 64
set position of item "QupZilla" of container window to {55, 390}
set position of item "Falkon" of container window to {55, 390}
set position of item "Applications" of container window to {390, 390}
# Since this is a dynamic template modifier script tell Finder not to do any registration of applications

22
mac/create_dmg.sh
View File

@ -4,16 +4,16 @@ TMP=/tmp
BUNDLE_PATH=bin
test -d bin || BUNDLE_PATH=../bin
WORK_TEMPLATE=tmp-QupZilla-release.dmg.sparseimage
WORK_TEMPLATE=tmp-Falkon-release.dmg.sparseimage
# NOTE: Value must currently match -volname exactly or an error happens in AppleScript with Finder
VOLUME_TEMPLATE=QupZilla
VOLUME_TEMPLATE=Falkon
echo "Ensuring working disk image template is not in use…"
hdiutil detach "$TMP/$WORK_TEMPLATE"
echo "Creating writable working disk image template…"
hdiutil create -size 200m "$TMP/$WORK_TEMPLATE" -type SPARSE -fs HFS+ -volname "QupZilla"
hdiutil create -size 200m "$TMP/$WORK_TEMPLATE" -type SPARSE -fs HFS+ -volname "Falkon"
echo "Attaching working disk image template for modification…"
hdiutil attach "$TMP/$WORK_TEMPLATE" -mountpoint "$TMP/$VOLUME_TEMPLATE"
@ -22,17 +22,17 @@ hdiutil create -size 200m "$TMP/$WORK_TEMPLATE" -type SPARSE -fs HFS+ -volname "
mkdir "$TMP/$VOLUME_TEMPLATE/.background"
echo "Copying background image…"
cp images/qupzilla-dmg-background.png "$TMP/$VOLUME_TEMPLATE/.background/"
cp dmg-background.png "$TMP/$VOLUME_TEMPLATE/.background/"
echo "Creating volume icon set…"
ICON=qupzilla-dmg-icon
ICON=dmg-icon
ICONEXT=png
ICONSETDIR=images/$ICON.iconset
ICONSETDIR=$ICON.iconset
mkdir -p "$ICONSETDIR"
# Convert last with qlmanage since sips does not do SVG
qlmanage -t -s 1024 -o "$ICONSETDIR" "images/$ICON.$ICONEXT"
qlmanage -t -s 1024 -o "$ICONSETDIR" "$ICON.$ICONEXT"
mv "$ICONSETDIR/$ICON.$ICONEXT.png" "$ICONSETDIR/icon_512x512@2x.png"
# Convert remaining with sips since qlmanage does not do 16 pixels
@ -48,7 +48,7 @@ hdiutil create -size 200m "$TMP/$WORK_TEMPLATE" -type SPARSE -fs HFS+ -volname "
done
echo "Creating application reference folder…"
mkdir "$TMP/$VOLUME_TEMPLATE/QupZilla.app"
mkdir "$TMP/$VOLUME_TEMPLATE/Falkon.app"
echo "Creating symbolic link to global Applications folder…"
ln -s /Applications "$TMP/$VOLUME_TEMPLATE/Applications"
@ -64,7 +64,7 @@ hdiutil create -size 200m "$TMP/$WORK_TEMPLATE" -type SPARSE -fs HFS+ -volname "
SetFile -a C "$TMP/$VOLUME_TEMPLATE"
echo "Copying application bundle contents…"
cp -fpR "$BUNDLE_PATH/QupZilla.app/Contents" "$TMP/$VOLUME_TEMPLATE/QupZilla.app"
cp -fpR "$BUNDLE_PATH/Falkon.app/Contents" "$TMP/$VOLUME_TEMPLATE/Falkon.app"
echo "Blessing folder to automatically open on mount…"
bless --folder "$TMP/$VOLUME_TEMPLATE" --openfolder "$TMP/$VOLUME_TEMPLATE"
@ -76,8 +76,8 @@ echo "Compacting working disk image…"
hdiutil compact "$TMP/$WORK_TEMPLATE"
echo "Converting working disk image to read only…"
rm "$BUNDLE_PATH/QupZilla.dmg"
hdiutil convert "$TMP/$WORK_TEMPLATE" -format UDBZ -o "$BUNDLE_PATH/QupZilla.dmg"
rm "$BUNDLE_PATH/Falkon.dmg"
hdiutil convert "$TMP/$WORK_TEMPLATE" -format UDBZ -o "$BUNDLE_PATH/Falkon.dmg"
echo "Cleaning up"
rm -Rf "$ICONSETDIR"

0
mac/images/qupzilla-dmg-background.png → mac/dmg-background.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

0
mac/images/qupzilla-dmg-icon.png → mac/dmg-icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

18
mac/macdeploy.sh
View File

@ -11,23 +11,23 @@ fi
MACDEPLOYQT=$1
QTDIR="`dirname $MACDEPLOYQT`/.."
LIBRARY_NAME="libQupZilla.2.dylib"
PLUGINS="QupZilla.app/Contents/Resources/plugins"
QTPLUGINS="QupZilla.app/Contents/PlugIns"
LIBRARY_NAME="libFalkonPrivate.2.dylib"
PLUGINS="Falkon.app/Contents/Resources/plugins"
QTPLUGINS="Falkon.app/Contents/PlugIns"
# cd to directory with bundle
test -d bin || cd ..
cd bin
# copy libQupZilla into bundle
cp $LIBRARY_NAME QupZilla.app/Contents/MacOS/
# copy libFalkonPrivate into bundle
cp $LIBRARY_NAME Falkon.app/Contents/MacOS/
# copy all QupZilla plugins into bundle
# copy all Falkon plugins into bundle
test -d $PLUGINS || mkdir $PLUGINS
cp plugins/*.dylib $PLUGINS/
# fix libQupZilla
install_name_tool -change $LIBRARY_NAME @executable_path/$LIBRARY_NAME QupZilla.app/Contents/MacOS/QupZilla
# fix libFalkon
install_name_tool -change $LIBRARY_NAME @executable_path/$LIBRARY_NAME Falkon.app/Contents/MacOS/Falkon
# fix plugins
for plugin in $PLUGINS/*.dylib
@ -51,7 +51,7 @@ else
fi
# run macdeployqt
$MACDEPLOYQT QupZilla.app -qmldir=$PWD/../src/lib/data/data
$MACDEPLOYQT Falkon.app -qmldir=$PWD/../src/lib/data/data
# create final dmg image
cd ../mac

2
src/lib/navigation/navigationbar.cpp
View File

@ -54,7 +54,7 @@ static QString titleForUrl(QString title, const QUrl &url)
static QIcon iconForPage(const QUrl &url, const QIcon &sIcon)
{
QIcon icon;
icon.addPixmap(url.scheme() == QL1S("qupzilla") ? QIcon(QSL(":icons/qupzilla.png")).pixmap(16) : IconProvider::iconForUrl(url).pixmap(16));
icon.addPixmap(url.scheme() == QL1S("falkon") ? QIcon(QSL(":icons/qupzilla.png")).pixmap(16) : IconProvider::iconForUrl(url).pixmap(16));
icon.addPixmap(sIcon.pixmap(16), QIcon::Active);
return icon;
}

2
src/plugins/AccessKeysNavigation/akn_handler.cpp
View File

@ -1,5 +1,5 @@
/* ============================================================
* Access Keys Navigation plugin for QupZilla
* Access Keys Navigation plugin for Falkon
* Copyright (C) 2012-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify

2
src/plugins/AccessKeysNavigation/akn_handler.h
View File

@ -1,5 +1,5 @@
/* ============================================================
* Access Keys Navigation plugin for QupZilla
* Access Keys Navigation plugin for Falkon
* Copyright (C) 2012-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify

7
src/plugins/AccessKeysNavigation/akn_plugin.cpp
View File

@ -1,5 +1,5 @@
/* ============================================================
* Access Keys Navigation plugin for QupZilla
* Access Keys Navigation plugin for Falkon
* Copyright (C) 2012-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
@ -21,6 +21,7 @@
#include "mainapplication.h"
#include "pluginproxy.h"
#include "browserwindow.h"
#include "../config.h"
#include <QTranslator>
@ -34,7 +35,7 @@ PluginSpec AKN_Plugin::pluginSpec()
{
PluginSpec spec;
spec.name = "Access Keys Navigation";
spec.info = "Access keys navigation for QupZilla";
spec.info = "Access keys navigation for Falkon";
spec.description = "Provides support for navigating in webpages by keyboard shortcuts";
spec.version = "0.4.3";
spec.author = "David Rosca <nowrep@gmail.com>";
@ -63,7 +64,7 @@ void AKN_Plugin::unload()
bool AKN_Plugin::testPlugin()
{
// Require the version that the plugin was built with
return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION));
return (Qz::VERSION == QLatin1String(FALKON_VERSION));
}
QTranslator* AKN_Plugin::getTranslator(const QString &locale)

4
src/plugins/AccessKeysNavigation/akn_plugin.h
View File

@ -1,5 +1,5 @@
/* ============================================================
* Access Keys Navigation plugin for QupZilla
* Access Keys Navigation plugin for Falkon
* Copyright (C) 2012-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
@ -31,7 +31,7 @@ class AKN_Plugin : public QObject, public PluginInterface
Q_INTERFACES(PluginInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.AKN")
Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.AKN")
#endif
public:

2
src/plugins/AccessKeysNavigation/akn_settings.cpp
View File

@ -1,5 +1,5 @@
/* ============================================================
* Access Keys Navigation plugin for QupZilla
* Access Keys Navigation plugin for Falkon
* Copyright (C) 2012-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify

2
src/plugins/AccessKeysNavigation/akn_settings.h
View File

@ -1,5 +1,5 @@
/* ============================================================
* Access Keys Navigation plugin for QupZilla
* Access Keys Navigation plugin for Falkon
* Copyright (C) 2012-2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify

4
tests/benchmarks/adblockmatchrule.cpp
View File

@ -1,5 +1,5 @@
/* ============================================================
* QupZilla - WebKit based browser
* Falkon - Qt web browser
* Copyright (C) 2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
@ -51,7 +51,7 @@ void AdBlockMatchRule::cleanupTestCase()
void AdBlockMatchRule::networkMatch()
{
QList<QUrl> urls;
urls << QUrl("http://www.qupzilla.com");
urls << QUrl("https://www.kde.org");
urls << QUrl("https://developers.google.com/feed/v1/reference?csw=1");
urls << QUrl("http://pagead2.googlesyndication.com/pagead/show_ads.js");
urls << QUrl("https://qt.gitorious.org/qt-labs/qwebchannel/source/d48ca4efa70624c3178c0b97441ff7499aa2be36:src/webchannel/qwebchannel.cpp");

2
tests/benchmarks/adblockparserule.cpp
View File

@ -1,5 +1,5 @@
/* ============================================================
* QupZilla - WebKit based browser
* Falkon - Qt web browser
* Copyright (C) 2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify