mirror of
https://invent.kde.org/network/falkon.git
synced 2024-09-21 09:42:10 +02:00
Initial rename to Falkon
This commit is contained in:
David Rosca
parent
04df4cbdf8
commit
d00e769749
10
.gitignore
vendored
10
.gitignore
vendored
|
|
@ -11,12 +11,12 @@ DEBIAN
|
|||
headers*.tar.gz
|
||||
license_template
|
||||
Makefile*
|
||||
bin/qupzilla
|
||||
bin/QupZilla.dmg
|
||||
mac/images/qupzilla-dmg-icon.iconset
|
||||
bin/falkon
|
||||
bin/Falkon.dmg
|
||||
mac/images/falkon-dmg-icon.iconset
|
||||
lib*.so*
|
||||
bin/core
|
||||
qupzilla.sh
|
||||
falkon.sh
|
||||
git_revision
|
||||
*.exe
|
||||
*.dll
|
||||
|
|
@ -32,7 +32,7 @@ Thumbs.db
|
|||
*.embed.manifest
|
||||
bin/autotests
|
||||
.clang_complete
|
||||
bin/qupzilla.app
|
||||
bin/falkon.app
|
||||
.DS_Store
|
||||
*.dylib
|
||||
hunspell
|
||||
|
|
|
|||
61
AUTHORS
61
AUTHORS
|
|
@ -1,61 +0,0 @@
|
|||
Main developer and project maintainer:
|
||||
|
||||
David Rosca <nowrep@gmail.com>
|
||||
|
||||
Contributors:
|
||||
|
||||
Mladen Pejaković <pejakm@autistici.org> (webview context menu improvements, speed dial background)
|
||||
Alexander Samilov <alexsamilovskih@gmail.com> (tab previews)
|
||||
Seyyed Razi Alavizadeh <s.r.alavizadeh@gmail.com> (fixed UI for RTL languages)
|
||||
Franz Fellner <alpine.art.de@googlemail.com> (new restore session ui)
|
||||
Bryan M Dunsmore <dunsmoreb@gmail.com> (opening background tabs, closing window when closing last tab)
|
||||
Mariusz Fik <fisiu@opensuse.org> (fixed tab order in preferences dialog)
|
||||
Daniele Cocca <jmc@chakra-project.org> (close tabs with middle click, initial work on speed dial)
|
||||
Giuseppe Calà <jiveaxe@gmail.com> (fixed loading of bookmarklets)
|
||||
Adrien Vigneron <adrienvigneron@ml1.net> (new QupZilla logo)
|
||||
Elio Qoshi <ping@elioqoshi.me> (new QupZilla logo)
|
||||
|
||||
Translators:
|
||||
|
||||
Jonathan Hooverman <jonathan.hooverman@gmail.com> (German)
|
||||
Heimen Stoffels <vistausss@gmail.com> (Dutch)
|
||||
Peter Vacula <pvacula1989@gmail.com> (Slovak)
|
||||
Federico Fabiani <federico.fabiani85@gmail.com> (Italian)
|
||||
Francesco Marinucci <framarinucci@gmail.com> (Italian)
|
||||
Jorge Sevilla <jsevi@ozu.es> (Spanish)
|
||||
Michał Szymanowski <tylkobuba@gmail.com> (Polish)
|
||||
Mariusz Fik <fisiu@opensuse.org> (Polish)
|
||||
Jérôme Giry <baikalink@hotmail.fr> (French)
|
||||
Nicolas Ourceau <lamessen@hotmail.fr> (French)
|
||||
Vasilis Tsivikis <vasitsiv.dev@gmail.com> (Greek)
|
||||
Rustam Salakhutdinov <salahutd@gmail.com> (Russian)
|
||||
Oleg Brezhnev <oleg-423@yandex.ru> (Russian)
|
||||
Sérgio Marques <smarquespt@gmail.com> (Portuguese)
|
||||
Alexandre Carvalho <alexandre05@live.com> (Brazilian Portuguese)
|
||||
Mladen Pejaković <pejakm@autistici.org> (Serbian)
|
||||
Unink-Lio <unink4451@163.com> (Chinese)
|
||||
Yu Hai <yohanprc@eml.cc> (Chinese)
|
||||
Wu Cheng-Hong <stu2731652@gmail.com> (Traditional Chinese)
|
||||
Widya Walesa <walecha99@gmail.com> (Indonesian)
|
||||
Beqa Arabuli <arabulibeqa@gmail.com> (Georgian)
|
||||
Daiki Noda <sys.pdr.pdm9@gmail.com> (Japanese)
|
||||
Ștefan Comănescu <sdfanq@gmail.com> (Romanian)
|
||||
Gábor Oberle <oberleg@myopera.com> (Hungarian)
|
||||
Piccoro McKay Lenz <mckaygerhard@gmail.com> (Venezuelan Spanish)
|
||||
Stanislav Kuznietsov <stanislav_kuznetsov@ukr.net> (Ukrainian)
|
||||
Seyyed Razi Alavizadeh <s.r.alavizadeh@gmail.com> (Persian)
|
||||
Guillem Prats <guprej@gmail.com> (Catalan)
|
||||
Clara Villalba <cvilmon@gmail.com> (Catalan)
|
||||
Xabier Aramendi <azpidatziak@gmail.com> (Basque)
|
||||
Muhammad Fawwaz Orabi <mfawwaz93@gmail.com> (Arabic)
|
||||
Lasso Kante <kantemou@gmail.com> (N'ko)
|
||||
Kizito Birabwa <kbirabwa@yahoo.co.uk> (Luganda)
|
||||
Juan Carlos Sánchez <hollow1984angel@gmail.com> (Mexican Spanish)
|
||||
Ferhat AYDIN <ferhataydin44@gmail.com> (Turkish)
|
||||
|
||||
Special thanks:
|
||||
|
||||
Jonathan Hooverman <jonathan.hooverman@gmail.com> (english language correction)
|
||||
Peter Vacula <pvacula1989@gmail.com> (for a big support in the beginnings)
|
||||
Sergio Cipolla <secipolla@gmail.com> (modifications to old QupZilla icon)
|
||||
Radomir Orkac (qupzilla.com domain)
|
||||
28
BUILDING.md
28
BUILDING.md
|
|
@ -8,21 +8,21 @@ General
|
|||
from git to specific directory by your system you compiled for.
|
||||
On Linux, you can easily do it by running make install.
|
||||
If you are unsure where is the right place, you can check it directly from
|
||||
QupZilla by clicking from Help Menu on Configuration Information, then in
|
||||
Falkon by clicking from Help Menu on Configuration Information, then in
|
||||
Path section.
|
||||
|
||||
You may want to build QupZilla with debugging symbols (for generating
|
||||
You may want to build Falkon with debugging symbols (for generating
|
||||
backtrace of crash) as easily as adding one line to src/defines.pri:
|
||||
|
||||
CONFIG += debug
|
||||
|
||||
QupZilla requires Qt (>= 5.8) and QtWebEngine (at least version included in Qt 5.8)
|
||||
Falkon requires Qt (>= 5.8) and QtWebEngine (at least version included in Qt 5.8)
|
||||
|
||||
Microsoft Windows
|
||||
----------------------------------------------------------------------------------
|
||||
|
||||
You need Microsoft Visual C++ Compiler, Qt Libraries 5.8 or higher and openssl
|
||||
libraries. in order to build QupZilla.
|
||||
libraries. in order to build Falkon.
|
||||
|
||||
Linux / Unix
|
||||
----------------------------------------------------------------------------------
|
||||
|
|
@ -54,7 +54,7 @@ MAC OS X
|
|||
FreeBSD
|
||||
----------------------------------------------------------------------------------
|
||||
|
||||
You may need to set few sysctls to get QupZilla running with raster graphics system.
|
||||
You may need to set few sysctls to get Falkon running with raster graphics system.
|
||||
|
||||
For more informations, please see FAQ.
|
||||
|
||||
|
|
@ -68,7 +68,7 @@ Available Defines
|
|||
$ export NAME="value"
|
||||
|
||||
General:
|
||||
PORTABLE_BUILD QupZilla won't write any data outside of path of execution.
|
||||
PORTABLE_BUILD Falkon won't write any data outside of path of execution.
|
||||
It will also disable plugins by default.
|
||||
(disabled by default)
|
||||
|
||||
|
|
@ -121,32 +121,32 @@ Available Defines
|
|||
example:
|
||||
$ export GNOME_INTEGRATION="true"
|
||||
|
||||
USE_LIBPATH By default, /usr/lib/ is used for libQupZilla and /usr/lib/qupzilla
|
||||
USE_LIBPATH By default, /usr/lib/ is used for libFalkon and /usr/lib/falkon
|
||||
for plugins.
|
||||
You can change it by setting this define.
|
||||
|
||||
example:
|
||||
$ export USE_LIBPATH="/usr/lib64"
|
||||
|
||||
NO_SYSTEM_DATAPATH By default, QupZilla is using /usr/share/qupzilla/ path
|
||||
NO_SYSTEM_DATAPATH By default, Falkon is using /usr/share/falkon/ path
|
||||
for storing themes and translations.
|
||||
By setting this define, QupZilla will use path of execution.
|
||||
By setting this define, Falkon will use path of execution.
|
||||
(disabled by default)
|
||||
|
||||
example:
|
||||
$ export NO_SYSTEM_DATAPATH="true"
|
||||
|
||||
QUPZILLA_PREFIX You can define different prefix.
|
||||
QupZilla binary will then be moved to PREFIX/bin/, use
|
||||
PREFIX/share/qupzilla/ as datadir, PREFIX/share/applications for
|
||||
FALKON_PREFIX You can define different prefix.
|
||||
Falkon binary will then be moved to PREFIX/bin/, use
|
||||
PREFIX/share/falkon/ as datadir, PREFIX/share/applications for
|
||||
desktop launcher and PREFIX/share/pixmaps for icon.
|
||||
(default prefix is "/usr")
|
||||
|
||||
example:
|
||||
$ export QUPZILLA_PREFIX="/usr"
|
||||
$ export FALKON_PREFIX="/usr"
|
||||
|
||||
SHARE_FOLDER You can define the path of the share folder, i.e. /usr/share
|
||||
QupZilla will then use SHARE_FOLDER/qupzilla as datadir,
|
||||
Falkon will then use SHARE_FOLDER/falkon as datadir,
|
||||
SHARE_FOLDER/applications for desktop launcher and
|
||||
SHARE_FOLDER/pixmaps for the icon. By default it is not defined
|
||||
and files will be installed as described above.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
3
FAQ
3
FAQ
|
|
@ -1,3 +0,0 @@
|
|||
Frequently Asked Questions
|
||||
|
||||
https://github.com/QupZilla/qupzilla/wiki/FAQ
|
||||
78
README.md
78
README.md
|
|
@ -1,76 +1,2 @@
|
|||
QupZilla Web Browser
|
||||
----------------------------------------------------------------------------------------
|
||||
|
||||
[](https://travis-ci.org/QupZilla/qupzilla)
|
||||
[](https://ci.appveyor.com/project/srazi/qupzilla-utoeb)
|
||||
Homepage: https://www.qupzilla.com
|
||||
Blog: http://blog.qupzilla.com
|
||||
IRC: `#qupzilla` at `irc.freenode.net`
|
||||
Translations: https://www.transifex.com/projects/p/qupzilla
|
||||
|
||||
|
||||
|
||||
QupZilla is a new and very fast QtWebEngine browser. It aims to be a lightweight web browser
|
||||
available through all major platforms. This project has been originally started only
|
||||
for educational purposes. But from its start, QupZilla has grown into a feature-rich browser.
|
||||
|
||||
QupZilla has all standard functions you expect from a web browser. It includes bookmarks,
|
||||
history (both also in sidebar) and tabs. Above that, it has by default enabled blocking ads
|
||||
with a built-in AdBlock plugin.
|
||||
|
||||
History
|
||||
----------------------------------------------------------------------------------------
|
||||
|
||||
The very first version of QupZilla has been released in December 2010 and it was written
|
||||
in Python with PyQt4 bindings. After a few versions, QupZilla has been completely rewritten
|
||||
in C++ with the Qt Framework. First public release was 1.0.0-b4.
|
||||
|
||||
Until version 2.0, QupZilla was using QtWebKit. QtWebKit is now deprecated and new versions
|
||||
are using QtWebEngine.
|
||||
|
||||
Compiling
|
||||
----------------------------------------------------------------------------------------
|
||||
|
||||
Before you start compiling, make sure that you have installed the Qt (>= 5.8) development libraries
|
||||
and you have read the [BUILDING.md](https://github.com/QupZilla/qupzilla/blob/master/BUILDING.md) information.
|
||||
|
||||
**Linux**
|
||||
|
||||
* OpenSSL (libcrypto) is required
|
||||
* xcb libraries when building without NO_X11
|
||||
|
||||
**Windows**
|
||||
* OpenSSL (libeay32) is required
|
||||
|
||||
Then you can start compiling by running this commands:
|
||||
|
||||
$ qmake
|
||||
$ make
|
||||
|
||||
After a successful compilation the executable binary can be found in the bin/ directory.
|
||||
On Fedora and possibly other Linux distributions you need to replace `qmake` with `qmake-qt5`.
|
||||
|
||||
On Linux/Unix: To install QupZilla, run this command: (it may be necessary to run it as root)
|
||||
|
||||
$ make install
|
||||
|
||||
On Mac OS X: To deploy QupZilla in dmg image, run this command:
|
||||
|
||||
$ make bundle
|
||||
|
||||
Current version
|
||||
----------------------------------------------------------------------------------------
|
||||
|
||||
The current stable version of QupZilla is 2.1.2. You can download precompiled packages
|
||||
and the sources from the download section at [homepage](https://www.qupzilla.com/download).
|
||||
However, if you want the latest revision, just take the latest code snapshot either by
|
||||
downloading a tarball or running:
|
||||
|
||||
$ git clone https://github.com/QupZilla/qupzilla.git
|
||||
|
||||
FAQ and Changelog
|
||||
----------------------------------------------------------------------------------------
|
||||
|
||||
If you are experiencing some sort of problem, please read the FAQ before you open an issue.
|
||||
|
||||
[FAQ](https://github.com/QupZilla/qupzilla/wiki/FAQ) | [Changelog](https://github.com/QupZilla/qupzilla/blob/master/CHANGELOG) | [Bug Reports](https://github.com/QupZilla/qupzilla/wiki/Bug-Reports)
|
||||
Falkon Web Browser
|
||||
------------------------
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Name: Chrome
|
||||
Author: David Rosca
|
||||
Short Description: Chrome like theme
|
||||
Long Description: Chrome like theme for QupZilla based on Firefox Chromifox theme
|
||||
Long Description: Chrome like theme for Falkon based on Firefox Chromifox theme
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Name: Mac
|
||||
Author: David Rosca
|
||||
Short Description: Mac like theme
|
||||
Long Description: Mac like theme for QupZilla based on Firefox Mac OS X theme
|
||||
Long Description: Mac like theme for Falkon based on Firefox Mac OS X theme
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Name: Windows
|
||||
Author: David Rosca
|
||||
Short Description: Windows default theme
|
||||
Long Description: Windows default theme for QupZilla based on Firefox Strata Aero theme. This theme supports transparent background on Windows 7
|
||||
Long Description: Windows default theme for Falkon based on Firefox Strata Aero theme. This theme supports transparent background on Windows 7
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
#-------------------------------------------------
|
||||
#
|
||||
# QupZilla - QtWebKit browser
|
||||
# Falkon - Qt web browser
|
||||
#
|
||||
# Project created by QtCreator 2010-12-18T14:53:41
|
||||
#
|
||||
#-------------------------------------------------
|
||||
|
||||
lessThan(QT_VERSION, 5.8) {
|
||||
error("QupZilla requires at least Qt 5.8!")
|
||||
error("Falkon requires at least Qt 5.8!")
|
||||
}
|
||||
|
||||
lessThan(QT.webengine.VERSION, 5.8) {
|
||||
error("QupZilla requires at least QtWebEngine 5.8!")
|
||||
error("Falkon requires at least QtWebEngine 5.8!")
|
||||
}
|
||||
|
||||
# Create plugins directory first on Mac / Linux
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"id": "org.qupzilla.QupZilla",
|
||||
"id": "org.kde.Falkon",
|
||||
"runtime": "org.kde.Platform",
|
||||
"runtime-version": "master",
|
||||
"sdk": "org.kde.Sdk",
|
||||
"rename-icon": "qupzilla",
|
||||
"rename-icon": "falkon",
|
||||
"tags": ["nightly"],
|
||||
"desktop-file-name-suffix": " (Nightly)",
|
||||
"command": "qupzilla",
|
||||
"command": "falkon",
|
||||
"finish-args": [
|
||||
"--share=ipc",
|
||||
"--share=network",
|
||||
|
|
@ -20,16 +20,16 @@
|
|||
|
||||
"modules": [
|
||||
{
|
||||
"name": "qupzilla",
|
||||
"name": "falkon",
|
||||
"build-options": {
|
||||
"env": {
|
||||
"QUPZILLA_PREFIX": "/app"
|
||||
"FALKON_PREFIX": "/app"
|
||||
}
|
||||
},
|
||||
"sources": [
|
||||
{
|
||||
"type": "git",
|
||||
"url": "https://github.com/QupZilla/qupzilla.git"
|
||||
"url": "git://anongit.kde.org/falkon.git"
|
||||
},
|
||||
{
|
||||
"type": "script",
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<application>
|
||||
<id type="desktop">org.qupzilla.QupZilla.desktop</id>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<project_license>GPL-3.0+</project_license>
|
||||
<name>QupZilla</name>
|
||||
<summary>Web Browser</summary>
|
||||
<description>
|
||||
<p>
|
||||
QupZilla is a new and very fast QtWebKit browser. It aims to be a lightweight web browser available through all major platforms. This project has been originally started only for educational purposes. But from its start, QupZilla has grown into a feature-rich browser.
|
||||
</p>
|
||||
<p>
|
||||
QupZilla has all standard functions you expect from a web browser. It includes bookmarks, history (both also in sidebar) and tabs. Above that, you can manage RSS feeds with an included RSS reader, block ads with a built-in AdBlock plugin, block Flash content with Click2Flash and edit the local CA Certificates database with an SSL manager.
|
||||
</p>
|
||||
<p>
|
||||
QupZilla's main aim is to be a very fast and very stable QtWebKit browser available to everyone. There are already a lot of QtWebKit browsers available, but they are either bound to the KDE environment, not actively developed or very unstable and miss important features. QupZilla, a multi-platform, modern and actively developed browser, is here to fill this gap by providing a very stable browsing experience.
|
||||
</p>
|
||||
</description>
|
||||
<screenshots>
|
||||
<screenshot type="default" width="864" height="567">https://www.qupzilla.com/screens/gnome.png</screenshot>
|
||||
<screenshot width="948" height="638">https://www.qupzilla.com/screens/kde_window.png</screenshot>
|
||||
<screenshot width="864" height="567">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
|
||||
<screenshot width="944" height="633">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
|
||||
<screenshot width="809" height="528">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
|
||||
<screenshot width="760" height="518">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
|
||||
</screenshots>
|
||||
<url type="homepage">https://www.qupzilla.com/</url>
|
||||
<updatecontact>nowrep_at_gmail.com</updatecontact>
|
||||
</application>
|
||||
29
linux/appdata/org.kde.Falkon.appdata.xml
Normal file
29
linux/appdata/org.kde.Falkon.appdata.xml
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<application>
|
||||
<id type="desktop">org.kde.Falkon.desktop</id>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<project_license>GPL-3.0+</project_license>
|
||||
<name>Falkon</name>
|
||||
<summary>Web Browser</summary>
|
||||
<description>
|
||||
<p>
|
||||
Falkon is a new and very fast QtWebKit browser. It aims to be a lightweight web browser available through all major platforms. This project has been originally started only for educational purposes. But from its start, Falkon has grown into a feature-rich browser.
|
||||
</p>
|
||||
<p>
|
||||
Falkon has all standard functions you expect from a web browser. It includes bookmarks, history (both also in sidebar) and tabs. Above that, you can manage RSS feeds with an included RSS reader, block ads with a built-in AdBlock plugin, block Flash content with Click2Flash and edit the local CA Certificates database with an SSL manager.
|
||||
</p>
|
||||
<p>
|
||||
Falkon's main aim is to be a very fast and very stable QtWebKit browser available to everyone. There are already a lot of QtWebKit browsers available, but they are either bound to the KDE environment, not actively developed or very unstable and miss important features. Falkon, a multi-platform, modern and actively developed browser, is here to fill this gap by providing a very stable browsing experience.
|
||||
</p>
|
||||
</description>
|
||||
<screenshots>
|
||||
<screenshot type="default" width="864" height="567">https://www.qupzilla.com/screens/gnome.png</screenshot>
|
||||
<screenshot width="948" height="638">https://www.qupzilla.com/screens/kde_window.png</screenshot>
|
||||
<screenshot width="864" height="567">https://www.qupzilla.com/screens/dial_gnome.png</screenshot>
|
||||
<screenshot width="944" height="633">https://www.qupzilla.com/screens/kde_speeddial.png</screenshot>
|
||||
<screenshot width="809" height="528">https://www.qupzilla.com/screens/preferences_gnome.png</screenshot>
|
||||
<screenshot width="760" height="518">https://www.qupzilla.com/screens/kde_preferences.png</screenshot>
|
||||
</screenshots>
|
||||
<url type="homepage">https://www.qupzilla.com/</url>
|
||||
<updatecontact>nowrep_at_gmail.com</updatecontact>
|
||||
</application>
|
||||
|
|
@ -1,23 +1,23 @@
|
|||
[Desktop Entry]
|
||||
Name=QupZilla
|
||||
Name=Falkon
|
||||
Type=Application
|
||||
Icon=qupzilla
|
||||
Categories=Network;WebBrowser;
|
||||
Comment=A fast and secure web browser
|
||||
GenericName=Web Browser
|
||||
Exec=qupzilla %u
|
||||
Exec=falkon %u
|
||||
MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;application/x-mimearchive;
|
||||
Terminal=false
|
||||
Actions=NewTab;NewWindow;PrivateBrowsing;
|
||||
|
||||
[Desktop Action NewTab]
|
||||
Name=Open new tab
|
||||
Exec=qupzilla --new-tab
|
||||
Exec=falkon --new-tab
|
||||
|
||||
[Desktop Action NewWindow]
|
||||
Name=Open new window
|
||||
Exec=qupzilla --new-window
|
||||
Exec=falkon --new-window
|
||||
|
||||
[Desktop Action PrivateBrowsing]
|
||||
Name=Start private browsing
|
||||
Exec=qupzilla --private-browsing
|
||||
Exec=falkon --private-browsing
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
**Shell completion files**
|
||||
|
||||
* *qupzilla* - bash completion file
|
||||
* *_qupzilla* - zsh completion file
|
||||
* *falkon* - bash completion file
|
||||
* *_falkon* - zsh completion file
|
||||
|
||||
Bash completion file will be automatically installed with make install
|
||||
into `/usr/share/bash-completion/completions`
|
||||
|
|
@ -9,4 +9,4 @@ into `/usr/share/bash-completion/completions`
|
|||
To install zsh completion file, either manually copy it to proper directory
|
||||
(one directory from $fpath), or run this command:
|
||||
|
||||
cp _qupzilla "`echo $fpath | cut -d' ' -f1`/_qupzilla"
|
||||
cp _falkon "`echo $fpath | cut -d' ' -f1`/_falkon"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
#compdef qupzilla
|
||||
#compdef falkon
|
||||
#
|
||||
# Zsh completion for QupZilla
|
||||
# Zsh completion for Falkon
|
||||
#
|
||||
opts=(
|
||||
'(-)'{-h,--help}'[print usage help]'
|
||||
'(-)'{-a,--authors}'[print QupZilla authors]'
|
||||
'(-)'{-v,--version}'[print QupZilla version]'
|
||||
'(-)'{-a,--authors}'[print Falkon authors]'
|
||||
'(-)'{-v,--version}'[print Falkon version]'
|
||||
|
||||
'(-)'{-p,--profile=}'[start with specified profile]'
|
||||
'(-)'{-e,--no-extensions}'[start without extensions]'
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Bash completion for QupZilla
|
||||
# Bash completion for Falkon
|
||||
#
|
||||
_qupzilla()
|
||||
_falkon()
|
||||
{
|
||||
local cur prev opts
|
||||
COMPREPLY=()
|
||||
|
|
@ -19,4 +19,4 @@ _qupzilla()
|
|||
_filedir
|
||||
fi
|
||||
}
|
||||
complete -F _qupzilla qupzilla
|
||||
complete -F _falkon falkon
|
||||
|
|
@ -10,7 +10,7 @@ mocinclude.CONFIG *= fix_target
|
|||
|
||||
QZ_VERSION = 2.1.99
|
||||
unix: VERSION = $$QZ_VERSION
|
||||
DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\""
|
||||
DEFINES *= FALKON_VERSION=\\\"""$$QZ_VERSION"\\\""
|
||||
|
||||
d_no_system_datapath = $$(NO_SYSTEM_DATAPATH)
|
||||
d_kde_integration = $$(KDE_INTEGRATION)
|
||||
|
|
@ -22,7 +22,7 @@ d_use_lib_path = $$(USE_LIBPATH)
|
|||
d_disable_dbus = $$(DISABLE_DBUS)
|
||||
d_disable_updates_check = $$(DISABLE_UPDATES_CHECK)
|
||||
d_debug_build = $$(DEBUG_BUILD)
|
||||
d_prefix = $$(QUPZILLA_PREFIX)
|
||||
d_prefix = $$(FALKON_PREFIX)
|
||||
d_share = $$(SHARE_FOLDER)
|
||||
|
||||
equals(d_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH }
|
||||
|
|
@ -38,7 +38,7 @@ equals(d_debug_build, "true") { CONFIG += debug }
|
|||
DEFINES *= QT_NO_URL_CAST_FROM_STRING
|
||||
DEFINES *= QT_USE_QSTRINGBUILDER
|
||||
|
||||
CONFIG(debug, debug|release): DEFINES *= QUPZILLA_DEBUG_BUILD
|
||||
CONFIG(debug, debug|release): DEFINES *= FALKON_DEBUG_BUILD
|
||||
|
||||
|
||||
win32-msvc* {
|
||||
|
|
@ -73,7 +73,7 @@ haiku-* {
|
|||
share_folder = "$$d_share"
|
||||
}
|
||||
|
||||
data_folder = $$share_folder/qupzilla
|
||||
data_folder = $$share_folder/falkon
|
||||
launcher_folder = $$share_folder/applications
|
||||
icon_folder = $$share_folder/pixmaps
|
||||
hicolor_folder = $$share_folder/icons/hicolor
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ mac {
|
|||
target1.files += $$QZ_DESTDIR/themes
|
||||
target1.path = $$data_folder
|
||||
|
||||
target2.files = $$PWD/../linux/applications/org.qupzilla.QupZilla.desktop
|
||||
target2.files = $$PWD/../linux/applications/org.kde.Falkon.desktop
|
||||
target2.path = $$launcher_folder
|
||||
|
||||
target3.files = $$PWD/../linux/pixmaps/qupzilla.png
|
||||
|
|
@ -43,10 +43,10 @@ mac {
|
|||
ico256.files = $$PWD/../linux/hicolor/256x256/apps/qupzilla.png
|
||||
ico256.path = $$hicolor_folder/256x256/apps
|
||||
|
||||
bashcompletion.files = $$PWD/../linux/completion/qupzilla
|
||||
bashcompletion.files = $$PWD/../linux/completion/falkon
|
||||
bashcompletion.path = $$share_folder/bash-completion/completions
|
||||
|
||||
appdata.files = $$PWD/../linux/appdata/org.qupzilla.QupZilla.appdata.xml
|
||||
appdata.files = $$PWD/../linux/appdata/org.kde.Falkon.appdata.xml
|
||||
appdata.path = $$share_folder/appdata
|
||||
|
||||
|
||||
|
|
|
|||
2
src/lib/3rdparty/fancytabwidget.cpp
vendored
2
src/lib/3rdparty/fancytabwidget.cpp
vendored
|
|
@ -468,7 +468,7 @@ void FancyTabBar::setCurrentIndex(int index)
|
|||
// FancyColorButton
|
||||
//////
|
||||
|
||||
class QUPZILLA_EXPORT FancyColorButton : public QWidget
|
||||
class FALKON_EXPORT FancyColorButton : public QWidget
|
||||
{
|
||||
public:
|
||||
FancyColorButton(QWidget* parent)
|
||||
|
|
|
|||
8
src/lib/3rdparty/fancytabwidget.h
vendored
8
src/lib/3rdparty/fancytabwidget.h
vendored
|
|
@ -52,7 +52,7 @@ namespace Core
|
|||
namespace Internal
|
||||
{
|
||||
|
||||
class QUPZILLA_EXPORT FancyTabProxyStyle : public QProxyStyle
|
||||
class FALKON_EXPORT FancyTabProxyStyle : public QProxyStyle
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ protected:
|
|||
bool eventFilter(QObject* o, QEvent* e);
|
||||
};
|
||||
|
||||
class QUPZILLA_EXPORT FancyTab : public QWidget
|
||||
class FALKON_EXPORT FancyTab : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ private:
|
|||
float m_fader;
|
||||
};
|
||||
|
||||
class QUPZILLA_EXPORT FancyTabBar : public QWidget
|
||||
class FALKON_EXPORT FancyTabBar : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
@ -144,7 +144,7 @@ private:
|
|||
|
||||
};
|
||||
|
||||
class QUPZILLA_EXPORT FancyTabWidget : public QWidget
|
||||
class FALKON_EXPORT FancyTabWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
6
src/lib/3rdparty/lineedit.h
vendored
6
src/lib/3rdparty/lineedit.h
vendored
|
|
@ -29,7 +29,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*/
|
||||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -63,7 +63,7 @@ As widgets are added to the class they are inserted from the outside
|
|||
into the center of the widget.
|
||||
*/
|
||||
class SideWidget;
|
||||
class QUPZILLA_EXPORT LineEdit : public QLineEdit
|
||||
class FALKON_EXPORT LineEdit : public QLineEdit
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize)
|
||||
|
|
@ -144,7 +144,7 @@ private:
|
|||
};
|
||||
|
||||
|
||||
class QUPZILLA_EXPORT SideWidget : public QWidget
|
||||
class FALKON_EXPORT SideWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
2
src/lib/3rdparty/processinfo.cpp
vendored
2
src/lib/3rdparty/processinfo.cpp
vendored
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
4
src/lib/3rdparty/processinfo.h
vendored
4
src/lib/3rdparty/processinfo.h
vendored
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
* written by user WitchCraft
|
||||
*/
|
||||
|
||||
class QUPZILLA_EXPORT ProcessInfo
|
||||
class FALKON_EXPORT ProcessInfo
|
||||
{
|
||||
public:
|
||||
explicit ProcessInfo(const QString &name);
|
||||
|
|
|
|||
2
src/lib/3rdparty/squeezelabelv1.h
vendored
2
src/lib/3rdparty/squeezelabelv1.h
vendored
|
|
@ -37,7 +37,7 @@
|
|||
A label that will squeeze the set text to fit within the size of the
|
||||
widget. The text will be elided in the middle.
|
||||
*/
|
||||
class QUPZILLA_EXPORT SqueezeLabelV1 : public QLabel
|
||||
class FALKON_EXPORT SqueezeLabelV1 : public QLabel
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
4
src/lib/3rdparty/squeezelabelv2.h
vendored
4
src/lib/3rdparty/squeezelabelv2.h
vendored
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include <QLabel>
|
||||
|
||||
class QUPZILLA_EXPORT SqueezeLabelV2 : public QLabel
|
||||
class FALKON_EXPORT SqueezeLabelV2 : public QLabel
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -28,7 +28,7 @@ namespace Ui
|
|||
class AdBlockAddSubscriptionDialog;
|
||||
}
|
||||
|
||||
class QUPZILLA_EXPORT AdBlockAddSubscriptionDialog : public QDialog
|
||||
class FALKON_EXPORT AdBlockAddSubscriptionDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -28,7 +28,7 @@ class AdBlockTreeWidget;
|
|||
class AdBlockManager;
|
||||
class AdBlockRule;
|
||||
|
||||
class QUPZILLA_EXPORT AdBlockDialog : public QWidget, public Ui_AdBlockDialog
|
||||
class FALKON_EXPORT AdBlockDialog : public QWidget, public Ui_AdBlockDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -27,7 +27,7 @@ class QUrl;
|
|||
|
||||
class BrowserWindow;
|
||||
|
||||
class QUPZILLA_EXPORT AdBlockIcon : public ClickableLabel
|
||||
class FALKON_EXPORT AdBlockIcon : public ClickableLabel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -123,7 +123,7 @@ bool AdBlockManager::block(QWebEngineUrlRequestInfo &request)
|
|||
res = true;
|
||||
|
||||
if (request.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeMainFrame) {
|
||||
QUrl url(QSL("qupzilla:adblock"));
|
||||
QUrl url(QSL("falkon:adblock"));
|
||||
QUrlQuery query;
|
||||
query.addQueryItem(QSL("rule"), blockedRule->filter());
|
||||
query.addQueryItem(QSL("subscription"), blockedRule->subscription()->title());
|
||||
|
|
@ -388,7 +388,7 @@ bool AdBlockManager::isEnabled() const
|
|||
bool AdBlockManager::canRunOnScheme(const QString &scheme) const
|
||||
{
|
||||
return !(scheme == QLatin1String("file") || scheme == QLatin1String("qrc")
|
||||
|| scheme == QLatin1String("qupzilla") || scheme == QLatin1String("data")
|
||||
|| scheme == QLatin1String("falkon") || scheme == QLatin1String("data")
|
||||
|| scheme == QLatin1String("abp"));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -35,7 +35,7 @@ class AdBlockCustomList;
|
|||
class AdBlockSubscription;
|
||||
class AdBlockUrlInterceptor;
|
||||
|
||||
class QUPZILLA_EXPORT AdBlockManager : public QObject
|
||||
class FALKON_EXPORT AdBlockManager : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2014-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2014-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -28,7 +28,7 @@ class QWebEngineUrlRequestInfo;
|
|||
|
||||
class AdBlockManager;
|
||||
|
||||
class QUPZILLA_EXPORT AdBlockMatcher : public QObject
|
||||
class FALKON_EXPORT AdBlockMatcher : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -58,7 +58,7 @@ class QWebEngineUrlRequestInfo;
|
|||
|
||||
class AdBlockSubscription;
|
||||
|
||||
class QUPZILLA_EXPORT AdBlockRule
|
||||
class FALKON_EXPORT AdBlockRule
|
||||
{
|
||||
Q_DISABLE_COPY(AdBlockRule)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2013-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -27,7 +27,7 @@ class QWebEngineUrlRequestInfo;
|
|||
|
||||
class AdBlockRule;
|
||||
|
||||
class QUPZILLA_EXPORT AdBlockSearchTree
|
||||
class FALKON_EXPORT AdBlockSearchTree
|
||||
{
|
||||
public:
|
||||
explicit AdBlockSearchTree();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
class QUrl;
|
||||
class QNetworkReply;
|
||||
|
||||
class QUPZILLA_EXPORT AdBlockSubscription : public QObject
|
||||
class FALKON_EXPORT AdBlockSubscription : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
class AdBlockSubscription;
|
||||
class AdBlockRule;
|
||||
|
||||
class QUPZILLA_EXPORT AdBlockTreeWidget : public TreeWidget
|
||||
class FALKON_EXPORT AdBlockTreeWidget : public TreeWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - QtWebEngine based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2015 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
class AdBlockManager;
|
||||
|
||||
class QUPZILLA_EXPORT AdBlockUrlInterceptor : public UrlInterceptor
|
||||
class FALKON_EXPORT AdBlockUrlInterceptor : public UrlInterceptor
|
||||
{
|
||||
public:
|
||||
explicit AdBlockUrlInterceptor(AdBlockManager* manager);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "qzcommon.h"
|
||||
|
||||
class QUPZILLA_EXPORT AutoSaver : public QObject
|
||||
class FALKON_EXPORT AutoSaver : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -102,7 +102,7 @@ BrowserWindow::BrowserWindow(Qz::BrowserWindowType type, const QUrl &startUrl)
|
|||
setAttribute(Qt::WA_DontCreateNativeAncestors);
|
||||
|
||||
setObjectName("mainwindow");
|
||||
setWindowTitle(tr("QupZilla"));
|
||||
setWindowTitle(tr("Falkon"));
|
||||
setProperty("private", mApp->isPrivate());
|
||||
|
||||
setupUi();
|
||||
|
|
@ -118,10 +118,10 @@ BrowserWindow::BrowserWindow(Qz::BrowserWindowType type, const QUrl &startUrl)
|
|||
QTimer::singleShot(0, this, SLOT(postLaunch()));
|
||||
|
||||
if (mApp->isPrivate()) {
|
||||
QzTools::setWmClass("QupZilla Browser (Private Window)", this);
|
||||
QzTools::setWmClass("Falkon Browser (Private Window)", this);
|
||||
}
|
||||
else {
|
||||
QzTools::setWmClass("QupZilla Browser", this);
|
||||
QzTools::setWmClass("Falkon Browser", this);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -159,7 +159,7 @@ void BrowserWindow::postLaunch()
|
|||
break;
|
||||
|
||||
case MainApplication::OpenSpeedDial:
|
||||
startUrl = QUrl("qupzilla:speeddial");
|
||||
startUrl = QUrl("falkon:speeddial");
|
||||
break;
|
||||
|
||||
case MainApplication::OpenHomePage:
|
||||
|
|
@ -177,7 +177,7 @@ void BrowserWindow::postLaunch()
|
|||
if (mApp->isStartingAfterCrash()) {
|
||||
addTab = false;
|
||||
startUrl.clear();
|
||||
m_tabWidget->addView(QUrl("qupzilla:restore"), Qz::NT_CleanSelectedTabAtTheEnd);
|
||||
m_tabWidget->addView(QUrl("falkon:restore"), Qz::NT_CleanSelectedTabAtTheEnd);
|
||||
}
|
||||
else if ((mApp->afterLaunch() == MainApplication::SelectSession || mApp->afterLaunch() == MainApplication::RestoreSession) && mApp->restoreManager()) {
|
||||
addTab = !mApp->restoreSession(this, mApp->restoreManager()->restoreData());
|
||||
|
|
@ -215,7 +215,7 @@ void BrowserWindow::postLaunch()
|
|||
if (addTab) {
|
||||
m_tabWidget->addView(startUrl, Qz::NT_CleanSelectedTabAtTheEnd);
|
||||
|
||||
if (startUrl.isEmpty() || startUrl.toString() == QLatin1String("qupzilla:speeddial")) {
|
||||
if (startUrl.isEmpty() || startUrl.toString() == QLatin1String("falkon:speeddial")) {
|
||||
locationBar()->setFocus();
|
||||
}
|
||||
}
|
||||
|
|
@ -424,7 +424,7 @@ void BrowserWindow::loadSettings()
|
|||
|
||||
//Url settings
|
||||
settings.beginGroup("Web-URL-Settings");
|
||||
m_homepage = settings.value("homepage", "qupzilla:start").toUrl();
|
||||
m_homepage = settings.value("homepage", "falkon:start").toUrl();
|
||||
settings.endGroup();
|
||||
|
||||
//Browser Window settings
|
||||
|
|
@ -839,7 +839,7 @@ void BrowserWindow::currentTabChanged()
|
|||
return;
|
||||
}
|
||||
|
||||
setWindowTitle(tr("%1 - QupZilla").arg(view->webTab()->title()));
|
||||
setWindowTitle(tr("%1 - Falkon").arg(view->webTab()->title()));
|
||||
m_ipLabel->setText(view->getIp());
|
||||
view->setFocus();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -15,8 +15,8 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
* ============================================================ */
|
||||
#ifndef QUPZILLA_H
|
||||
#define QUPZILLA_H
|
||||
#ifndef BROWSERWINDOW_H
|
||||
#define BROWSERWINDOW_H
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QPointer>
|
||||
|
|
@ -53,7 +53,7 @@ class NavigationContainer;
|
|||
class ClickableLabel;
|
||||
class LocationBar;
|
||||
|
||||
class QUPZILLA_EXPORT BrowserWindow : public QMainWindow
|
||||
class FALKON_EXPORT BrowserWindow : public QMainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
@ -226,4 +226,4 @@ private:
|
|||
#endif
|
||||
};
|
||||
|
||||
#endif // QUPZILLA_H
|
||||
#endif // BROWSERWINDOW_H
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - QtWebEngine based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -116,7 +116,7 @@ void CommandLineOptions::parseActions()
|
|||
|
||||
if (parser.isSet(profileOption)) {
|
||||
const QString profileName = parser.value(profileOption);
|
||||
std::cout << "QupZilla: Starting with profile '" << profileName.toUtf8().data() << "'" << std::endl;
|
||||
std::cout << "Falkon: Starting with profile '" << profileName.toUtf8().data() << "'" << std::endl;
|
||||
|
||||
ActionPair pair;
|
||||
pair.action = Qz::CL_StartWithProfile;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - QtWebEngine based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2015 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include "qzcommon.h"
|
||||
|
||||
class QUPZILLA_EXPORT CommandLineOptions
|
||||
class FALKON_EXPORT CommandLineOptions
|
||||
{
|
||||
public:
|
||||
struct ActionPair {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2014-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -99,12 +99,12 @@ void DataPaths::init()
|
|||
|
||||
// Config
|
||||
#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
|
||||
// Use %LOCALAPPDATA%/qupzilla as Config path on Windows
|
||||
// Use %LOCALAPPDATA%/falkon as Config path on Windows
|
||||
m_paths[Config].append(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation));
|
||||
#elif defined(Q_OS_MACOS)
|
||||
m_paths[Config].append(QDir::homePath() + QLatin1String("/Library/Application Support/QupZilla"));
|
||||
m_paths[Config].append(QDir::homePath() + QLatin1String("/Library/Application Support/Falkon"));
|
||||
#else // Unix
|
||||
m_paths[Config].append(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QL1S("/qupzilla"));
|
||||
m_paths[Config].append(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QL1S("/falkon"));
|
||||
#endif
|
||||
|
||||
// Profiles
|
||||
|
|
@ -113,7 +113,7 @@ void DataPaths::init()
|
|||
// Temp
|
||||
#ifdef Q_OS_UNIX
|
||||
const QByteArray &user = qgetenv("USER");
|
||||
const QString &tempPath = QString(QSL("%1/qupzilla-%2")).arg(QDir::tempPath(), user.constData());
|
||||
const QString &tempPath = QString(QSL("%1/falkon-%2")).arg(QDir::tempPath(), user.constData());
|
||||
m_paths[Temp].append(tempPath);
|
||||
#else
|
||||
m_paths[Temp].append(m_paths[Config].at(0) + QLatin1String("/tmp"));
|
||||
|
|
@ -123,7 +123,7 @@ void DataPaths::init()
|
|||
#ifdef Q_OS_UNIX
|
||||
const QString &cachePath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
|
||||
if (!cachePath.isEmpty())
|
||||
m_paths[Cache].append(cachePath + QLatin1String("/qupzilla"));
|
||||
m_paths[Cache].append(cachePath + QLatin1String("/falkon"));
|
||||
#endif
|
||||
|
||||
// Make sure the Config and Temp paths exists
|
||||
|
|
@ -137,7 +137,7 @@ void DataPaths::init()
|
|||
m_paths[Plugins].append(m_paths[Config].at(0) + QLatin1String("/plugins"));
|
||||
|
||||
#ifdef USE_LIBPATH
|
||||
m_paths[Plugins].append(QLatin1String(USE_LIBPATH "/qupzilla"));
|
||||
m_paths[Plugins].append(QLatin1String(USE_LIBPATH "/falkon"));
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -22,19 +22,19 @@
|
|||
|
||||
#include "qzcommon.h"
|
||||
|
||||
class QUPZILLA_EXPORT DataPaths
|
||||
class FALKON_EXPORT DataPaths
|
||||
{
|
||||
public:
|
||||
enum Path {
|
||||
AppData = 0, // /usr/share/qupzilla or . or ../Resources
|
||||
AppData = 0, // /usr/share/falkon or . or ../Resources
|
||||
Translations = 1, // $AppData/locale
|
||||
Themes = 2, // $AppData/themes
|
||||
Plugins = 3, // $AppData/plugins
|
||||
Config = 4, // $XDG_CONFIG_HOME/qupzilla or %LOCALAPPDATA%/qupzilla or $AppData/data (portable)
|
||||
Config = 4, // $XDG_CONFIG_HOME/falkon or %LOCALAPPDATA%/falkon or $AppData/data (portable)
|
||||
Profiles = 5, // $Config/profiles
|
||||
CurrentProfile = 6, // $Profiles/current_profile
|
||||
Temp = 7, // $Config/tmp
|
||||
Cache = 8, // $XDG_CACHE_HOME/qupzilla or $CurrentProfile/cache
|
||||
Cache = 8, // $XDG_CACHE_HOME/falkon or $CurrentProfile/cache
|
||||
Sessions = 9, // $CurrentProfile/sessions
|
||||
LastPath = 10
|
||||
};
|
||||
|
|
@ -48,7 +48,7 @@ public:
|
|||
|
||||
// Returns main path (Themes -> /usr/share/themes)
|
||||
static QString path(Path type);
|
||||
// Returns all paths (Themes -> /usr/share/themes, ~/.config/qupzilla/themes)
|
||||
// Returns all paths (Themes -> /usr/share/themes, ~/.config/falkon/themes)
|
||||
static QStringList allPaths(Path type);
|
||||
// Convenience function for getting CurrentProfile
|
||||
static QString currentProfilePath();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -107,10 +107,10 @@ MainApplication::MainApplication(int &argc, char** argv)
|
|||
setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
|
||||
|
||||
setApplicationName(QLatin1String("QupZilla"));
|
||||
setOrganizationDomain(QLatin1String("qupzilla"));
|
||||
setApplicationName(QLatin1String("Falkon"));
|
||||
setOrganizationDomain(QLatin1String("org.kde"));
|
||||
setWindowIcon(QIcon::fromTheme(QSL("qupzilla"), QIcon(QSL(":icons/exeicons/qupzilla-window.png"))));
|
||||
setDesktopFileName(QSL("org.qupzilla.QupZilla"));
|
||||
setDesktopFileName(QSL("org.kde.Falkon"));
|
||||
|
||||
#ifdef GIT_REVISION
|
||||
setApplicationVersion(QSL("%1 (%2)").arg(Qz::VERSION, GIT_REVISION));
|
||||
|
|
@ -204,13 +204,13 @@ MainApplication::MainApplication(int &argc, char** argv)
|
|||
}
|
||||
|
||||
if (isPortable()) {
|
||||
std::cout << "QupZilla: Running in Portable Mode." << std::endl;
|
||||
std::cout << "Falkon: Running in Portable Mode." << std::endl;
|
||||
DataPaths::setPortableVersion();
|
||||
}
|
||||
|
||||
// Don't start single application in private browsing
|
||||
if (!isPrivate()) {
|
||||
QString appId = QLatin1String("QupZillaWebBrowser");
|
||||
QString appId = QLatin1String("FalkonWebBrowser");
|
||||
|
||||
if (isPortable()) {
|
||||
appId.append(QLatin1String("Portable"));
|
||||
|
|
@ -271,7 +271,7 @@ MainApplication::MainApplication(int &argc, char** argv)
|
|||
|
||||
// Setup QWebChannel userscript
|
||||
QWebEngineScript script;
|
||||
script.setName(QSL("_qupzilla_webchannel"));
|
||||
script.setName(QSL("_falkon_webchannel"));
|
||||
script.setInjectionPoint(QWebEngineScript::DocumentCreation);
|
||||
script.setWorldId(QWebEngineScript::MainWorld);
|
||||
script.setRunsOnSubFrames(true);
|
||||
|
|
@ -1085,8 +1085,8 @@ void MainApplication::checkDefaultWebBrowser()
|
|||
|
||||
if (!associationManager()->isDefaultForAllCapabilities()) {
|
||||
CheckBoxDialog dialog(QMessageBox::Yes | QMessageBox::No, getWindow());
|
||||
dialog.setText(tr("QupZilla is not currently your default browser. Would you like to make it your default browser?"));
|
||||
dialog.setCheckBoxText(tr("Always perform this check when starting QupZilla."));
|
||||
dialog.setText(tr("Falkon is not currently your default browser. Would you like to make it your default browser?"));
|
||||
dialog.setCheckBoxText(tr("Always perform this check when starting Falkon."));
|
||||
dialog.setDefaultCheckState(Qt::Checked);
|
||||
dialog.setWindowTitle(tr("Default Browser"));
|
||||
dialog.setIcon(QMessageBox::Warning);
|
||||
|
|
@ -1140,7 +1140,7 @@ void MainApplication::setUserStyleSheet(const QString &filePath)
|
|||
|
||||
userCss += QzTools::readAllFileContents(filePath).remove(QLatin1Char('\n'));
|
||||
|
||||
const QString name = QStringLiteral("_qupzilla_userstylesheet");
|
||||
const QString name = QStringLiteral("_falkon_userstylesheet");
|
||||
|
||||
QWebEngineScript oldScript = m_webProfile->scripts()->findScript(name);
|
||||
if (!oldScript.isNull()) {
|
||||
|
|
@ -1184,7 +1184,7 @@ void MainApplication::createJumpList()
|
|||
|
||||
void MainApplication::initPulseSupport()
|
||||
{
|
||||
qputenv("PULSE_PROP_OVERRIDE_application.name", "QupZilla");
|
||||
qputenv("PULSE_PROP_OVERRIDE_application.name", "Falkon");
|
||||
qputenv("PULSE_PROP_OVERRIDE_application.icon_name", "qupzilla");
|
||||
qputenv("PULSE_PROP_OVERRIDE_media.icon_name", "qupzilla");
|
||||
}
|
||||
|
|
@ -1193,14 +1193,14 @@ void MainApplication::initPulseSupport()
|
|||
RegisterQAppAssociation* MainApplication::associationManager()
|
||||
{
|
||||
if (!m_registerQAppAssociation) {
|
||||
QString desc = tr("QupZilla is a new, fast and secure open-source WWW browser. QupZilla is licensed under GPL version 3 or (at your option) any later version. It is based on WebKit core and Qt Framework.");
|
||||
QString desc = tr("Falkon is a new, fast and secure open-source WWW browser. Falkon is licensed under GPL version 3 or (at your option) any later version. It is based on WebKit core and Qt Framework.");
|
||||
QString fileIconPath = QApplication::applicationFilePath() + ",1";
|
||||
QString appIconPath = QApplication::applicationFilePath() + ",0";
|
||||
m_registerQAppAssociation = new RegisterQAppAssociation("QupZilla", QApplication::applicationFilePath(), appIconPath, desc, this);
|
||||
m_registerQAppAssociation->addCapability(".html", "QupZilla.HTML", "HTML File", fileIconPath, RegisterQAppAssociation::FileAssociation);
|
||||
m_registerQAppAssociation->addCapability(".htm", "QupZilla.HTM", "HTM File", fileIconPath, RegisterQAppAssociation::FileAssociation);
|
||||
m_registerQAppAssociation->addCapability("http", "QupZilla.HTTP", "URL:HyperText Transfer Protocol", appIconPath, RegisterQAppAssociation::UrlAssociation);
|
||||
m_registerQAppAssociation->addCapability("https", "QupZilla.HTTPS", "URL:HyperText Transfer Protocol with Privacy", appIconPath, RegisterQAppAssociation::UrlAssociation);
|
||||
m_registerQAppAssociation = new RegisterQAppAssociation("Falkon", QApplication::applicationFilePath(), appIconPath, desc, this);
|
||||
m_registerQAppAssociation->addCapability(".html", "Falkon.HTML", "HTML File", fileIconPath, RegisterQAppAssociation::FileAssociation);
|
||||
m_registerQAppAssociation->addCapability(".htm", "Falkon.HTM", "HTM File", fileIconPath, RegisterQAppAssociation::FileAssociation);
|
||||
m_registerQAppAssociation->addCapability("http", "Falkon.HTTP", "URL:HyperText Transfer Protocol", appIconPath, RegisterQAppAssociation::UrlAssociation);
|
||||
m_registerQAppAssociation->addCapability("https", "Falkon.HTTPS", "URL:HyperText Transfer Protocol with Privacy", appIconPath, RegisterQAppAssociation::UrlAssociation);
|
||||
}
|
||||
return m_registerQAppAssociation;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -51,7 +51,7 @@ class DesktopNotificationsFactory;
|
|||
class ProxyStyle;
|
||||
class SessionManager;
|
||||
|
||||
class QUPZILLA_EXPORT MainApplication : public QtSingleApplication
|
||||
class FALKON_EXPORT MainApplication : public QtSingleApplication
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2014-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -338,21 +338,21 @@ void MainMenu::aboutQt()
|
|||
void MainMenu::showInfoAboutApp()
|
||||
{
|
||||
if (m_window) {
|
||||
m_window->tabWidget()->addView(QUrl(QSL("qupzilla:about")), Qz::NT_CleanSelectedTab);
|
||||
m_window->tabWidget()->addView(QUrl(QSL("falkon:about")), Qz::NT_CleanSelectedTab);
|
||||
}
|
||||
}
|
||||
|
||||
void MainMenu::showConfigInfo()
|
||||
{
|
||||
if (m_window) {
|
||||
m_window->tabWidget()->addView(QUrl(QSL("qupzilla:config")), Qz::NT_CleanSelectedTab);
|
||||
m_window->tabWidget()->addView(QUrl(QSL("falkon:config")), Qz::NT_CleanSelectedTab);
|
||||
}
|
||||
}
|
||||
|
||||
void MainMenu::reportIssue()
|
||||
{
|
||||
if (m_window) {
|
||||
m_window->tabWidget()->addView(QUrl(QSL("qupzilla:reportbug")), Qz::NT_CleanSelectedTab);
|
||||
m_window->tabWidget()->addView(QUrl(QSL("falkon:reportbug")), Qz::NT_CleanSelectedTab);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -503,7 +503,7 @@ void MainMenu::init()
|
|||
m_actions[QSL(name)] = action
|
||||
|
||||
// Standard actions - needed on Mac to be placed correctly in "application" menu
|
||||
QAction* action = new QAction(QIcon::fromTheme(QSL("help-about")), tr("&About QupZilla"), this);
|
||||
QAction* action = new QAction(QIcon::fromTheme(QSL("help-about")), tr("&About Falkon"), this);
|
||||
action->setMenuRole(QAction::AboutRole);
|
||||
connect(action, SIGNAL(triggered()), this, SLOT(showAboutDialog()));
|
||||
m_actions[QSL("Standard/About")] = action;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2014-2016 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -31,7 +31,7 @@ class HistoryMenu;
|
|||
class BookmarksMenu;
|
||||
class BrowserWindow;
|
||||
|
||||
class QUPZILLA_EXPORT MainMenu : public QMenu
|
||||
class FALKON_EXPORT MainMenu : public QMenu
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ void ProfileManager::initConfigDir()
|
|||
return;
|
||||
}
|
||||
|
||||
std::cout << "QupZilla: Creating new profile directory" << std::endl;
|
||||
std::cout << "Falkon: Creating new profile directory" << std::endl;
|
||||
|
||||
if (!dir.exists()) {
|
||||
dir.mkpath(dir.absolutePath());
|
||||
|
|
@ -188,7 +188,7 @@ void ProfileManager::updateProfile(const QString ¤t, const QString &profil
|
|||
Updater::Version prof(profile);
|
||||
|
||||
if (prof < Updater::Version("1.9.0")) {
|
||||
std::cout << "QupZilla: Using profile from QupZilla " << qPrintable(profile) << " is not supported!" << std::endl;
|
||||
std::cout << "Falkon: Using profile from QupZilla " << qPrintable(profile) << " is not supported!" << std::endl;
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -225,7 +225,7 @@ void ProfileManager::copyDataToProfile()
|
|||
|
||||
const QString text = "Incompatible profile version has been detected. To avoid losing your profile data, they were "
|
||||
"backed up in following file:<br/><br/><b>" + browseDataBackup + "<br/></b>";
|
||||
QMessageBox::warning(0, "QupZilla: Incompatible profile version", text);
|
||||
QMessageBox::warning(0, "Falkon: Incompatible profile version", text);
|
||||
}
|
||||
|
||||
QFile(QLatin1String(":data/browsedata.db")).copy(profileDir.filePath(QLatin1String("browsedata.db")));
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include "qzcommon.h"
|
||||
|
||||
class QUPZILLA_EXPORT ProxyStyle : public QProxyStyle
|
||||
class FALKON_EXPORT ProxyStyle : public QProxyStyle
|
||||
{
|
||||
public:
|
||||
explicit ProxyStyle();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2014-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -23,10 +23,10 @@ const int sessionVersion = 0x0003;
|
|||
const int sessionVersionQt5 = 0x0003 | 0x050000;
|
||||
const int bookmarksVersion = 1;
|
||||
|
||||
QUPZILLA_EXPORT const char* APPNAME = "QupZilla";
|
||||
QUPZILLA_EXPORT const char* VERSION = QUPZILLA_VERSION;
|
||||
QUPZILLA_EXPORT const char* AUTHOR = "David Rosca";
|
||||
QUPZILLA_EXPORT const char* COPYRIGHT = "2010-2017";
|
||||
QUPZILLA_EXPORT const char* WWWADDRESS = "https://www.qupzilla.com";
|
||||
QUPZILLA_EXPORT const char* WIKIADDRESS = "https://github.com/QupZilla/qupzilla/wiki";
|
||||
FALKON_EXPORT const char* APPNAME = "Falkon";
|
||||
FALKON_EXPORT const char* VERSION = FALKON_VERSION;
|
||||
FALKON_EXPORT const char* AUTHOR = "David Rosca";
|
||||
FALKON_EXPORT const char* COPYRIGHT = "2010-2017";
|
||||
FALKON_EXPORT const char* WWWADDRESS = "https://www.qupzilla.com";
|
||||
FALKON_EXPORT const char* WIKIADDRESS = "https://github.com/QupZilla/qupzilla/wiki";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -21,10 +21,10 @@
|
|||
#include <QDebug>
|
||||
#include <QFlags>
|
||||
|
||||
#ifdef QUPZILLA_SHAREDLIBRARY
|
||||
#define QUPZILLA_EXPORT Q_DECL_EXPORT
|
||||
#ifdef FALKON_SHAREDLIBRARY
|
||||
#define FALKON_EXPORT Q_DECL_EXPORT
|
||||
#else
|
||||
#define QUPZILLA_EXPORT Q_DECL_IMPORT
|
||||
#define FALKON_EXPORT Q_DECL_IMPORT
|
||||
#endif
|
||||
|
||||
#ifndef Q_UNLIKELY
|
||||
|
|
@ -57,12 +57,12 @@ extern const int sessionVersionQt5;
|
|||
// Version of bookmarks.json file
|
||||
extern const int bookmarksVersion;
|
||||
|
||||
QUPZILLA_EXPORT extern const char* APPNAME;
|
||||
QUPZILLA_EXPORT extern const char* VERSION;
|
||||
QUPZILLA_EXPORT extern const char* AUTHOR;
|
||||
QUPZILLA_EXPORT extern const char* COPYRIGHT;
|
||||
QUPZILLA_EXPORT extern const char* WWWADDRESS;
|
||||
QUPZILLA_EXPORT extern const char* WIKIADDRESS;
|
||||
FALKON_EXPORT extern const char* APPNAME;
|
||||
FALKON_EXPORT extern const char* VERSION;
|
||||
FALKON_EXPORT extern const char* AUTHOR;
|
||||
FALKON_EXPORT extern const char* COPYRIGHT;
|
||||
FALKON_EXPORT extern const char* WWWADDRESS;
|
||||
FALKON_EXPORT extern const char* WIKIADDRESS;
|
||||
|
||||
enum BrowserWindowType {
|
||||
BW_FirstAppWindow,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -26,7 +26,7 @@ class QSettings;
|
|||
|
||||
class QzSettings;
|
||||
|
||||
class QUPZILLA_EXPORT Settings
|
||||
class FALKON_EXPORT Settings
|
||||
{
|
||||
public:
|
||||
explicit Settings();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -44,7 +44,7 @@ AutoFill::AutoFill(QObject* parent)
|
|||
|
||||
// Setup AutoFill userscript
|
||||
QWebEngineScript script;
|
||||
script.setName(QSL("_qupzilla_autofill"));
|
||||
script.setName(QSL("_falkon_autofill"));
|
||||
script.setInjectionPoint(QWebEngineScript::DocumentReady);
|
||||
script.setWorldId(QWebEngineScript::MainWorld);
|
||||
script.setRunsOnSubFrames(true);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - Qt web browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -43,7 +43,7 @@ struct PageFormData {
|
|||
}
|
||||
};
|
||||
|
||||
class QUPZILLA_EXPORT AutoFill : public QObject
|
||||
class FALKON_EXPORT AutoFill : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
class WebView;
|
||||
|
||||
class QUPZILLA_EXPORT AutoFillIcon : public ClickableLabel
|
||||
class FALKON_EXPORT AutoFillIcon : public ClickableLabel
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -46,13 +46,13 @@ AutoFillNotification::AutoFillNotification(const QUrl &url, const PageFormData &
|
|||
}
|
||||
|
||||
if (m_updateData.isValid()) {
|
||||
ui->label->setText(tr("Do you want QupZilla to update saved password %1?").arg(userPart));
|
||||
ui->label->setText(tr("Do you want Falkon to update saved password %1?").arg(userPart));
|
||||
|
||||
ui->remember->setVisible(false);
|
||||
ui->never->setVisible(false);
|
||||
}
|
||||
else {
|
||||
ui->label->setText(tr("Do you want QupZilla to remember the password %1 %2?").arg(userPart, hostPart));
|
||||
ui->label->setText(tr("Do you want Falkon to remember the password %1 %2?").arg(userPart, hostPart));
|
||||
|
||||
ui->update->setVisible(false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -32,7 +32,7 @@ class AutoFillNotification;
|
|||
|
||||
class AnimatedWidget;
|
||||
|
||||
class QUPZILLA_EXPORT AutoFillNotification : public AnimatedWidget
|
||||
class FALKON_EXPORT AutoFillNotification : public AnimatedWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2013-2016 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -32,7 +32,7 @@ class AutoFillWidget;
|
|||
class WebView;
|
||||
struct PasswordEntry;
|
||||
|
||||
class QUPZILLA_EXPORT AutoFillWidget : public LocationBarPopup
|
||||
class FALKON_EXPORT AutoFillWidget : public LocationBarPopup
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2013-2014 S. Razi Alavizadeh <s.r.alavizadeh@gmail.com>
|
||||
* Copyright (C) 2013-2016 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
#include <QSqlQuery>
|
||||
#include <QMessageBox>
|
||||
|
||||
#define INTERNAL_SERVER_ID QLatin1String("qupzilla.internal")
|
||||
#define INTERNAL_SERVER_ID QLatin1String("falkon.internal")
|
||||
|
||||
DatabaseEncryptedPasswordBackend::DatabaseEncryptedPasswordBackend()
|
||||
: PasswordBackend()
|
||||
|
|
@ -567,7 +567,7 @@ void MasterPasswordDialog::reject()
|
|||
// master password not setted
|
||||
QMessageBox::information(this, AutoFill::tr("Warning!"),
|
||||
AutoFill::tr("This backend needs a master password to be set! "
|
||||
"QupZilla just switches to its default backend"));
|
||||
"Falkon just switches to its default backend"));
|
||||
// active default backend
|
||||
mApp->autoFill()->passwordManager()->switchBackend("database");
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2013-2014 S. Razi Alavizadeh <s.r.alavizadeh@gmail.com>
|
||||
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
class AesInterface;
|
||||
class MasterPasswordDialog;
|
||||
|
||||
class QUPZILLA_EXPORT DatabaseEncryptedPasswordBackend : public PasswordBackend
|
||||
class FALKON_EXPORT DatabaseEncryptedPasswordBackend : public PasswordBackend
|
||||
{
|
||||
public:
|
||||
enum MasterPasswordState {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
#include "passwordbackend.h"
|
||||
#include "qzcommon.h"
|
||||
|
||||
class QUPZILLA_EXPORT DatabasePasswordBackend : public PasswordBackend
|
||||
class FALKON_EXPORT DatabasePasswordBackend : public PasswordBackend
|
||||
{
|
||||
public:
|
||||
explicit DatabasePasswordBackend();
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 @@
|
|||
|
||||
class QWidget;
|
||||
|
||||
class QUPZILLA_EXPORT PasswordBackend
|
||||
class FALKON_EXPORT PasswordBackend
|
||||
{
|
||||
public:
|
||||
explicit PasswordBackend();
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -28,7 +28,7 @@ class PasswordBackend;
|
|||
class DatabasePasswordBackend;
|
||||
class DatabaseEncryptedPasswordBackend;
|
||||
|
||||
struct QUPZILLA_EXPORT PasswordEntry {
|
||||
struct FALKON_EXPORT PasswordEntry {
|
||||
QVariant id;
|
||||
QString host;
|
||||
QString username;
|
||||
|
|
@ -50,11 +50,11 @@ struct QUPZILLA_EXPORT PasswordEntry {
|
|||
return updated > other.updated;
|
||||
}
|
||||
|
||||
friend QUPZILLA_EXPORT QDataStream &operator<<(QDataStream &stream, const PasswordEntry &entry);
|
||||
friend QUPZILLA_EXPORT QDataStream &operator>>(QDataStream &stream, PasswordEntry &entry);
|
||||
friend FALKON_EXPORT QDataStream &operator<<(QDataStream &stream, const PasswordEntry &entry);
|
||||
friend FALKON_EXPORT QDataStream &operator>>(QDataStream &stream, PasswordEntry &entry);
|
||||
};
|
||||
|
||||
class QUPZILLA_EXPORT PasswordManager : public QObject
|
||||
class FALKON_EXPORT PasswordManager : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include "qzcommon.h"
|
||||
|
||||
class QUPZILLA_EXPORT BookmarkItem
|
||||
class FALKON_EXPORT BookmarkItem
|
||||
{
|
||||
public:
|
||||
enum Type {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -29,7 +29,7 @@ class BookmarkItem;
|
|||
class BookmarksModel;
|
||||
class AutoSaver;
|
||||
|
||||
class QUPZILLA_EXPORT Bookmarks : public QObject
|
||||
class FALKON_EXPORT Bookmarks : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -29,7 +29,7 @@ class BookmarksExportDialog;
|
|||
|
||||
class BookmarksExporter;
|
||||
|
||||
class QUPZILLA_EXPORT BookmarksExportDialog : public QDialog
|
||||
class FALKON_EXPORT BookmarksExportDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
class BookmarkItem;
|
||||
|
||||
class QUPZILLA_EXPORT BookmarksExporter : public QObject
|
||||
class FALKON_EXPORT BookmarksExporter : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
class WebView;
|
||||
class BookmarkItem;
|
||||
|
||||
class QUPZILLA_EXPORT BookmarksIcon : public ClickableLabel
|
||||
class FALKON_EXPORT BookmarksIcon : public ClickableLabel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -31,7 +31,7 @@ class BookmarkItem;
|
|||
class BookmarksModel;
|
||||
class BookmarksImporter;
|
||||
|
||||
class QUPZILLA_EXPORT BookmarksImportDialog : public QDialog
|
||||
class FALKON_EXPORT BookmarksImportDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -26,7 +26,7 @@ class QIcon;
|
|||
|
||||
class BookmarkItem;
|
||||
|
||||
class QUPZILLA_EXPORT BookmarksImporter : public QObject
|
||||
class FALKON_EXPORT BookmarksImporter : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "bookmarksimporter.h"
|
||||
|
||||
class QUPZILLA_EXPORT ChromeImporter : public BookmarksImporter
|
||||
class FALKON_EXPORT ChromeImporter : public BookmarksImporter
|
||||
{
|
||||
public:
|
||||
explicit ChromeImporter(QObject* parent = 0);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Falkon - Qt web browser
|
||||
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user