diff --git a/.gitignore b/.gitignore index cd0b59317..1c959ee72 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index f67ec1a64..000000000 --- a/AUTHORS +++ /dev/null @@ -1,61 +0,0 @@ -Main developer and project maintainer: - -David Rosca - -Contributors: - -Mladen Pejaković (webview context menu improvements, speed dial background) -Alexander Samilov (tab previews) -Seyyed Razi Alavizadeh (fixed UI for RTL languages) -Franz Fellner (new restore session ui) -Bryan M Dunsmore (opening background tabs, closing window when closing last tab) -Mariusz Fik (fixed tab order in preferences dialog) -Daniele Cocca (close tabs with middle click, initial work on speed dial) -Giuseppe Calà (fixed loading of bookmarklets) -Adrien Vigneron (new QupZilla logo) -Elio Qoshi (new QupZilla logo) - -Translators: - -Jonathan Hooverman (German) -Heimen Stoffels (Dutch) -Peter Vacula (Slovak) -Federico Fabiani (Italian) -Francesco Marinucci (Italian) -Jorge Sevilla (Spanish) -Michał Szymanowski (Polish) -Mariusz Fik (Polish) -Jérôme Giry (French) -Nicolas Ourceau (French) -Vasilis Tsivikis (Greek) -Rustam Salakhutdinov (Russian) -Oleg Brezhnev (Russian) -Sérgio Marques (Portuguese) -Alexandre Carvalho (Brazilian Portuguese) -Mladen Pejaković (Serbian) -Unink-Lio (Chinese) -Yu Hai (Chinese) -Wu Cheng-Hong (Traditional Chinese) -Widya Walesa (Indonesian) -Beqa Arabuli (Georgian) -Daiki Noda (Japanese) -Ștefan Comănescu (Romanian) -Gábor Oberle (Hungarian) -Piccoro McKay Lenz (Venezuelan Spanish) -Stanislav Kuznietsov (Ukrainian) -Seyyed Razi Alavizadeh (Persian) -Guillem Prats (Catalan) -Clara Villalba (Catalan) -Xabier Aramendi (Basque) -Muhammad Fawwaz Orabi (Arabic) -Lasso Kante (N'ko) -Kizito Birabwa (Luganda) -Juan Carlos Sánchez (Mexican Spanish) -Ferhat AYDIN (Turkish) - -Special thanks: - -Jonathan Hooverman (english language correction) -Peter Vacula (for a big support in the beginnings) -Sergio Cipolla (modifications to old QupZilla icon) -Radomir Orkac (qupzilla.com domain) diff --git a/BUILDING.md b/BUILDING.md index aa10cde24..879a15cdd 100644 --- a/BUILDING.md +++ b/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. diff --git a/COPYRIGHT b/COPYRIGHT index c94b9ba92..b44a1a70c 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/FAQ b/FAQ deleted file mode 100644 index c5f20c751..000000000 --- a/FAQ +++ /dev/null @@ -1,3 +0,0 @@ -Frequently Asked Questions - -https://github.com/QupZilla/qupzilla/wiki/FAQ diff --git a/README.md b/README.md index edc9ef0b5..7ee105c2f 100644 --- a/README.md +++ b/README.md @@ -1,76 +1,2 @@ -QupZilla Web Browser ----------------------------------------------------------------------------------------- - -[![Travis-ci](https://travis-ci.org/QupZilla/qupzilla.svg?branch=master)](https://travis-ci.org/QupZilla/qupzilla) -[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/qupzilla/qupzilla?svg=true)](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 icon](https://github.com/QupZilla/qupzilla/blob/master/src/lib/data/icons/other/about.png?raw=true) - -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 +------------------------ diff --git a/bin/themes/chrome/theme.info b/bin/themes/chrome/theme.info index 36b026c4d..4d31e06b1 100644 --- a/bin/themes/chrome/theme.info +++ b/bin/themes/chrome/theme.info @@ -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 diff --git a/bin/themes/mac/theme.info b/bin/themes/mac/theme.info index e6b786ad5..d18afe640 100644 --- a/bin/themes/mac/theme.info +++ b/bin/themes/mac/theme.info @@ -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 diff --git a/bin/themes/windows/theme.info b/bin/themes/windows/theme.info index 63bcb6467..9461fd6a5 100644 --- a/bin/themes/windows/theme.info +++ b/bin/themes/windows/theme.info @@ -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 diff --git a/QupZilla.pro b/falkon.pro similarity index 83% rename from QupZilla.pro rename to falkon.pro index 72b8eb7f2..fc6ab748d 100644 --- a/QupZilla.pro +++ b/falkon.pro @@ -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 diff --git a/flatpak/org.qupzilla.QupZilla.json b/flatpak/org.kde.Falkon.json similarity index 77% rename from flatpak/org.qupzilla.QupZilla.json rename to flatpak/org.kde.Falkon.json index 629897102..d7e7fedd7 100644 --- a/flatpak/org.qupzilla.QupZilla.json +++ b/flatpak/org.kde.Falkon.json @@ -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", diff --git a/linux/appdata/or.qupzilla.QupZilla.appdata.xml b/linux/appdata/or.qupzilla.QupZilla.appdata.xml deleted file mode 100644 index 90346c749..000000000 --- a/linux/appdata/or.qupzilla.QupZilla.appdata.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - org.qupzilla.QupZilla.desktop - CC0-1.0 - GPL-3.0+ - QupZilla - Web Browser - -

- 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. -

-

- 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. -

-

- 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. -

- - - https://www.qupzilla.com/screens/gnome.png - https://www.qupzilla.com/screens/kde_window.png - https://www.qupzilla.com/screens/dial_gnome.png - https://www.qupzilla.com/screens/kde_speeddial.png - https://www.qupzilla.com/screens/preferences_gnome.png - https://www.qupzilla.com/screens/kde_preferences.png - - https://www.qupzilla.com/ - nowrep_at_gmail.com - diff --git a/linux/appdata/org.kde.Falkon.appdata.xml b/linux/appdata/org.kde.Falkon.appdata.xml new file mode 100644 index 000000000..796f9f329 --- /dev/null +++ b/linux/appdata/org.kde.Falkon.appdata.xml @@ -0,0 +1,29 @@ + + + org.kde.Falkon.desktop + CC0-1.0 + GPL-3.0+ + Falkon + Web Browser + +

+ 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. +

+

+ 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. +

+

+ 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. +

+ + + https://www.qupzilla.com/screens/gnome.png + https://www.qupzilla.com/screens/kde_window.png + https://www.qupzilla.com/screens/dial_gnome.png + https://www.qupzilla.com/screens/kde_speeddial.png + https://www.qupzilla.com/screens/preferences_gnome.png + https://www.qupzilla.com/screens/kde_preferences.png + + https://www.qupzilla.com/ + nowrep_at_gmail.com + diff --git a/linux/applications/org.qupzilla.QupZilla.desktop b/linux/applications/org.kde.Falkon.desktop similarity index 80% rename from linux/applications/org.qupzilla.QupZilla.desktop rename to linux/applications/org.kde.Falkon.desktop index 99cef0cb9..5869e3294 100644 --- a/linux/applications/org.qupzilla.QupZilla.desktop +++ b/linux/applications/org.kde.Falkon.desktop @@ -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 diff --git a/linux/completion/README.md b/linux/completion/README.md index 5dd03ad4b..d645691ad 100644 --- a/linux/completion/README.md +++ b/linux/completion/README.md @@ -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" diff --git a/linux/completion/_qupzilla b/linux/completion/_falkon similarity index 82% rename from linux/completion/_qupzilla rename to linux/completion/_falkon index e1d023b71..1076b1afb 100644 --- a/linux/completion/_qupzilla +++ b/linux/completion/_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]' diff --git a/linux/completion/qupzilla b/linux/completion/falkon similarity index 87% rename from linux/completion/qupzilla rename to linux/completion/falkon index 2d2f95775..27ea14506 100644 --- a/linux/completion/qupzilla +++ b/linux/completion/falkon @@ -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 diff --git a/src/defines.pri b/src/defines.pri index 5a05ca239..6af45dfc2 100644 --- a/src/defines.pri +++ b/src/defines.pri @@ -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 diff --git a/src/install.pri b/src/install.pri index f8360de9d..b52d2ad31 100644 --- a/src/install.pri +++ b/src/install.pri @@ -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 diff --git a/src/lib/3rdparty/fancytabwidget.cpp b/src/lib/3rdparty/fancytabwidget.cpp index 7fe7469ba..e916ea228 100644 --- a/src/lib/3rdparty/fancytabwidget.cpp +++ b/src/lib/3rdparty/fancytabwidget.cpp @@ -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) diff --git a/src/lib/3rdparty/fancytabwidget.h b/src/lib/3rdparty/fancytabwidget.h index 13f853d36..68e8ffbf7 100644 --- a/src/lib/3rdparty/fancytabwidget.h +++ b/src/lib/3rdparty/fancytabwidget.h @@ -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 diff --git a/src/lib/3rdparty/lineedit.h b/src/lib/3rdparty/lineedit.h index a7564728a..f84fd450f 100644 --- a/src/lib/3rdparty/lineedit.h +++ b/src/lib/3rdparty/lineedit.h @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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 diff --git a/src/lib/3rdparty/processinfo.cpp b/src/lib/3rdparty/processinfo.cpp index 2d5501955..e42c4992f 100644 --- a/src/lib/3rdparty/processinfo.cpp +++ b/src/lib/3rdparty/processinfo.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/3rdparty/processinfo.h b/src/lib/3rdparty/processinfo.h index f9218b53c..13026f2a7 100644 --- a/src/lib/3rdparty/processinfo.h +++ b/src/lib/3rdparty/processinfo.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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); diff --git a/src/lib/3rdparty/squeezelabelv1.h b/src/lib/3rdparty/squeezelabelv1.h index 603529632..4c1bd4458 100644 --- a/src/lib/3rdparty/squeezelabelv1.h +++ b/src/lib/3rdparty/squeezelabelv1.h @@ -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 diff --git a/src/lib/3rdparty/squeezelabelv2.h b/src/lib/3rdparty/squeezelabelv2.h index 7fe1c1d9b..ce5cbe320 100644 --- a/src/lib/3rdparty/squeezelabelv2.h +++ b/src/lib/3rdparty/squeezelabelv2.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ #include -class QUPZILLA_EXPORT SqueezeLabelV2 : public QLabel +class FALKON_EXPORT SqueezeLabelV2 : public QLabel { Q_OBJECT diff --git a/src/lib/adblock/adblockaddsubscriptiondialog.cpp b/src/lib/adblock/adblockaddsubscriptiondialog.cpp index 7571eb7ec..db89ce100 100644 --- a/src/lib/adblock/adblockaddsubscriptiondialog.cpp +++ b/src/lib/adblock/adblockaddsubscriptiondialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/adblock/adblockaddsubscriptiondialog.h b/src/lib/adblock/adblockaddsubscriptiondialog.h index f8125d676..7fbea8264 100644 --- a/src/lib/adblock/adblockaddsubscriptiondialog.h +++ b/src/lib/adblock/adblockaddsubscriptiondialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * 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 diff --git a/src/lib/adblock/adblockdialog.cpp b/src/lib/adblock/adblockdialog.cpp index c05bda164..bb94154e8 100644 --- a/src/lib/adblock/adblockdialog.cpp +++ b/src/lib/adblock/adblockdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/adblock/adblockdialog.h b/src/lib/adblock/adblockdialog.h index ce1725de0..886ebb75d 100644 --- a/src/lib/adblock/adblockdialog.h +++ b/src/lib/adblock/adblockdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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 diff --git a/src/lib/adblock/adblockicon.cpp b/src/lib/adblock/adblockicon.cpp index 26be32687..56c1c220f 100644 --- a/src/lib/adblock/adblockicon.cpp +++ b/src/lib/adblock/adblockicon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/adblock/adblockicon.h b/src/lib/adblock/adblockicon.h index 2b1897c28..455e2a5ae 100644 --- a/src/lib/adblock/adblockicon.h +++ b/src/lib/adblock/adblockicon.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * 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: diff --git a/src/lib/adblock/adblockmanager.cpp b/src/lib/adblock/adblockmanager.cpp index df3a9e575..5530dc9e8 100644 --- a/src/lib/adblock/adblockmanager.cpp +++ b/src/lib/adblock/adblockmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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")); } diff --git a/src/lib/adblock/adblockmanager.h b/src/lib/adblock/adblockmanager.h index bd2e83bea..81fc1eab4 100644 --- a/src/lib/adblock/adblockmanager.h +++ b/src/lib/adblock/adblockmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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 diff --git a/src/lib/adblock/adblockmatcher.cpp b/src/lib/adblock/adblockmatcher.cpp index 98581d906..90927538e 100644 --- a/src/lib/adblock/adblockmatcher.cpp +++ b/src/lib/adblock/adblockmatcher.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/adblock/adblockmatcher.h b/src/lib/adblock/adblockmatcher.h index 12ff2318d..32892f969 100644 --- a/src/lib/adblock/adblockmatcher.h +++ b/src/lib/adblock/adblockmatcher.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * 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 diff --git a/src/lib/adblock/adblockrule.cpp b/src/lib/adblock/adblockrule.cpp index e48fc2b75..0b7cf9a95 100644 --- a/src/lib/adblock/adblockrule.cpp +++ b/src/lib/adblock/adblockrule.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/adblock/adblockrule.h b/src/lib/adblock/adblockrule.h index 385b27c95..76cadc578 100644 --- a/src/lib/adblock/adblockrule.h +++ b/src/lib/adblock/adblockrule.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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) diff --git a/src/lib/adblock/adblocksearchtree.cpp b/src/lib/adblock/adblocksearchtree.cpp index 398400b23..6e5cf9200 100644 --- a/src/lib/adblock/adblocksearchtree.cpp +++ b/src/lib/adblock/adblocksearchtree.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2013-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/adblock/adblocksearchtree.h b/src/lib/adblock/adblocksearchtree.h index 878a588f9..c98480201 100644 --- a/src/lib/adblock/adblocksearchtree.h +++ b/src/lib/adblock/adblocksearchtree.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * 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(); diff --git a/src/lib/adblock/adblocksubscription.cpp b/src/lib/adblock/adblocksubscription.cpp index b4b964fb0..b91157f4c 100644 --- a/src/lib/adblock/adblocksubscription.cpp +++ b/src/lib/adblock/adblocksubscription.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/adblock/adblocksubscription.h b/src/lib/adblock/adblocksubscription.h index d66140f82..505e3d6d1 100644 --- a/src/lib/adblock/adblocksubscription.h +++ b/src/lib/adblock/adblocksubscription.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * 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: diff --git a/src/lib/adblock/adblocktreewidget.cpp b/src/lib/adblock/adblocktreewidget.cpp index 317e4b61a..fa1c5d476 100644 --- a/src/lib/adblock/adblocktreewidget.cpp +++ b/src/lib/adblock/adblocktreewidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/adblock/adblocktreewidget.h b/src/lib/adblock/adblocktreewidget.h index 360035ba8..aa0567147 100644 --- a/src/lib/adblock/adblocktreewidget.h +++ b/src/lib/adblock/adblocktreewidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * 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: diff --git a/src/lib/adblock/adblockurlinterceptor.h b/src/lib/adblock/adblockurlinterceptor.h index e87096369..3e31b1a6e 100644 --- a/src/lib/adblock/adblockurlinterceptor.h +++ b/src/lib/adblock/adblockurlinterceptor.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - QtWebEngine based browser +* Falkon - Qt web browser * Copyright (C) 2015 David Rosca * * 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); diff --git a/src/lib/app/autosaver.cpp b/src/lib/app/autosaver.cpp index 24f38e78c..894d27990 100644 --- a/src/lib/app/autosaver.cpp +++ b/src/lib/app/autosaver.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/app/autosaver.h b/src/lib/app/autosaver.h index bf9ec32b8..01d82d14e 100644 --- a/src/lib/app/autosaver.h +++ b/src/lib/app/autosaver.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * 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 diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index badb942a6..9ce4a38a6 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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(); diff --git a/src/lib/app/browserwindow.h b/src/lib/app/browserwindow.h index e84c65a26..66271b087 100644 --- a/src/lib/app/browserwindow.h +++ b/src/lib/app/browserwindow.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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 . * ============================================================ */ -#ifndef QUPZILLA_H -#define QUPZILLA_H +#ifndef BROWSERWINDOW_H +#define BROWSERWINDOW_H #include #include @@ -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 diff --git a/src/lib/app/commandlineoptions.cpp b/src/lib/app/commandlineoptions.cpp index 6dd4fd596..681cb42c4 100644 --- a/src/lib/app/commandlineoptions.cpp +++ b/src/lib/app/commandlineoptions.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - QtWebEngine based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * 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; diff --git a/src/lib/app/commandlineoptions.h b/src/lib/app/commandlineoptions.h index e8b75fd32..d1c25563a 100644 --- a/src/lib/app/commandlineoptions.h +++ b/src/lib/app/commandlineoptions.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - QtWebEngine based browser +* Falkon - Qt web browser * Copyright (C) 2010-2015 David Rosca * * 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 { diff --git a/src/lib/app/datapaths.cpp b/src/lib/app/datapaths.cpp index cfee9d6af..ab6c54584 100644 --- a/src/lib/app/datapaths.cpp +++ b/src/lib/app/datapaths.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * 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 } diff --git a/src/lib/app/datapaths.h b/src/lib/app/datapaths.h index 7d052810f..50b905ff8 100644 --- a/src/lib/app/datapaths.h +++ b/src/lib/app/datapaths.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * 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(); diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index 478cee194..25ac41454 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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; } diff --git a/src/lib/app/mainapplication.h b/src/lib/app/mainapplication.h index 0a09b8efc..223f9c3d3 100644 --- a/src/lib/app/mainapplication.h +++ b/src/lib/app/mainapplication.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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 diff --git a/src/lib/app/mainmenu.cpp b/src/lib/app/mainmenu.cpp index 022d402a2..6e50a8d3c 100644 --- a/src/lib/app/mainmenu.cpp +++ b/src/lib/app/mainmenu.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * 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; diff --git a/src/lib/app/mainmenu.h b/src/lib/app/mainmenu.h index 32e2301eb..c259361cb 100644 --- a/src/lib/app/mainmenu.h +++ b/src/lib/app/mainmenu.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014-2016 David Rosca * * 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 diff --git a/src/lib/app/profilemanager.cpp b/src/lib/app/profilemanager.cpp index 54bcf44f4..6946fc28d 100644 --- a/src/lib/app/profilemanager.cpp +++ b/src/lib/app/profilemanager.cpp @@ -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:

" + browseDataBackup + "
"; - 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"))); diff --git a/src/lib/app/profilemanager.h b/src/lib/app/profilemanager.h index 57317ba22..43b84b4f4 100644 --- a/src/lib/app/profilemanager.h +++ b/src/lib/app/profilemanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/app/proxystyle.cpp b/src/lib/app/proxystyle.cpp index ecca64a1f..fdcef5bcc 100644 --- a/src/lib/app/proxystyle.cpp +++ b/src/lib/app/proxystyle.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/app/proxystyle.h b/src/lib/app/proxystyle.h index 14d171576..4473e2eff 100644 --- a/src/lib/app/proxystyle.h +++ b/src/lib/app/proxystyle.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * 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(); diff --git a/src/lib/app/qzcommon.cpp b/src/lib/app/qzcommon.cpp index 0166389d5..fd8664b3f 100644 --- a/src/lib/app/qzcommon.cpp +++ b/src/lib/app/qzcommon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * 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"; } diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h index c97f5958f..f02b60862 100644 --- a/src/lib/app/qzcommon.h +++ b/src/lib/app/qzcommon.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -21,10 +21,10 @@ #include #include -#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, diff --git a/src/lib/app/settings.cpp b/src/lib/app/settings.cpp index ffcaafb97..c9ec64fef 100644 --- a/src/lib/app/settings.cpp +++ b/src/lib/app/settings.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/app/settings.h b/src/lib/app/settings.h index 8bb2e29cd..b45a8cd44 100644 --- a/src/lib/app/settings.h +++ b/src/lib/app/settings.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * 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(); diff --git a/src/lib/autofill/autofill.cpp b/src/lib/autofill/autofill.cpp index d3759383a..55ae94ad2 100644 --- a/src/lib/autofill/autofill.cpp +++ b/src/lib/autofill/autofill.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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); diff --git a/src/lib/autofill/autofill.h b/src/lib/autofill/autofill.h index a0d08143d..2458b1af8 100644 --- a/src/lib/autofill/autofill.h +++ b/src/lib/autofill/autofill.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * 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 diff --git a/src/lib/autofill/autofillicon.cpp b/src/lib/autofill/autofillicon.cpp index 1c4d00529..e45faa3b3 100644 --- a/src/lib/autofill/autofillicon.cpp +++ b/src/lib/autofill/autofillicon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/autofill/autofillicon.h b/src/lib/autofill/autofillicon.h index 1a183cf48..1f62698ed 100644 --- a/src/lib/autofill/autofillicon.h +++ b/src/lib/autofill/autofillicon.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * 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 diff --git a/src/lib/autofill/autofillnotification.cpp b/src/lib/autofill/autofillnotification.cpp index a62ee24fa..3c8524aab 100644 --- a/src/lib/autofill/autofillnotification.cpp +++ b/src/lib/autofill/autofillnotification.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * 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); } diff --git a/src/lib/autofill/autofillnotification.h b/src/lib/autofill/autofillnotification.h index 2b5de56b2..f519b17b0 100644 --- a/src/lib/autofill/autofillnotification.h +++ b/src/lib/autofill/autofillnotification.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * 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 diff --git a/src/lib/autofill/autofillwidget.cpp b/src/lib/autofill/autofillwidget.cpp index 9e5f39d1b..c85a46a6c 100644 --- a/src/lib/autofill/autofillwidget.cpp +++ b/src/lib/autofill/autofillwidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/autofill/autofillwidget.h b/src/lib/autofill/autofillwidget.h index 2dc436910..2e246b5a9 100644 --- a/src/lib/autofill/autofillwidget.h +++ b/src/lib/autofill/autofillwidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * 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 diff --git a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp index 5ecdbb518..2cda02b94 100644 --- a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp +++ b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 S. Razi Alavizadeh * Copyright (C) 2013-2016 David Rosca * @@ -27,7 +27,7 @@ #include #include -#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; diff --git a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h index b14d3dac6..d4c53484d 100644 --- a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h +++ b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 S. Razi Alavizadeh * Copyright (C) 2013-2014 David Rosca * @@ -27,7 +27,7 @@ class AesInterface; class MasterPasswordDialog; -class QUPZILLA_EXPORT DatabaseEncryptedPasswordBackend : public PasswordBackend +class FALKON_EXPORT DatabaseEncryptedPasswordBackend : public PasswordBackend { public: enum MasterPasswordState { diff --git a/src/lib/autofill/passwordbackends/databasepasswordbackend.cpp b/src/lib/autofill/passwordbackends/databasepasswordbackend.cpp index 2914fe571..d51b52e47 100644 --- a/src/lib/autofill/passwordbackends/databasepasswordbackend.cpp +++ b/src/lib/autofill/passwordbackends/databasepasswordbackend.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/autofill/passwordbackends/databasepasswordbackend.h b/src/lib/autofill/passwordbackends/databasepasswordbackend.h index 05415de1c..d651f7a97 100644 --- a/src/lib/autofill/passwordbackends/databasepasswordbackend.h +++ b/src/lib/autofill/passwordbackends/databasepasswordbackend.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * 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(); diff --git a/src/lib/autofill/passwordbackends/passwordbackend.cpp b/src/lib/autofill/passwordbackends/passwordbackend.cpp index d6542ca63..b5fc5a95b 100644 --- a/src/lib/autofill/passwordbackends/passwordbackend.cpp +++ b/src/lib/autofill/passwordbackends/passwordbackend.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/autofill/passwordbackends/passwordbackend.h b/src/lib/autofill/passwordbackends/passwordbackend.h index 2a5f0e3d9..bd15df1bf 100644 --- a/src/lib/autofill/passwordbackends/passwordbackend.h +++ b/src/lib/autofill/passwordbackends/passwordbackend.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * 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(); diff --git a/src/lib/autofill/passwordmanager.cpp b/src/lib/autofill/passwordmanager.cpp index 7707f29c2..ca0f1c841 100644 --- a/src/lib/autofill/passwordmanager.cpp +++ b/src/lib/autofill/passwordmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/autofill/passwordmanager.h b/src/lib/autofill/passwordmanager.h index c67a07dca..a216e7709 100644 --- a/src/lib/autofill/passwordmanager.h +++ b/src/lib/autofill/passwordmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * 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: diff --git a/src/lib/bookmarks/bookmarkitem.cpp b/src/lib/bookmarks/bookmarkitem.cpp index 4c673d2e4..eac30bbc5 100644 --- a/src/lib/bookmarks/bookmarkitem.cpp +++ b/src/lib/bookmarks/bookmarkitem.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarkitem.h b/src/lib/bookmarks/bookmarkitem.h index 25af10da5..48e33cb97 100644 --- a/src/lib/bookmarks/bookmarkitem.h +++ b/src/lib/bookmarks/bookmarkitem.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * 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 { diff --git a/src/lib/bookmarks/bookmarks.cpp b/src/lib/bookmarks/bookmarks.cpp index 747717ced..56768dfb5 100644 --- a/src/lib/bookmarks/bookmarks.cpp +++ b/src/lib/bookmarks/bookmarks.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarks.h b/src/lib/bookmarks/bookmarks.h index 7a2888c0f..92db92857 100644 --- a/src/lib/bookmarks/bookmarks.h +++ b/src/lib/bookmarks/bookmarks.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * 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: diff --git a/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.cpp b/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.cpp index bf70f9112..780a6ea60 100644 --- a/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.cpp +++ b/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h b/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h index 285f1c75b..ef5650ce9 100644 --- a/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h +++ b/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * 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 diff --git a/src/lib/bookmarks/bookmarksexport/bookmarksexporter.cpp b/src/lib/bookmarks/bookmarksexport/bookmarksexporter.cpp index d7f0af281..7e6746303 100644 --- a/src/lib/bookmarks/bookmarksexport/bookmarksexporter.cpp +++ b/src/lib/bookmarks/bookmarksexport/bookmarksexporter.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksexport/bookmarksexporter.h b/src/lib/bookmarks/bookmarksexport/bookmarksexporter.h index f0bc5b3ba..aec54819f 100644 --- a/src/lib/bookmarks/bookmarksexport/bookmarksexporter.h +++ b/src/lib/bookmarks/bookmarksexport/bookmarksexporter.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * 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 diff --git a/src/lib/bookmarks/bookmarksexport/htmlexporter.cpp b/src/lib/bookmarks/bookmarksexport/htmlexporter.cpp index 5f3fe09d9..6b2d1fbd2 100644 --- a/src/lib/bookmarks/bookmarksexport/htmlexporter.cpp +++ b/src/lib/bookmarks/bookmarksexport/htmlexporter.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksexport/htmlexporter.h b/src/lib/bookmarks/bookmarksexport/htmlexporter.h index cc48bd301..3003ccac6 100644 --- a/src/lib/bookmarks/bookmarksexport/htmlexporter.h +++ b/src/lib/bookmarks/bookmarksexport/htmlexporter.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksicon.cpp b/src/lib/bookmarks/bookmarksicon.cpp index f1337de99..656a85666 100644 --- a/src/lib/bookmarks/bookmarksicon.cpp +++ b/src/lib/bookmarks/bookmarksicon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksicon.h b/src/lib/bookmarks/bookmarksicon.h index 01c0d9256..2c4314bea 100644 --- a/src/lib/bookmarks/bookmarksicon.h +++ b/src/lib/bookmarks/bookmarksicon.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * 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: diff --git a/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.cpp b/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.cpp index d9e895ef2..1f278efff 100644 --- a/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.cpp +++ b/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h b/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h index 65fb038ad..b41e778d7 100644 --- a/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h +++ b/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * 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 diff --git a/src/lib/bookmarks/bookmarksimport/bookmarksimporter.cpp b/src/lib/bookmarks/bookmarksimport/bookmarksimporter.cpp index fabc61034..f2754edbe 100644 --- a/src/lib/bookmarks/bookmarksimport/bookmarksimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/bookmarksimporter.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksimport/bookmarksimporter.h b/src/lib/bookmarks/bookmarksimport/bookmarksimporter.h index 786c01561..182540f42 100644 --- a/src/lib/bookmarks/bookmarksimport/bookmarksimporter.h +++ b/src/lib/bookmarks/bookmarksimport/bookmarksimporter.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * 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 diff --git a/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp b/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp index e81fddf74..814e24b7a 100644 --- a/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksimport/chromeimporter.h b/src/lib/bookmarks/bookmarksimport/chromeimporter.h index bff26a2e2..1f5bfb74c 100644 --- a/src/lib/bookmarks/bookmarksimport/chromeimporter.h +++ b/src/lib/bookmarks/bookmarksimport/chromeimporter.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * 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); diff --git a/src/lib/bookmarks/bookmarksimport/firefoximporter.cpp b/src/lib/bookmarks/bookmarksimport/firefoximporter.cpp index a93b1aa91..fc00d8406 100644 --- a/src/lib/bookmarks/bookmarksimport/firefoximporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/firefoximporter.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksimport/firefoximporter.h b/src/lib/bookmarks/bookmarksimport/firefoximporter.h index 4a26bfc7c..376c9e22c 100644 --- a/src/lib/bookmarks/bookmarksimport/firefoximporter.h +++ b/src/lib/bookmarks/bookmarksimport/firefoximporter.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ #include "bookmarksimporter.h" #include "bookmarkitem.h" -class QUPZILLA_EXPORT FirefoxImporter : public BookmarksImporter +class FALKON_EXPORT FirefoxImporter : public BookmarksImporter { public: explicit FirefoxImporter(QObject* parent = 0); diff --git a/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp b/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp index 3c3a5b68e..76857dd5b 100644 --- a/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/htmlimporter.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksimport/htmlimporter.h b/src/lib/bookmarks/bookmarksimport/htmlimporter.h index 17712234f..1ce0ffe06 100644 --- a/src/lib/bookmarks/bookmarksimport/htmlimporter.h +++ b/src/lib/bookmarks/bookmarksimport/htmlimporter.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ #include "bookmarksimporter.h" -class QUPZILLA_EXPORT HtmlImporter : public BookmarksImporter +class FALKON_EXPORT HtmlImporter : public BookmarksImporter { public: explicit HtmlImporter(QObject* parent = 0); diff --git a/src/lib/bookmarks/bookmarksimport/ieimporter.cpp b/src/lib/bookmarks/bookmarksimport/ieimporter.cpp index f6802115f..5b5d59dfb 100644 --- a/src/lib/bookmarks/bookmarksimport/ieimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/ieimporter.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 Mattias Cibien * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksimport/ieimporter.h b/src/lib/bookmarks/bookmarksimport/ieimporter.h index ca09b44ba..2991bacae 100644 --- a/src/lib/bookmarks/bookmarksimport/ieimporter.h +++ b/src/lib/bookmarks/bookmarksimport/ieimporter.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 Mattias Cibien * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksimport/operaimporter.cpp b/src/lib/bookmarks/bookmarksimport/operaimporter.cpp index 573c535e9..0e112bdd9 100644 --- a/src/lib/bookmarks/bookmarksimport/operaimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/operaimporter.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksimport/operaimporter.h b/src/lib/bookmarks/bookmarksimport/operaimporter.h index c36358fce..bb5ca64b4 100644 --- a/src/lib/bookmarks/bookmarksimport/operaimporter.h +++ b/src/lib/bookmarks/bookmarksimport/operaimporter.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ #include "bookmarksimporter.h" -class QUPZILLA_EXPORT OperaImporter : public BookmarksImporter +class FALKON_EXPORT OperaImporter : public BookmarksImporter { public: explicit OperaImporter(QObject* parent = 0); diff --git a/src/lib/bookmarks/bookmarksitemdelegate.cpp b/src/lib/bookmarks/bookmarksitemdelegate.cpp index aad46f27a..ac2b665b1 100644 --- a/src/lib/bookmarks/bookmarksitemdelegate.cpp +++ b/src/lib/bookmarks/bookmarksitemdelegate.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksitemdelegate.h b/src/lib/bookmarks/bookmarksitemdelegate.h index 8fd3788b2..19e3aa410 100644 --- a/src/lib/bookmarks/bookmarksitemdelegate.h +++ b/src/lib/bookmarks/bookmarksitemdelegate.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class QTreeView; -class QUPZILLA_EXPORT BookmarksItemDelegate : public QStyledItemDelegate +class FALKON_EXPORT BookmarksItemDelegate : public QStyledItemDelegate { Q_OBJECT diff --git a/src/lib/bookmarks/bookmarksmanager.cpp b/src/lib/bookmarks/bookmarksmanager.cpp index 9dd5b4c14..2341bbaa4 100644 --- a/src/lib/bookmarks/bookmarksmanager.cpp +++ b/src/lib/bookmarks/bookmarksmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -144,13 +144,13 @@ void BookmarksManager::createContextMenu(const QPoint &pos) void BookmarksManager::openBookmark(BookmarkItem* item) { item = item ? item : m_selectedBookmark; - BookmarksTools::openBookmark(getQupZilla(), item); + BookmarksTools::openBookmark(getWindow(), item); } void BookmarksManager::openBookmarkInNewTab(BookmarkItem* item) { item = item ? item : m_selectedBookmark; - BookmarksTools::openBookmarkInNewTab(getQupZilla(), item); + BookmarksTools::openBookmarkInNewTab(getWindow(), item); } void BookmarksManager::openBookmarkInNewWindow(BookmarkItem* item) @@ -329,7 +329,7 @@ void BookmarksManager::keyPressEvent(QKeyEvent* event) QWidget::keyPressEvent(event); } -BrowserWindow* BookmarksManager::getQupZilla() +BrowserWindow* BookmarksManager::getWindow() { if (!m_window) { m_window = mApp->getWindow(); diff --git a/src/lib/bookmarks/bookmarksmanager.h b/src/lib/bookmarks/bookmarksmanager.h index 68af400eb..fb417ec3d 100644 --- a/src/lib/bookmarks/bookmarksmanager.h +++ b/src/lib/bookmarks/bookmarksmanager.h @@ -34,7 +34,7 @@ class BrowserWindow; class Bookmarks; class BookmarkItem; -class QUPZILLA_EXPORT BookmarksManager : public QWidget +class FALKON_EXPORT BookmarksManager : public QWidget { Q_OBJECT @@ -73,7 +73,7 @@ private: bool bookmarkEditable(BookmarkItem* item) const; void addBookmark(BookmarkItem* item); BookmarkItem* parentForNewBookmark() const; - BrowserWindow* getQupZilla(); + BrowserWindow* getWindow(); void showEvent(QShowEvent* event); void keyPressEvent(QKeyEvent* event); diff --git a/src/lib/bookmarks/bookmarksmenu.cpp b/src/lib/bookmarks/bookmarksmenu.cpp index 78202a78b..4dd12a22e 100644 --- a/src/lib/bookmarks/bookmarksmenu.cpp +++ b/src/lib/bookmarks/bookmarksmenu.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarksmenu.h b/src/lib/bookmarks/bookmarksmenu.h index e780c22b6..edb6c4124 100644 --- a/src/lib/bookmarks/bookmarksmenu.h +++ b/src/lib/bookmarks/bookmarksmenu.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -26,7 +26,7 @@ class BrowserWindow; class BookmarkItem; -class QUPZILLA_EXPORT BookmarksMenu : public Menu +class FALKON_EXPORT BookmarksMenu : public Menu { Q_OBJECT diff --git a/src/lib/bookmarks/bookmarksmodel.cpp b/src/lib/bookmarks/bookmarksmodel.cpp index 1c4604d7e..9d69b13eb 100644 --- a/src/lib/bookmarks/bookmarksmodel.cpp +++ b/src/lib/bookmarks/bookmarksmodel.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -184,7 +184,7 @@ Qt::DropActions BookmarksModel::supportedDropActions() const return Qt::CopyAction | Qt::MoveAction; } -#define MIMETYPE QLatin1String("application/qupzilla.bookmarks") +#define MIMETYPE QLatin1String("application/falkon.bookmarks") QStringList BookmarksModel::mimeTypes() const { diff --git a/src/lib/bookmarks/bookmarksmodel.h b/src/lib/bookmarks/bookmarksmodel.h index ad3b498a0..e5bccc4ae 100644 --- a/src/lib/bookmarks/bookmarksmodel.h +++ b/src/lib/bookmarks/bookmarksmodel.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -28,7 +28,7 @@ class QTimer; class Bookmarks; class BookmarkItem; -class QUPZILLA_EXPORT BookmarksModel : public QAbstractItemModel +class FALKON_EXPORT BookmarksModel : public QAbstractItemModel { Q_OBJECT @@ -78,7 +78,7 @@ private: Bookmarks* m_bookmarks; }; -class QUPZILLA_EXPORT BookmarksFilterModel : public QSortFilterProxyModel +class FALKON_EXPORT BookmarksFilterModel : public QSortFilterProxyModel { Q_OBJECT diff --git a/src/lib/bookmarks/bookmarkstoolbar.cpp b/src/lib/bookmarks/bookmarkstoolbar.cpp index 56749f56e..ffc8b5b54 100644 --- a/src/lib/bookmarks/bookmarkstoolbar.cpp +++ b/src/lib/bookmarks/bookmarkstoolbar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarkstoolbar.h b/src/lib/bookmarks/bookmarkstoolbar.h index f3f39e98e..a9e3413f0 100644 --- a/src/lib/bookmarks/bookmarkstoolbar.h +++ b/src/lib/bookmarks/bookmarkstoolbar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ class Bookmarks; class BookmarkItem; class BookmarksToolbarButton; -class QUPZILLA_EXPORT BookmarksToolbar : public QWidget +class FALKON_EXPORT BookmarksToolbar : public QWidget { Q_OBJECT public: diff --git a/src/lib/bookmarks/bookmarkstoolbarbutton.cpp b/src/lib/bookmarks/bookmarkstoolbarbutton.cpp index b04d802ae..8dcd27f34 100644 --- a/src/lib/bookmarks/bookmarkstoolbarbutton.cpp +++ b/src/lib/bookmarks/bookmarkstoolbarbutton.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarkstoolbarbutton.h b/src/lib/bookmarks/bookmarkstoolbarbutton.h index 1d5bac932..05faf29ae 100644 --- a/src/lib/bookmarks/bookmarkstoolbarbutton.h +++ b/src/lib/bookmarks/bookmarkstoolbarbutton.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -26,7 +26,7 @@ class Menu; class BrowserWindow; class BookmarkItem; -class QUPZILLA_EXPORT BookmarksToolbarButton : public QPushButton +class FALKON_EXPORT BookmarksToolbarButton : public QPushButton { Q_OBJECT diff --git a/src/lib/bookmarks/bookmarkstools.cpp b/src/lib/bookmarks/bookmarkstools.cpp index fc8d1b56d..cd4347510 100644 --- a/src/lib/bookmarks/bookmarkstools.cpp +++ b/src/lib/bookmarks/bookmarkstools.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarkstools.h b/src/lib/bookmarks/bookmarkstools.h index a31f34b3d..d0710d7f2 100644 --- a/src/lib/bookmarks/bookmarkstools.h +++ b/src/lib/bookmarks/bookmarkstools.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -26,7 +26,7 @@ class Bookmarks; class BookmarkItem; -class QUPZILLA_EXPORT BookmarksFoldersMenu : public QMenu +class FALKON_EXPORT BookmarksFoldersMenu : public QMenu { Q_OBJECT @@ -48,7 +48,7 @@ private: BookmarkItem* m_selectedFolder; }; -class QUPZILLA_EXPORT BookmarksFoldersButton : public QPushButton +class FALKON_EXPORT BookmarksFoldersButton : public QPushButton { Q_OBJECT @@ -75,7 +75,7 @@ class TabWidget; class Action; class Menu; -class QUPZILLA_EXPORT BookmarksTools +class FALKON_EXPORT BookmarksTools { public: // Add Bookmark Dialogs diff --git a/src/lib/bookmarks/bookmarkstreeview.cpp b/src/lib/bookmarks/bookmarkstreeview.cpp index 030d1fa6e..2ed3d3282 100644 --- a/src/lib/bookmarks/bookmarkstreeview.cpp +++ b/src/lib/bookmarks/bookmarkstreeview.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarkstreeview.h b/src/lib/bookmarks/bookmarkstreeview.h index ede6dba6e..1dcf00cdb 100644 --- a/src/lib/bookmarks/bookmarkstreeview.h +++ b/src/lib/bookmarks/bookmarkstreeview.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ class BookmarkItem; class BookmarksModel; class BookmarksFilterModel; -class QUPZILLA_EXPORT BookmarksTreeView : public QTreeView +class FALKON_EXPORT BookmarksTreeView : public QTreeView { Q_OBJECT diff --git a/src/lib/bookmarks/bookmarkswidget.cpp b/src/lib/bookmarks/bookmarkswidget.cpp index 1159d520b..f06652004 100644 --- a/src/lib/bookmarks/bookmarkswidget.cpp +++ b/src/lib/bookmarks/bookmarkswidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/bookmarks/bookmarkswidget.h b/src/lib/bookmarks/bookmarkswidget.h index 3f39881f8..6ee371824 100644 --- a/src/lib/bookmarks/bookmarkswidget.h +++ b/src/lib/bookmarks/bookmarkswidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -33,7 +33,7 @@ class SpeedDial; class Bookmarks; class BookmarkItem; -class QUPZILLA_EXPORT BookmarksWidget : public LocationBarPopup +class FALKON_EXPORT BookmarksWidget : public LocationBarPopup { Q_OBJECT public: diff --git a/src/lib/cookies/cookiejar.cpp b/src/lib/cookies/cookiejar.cpp index 18a17dd74..0c968cff9 100644 --- a/src/lib/cookies/cookiejar.cpp +++ b/src/lib/cookies/cookiejar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/cookies/cookiejar.h b/src/lib/cookies/cookiejar.h index 4fd4fcf8f..5c8633ec3 100644 --- a/src/lib/cookies/cookiejar.h +++ b/src/lib/cookies/cookiejar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -26,7 +26,7 @@ class AutoSaver; -class QUPZILLA_EXPORT CookieJar : public QObject +class FALKON_EXPORT CookieJar : public QObject { Q_OBJECT diff --git a/src/lib/cookies/cookiemanager.cpp b/src/lib/cookies/cookiemanager.cpp index c18aef9a1..f767971b7 100644 --- a/src/lib/cookies/cookiemanager.cpp +++ b/src/lib/cookies/cookiemanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/cookies/cookiemanager.h b/src/lib/cookies/cookiemanager.h index 750454a0b..f58f62c56 100644 --- a/src/lib/cookies/cookiemanager.h +++ b/src/lib/cookies/cookiemanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -32,7 +32,7 @@ class QNetworkCookie; class BrowserWindow; -class QUPZILLA_EXPORT CookieManager : public QWidget +class FALKON_EXPORT CookieManager : public QWidget { Q_OBJECT diff --git a/src/lib/data/html/about.html b/src/lib/data/html/about.html index 82c2109f8..2af582fa0 100644 --- a/src/lib/data/html/about.html +++ b/src/lib/data/html/about.html @@ -17,7 +17,7 @@ p {margin-%LEFT_STR%: 1%;}
-

%ABOUT-QUPZILLA%

+

%ABOUT-FALKON%

%INFORMATIONS-ABOUT-VERSION%

%VERSION-INFO% diff --git a/src/lib/data/html/copyright b/src/lib/data/html/copyright index c94b9ba92..b44a1a70c 100644 --- a/src/lib/data/html/copyright +++ b/src/lib/data/html/copyright @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/data/html/restore.html b/src/lib/data/html/restore.html index 5002612c6..be6e56b7f 100644 --- a/src/lib/data/html/restore.html +++ b/src/lib/data/html/restore.html @@ -319,7 +319,7 @@ function init() if (window.external) { init(); } else { - document.addEventListener("_qupzilla_external_created", init); + document.addEventListener("_falkon_external_created", init); } diff --git a/src/lib/data/html/speeddial.html b/src/lib/data/html/speeddial.html index 813dd14e3..8b0d8f340 100644 --- a/src/lib/data/html/speeddial.html +++ b/src/lib/data/html/speeddial.html @@ -554,7 +554,7 @@ function init() if (window.external) { init(); } else { - document.addEventListener('_qupzilla_external_created', init); + document.addEventListener('_falkon_external_created', init); } diff --git a/src/lib/data/html/start.html b/src/lib/data/html/start.html index e72b7bc3a..10322a342 100644 --- a/src/lib/data/html/start.html +++ b/src/lib/data/html/start.html @@ -20,12 +20,12 @@ img {margin-bottom:15px;} %PRIVATE-BROWSING%
- +
-

%SEARCH-BY% | %ABOUT-QUPZILLA%

+

%SEARCH-BY% | %ABOUT-FALKON%

diff --git a/src/lib/downloads/downloaditem.cpp b/src/lib/downloads/downloaditem.cpp index 6414186bb..4817f178c 100644 --- a/src/lib/downloads/downloaditem.cpp +++ b/src/lib/downloads/downloaditem.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/downloads/downloaditem.h b/src/lib/downloads/downloaditem.h index 17f46fa53..db7b4ba32 100644 --- a/src/lib/downloads/downloaditem.h +++ b/src/lib/downloads/downloaditem.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -37,7 +37,7 @@ class QWebEngineDownloadItem; class DownloadManager; -class QUPZILLA_EXPORT DownloadItem : public QWidget +class FALKON_EXPORT DownloadItem : public QWidget { Q_OBJECT diff --git a/src/lib/downloads/downloadmanager.cpp b/src/lib/downloads/downloadmanager.cpp index d397ef22c..924ed4833 100644 --- a/src/lib/downloads/downloadmanager.cpp +++ b/src/lib/downloads/downloadmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/downloads/downloadmanager.h b/src/lib/downloads/downloadmanager.h index e6b8797e9..7613fb1ed 100644 --- a/src/lib/downloads/downloadmanager.h +++ b/src/lib/downloads/downloadmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -37,7 +37,7 @@ class QWinTaskbarButton; class DownloadItem; class WebPage; -class QUPZILLA_EXPORT DownloadManager : public QWidget +class FALKON_EXPORT DownloadManager : public QWidget { Q_OBJECT public: diff --git a/src/lib/downloads/downloadoptionsdialog.cpp b/src/lib/downloads/downloadoptionsdialog.cpp index 69d327358..0a893fd0b 100644 --- a/src/lib/downloads/downloadoptionsdialog.cpp +++ b/src/lib/downloads/downloadoptionsdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/downloads/downloadoptionsdialog.h b/src/lib/downloads/downloadoptionsdialog.h index ed4c25106..208c8d900 100644 --- a/src/lib/downloads/downloadoptionsdialog.h +++ b/src/lib/downloads/downloadoptionsdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -31,7 +31,7 @@ class DownloadOptionsDialog; class QWebEngineDownloadItem; -class QUPZILLA_EXPORT DownloadOptionsDialog : public QDialog +class FALKON_EXPORT DownloadOptionsDialog : public QDialog { Q_OBJECT diff --git a/src/lib/downloads/downloadoptionsdialog.ui b/src/lib/downloads/downloadoptionsdialog.ui index cadee69ba..7a4938da0 100644 --- a/src/lib/downloads/downloadoptionsdialog.ui +++ b/src/lib/downloads/downloadoptionsdialog.ui @@ -22,7 +22,7 @@ - What should QupZilla do with this file? + What should Falkon do with this file? diff --git a/src/lib/history/history.cpp b/src/lib/history/history.cpp index 8ce388b05..c1764101a 100644 --- a/src/lib/history/history.cpp +++ b/src/lib/history/history.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -70,7 +70,7 @@ void History::addHistoryEntry(const QUrl &url, QString title) } const QStringList ignoredSchemes = { - QStringLiteral("qupzilla"), + QStringLiteral("falkon"), QStringLiteral("view-source"), QStringLiteral("data"), QStringLiteral("about") diff --git a/src/lib/history/history.h b/src/lib/history/history.h index 059ae1b57..e6730ae71 100644 --- a/src/lib/history/history.h +++ b/src/lib/history/history.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ class QIcon; class WebView; class HistoryModel; -class QUPZILLA_EXPORT History : public QObject +class FALKON_EXPORT History : public QObject { Q_OBJECT public: diff --git a/src/lib/history/historyitem.cpp b/src/lib/history/historyitem.cpp index 90b5559c1..7672054c5 100644 --- a/src/lib/history/historyitem.cpp +++ b/src/lib/history/historyitem.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/history/historyitem.h b/src/lib/history/historyitem.h index bf1babd55..2397eba43 100644 --- a/src/lib/history/historyitem.h +++ b/src/lib/history/historyitem.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ #include "qzcommon.h" #include "history.h" -class QUPZILLA_EXPORT HistoryItem +class FALKON_EXPORT HistoryItem { public: explicit HistoryItem(HistoryItem* parent = 0); diff --git a/src/lib/history/historymanager.cpp b/src/lib/history/historymanager.cpp index 872f21206..b006c8061 100644 --- a/src/lib/history/historymanager.cpp +++ b/src/lib/history/historymanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/history/historymanager.h b/src/lib/history/historymanager.h index 367be8903..524f4fa67 100644 --- a/src/lib/history/historymanager.h +++ b/src/lib/history/historymanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -33,7 +33,7 @@ class QTreeWidgetItem; class BrowserWindow; -class QUPZILLA_EXPORT HistoryManager : public QWidget +class FALKON_EXPORT HistoryManager : public QWidget { Q_OBJECT diff --git a/src/lib/history/historymenu.cpp b/src/lib/history/historymenu.cpp index aeeca267d..f1880b495 100644 --- a/src/lib/history/historymenu.cpp +++ b/src/lib/history/historymenu.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/history/historymenu.h b/src/lib/history/historymenu.h index 446c7c010..8e9fe25e9 100644 --- a/src/lib/history/historymenu.h +++ b/src/lib/history/historymenu.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -25,7 +25,7 @@ class BrowserWindow; -class QUPZILLA_EXPORT HistoryMenu : public Menu +class FALKON_EXPORT HistoryMenu : public Menu { Q_OBJECT diff --git a/src/lib/history/historymodel.cpp b/src/lib/history/historymodel.cpp index 5739bd79e..01c1e7c69 100644 --- a/src/lib/history/historymodel.cpp +++ b/src/lib/history/historymodel.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/history/historymodel.h b/src/lib/history/historymodel.h index 11bc8f061..1d663c38c 100644 --- a/src/lib/history/historymodel.h +++ b/src/lib/history/historymodel.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ class QTimer; class History; class HistoryItem; -class QUPZILLA_EXPORT HistoryModel : public QAbstractItemModel +class FALKON_EXPORT HistoryModel : public QAbstractItemModel { Q_OBJECT public: @@ -86,7 +86,7 @@ private: History* m_history; }; -class QUPZILLA_EXPORT HistoryFilterModel : public QSortFilterProxyModel +class FALKON_EXPORT HistoryFilterModel : public QSortFilterProxyModel { Q_OBJECT public: diff --git a/src/lib/history/historytreeview.cpp b/src/lib/history/historytreeview.cpp index a11068408..e14e87e38 100644 --- a/src/lib/history/historytreeview.cpp +++ b/src/lib/history/historytreeview.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/history/historytreeview.h b/src/lib/history/historytreeview.h index cf923b816..47fd58364 100644 --- a/src/lib/history/historytreeview.h +++ b/src/lib/history/historytreeview.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 040b651bb..19784d168 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -1,9 +1,9 @@ QT += webenginecore webenginewidgets webchannel network widgets sql quickwidgets printsupport -TARGET = QupZilla +TARGET = Falkon TEMPLATE = lib -DEFINES *= QUPZILLA_SHAREDLIBRARY +DEFINES *= FALKON_SHAREDLIBRARY CONFIG += c++14 @@ -127,7 +127,7 @@ SOURCES += \ network/networkproxyfactory.cpp \ network/networkurlinterceptor.cpp \ #network/schemehandlers/fileschemehandler.cpp \ - network/schemehandlers/qupzillaschemehandler.cpp \ + network/schemehandlers/falkonschemehandler.cpp \ network/sslerrordialog.cpp \ notifications/desktopnotification.cpp \ notifications/desktopnotificationsfactory.cpp \ @@ -309,7 +309,7 @@ HEADERS += \ network/networkproxyfactory.h \ network/networkurlinterceptor.h \ #network/schemehandlers/fileschemehandler.h \ - network/schemehandlers/qupzillaschemehandler.h \ + network/schemehandlers/falkonschemehandler.h \ network/urlinterceptor.h \ network/sslerrordialog.h \ notifications/desktopnotification.h \ diff --git a/src/lib/navigation/completer/locationcompleter.cpp b/src/lib/navigation/completer/locationcompleter.cpp index 70c380da5..9f7a55d7c 100644 --- a/src/lib/navigation/completer/locationcompleter.cpp +++ b/src/lib/navigation/completer/locationcompleter.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/navigation/completer/locationcompleter.h b/src/lib/navigation/completer/locationcompleter.h index 8e3542d5b..f94adeb1f 100644 --- a/src/lib/navigation/completer/locationcompleter.h +++ b/src/lib/navigation/completer/locationcompleter.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -31,7 +31,7 @@ class OpenSearchEngine; class LocationCompleterModel; class LocationCompleterView; -class QUPZILLA_EXPORT LocationCompleter : public QObject +class FALKON_EXPORT LocationCompleter : public QObject { Q_OBJECT public: diff --git a/src/lib/navigation/completer/locationcompleterdelegate.cpp b/src/lib/navigation/completer/locationcompleterdelegate.cpp index 965820019..d9f3f7ee4 100644 --- a/src/lib/navigation/completer/locationcompleterdelegate.cpp +++ b/src/lib/navigation/completer/locationcompleterdelegate.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/navigation/completer/locationcompleterdelegate.h b/src/lib/navigation/completer/locationcompleterdelegate.h index dcf5c25bd..37ef7c4dd 100644 --- a/src/lib/navigation/completer/locationcompleterdelegate.h +++ b/src/lib/navigation/completer/locationcompleterdelegate.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT LocationCompleterDelegate : public QStyledItemDelegate +class FALKON_EXPORT LocationCompleterDelegate : public QStyledItemDelegate { public: explicit LocationCompleterDelegate(QObject *parent = 0); diff --git a/src/lib/navigation/completer/locationcompletermodel.cpp b/src/lib/navigation/completer/locationcompletermodel.cpp index 1cc9fbbf1..9225d4e71 100644 --- a/src/lib/navigation/completer/locationcompletermodel.cpp +++ b/src/lib/navigation/completer/locationcompletermodel.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/navigation/completer/locationcompletermodel.h b/src/lib/navigation/completer/locationcompletermodel.h index 139c4b16e..d2c7aa78b 100644 --- a/src/lib/navigation/completer/locationcompletermodel.h +++ b/src/lib/navigation/completer/locationcompletermodel.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/navigation/completer/locationcompleterrefreshjob.cpp b/src/lib/navigation/completer/locationcompleterrefreshjob.cpp index 1952da107..ef0043c86 100644 --- a/src/lib/navigation/completer/locationcompleterrefreshjob.cpp +++ b/src/lib/navigation/completer/locationcompleterrefreshjob.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/navigation/completer/locationcompleterrefreshjob.h b/src/lib/navigation/completer/locationcompleterrefreshjob.h index 7913fa56e..9f2157908 100644 --- a/src/lib/navigation/completer/locationcompleterrefreshjob.h +++ b/src/lib/navigation/completer/locationcompleterrefreshjob.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class QStandardItem; -class QUPZILLA_EXPORT LocationCompleterRefreshJob : public QObject +class FALKON_EXPORT LocationCompleterRefreshJob : public QObject { Q_OBJECT diff --git a/src/lib/navigation/completer/locationcompleterview.cpp b/src/lib/navigation/completer/locationcompleterview.cpp index 1ee146191..585221984 100644 --- a/src/lib/navigation/completer/locationcompleterview.cpp +++ b/src/lib/navigation/completer/locationcompleterview.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/navigation/completer/locationcompleterview.h b/src/lib/navigation/completer/locationcompleterview.h index 67dfa8889..eb3f53856 100644 --- a/src/lib/navigation/completer/locationcompleterview.h +++ b/src/lib/navigation/completer/locationcompleterview.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class LocationCompleterDelegate; -class QUPZILLA_EXPORT LocationCompleterView : public QListView +class FALKON_EXPORT LocationCompleterView : public QListView { Q_OBJECT public: diff --git a/src/lib/navigation/downicon.cpp b/src/lib/navigation/downicon.cpp index 1316a6908..c951d14ca 100644 --- a/src/lib/navigation/downicon.cpp +++ b/src/lib/navigation/downicon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/navigation/downicon.h b/src/lib/navigation/downicon.h index e1ba0cfdc..435dd9892 100644 --- a/src/lib/navigation/downicon.h +++ b/src/lib/navigation/downicon.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -21,7 +21,7 @@ #include "qzcommon.h" #include "clickablelabel.h" -class QUPZILLA_EXPORT DownIcon : public ClickableLabel +class FALKON_EXPORT DownIcon : public ClickableLabel { public: explicit DownIcon(QWidget* parent = 0); diff --git a/src/lib/navigation/goicon.cpp b/src/lib/navigation/goicon.cpp index 181d9f8cf..eaff70a7e 100644 --- a/src/lib/navigation/goicon.cpp +++ b/src/lib/navigation/goicon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/navigation/goicon.h b/src/lib/navigation/goicon.h index bd879bab8..f4e7f2614 100644 --- a/src/lib/navigation/goicon.h +++ b/src/lib/navigation/goicon.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -21,7 +21,7 @@ #include "qzcommon.h" #include "clickablelabel.h" -class QUPZILLA_EXPORT GoIcon : public ClickableLabel +class FALKON_EXPORT GoIcon : public ClickableLabel { public: explicit GoIcon(QWidget* parent = 0); diff --git a/src/lib/navigation/locationbar.cpp b/src/lib/navigation/locationbar.cpp index 5f9f41d13..ae514e039 100644 --- a/src/lib/navigation/locationbar.cpp +++ b/src/lib/navigation/locationbar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -231,7 +231,7 @@ QString LocationBar::convertUrlToText(const QUrl &url) QString stringUrl = QzTools::urlEncodeQueryString(url); - if (stringUrl == QL1S("qupzilla:speeddial") || stringUrl == QL1S("about:blank")) { + if (stringUrl == QL1S("falkon:speeddial") || stringUrl == QL1S("about:blank")) { stringUrl.clear(); } diff --git a/src/lib/navigation/locationbar.h b/src/lib/navigation/locationbar.h index 0260bce85..e09b2e907 100644 --- a/src/lib/navigation/locationbar.h +++ b/src/lib/navigation/locationbar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -34,7 +34,7 @@ class GoIcon; class AutoFillIcon; class LoadRequest; -class QUPZILLA_EXPORT LocationBar : public LineEdit +class FALKON_EXPORT LocationBar : public LineEdit { Q_OBJECT diff --git a/src/lib/navigation/locationbarpopup.cpp b/src/lib/navigation/locationbarpopup.cpp index a6bdf2b9a..a248f2698 100644 --- a/src/lib/navigation/locationbarpopup.cpp +++ b/src/lib/navigation/locationbarpopup.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2012-2014 Franz Fellner * Copyright (C) 2012-2017 David Rosca * diff --git a/src/lib/navigation/locationbarpopup.h b/src/lib/navigation/locationbarpopup.h index 16537edc2..2f9ad039d 100644 --- a/src/lib/navigation/locationbarpopup.h +++ b/src/lib/navigation/locationbarpopup.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 Franz Fellner * David Rosca * @@ -23,7 +23,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT LocationBarPopup : public QFrame +class FALKON_EXPORT LocationBarPopup : public QFrame { public: explicit LocationBarPopup(QWidget* parent); diff --git a/src/lib/navigation/navigationbar.cpp b/src/lib/navigation/navigationbar.cpp index b88b017ea..2357ff1f9 100644 --- a/src/lib/navigation/navigationbar.cpp +++ b/src/lib/navigation/navigationbar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -382,7 +382,7 @@ QString NavigationBar::titleForUrl(QString title, const QUrl &url) QIcon NavigationBar::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; } diff --git a/src/lib/navigation/navigationbar.h b/src/lib/navigation/navigationbar.h index ec6b4f3ae..031da23d5 100644 --- a/src/lib/navigation/navigationbar.h +++ b/src/lib/navigation/navigationbar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -33,7 +33,7 @@ class ReloadStopButton; class Menu; class QUrl; -class QUPZILLA_EXPORT NavigationBar : public QWidget +class FALKON_EXPORT NavigationBar : public QWidget { Q_OBJECT public: diff --git a/src/lib/navigation/navigationcontainer.cpp b/src/lib/navigation/navigationcontainer.cpp index 71061a252..d56967a6e 100644 --- a/src/lib/navigation/navigationcontainer.cpp +++ b/src/lib/navigation/navigationcontainer.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/navigation/navigationcontainer.h b/src/lib/navigation/navigationcontainer.h index 8378ca302..f7256214d 100644 --- a/src/lib/navigation/navigationcontainer.h +++ b/src/lib/navigation/navigationcontainer.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -26,7 +26,7 @@ class QVBoxLayout; class TabBar; -class QUPZILLA_EXPORT NavigationContainer : public QWidget +class FALKON_EXPORT NavigationContainer : public QWidget { public: explicit NavigationContainer(QWidget* parent = 0); diff --git a/src/lib/navigation/reloadstopbutton.cpp b/src/lib/navigation/reloadstopbutton.cpp index 3c2daafd1..efe57f1aa 100644 --- a/src/lib/navigation/reloadstopbutton.cpp +++ b/src/lib/navigation/reloadstopbutton.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/navigation/reloadstopbutton.h b/src/lib/navigation/reloadstopbutton.h index 5c796cc35..f91556f2b 100644 --- a/src/lib/navigation/reloadstopbutton.h +++ b/src/lib/navigation/reloadstopbutton.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ class QTimer; -class QUPZILLA_EXPORT ReloadStopButton : public ToolButton +class FALKON_EXPORT ReloadStopButton : public ToolButton { Q_OBJECT diff --git a/src/lib/navigation/siteicon.cpp b/src/lib/navigation/siteicon.cpp index 192e6a36c..b65a354a9 100644 --- a/src/lib/navigation/siteicon.cpp +++ b/src/lib/navigation/siteicon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -101,7 +101,7 @@ void SiteIcon::mouseReleaseEvent(QMouseEvent* e) bool activated = false; if (e->button() == Qt::LeftButton && rect().contains(e->pos())) { - // Popup may not be always shown, eg. on qupzilla: pages + // Popup may not be always shown, eg. on falkon: pages activated = showPopup(); } diff --git a/src/lib/navigation/siteicon.h b/src/lib/navigation/siteicon.h index 6482b4fa9..542f275d4 100644 --- a/src/lib/navigation/siteicon.h +++ b/src/lib/navigation/siteicon.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ class LocationBar; class WebView; class BrowserWindow; -class QUPZILLA_EXPORT SiteIcon : public ToolButton +class FALKON_EXPORT SiteIcon : public ToolButton { Q_OBJECT diff --git a/src/lib/navigation/websearchbar.cpp b/src/lib/navigation/websearchbar.cpp index de46e6e34..0166b10aa 100644 --- a/src/lib/navigation/websearchbar.cpp +++ b/src/lib/navigation/websearchbar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/navigation/websearchbar.h b/src/lib/navigation/websearchbar.h index e4bb6290b..04c9972ec 100644 --- a/src/lib/navigation/websearchbar.h +++ b/src/lib/navigation/websearchbar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -35,7 +35,7 @@ class SearchEnginesManager; class SearchEnginesDialog; class OpenSearchEngine; -class QUPZILLA_EXPORT WebSearchBar_Button : public ClickableLabel +class FALKON_EXPORT WebSearchBar_Button : public ClickableLabel { public: explicit WebSearchBar_Button(QWidget* parent = 0); @@ -44,7 +44,7 @@ private: void contextMenuEvent(QContextMenuEvent* event); }; -class QUPZILLA_EXPORT WebSearchBar : public LineEdit +class FALKON_EXPORT WebSearchBar : public LineEdit { Q_OBJECT diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp index 1b0fb6677..fdc0fd8fc 100644 --- a/src/lib/network/networkmanager.cpp +++ b/src/lib/network/networkmanager.cpp @@ -25,7 +25,7 @@ #include "passwordmanager.h" #include "sslerrordialog.h" #include "networkurlinterceptor.h" -#include "schemehandlers/qupzillaschemehandler.h" +#include "schemehandlers/falkonschemehandler.h" #include #include @@ -43,7 +43,7 @@ NetworkManager::NetworkManager(QObject *parent) : QNetworkAccessManager(parent) { // Create scheme handlers - mApp->webProfile()->installUrlSchemeHandler(QByteArrayLiteral("qupzilla"), new QupZillaSchemeHandler()); + mApp->webProfile()->installUrlSchemeHandler(QByteArrayLiteral("falkon"), new FalkonSchemeHandler()); // Create url interceptor m_urlInterceptor = new NetworkUrlInterceptor(this); diff --git a/src/lib/network/networkmanager.h b/src/lib/network/networkmanager.h index 7bfaff994..4a072b23d 100644 --- a/src/lib/network/networkmanager.h +++ b/src/lib/network/networkmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -26,7 +26,7 @@ class UrlInterceptor; class NetworkUrlInterceptor; -class QUPZILLA_EXPORT NetworkManager : public QNetworkAccessManager +class FALKON_EXPORT NetworkManager : public QNetworkAccessManager { Q_OBJECT diff --git a/src/lib/network/networkproxyfactory.cpp b/src/lib/network/networkproxyfactory.cpp index 5c75bf95a..aa5d23a26 100644 --- a/src/lib/network/networkproxyfactory.cpp +++ b/src/lib/network/networkproxyfactory.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/network/networkproxyfactory.h b/src/lib/network/networkproxyfactory.h index 8e529659f..471a50180 100644 --- a/src/lib/network/networkproxyfactory.h +++ b/src/lib/network/networkproxyfactory.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -40,7 +40,7 @@ private: QzRegExp* m_regExp; }; -class QUPZILLA_EXPORT NetworkProxyFactory : public QNetworkProxyFactory +class FALKON_EXPORT NetworkProxyFactory : public QNetworkProxyFactory { public: enum ProxyPreference { SystemProxy, NoProxy, ProxyAutoConfig, DefinedProxy }; diff --git a/src/lib/network/networkurlinterceptor.cpp b/src/lib/network/networkurlinterceptor.cpp index 299c06ca9..d9079ec3c 100644 --- a/src/lib/network/networkurlinterceptor.cpp +++ b/src/lib/network/networkurlinterceptor.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2015-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/network/networkurlinterceptor.h b/src/lib/network/networkurlinterceptor.h index 8f862d7f2..ab63f6936 100644 --- a/src/lib/network/networkurlinterceptor.h +++ b/src/lib/network/networkurlinterceptor.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - QtWebEngine based browser +* Falkon - Qt web browser * Copyright (C) 2015 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -25,7 +25,7 @@ class UrlInterceptor; -class QUPZILLA_EXPORT NetworkUrlInterceptor : public QWebEngineUrlRequestInterceptor +class FALKON_EXPORT NetworkUrlInterceptor : public QWebEngineUrlRequestInterceptor { public: explicit NetworkUrlInterceptor(QObject* parent = Q_NULLPTR); diff --git a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp b/src/lib/network/schemehandlers/falkonschemehandler.cpp similarity index 94% rename from src/lib/network/schemehandlers/qupzillaschemehandler.cpp rename to src/lib/network/schemehandlers/falkonschemehandler.cpp index 45c838baf..55be1ccce 100644 --- a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp +++ b/src/lib/network/schemehandlers/falkonschemehandler.cpp @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * ============================================================ */ -#include "qupzillaschemehandler.h" +#include "falkonschemehandler.h" #include "qztools.h" #include "browserwindow.h" #include "mainapplication.h" @@ -39,23 +39,23 @@ static QString authorString(const char* name, const QString &mail) return QSL("%1 <%2>").arg(QString::fromUtf8(name), mail); } -QupZillaSchemeHandler::QupZillaSchemeHandler(QObject *parent) +FalkonSchemeHandler::FalkonSchemeHandler(QObject *parent) : QWebEngineUrlSchemeHandler(parent) { } -void QupZillaSchemeHandler::requestStarted(QWebEngineUrlRequestJob *job) +void FalkonSchemeHandler::requestStarted(QWebEngineUrlRequestJob *job) { QStringList knownPages; knownPages << "about" << "reportbug" << "start" << "speeddial" << "config" << "restore" << "adblock"; if (knownPages.contains(job->requestUrl().path())) - job->reply(QByteArrayLiteral("text/html"), new QupZillaSchemeReply(job)); + job->reply(QByteArrayLiteral("text/html"), new FalkonSchemeReply(job)); else job->fail(QWebEngineUrlRequestJob::UrlInvalid); } -QupZillaSchemeReply::QupZillaSchemeReply(QWebEngineUrlRequestJob *job, QObject *parent) +FalkonSchemeReply::FalkonSchemeReply(QWebEngineUrlRequestJob *job, QObject *parent) : QIODevice(parent) , m_loaded(false) , m_job(job) @@ -66,7 +66,7 @@ QupZillaSchemeReply::QupZillaSchemeReply(QWebEngineUrlRequestJob *job, QObject * m_buffer.open(QIODevice::ReadWrite); } -void QupZillaSchemeReply::loadPage() +void FalkonSchemeReply::loadPage() { if (m_loaded) return; @@ -101,18 +101,18 @@ void QupZillaSchemeReply::loadPage() m_loaded = true; } -qint64 QupZillaSchemeReply::bytesAvailable() const +qint64 FalkonSchemeReply::bytesAvailable() const { return m_buffer.bytesAvailable(); } -qint64 QupZillaSchemeReply::readData(char *data, qint64 maxSize) +qint64 FalkonSchemeReply::readData(char *data, qint64 maxSize) { loadPage(); return m_buffer.read(data, maxSize); } -qint64 QupZillaSchemeReply::writeData(const char *data, qint64 len) +qint64 FalkonSchemeReply::writeData(const char *data, qint64 len) { Q_UNUSED(data); Q_UNUSED(len); @@ -120,7 +120,7 @@ qint64 QupZillaSchemeReply::writeData(const char *data, qint64 len) return 0; } -QString QupZillaSchemeReply::reportbugPage() +QString FalkonSchemeReply::reportbugPage() { static QString bPage; @@ -131,7 +131,7 @@ QString QupZillaSchemeReply::reportbugPage() bPage.append(QzTools::readAllFileContents(":html/reportbug.html")); bPage.replace(QLatin1String("%TITLE%"), tr("Report Issue")); bPage.replace(QLatin1String("%REPORT-ISSUE%"), tr("Report Issue")); - bPage.replace(QLatin1String("%PLUGINS-TEXT%"), tr("If you are experiencing problems with QupZilla, please try to disable" + bPage.replace(QLatin1String("%PLUGINS-TEXT%"), tr("If you are experiencing problems with Falkon, please try to disable" " all extensions first.
If this does not fix it, then please fill out this form: ")); bPage.replace(QLatin1String("%EMAIL%"), tr("Your E-mail")); bPage.replace(QLatin1String("%TYPE%"), tr("Issue type")); @@ -156,7 +156,7 @@ QString QupZillaSchemeReply::reportbugPage() return bPage; } -QString QupZillaSchemeReply::startPage() +QString FalkonSchemeReply::startPage() { static QString sPage; @@ -171,14 +171,14 @@ QString QupZillaSchemeReply::startPage() sPage.replace(QLatin1String("%BUTTON-LABEL%"), tr("Search on Web")); sPage.replace(QLatin1String("%SEARCH-BY%"), tr("Search results provided by DuckDuckGo")); sPage.replace(QLatin1String("%WWW%"), Qz::WIKIADDRESS); - sPage.replace(QLatin1String("%ABOUT-QUPZILLA%"), tr("About QupZilla")); + sPage.replace(QLatin1String("%ABOUT-FALKON%"), tr("About Falkon")); sPage.replace(QLatin1String("%PRIVATE-BROWSING%"), mApp->isPrivate() ? tr("

Private Browsing

") : QString()); sPage = QzTools::applyDirectionToPage(sPage); return sPage; } -QString QupZillaSchemeReply::aboutPage() +QString FalkonSchemeReply::aboutPage() { static QString aPage; @@ -187,8 +187,8 @@ QString QupZillaSchemeReply::aboutPage() aPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QzTools::dpiAwarePixmap(QSL(":icons/other/about.png"))).toString()); aPage.replace(QLatin1String("%COPYRIGHT-INCLUDE%"), QzTools::readAllFileContents(":html/copyright").toHtmlEscaped()); - aPage.replace(QLatin1String("%TITLE%"), tr("About QupZilla")); - aPage.replace(QLatin1String("%ABOUT-QUPZILLA%"), tr("About QupZilla")); + aPage.replace(QLatin1String("%TITLE%"), tr("About Falkon")); + aPage.replace(QLatin1String("%ABOUT-FALKON%"), tr("About Falkon")); aPage.replace(QLatin1String("%INFORMATIONS-ABOUT-VERSION%"), tr("Information about version")); aPage.replace(QLatin1String("%COPYRIGHT%"), tr("Copyright")); @@ -259,7 +259,7 @@ QString QupZillaSchemeReply::aboutPage() return aPage; } -QString QupZillaSchemeReply::speeddialPage() +QString FalkonSchemeReply::speeddialPage() { static QString dPage; @@ -316,7 +316,7 @@ QString QupZillaSchemeReply::speeddialPage() return page; } -QString QupZillaSchemeReply::restorePage() +QString FalkonSchemeReply::restorePage() { static QString rPage; @@ -324,7 +324,7 @@ QString QupZillaSchemeReply::restorePage() rPage.append(QzTools::readAllFileContents(":html/restore.html")); rPage.replace(QLatin1String("%IMAGE%"), QzTools::pixmapToDataUrl(IconProvider::standardIcon(QStyle::SP_MessageBoxWarning).pixmap(45)).toString()); rPage.replace(QLatin1String("%TITLE%"), tr("Restore Session")); - rPage.replace(QLatin1String("%OOPS%"), tr("Oops, QupZilla crashed.")); + rPage.replace(QLatin1String("%OOPS%"), tr("Oops, Falkon crashed.")); rPage.replace(QLatin1String("%APOLOGIZE%"), tr("We apologize for this. Would you like to restore the last saved state?")); rPage.replace(QLatin1String("%TRY-REMOVING%"), tr("Try removing one or more tabs that you think cause troubles")); rPage.replace(QLatin1String("%START-NEW%"), tr("Or you can start completely new session")); @@ -338,7 +338,7 @@ QString QupZillaSchemeReply::restorePage() return rPage; } -QString QupZillaSchemeReply::configPage() +QString FalkonSchemeReply::configPage() { static QString cPage; @@ -349,7 +349,7 @@ QString QupZillaSchemeReply::configPage() cPage.replace(QLatin1String("%TITLE%"), tr("Configuration Information")); cPage.replace(QLatin1String("%CONFIG%"), tr("Configuration Information")); cPage.replace(QLatin1String("%INFORMATIONS-ABOUT-VERSION%"), tr("Information about version")); - cPage.replace(QLatin1String("%CONFIG-ABOUT%"), tr("This page contains information about QupZilla's current configuration - relevant for troubleshooting. Please include this information when submitting bug reports.")); + cPage.replace(QLatin1String("%CONFIG-ABOUT%"), tr("This page contains information about Falkon's current configuration - relevant for troubleshooting. Please include this information when submitting bug reports.")); cPage.replace(QLatin1String("%BROWSER-IDENTIFICATION%"), tr("Browser Identification")); cPage.replace(QLatin1String("%PATHS%"), tr("Paths")); cPage.replace(QLatin1String("%BUILD-CONFIG%"), tr("Build Configuration")); @@ -382,7 +382,7 @@ QString QupZillaSchemeReply::configPage() QString("
%1
%2
").arg(tr("Themes"), DataPaths::path(DataPaths::Themes)) + QString("
%1
%2
").arg(tr("Translations"), DataPaths::path(DataPaths::Translations))); -#ifdef QUPZILLA_DEBUG_BUILD +#ifdef FALKON_DEBUG_BUILD QString debugBuild = tr("Enabled"); #else QString debugBuild = tr("Disabled"); @@ -471,7 +471,7 @@ QString QupZillaSchemeReply::configPage() return page; } -QString QupZillaSchemeReply::adblockPage() +QString FalkonSchemeReply::adblockPage() { static QString aPage; diff --git a/src/lib/network/schemehandlers/qupzillaschemehandler.h b/src/lib/network/schemehandlers/falkonschemehandler.h similarity index 80% rename from src/lib/network/schemehandlers/qupzillaschemehandler.h rename to src/lib/network/schemehandlers/falkonschemehandler.h index 48d3b5c75..6abba3679 100644 --- a/src/lib/network/schemehandlers/qupzillaschemehandler.h +++ b/src/lib/network/schemehandlers/falkonschemehandler.h @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * ============================================================ */ -#ifndef QUPZILLASCHEMEHANDLER_H -#define QUPZILLASCHEMEHANDLER_H +#ifndef FALKONSCHEMEHANDLER_H +#define FALKONSCHEMEHANDLER_H #include #include @@ -24,20 +24,20 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT QupZillaSchemeHandler : public QWebEngineUrlSchemeHandler +class FALKON_EXPORT FalkonSchemeHandler : public QWebEngineUrlSchemeHandler { public: - explicit QupZillaSchemeHandler(QObject *parent = Q_NULLPTR); + explicit FalkonSchemeHandler(QObject *parent = Q_NULLPTR); void requestStarted(QWebEngineUrlRequestJob *job) Q_DECL_OVERRIDE; }; -class QUPZILLA_EXPORT QupZillaSchemeReply : public QIODevice +class FALKON_EXPORT FalkonSchemeReply : public QIODevice { Q_OBJECT public: - explicit QupZillaSchemeReply(QWebEngineUrlRequestJob *job, QObject *parent = Q_NULLPTR); + explicit FalkonSchemeReply(QWebEngineUrlRequestJob *job, QObject *parent = Q_NULLPTR); qint64 bytesAvailable() const Q_DECL_OVERRIDE; qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE; @@ -61,4 +61,4 @@ private: QWebEngineUrlRequestJob *m_job; }; -#endif // QUPZILLASCHEMEHANDLER_H +#endif // FALKONSCHEMEHANDLER_H diff --git a/src/lib/network/sslerrordialog.cpp b/src/lib/network/sslerrordialog.cpp index 827ab0380..8d1455e00 100644 --- a/src/lib/network/sslerrordialog.cpp +++ b/src/lib/network/sslerrordialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/network/sslerrordialog.h b/src/lib/network/sslerrordialog.h index 1f9795810..a6bdde247 100644 --- a/src/lib/network/sslerrordialog.h +++ b/src/lib/network/sslerrordialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ class QAbstractButton; #include "qzcommon.h" -class QUPZILLA_EXPORT SslErrorDialog : public QDialog +class FALKON_EXPORT SslErrorDialog : public QDialog { Q_OBJECT diff --git a/src/lib/network/urlinterceptor.h b/src/lib/network/urlinterceptor.h index ac25bc358..55d9380ed 100644 --- a/src/lib/network/urlinterceptor.h +++ b/src/lib/network/urlinterceptor.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - QtWebEngine based browser +* Falkon - Qt web browser * Copyright (C) 2015 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/notifications/desktopnotification.cpp b/src/lib/notifications/desktopnotification.cpp index 31d80d586..08818ae80 100644 --- a/src/lib/notifications/desktopnotification.cpp +++ b/src/lib/notifications/desktopnotification.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/notifications/desktopnotification.h b/src/lib/notifications/desktopnotification.h index 6d51e4c48..da76864eb 100644 --- a/src/lib/notifications/desktopnotification.h +++ b/src/lib/notifications/desktopnotification.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -28,7 +28,7 @@ namespace Ui class DesktopNotification; } -class QUPZILLA_EXPORT DesktopNotification : public QWidget +class FALKON_EXPORT DesktopNotification : public QWidget { Q_OBJECT diff --git a/src/lib/notifications/desktopnotificationsfactory.cpp b/src/lib/notifications/desktopnotificationsfactory.cpp index 193607b07..c6273944c 100644 --- a/src/lib/notifications/desktopnotificationsfactory.cpp +++ b/src/lib/notifications/desktopnotificationsfactory.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -78,13 +78,13 @@ void DesktopNotificationsFactory::showNotification(const QPixmap &icon, const QS break; case DesktopNative: #if defined(Q_OS_UNIX) && !defined(DISABLE_DBUS) - QFile tmp(DataPaths::path(DataPaths::Temp) + QLatin1String("/qupzilla_notif.png")); + QFile tmp(DataPaths::path(DataPaths::Temp) + QLatin1String("/falkon_notif.png")); tmp.open(QFile::WriteOnly); icon.save(tmp.fileName()); QDBusInterface dbus("org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications", QDBusConnection::sessionBus()); QVariantList args; - args.append(QLatin1String("qupzilla")); + args.append(QLatin1String("falkon")); args.append(m_uint); args.append(tmp.fileName()); args.append(heading); @@ -103,7 +103,7 @@ void DesktopNotificationsFactory::nativeNotificationPreview() #if defined(Q_OS_UNIX) && !defined(DISABLE_DBUS) QDBusInterface dbus("org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications", QDBusConnection::sessionBus()); QVariantList args; - args.append(QLatin1String("qupzilla")); + args.append(QLatin1String("falkon")); args.append(m_uint); args.append(QString()); args.append(QObject::tr("Native System Notification")); diff --git a/src/lib/notifications/desktopnotificationsfactory.h b/src/lib/notifications/desktopnotificationsfactory.h index b7511a22d..cc32299a9 100644 --- a/src/lib/notifications/desktopnotificationsfactory.h +++ b/src/lib/notifications/desktopnotificationsfactory.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ class QDBusError; class DesktopNotification; -class QUPZILLA_EXPORT DesktopNotificationsFactory : public QObject +class FALKON_EXPORT DesktopNotificationsFactory : public QObject { Q_OBJECT diff --git a/src/lib/opensearch/editsearchengine.cpp b/src/lib/opensearch/editsearchengine.cpp index 0f045bb4d..e3116e23f 100644 --- a/src/lib/opensearch/editsearchengine.cpp +++ b/src/lib/opensearch/editsearchengine.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/opensearch/editsearchengine.h b/src/lib/opensearch/editsearchengine.h index fb6f70bcd..df46cf5fc 100644 --- a/src/lib/opensearch/editsearchengine.h +++ b/src/lib/opensearch/editsearchengine.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ namespace Ui class EditSearchEngine; } -class QUPZILLA_EXPORT EditSearchEngine : public QDialog +class FALKON_EXPORT EditSearchEngine : public QDialog { Q_OBJECT public: diff --git a/src/lib/opensearch/opensearchengine.cpp b/src/lib/opensearch/opensearchengine.cpp index b9818a587..16e2c9726 100644 --- a/src/lib/opensearch/opensearchengine.cpp +++ b/src/lib/opensearch/opensearchengine.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301 USA */ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/opensearch/opensearchengine.h b/src/lib/opensearch/opensearchengine.h index 6fa1dc5ad..e32689c31 100644 --- a/src/lib/opensearch/opensearchengine.h +++ b/src/lib/opensearch/opensearchengine.h @@ -17,7 +17,7 @@ * Boston, MA 02110-1301 USA */ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -49,7 +49,7 @@ class QNetworkReply; class OpenSearchEngineDelegate; -class QUPZILLA_EXPORT OpenSearchEngine : public QObject +class FALKON_EXPORT OpenSearchEngine : public QObject { Q_OBJECT diff --git a/src/lib/opensearch/opensearchreader.cpp b/src/lib/opensearch/opensearchreader.cpp index e44d5aa8c..3e7356b56 100644 --- a/src/lib/opensearch/opensearchreader.cpp +++ b/src/lib/opensearch/opensearchreader.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301 USA */ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/opensearch/opensearchreader.h b/src/lib/opensearch/opensearchreader.h index 8378ca68d..9d89f596e 100644 --- a/src/lib/opensearch/opensearchreader.h +++ b/src/lib/opensearch/opensearchreader.h @@ -17,7 +17,7 @@ * Boston, MA 02110-1301 USA */ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -42,7 +42,7 @@ class OpenSearchEngine; -class QUPZILLA_EXPORT OpenSearchReader : public QXmlStreamReader +class FALKON_EXPORT OpenSearchReader : public QXmlStreamReader { public: OpenSearchReader(); diff --git a/src/lib/opensearch/searchenginesdialog.cpp b/src/lib/opensearch/searchenginesdialog.cpp index ec1c88df9..ba13ae7ac 100644 --- a/src/lib/opensearch/searchenginesdialog.cpp +++ b/src/lib/opensearch/searchenginesdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/opensearch/searchenginesdialog.h b/src/lib/opensearch/searchenginesdialog.h index 413dc8229..4bb82bcf7 100644 --- a/src/lib/opensearch/searchenginesdialog.h +++ b/src/lib/opensearch/searchenginesdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ namespace Ui class SearchEnginesDialog; } -class QUPZILLA_EXPORT SearchEnginesDialog : public QDialog +class FALKON_EXPORT SearchEnginesDialog : public QDialog { Q_OBJECT diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp index de833eeca..94b86e2ff 100644 --- a/src/lib/opensearch/searchenginesmanager.cpp +++ b/src/lib/opensearch/searchenginesmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -161,7 +161,7 @@ void SearchEnginesManager::restoreDefaults() Engine duck; duck.name = "DuckDuckGo"; duck.icon = QIcon(":/icons/sites/duck.png"); - duck.url = "https://duckduckgo.com/?q=%s&t=qupzilla"; + duck.url = "https://duckduckgo.com/?q=%s&t=falkon"; duck.shortcut = "d"; duck.suggestionsUrl = "https://ac.duckduckgo.com/ac/?q=%s&type=list"; @@ -183,7 +183,7 @@ void SearchEnginesManager::restoreDefaults() Engine google; google.name = "Google"; google.icon = QIcon(":icons/sites/google.png"); - google.url = "https://www.google.com/search?client=qupzilla&q=%s"; + google.url = "https://www.google.com/search?client=falkon&q=%s"; google.shortcut = "g"; google.suggestionsUrl = "https://suggestqueries.google.com/complete/search?output=firefox&q=%s"; diff --git a/src/lib/opensearch/searchenginesmanager.h b/src/lib/opensearch/searchenginesmanager.h index 123037d1a..902867294 100644 --- a/src/lib/opensearch/searchenginesmanager.h +++ b/src/lib/opensearch/searchenginesmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -31,7 +31,7 @@ class QWebElement; class WebView; class LoadRequest; -class QUPZILLA_EXPORT SearchEnginesManager : public QObject +class FALKON_EXPORT SearchEnginesManager : public QObject { Q_OBJECT public: diff --git a/src/lib/other/aboutdialog.cpp b/src/lib/other/aboutdialog.cpp index 747b85e90..81324924c 100644 --- a/src/lib/other/aboutdialog.cpp +++ b/src/lib/other/aboutdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -90,7 +90,7 @@ void AboutDialog::showAbout() void AboutDialog::showAuthors() { m_showingAuthors = true; - ui->authorsButton->setText(tr("< About QupZilla")); + ui->authorsButton->setText(tr("< About Falkon")); if (m_authorsHtml.isEmpty()) { m_authorsHtml += "
"; m_authorsHtml += tr("

Main developer:
%1 <%2>

").arg(Qz::AUTHOR, "nowrep@gmail.com"); diff --git a/src/lib/other/aboutdialog.h b/src/lib/other/aboutdialog.h index acab69e68..6e4b8d5de 100644 --- a/src/lib/other/aboutdialog.h +++ b/src/lib/other/aboutdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ namespace Ui class AboutDialog; } -class QUPZILLA_EXPORT AboutDialog : public QDialog +class FALKON_EXPORT AboutDialog : public QDialog { Q_OBJECT diff --git a/src/lib/other/aboutdialog.ui b/src/lib/other/aboutdialog.ui index e2520edd3..b912bb977 100644 --- a/src/lib/other/aboutdialog.ui +++ b/src/lib/other/aboutdialog.ui @@ -11,7 +11,7 @@ - About QupZilla + About Falkon diff --git a/src/lib/other/browsinglibrary.cpp b/src/lib/other/browsinglibrary.cpp index 2c61ce7b4..0ad6d9712 100644 --- a/src/lib/other/browsinglibrary.cpp +++ b/src/lib/other/browsinglibrary.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/other/browsinglibrary.h b/src/lib/other/browsinglibrary.h index 65aa47956..8ced5bc90 100644 --- a/src/lib/other/browsinglibrary.h +++ b/src/lib/other/browsinglibrary.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ class BrowsingLibrary; class HistoryManager; class BookmarksManager; class BrowserWindow; -class QUPZILLA_EXPORT BrowsingLibrary : public QWidget +class FALKON_EXPORT BrowsingLibrary : public QWidget { Q_OBJECT diff --git a/src/lib/other/checkboxdialog.cpp b/src/lib/other/checkboxdialog.cpp index 4ccf8b065..3479aa0a1 100644 --- a/src/lib/other/checkboxdialog.cpp +++ b/src/lib/other/checkboxdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * Copyright (C) 2017 Razi Alavizadeh * diff --git a/src/lib/other/checkboxdialog.h b/src/lib/other/checkboxdialog.h index fb0ad097c..9f2f3fc24 100644 --- a/src/lib/other/checkboxdialog.h +++ b/src/lib/other/checkboxdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * Copyright (C) 2017 Razi Alavizadeh * @@ -23,7 +23,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT CheckBoxDialog : public QMessageBox +class FALKON_EXPORT CheckBoxDialog : public QMessageBox { Q_OBJECT public: diff --git a/src/lib/other/clearprivatedata.cpp b/src/lib/other/clearprivatedata.cpp index 4fd9ba004..c30312212 100644 --- a/src/lib/other/clearprivatedata.cpp +++ b/src/lib/other/clearprivatedata.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2015 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/other/clearprivatedata.h b/src/lib/other/clearprivatedata.h index eaed5ecae..daf2cb730 100644 --- a/src/lib/other/clearprivatedata.h +++ b/src/lib/other/clearprivatedata.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ namespace Ui class ClearPrivateData; } -class QUPZILLA_EXPORT ClearPrivateData : public QDialog +class FALKON_EXPORT ClearPrivateData : public QDialog { Q_OBJECT public: diff --git a/src/lib/other/iconchooser.cpp b/src/lib/other/iconchooser.cpp index 46f8aae3c..ea7099e30 100644 --- a/src/lib/other/iconchooser.cpp +++ b/src/lib/other/iconchooser.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/other/iconchooser.h b/src/lib/other/iconchooser.h index aee423931..463f5d397 100644 --- a/src/lib/other/iconchooser.h +++ b/src/lib/other/iconchooser.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ namespace Ui class IconChooser; } -class QUPZILLA_EXPORT IconChooser : public QDialog +class FALKON_EXPORT IconChooser : public QDialog { Q_OBJECT @@ -48,7 +48,7 @@ private: Ui::IconChooser* ui; }; -class QUPZILLA_EXPORT IconChooserDelegate : public QStyledItemDelegate +class FALKON_EXPORT IconChooserDelegate : public QStyledItemDelegate { public: explicit IconChooserDelegate(QWidget* parent = 0); diff --git a/src/lib/other/licenseviewer.cpp b/src/lib/other/licenseviewer.cpp index 1f0cca7e8..b49152892 100644 --- a/src/lib/other/licenseviewer.cpp +++ b/src/lib/other/licenseviewer.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/other/licenseviewer.h b/src/lib/other/licenseviewer.h index 5d2dd3a43..2ccb47771 100644 --- a/src/lib/other/licenseviewer.h +++ b/src/lib/other/licenseviewer.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class QTextBrowser; -class QUPZILLA_EXPORT LicenseViewer : public QWidget +class FALKON_EXPORT LicenseViewer : public QWidget { Q_OBJECT diff --git a/src/lib/other/pagescreen.cpp b/src/lib/other/pagescreen.cpp index 6af8f8e50..eef08bd6b 100644 --- a/src/lib/other/pagescreen.cpp +++ b/src/lib/other/pagescreen.cpp @@ -165,7 +165,7 @@ void PageScreen::saveAsDocument(const QString &format) } QPrinter printer; - printer.setCreator(BrowserWindow::tr("QupZilla %1 (%2)").arg(Qz::VERSION, Qz::WWWADDRESS)); + printer.setCreator(BrowserWindow::tr("Falkon %1 (%2)").arg(Qz::VERSION, Qz::WWWADDRESS)); printer.setOutputFileName(pathWithoutSuffix + suffix); printer.setOutputFormat(QPrinter::PdfFormat); printer.setPaperSize(m_pageImages.first().size(), QPrinter::DevicePixel); diff --git a/src/lib/other/pagescreen.h b/src/lib/other/pagescreen.h index 6c2b17ef2..a867f1bc6 100644 --- a/src/lib/other/pagescreen.h +++ b/src/lib/other/pagescreen.h @@ -32,7 +32,7 @@ class PageScreen; class WebView; -class QUPZILLA_EXPORT PageScreen : public QDialog +class FALKON_EXPORT PageScreen : public QDialog { Q_OBJECT diff --git a/src/lib/other/qzsettings.cpp b/src/lib/other/qzsettings.cpp index 41f1124aa..f43f8f4a2 100644 --- a/src/lib/other/qzsettings.cpp +++ b/src/lib/other/qzsettings.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/other/qzsettings.h b/src/lib/other/qzsettings.h index 85e389333..cce79b8b4 100644 --- a/src/lib/other/qzsettings.h +++ b/src/lib/other/qzsettings.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ #include -class QUPZILLA_EXPORT QzSettings +class FALKON_EXPORT QzSettings { public: QzSettings(); diff --git a/src/lib/other/registerqappassociation.cpp b/src/lib/other/registerqappassociation.cpp index 3903c12a5..e061ed721 100644 --- a/src/lib/other/registerqappassociation.cpp +++ b/src/lib/other/registerqappassociation.cpp @@ -1,6 +1,6 @@ /* ============================================================ * Copyright (C) 2012-2017 S. Razi Alavizadeh -* This file is part of QupZilla - WebKit based browser 2010-2014 +* This file is part of Falkon - Qt web browser 2010-2014 * by David Rosca * * This program is free software: you can redistribute it and/or modify @@ -108,7 +108,7 @@ bool RegisterQAppAssociation::registerAppCapabilities() if (capabilitiesKey.isEmpty()) { QMessageBox::warning(mApp->getWindow(), tr("Warning!"), - tr("There are some problems. Please, reinstall QupZilla.\n" + tr("There are some problems. Please, reinstall Falkon.\n" "Maybe relaunch with administrator right do a magic for you! ;)")); return false; } diff --git a/src/lib/other/registerqappassociation.h b/src/lib/other/registerqappassociation.h index cf1d6dc5f..169337504 100644 --- a/src/lib/other/registerqappassociation.h +++ b/src/lib/other/registerqappassociation.h @@ -1,6 +1,6 @@ /* ============================================================ * Copyright (C) 2012-2017 S. Razi Alavizadeh -* This file is part of QupZilla - WebKit based browser 2010-2014 +* This file is part of Falkon - Qt web browser 2010-2014 * by David Rosca * * This program is free software: you can redistribute it and/or modify @@ -25,7 +25,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT RegisterQAppAssociation : public QObject +class FALKON_EXPORT RegisterQAppAssociation : public QObject { Q_OBJECT public: diff --git a/src/lib/other/siteinfo.cpp b/src/lib/other/siteinfo.cpp index bc02730f8..187946280 100644 --- a/src/lib/other/siteinfo.cpp +++ b/src/lib/other/siteinfo.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -139,7 +139,7 @@ bool SiteInfo::canShowSiteInfo(const QUrl &url) if (LocationBar::convertUrlToText(url).isEmpty()) return false; - if (url.scheme() == QL1S("qupzilla") || url.scheme() == QL1S("view-source")) + if (url.scheme() == QL1S("falkon") || url.scheme() == QL1S("view-source")) return false; return true; diff --git a/src/lib/other/siteinfo.h b/src/lib/other/siteinfo.h index c7835b51d..ee80537c1 100644 --- a/src/lib/other/siteinfo.h +++ b/src/lib/other/siteinfo.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -34,7 +34,7 @@ class QTreeWidgetItem; class WebView; class CertificateInfoWidget; -class QUPZILLA_EXPORT SiteInfo : public QWidget +class FALKON_EXPORT SiteInfo : public QWidget { Q_OBJECT diff --git a/src/lib/other/siteinfowidget.cpp b/src/lib/other/siteinfowidget.cpp index d3858d335..5ae26b016 100644 --- a/src/lib/other/siteinfowidget.cpp +++ b/src/lib/other/siteinfowidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/other/siteinfowidget.h b/src/lib/other/siteinfowidget.h index 246725300..416df5c70 100644 --- a/src/lib/other/siteinfowidget.h +++ b/src/lib/other/siteinfowidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ class SiteInfoWidget; class BrowserWindow; -class QUPZILLA_EXPORT SiteInfoWidget : public LocationBarPopup +class FALKON_EXPORT SiteInfoWidget : public LocationBarPopup { Q_OBJECT public: diff --git a/src/lib/other/statusbarmessage.cpp b/src/lib/other/statusbarmessage.cpp index 09b87df2e..6cdcf20d9 100644 --- a/src/lib/other/statusbarmessage.cpp +++ b/src/lib/other/statusbarmessage.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/other/statusbarmessage.h b/src/lib/other/statusbarmessage.h index 12fd57b9e..bed1f3047 100644 --- a/src/lib/other/statusbarmessage.h +++ b/src/lib/other/statusbarmessage.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -28,7 +28,7 @@ class QTimer; class BrowserWindow; -class QUPZILLA_EXPORT TipLabel : public SqueezeLabelV1 +class FALKON_EXPORT TipLabel : public SqueezeLabelV1 { public: explicit TipLabel(QWidget* parent); @@ -45,7 +45,7 @@ private: QTimer* m_timer; }; -class QUPZILLA_EXPORT StatusBarMessage +class FALKON_EXPORT StatusBarMessage { public: explicit StatusBarMessage(BrowserWindow* window); diff --git a/src/lib/other/updater.cpp b/src/lib/other/updater.cpp index 85eef5edd..05dca1109 100644 --- a/src/lib/other/updater.cpp +++ b/src/lib/other/updater.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -148,7 +148,7 @@ void Updater::downCompleted() Version updated(html); if (current.isValid && updated.isValid && current < updated) { - mApp->desktopNotifications()->showNotification(QPixmap(":icons/qupzilla.png"), tr("Update available"), tr("New version of QupZilla is ready to download.")); + mApp->desktopNotifications()->showNotification(QPixmap(":icons/qupzilla.png"), tr("Update available"), tr("New version of Falkon is ready to download.")); } } diff --git a/src/lib/other/updater.h b/src/lib/other/updater.h index 0a23b07e5..0e7a05cc7 100644 --- a/src/lib/other/updater.h +++ b/src/lib/other/updater.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -27,13 +27,13 @@ class QUrl; class BrowserWindow; -class QUPZILLA_EXPORT Updater : public QObject +class FALKON_EXPORT Updater : public QObject { Q_OBJECT public: explicit Updater(BrowserWindow* window, QObject* parent = 0); - struct QUPZILLA_EXPORT Version { + struct FALKON_EXPORT Version { bool isValid; int majorVersion; int minorVersion; diff --git a/src/lib/other/useragentmanager.cpp b/src/lib/other/useragentmanager.cpp index ab5e1e79a..52778b1aa 100644 --- a/src/lib/other/useragentmanager.cpp +++ b/src/lib/other/useragentmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -28,7 +28,7 @@ UserAgentManager::UserAgentManager(QObject* parent) , m_usePerDomainUserAgent(false) { m_defaultUserAgent = QWebEngineProfile::defaultProfile()->httpUserAgent(); - m_defaultUserAgent.replace(QRegularExpression(QSL("QtWebEngine/[^\\s]+")), QSL("QupZilla/%1").arg(Qz::VERSION)); + m_defaultUserAgent.replace(QRegularExpression(QSL("QtWebEngine/[^\\s]+")), QSL("Falkon/%1").arg(Qz::VERSION)); } void UserAgentManager::loadSettings() diff --git a/src/lib/other/useragentmanager.h b/src/lib/other/useragentmanager.h index b8a94f0c0..45477847c 100644 --- a/src/lib/other/useragentmanager.h +++ b/src/lib/other/useragentmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2015 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -25,7 +25,7 @@ class QUrl; -class QUPZILLA_EXPORT UserAgentManager : QObject +class FALKON_EXPORT UserAgentManager : QObject { Q_OBJECT diff --git a/src/lib/plugins/plugininterface.h b/src/lib/plugins/plugininterface.h index 7378b7bc2..b72a0a83b 100644 --- a/src/lib/plugins/plugininterface.h +++ b/src/lib/plugins/plugininterface.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -86,6 +86,6 @@ public: virtual bool acceptNavigationRequest(WebPage *page, const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame) { Q_UNUSED(page); Q_UNUSED(url); Q_UNUSED(type); Q_UNUSED(isMainFrame); return true; } }; -Q_DECLARE_INTERFACE(PluginInterface, "QupZilla.Browser.PluginInterface/2.0") +Q_DECLARE_INTERFACE(PluginInterface, "Falkon.Browser.PluginInterface/2.0") #endif // PLUGININTERFACE_H diff --git a/src/lib/plugins/pluginproxy.cpp b/src/lib/plugins/pluginproxy.cpp index b536259a9..014d896fe 100644 --- a/src/lib/plugins/pluginproxy.cpp +++ b/src/lib/plugins/pluginproxy.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/plugins/pluginproxy.h b/src/lib/plugins/pluginproxy.h index da593fb6f..3f82756cd 100644 --- a/src/lib/plugins/pluginproxy.h +++ b/src/lib/plugins/pluginproxy.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -26,7 +26,7 @@ class WebPage; class BrowserWindow; -class QUPZILLA_EXPORT PluginProxy : public Plugins +class FALKON_EXPORT PluginProxy : public Plugins { Q_OBJECT public: diff --git a/src/lib/plugins/plugins.cpp b/src/lib/plugins/plugins.cpp index dc5304498..32e84fb01 100644 --- a/src/lib/plugins/plugins.cpp +++ b/src/lib/plugins/plugins.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -164,7 +164,7 @@ void Plugins::loadPlugins() refreshLoadedPlugins(); - std::cout << "QupZilla: " << m_loadedPlugins.count() << " extensions loaded" << std::endl; + std::cout << "Falkon: " << m_loadedPlugins.count() << " extensions loaded" << std::endl; } void Plugins::loadAvailablePlugins() diff --git a/src/lib/plugins/plugins.h b/src/lib/plugins/plugins.h index 2d767cfbb..6e90d9059 100644 --- a/src/lib/plugins/plugins.h +++ b/src/lib/plugins/plugins.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ class QPluginLoader; class SpeedDial; -class QUPZILLA_EXPORT Plugins : public QObject +class FALKON_EXPORT Plugins : public QObject { Q_OBJECT public: diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp index 8db3e7a3a..afa67ef3b 100644 --- a/src/lib/plugins/speeddial.cpp +++ b/src/lib/plugins/speeddial.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/plugins/speeddial.h b/src/lib/plugins/speeddial.h index 494b0f9cc..95fc2e126 100644 --- a/src/lib/plugins/speeddial.h +++ b/src/lib/plugins/speeddial.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ class QPixmap; class AutoSaver; class PageThumbnailer; -class QUPZILLA_EXPORT SpeedDial : public QObject +class FALKON_EXPORT SpeedDial : public QObject { Q_OBJECT public: diff --git a/src/lib/popupwindow/popuplocationbar.cpp b/src/lib/popupwindow/popuplocationbar.cpp index 5fbf4a134..3c83b3206 100644 --- a/src/lib/popupwindow/popuplocationbar.cpp +++ b/src/lib/popupwindow/popuplocationbar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ #include "autofillicon.h" #include "webpage.h" -class QUPZILLA_EXPORT PopupSiteIcon : public QWidget +class FALKON_EXPORT PopupSiteIcon : public QWidget { public: explicit PopupSiteIcon(QWidget* parent = 0) : QWidget(parent) { } diff --git a/src/lib/popupwindow/popuplocationbar.h b/src/lib/popupwindow/popuplocationbar.h index 1ef7ded1e..1f122fe82 100644 --- a/src/lib/popupwindow/popuplocationbar.h +++ b/src/lib/popupwindow/popuplocationbar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -28,7 +28,7 @@ class PopupWebView; class AutoFillIcon; class BookmarksIcon; -class QUPZILLA_EXPORT PopupLocationBar : public LineEdit +class FALKON_EXPORT PopupLocationBar : public LineEdit { Q_OBJECT Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize) diff --git a/src/lib/popupwindow/popupstatusbarmessage.cpp b/src/lib/popupwindow/popupstatusbarmessage.cpp index 129fde2a6..ef0114829 100644 --- a/src/lib/popupwindow/popupstatusbarmessage.cpp +++ b/src/lib/popupwindow/popupstatusbarmessage.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/popupwindow/popupstatusbarmessage.h b/src/lib/popupwindow/popupstatusbarmessage.h index 808ad2a16..05cc947f1 100644 --- a/src/lib/popupwindow/popupstatusbarmessage.h +++ b/src/lib/popupwindow/popupstatusbarmessage.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ class PopupWindow; class TipLabel; -class QUPZILLA_EXPORT PopupStatusBarMessage +class FALKON_EXPORT PopupStatusBarMessage { public: explicit PopupStatusBarMessage(PopupWindow* window); diff --git a/src/lib/popupwindow/popupwebview.cpp b/src/lib/popupwindow/popupwebview.cpp index 3ca7d77a9..4a053a004 100644 --- a/src/lib/popupwindow/popupwebview.cpp +++ b/src/lib/popupwindow/popupwebview.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/popupwindow/popupwebview.h b/src/lib/popupwindow/popupwebview.h index 788f8be6c..f70f61c54 100644 --- a/src/lib/popupwindow/popupwebview.h +++ b/src/lib/popupwindow/popupwebview.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2015 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ class Menu; class LoadRequest; class WebInspector; -class QUPZILLA_EXPORT PopupWebView : public WebView +class FALKON_EXPORT PopupWebView : public WebView { Q_OBJECT public: diff --git a/src/lib/popupwindow/popupwindow.cpp b/src/lib/popupwindow/popupwindow.cpp index b786208a3..cd963b15a 100644 --- a/src/lib/popupwindow/popupwindow.cpp +++ b/src/lib/popupwindow/popupwindow.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -249,7 +249,7 @@ void PopupWindow::searchOnPage() void PopupWindow::titleChanged() { - setWindowTitle(tr("%1 - QupZilla").arg(m_view->title())); + setWindowTitle(tr("%1 - Falkon").arg(m_view->title())); } void PopupWindow::setWindowGeometry(QRect newRect) diff --git a/src/lib/popupwindow/popupwindow.h b/src/lib/popupwindow/popupwindow.h index 160596824..85b4bb707 100644 --- a/src/lib/popupwindow/popupwindow.h +++ b/src/lib/popupwindow/popupwindow.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -35,7 +35,7 @@ class PopupLocationBar; class ProgressBar; class SearchToolBar; -class QUPZILLA_EXPORT PopupWindow : public QWidget +class FALKON_EXPORT PopupWindow : public QWidget { Q_OBJECT public: diff --git a/src/lib/preferences/acceptlanguage.cpp b/src/lib/preferences/acceptlanguage.cpp index fa02a5c6d..da6986517 100644 --- a/src/lib/preferences/acceptlanguage.cpp +++ b/src/lib/preferences/acceptlanguage.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301 USA */ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/preferences/acceptlanguage.h b/src/lib/preferences/acceptlanguage.h index 94d3151b2..16182e0ae 100644 --- a/src/lib/preferences/acceptlanguage.h +++ b/src/lib/preferences/acceptlanguage.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -28,7 +28,7 @@ namespace Ui class AcceptLanguage; } -class QUPZILLA_EXPORT AcceptLanguage : public QDialog +class FALKON_EXPORT AcceptLanguage : public QDialog { Q_OBJECT diff --git a/src/lib/preferences/autofillmanager.cpp b/src/lib/preferences/autofillmanager.cpp index bde705bae..d3f76666b 100644 --- a/src/lib/preferences/autofillmanager.cpp +++ b/src/lib/preferences/autofillmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/preferences/autofillmanager.h b/src/lib/preferences/autofillmanager.h index 4a7289aa6..3516a114e 100644 --- a/src/lib/preferences/autofillmanager.h +++ b/src/lib/preferences/autofillmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ namespace Ui class AutoFillManager; } -class QUPZILLA_EXPORT AutoFillManager : public QWidget +class FALKON_EXPORT AutoFillManager : public QWidget { Q_OBJECT diff --git a/src/lib/preferences/jsoptions.cpp b/src/lib/preferences/jsoptions.cpp index f5cd925c6..bf1f113df 100644 --- a/src/lib/preferences/jsoptions.cpp +++ b/src/lib/preferences/jsoptions.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca 2013-2014 Mladen Pejaković * diff --git a/src/lib/preferences/jsoptions.h b/src/lib/preferences/jsoptions.h index cbcdc007a..bf0618c43 100644 --- a/src/lib/preferences/jsoptions.h +++ b/src/lib/preferences/jsoptions.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca 2013-2014 Mladen Pejaković * @@ -28,7 +28,7 @@ namespace Ui class JsOptions; } -class QUPZILLA_EXPORT JsOptions : public QDialog +class FALKON_EXPORT JsOptions : public QDialog { Q_OBJECT diff --git a/src/lib/preferences/pluginlistdelegate.cpp b/src/lib/preferences/pluginlistdelegate.cpp index 2a5cbc7cd..f1b7a6e3f 100644 --- a/src/lib/preferences/pluginlistdelegate.cpp +++ b/src/lib/preferences/pluginlistdelegate.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/preferences/pluginlistdelegate.h b/src/lib/preferences/pluginlistdelegate.h index 077909625..f5d37a042 100644 --- a/src/lib/preferences/pluginlistdelegate.h +++ b/src/lib/preferences/pluginlistdelegate.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class QListWidget; -class QUPZILLA_EXPORT PluginListDelegate : public QStyledItemDelegate +class FALKON_EXPORT PluginListDelegate : public QStyledItemDelegate { public: explicit PluginListDelegate(QListWidget* parent); diff --git a/src/lib/preferences/pluginsmanager.cpp b/src/lib/preferences/pluginsmanager.cpp index 1f2ca6a47..da1eed66e 100644 --- a/src/lib/preferences/pluginsmanager.cpp +++ b/src/lib/preferences/pluginsmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/preferences/pluginsmanager.h b/src/lib/preferences/pluginsmanager.h index 521a78741..904f6ed33 100644 --- a/src/lib/preferences/pluginsmanager.h +++ b/src/lib/preferences/pluginsmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ class PluginsList; class QListWidgetItem; -class QUPZILLA_EXPORT PluginsManager : public QWidget +class FALKON_EXPORT PluginsManager : public QWidget { Q_OBJECT diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp index bfcfe2043..90f43f219 100644 --- a/src/lib/preferences/preferences.cpp +++ b/src/lib/preferences/preferences.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -134,8 +134,8 @@ Preferences::Preferences(BrowserWindow* window) Settings settings; //GENERAL URLs settings.beginGroup("Web-URL-Settings"); - m_homepage = settings.value("homepage", QUrl(QSL("qupzilla:start"))).toUrl(); - m_newTabUrl = settings.value("newTabUrl", QUrl(QSL("qupzilla:speeddial"))).toUrl(); + m_homepage = settings.value("homepage", QUrl(QSL("falkon:start"))).toUrl(); + m_newTabUrl = settings.value("newTabUrl", QUrl(QSL("falkon:speeddial"))).toUrl(); ui->homepage->setText(m_homepage.toEncoded()); ui->newTabUrl->setText(m_newTabUrl.toEncoded()); settings.endGroup(); @@ -152,7 +152,7 @@ Preferences::Preferences(BrowserWindow* window) else { ui->checkNowDefaultBrowser->setText(tr("Set as default")); ui->checkNowDefaultBrowser->setEnabled(true); - connect(ui->checkNowDefaultBrowser, SIGNAL(clicked()), this, SLOT(makeQupZillaDefault())); + connect(ui->checkNowDefaultBrowser, SIGNAL(clicked()), this, SLOT(makeFalkonDefault())); } #else // No Default Browser settings on non-Windows platform ui->hSpacerDefaultBrowser->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed); @@ -169,7 +169,7 @@ Preferences::Preferences(BrowserWindow* window) else if (m_newTabUrl == m_homepage) { ui->newTab->setCurrentIndex(1); } - else if (m_newTabUrl.toString() == QL1S("qupzilla:speeddial")) { + else if (m_newTabUrl.toString() == QL1S("falkon:speeddial")) { ui->newTab->setCurrentIndex(2); } else { @@ -607,10 +607,10 @@ void Preferences::showNotificationPreview() } } -void Preferences::makeQupZillaDefault() +void Preferences::makeFalkonDefault() { #if defined(Q_OS_WIN) && !defined(Q_OS_OS2) - disconnect(ui->checkNowDefaultBrowser, SIGNAL(clicked()), this, SLOT(makeQupZillaDefault())); + disconnect(ui->checkNowDefaultBrowser, SIGNAL(clicked()), this, SLOT(makeFalkonDefault())); ui->checkNowDefaultBrowser->setText(tr("Default")); ui->checkNowDefaultBrowser->setEnabled(false); @@ -877,7 +877,7 @@ void Preferences::saveSettings() break; case 2: - settings.setValue("newTabUrl", QUrl(QSL("qupzilla:speeddial"))); + settings.setValue("newTabUrl", QUrl(QSL("falkon:speeddial"))); break; case 3: diff --git a/src/lib/preferences/preferences.h b/src/lib/preferences/preferences.h index 2e3fe1a7d..b0e0ef9c9 100644 --- a/src/lib/preferences/preferences.h +++ b/src/lib/preferences/preferences.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -38,7 +38,7 @@ class PluginsManager; class DesktopNotification; class ThemeManager; -class QUPZILLA_EXPORT Preferences : public QWidget +class FALKON_EXPORT Preferences : public QWidget { Q_OBJECT @@ -87,7 +87,7 @@ private slots: void showNotificationPreview(); - void makeQupZillaDefault(); + void makeFalkonDefault(); private: void closeEvent(QCloseEvent* event); diff --git a/src/lib/preferences/preferences.ui b/src/lib/preferences/preferences.ui index 19788e6cb..cff521def 100644 --- a/src/lib/preferences/preferences.ui +++ b/src/lib/preferences/preferences.ui @@ -477,7 +477,7 @@ - Check to see if QupZilla is the default browser on startup + Check to see if Falkon is the default browser on startup false diff --git a/src/lib/preferences/thememanager.cpp b/src/lib/preferences/thememanager.cpp index cc1723840..156bf8197 100644 --- a/src/lib/preferences/thememanager.cpp +++ b/src/lib/preferences/thememanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/preferences/thememanager.h b/src/lib/preferences/thememanager.h index 00e8f51d0..e479f7b4a 100644 --- a/src/lib/preferences/thememanager.h +++ b/src/lib/preferences/thememanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -32,7 +32,7 @@ class ThemeManager; class Preferences; -class QUPZILLA_EXPORT ThemeManager : public QWidget +class FALKON_EXPORT ThemeManager : public QWidget { Q_OBJECT diff --git a/src/lib/preferences/useragentdialog.cpp b/src/lib/preferences/useragentdialog.cpp index a36392179..af887c8c9 100644 --- a/src/lib/preferences/useragentdialog.cpp +++ b/src/lib/preferences/useragentdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/preferences/useragentdialog.h b/src/lib/preferences/useragentdialog.h index 0e9b511fc..aa0838a38 100644 --- a/src/lib/preferences/useragentdialog.h +++ b/src/lib/preferences/useragentdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ namespace Ui class UserAgentDialog; } -class QUPZILLA_EXPORT UserAgentDialog : public QDialog +class FALKON_EXPORT UserAgentDialog : public QDialog { Q_OBJECT diff --git a/src/lib/session/recoveryjsobject.cpp b/src/lib/session/recoveryjsobject.cpp index 2bcb7693c..02e81e1a4 100644 --- a/src/lib/session/recoveryjsobject.cpp +++ b/src/lib/session/recoveryjsobject.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2015-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/session/recoveryjsobject.h b/src/lib/session/recoveryjsobject.h index 8b1c92683..208f81067 100644 --- a/src/lib/session/recoveryjsobject.h +++ b/src/lib/session/recoveryjsobject.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - QtWebEngine based browser +* Falkon - Qt web browser * Copyright (C) 2015 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/session/restoremanager.cpp b/src/lib/session/restoremanager.cpp index 90ee0a26e..16d88334d 100644 --- a/src/lib/session/restoremanager.cpp +++ b/src/lib/session/restoremanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 Franz Fellner * David Rosca * diff --git a/src/lib/session/restoremanager.h b/src/lib/session/restoremanager.h index 69b168c65..880a18cda 100644 --- a/src/lib/session/restoremanager.h +++ b/src/lib/session/restoremanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 Franz Fellner * David Rosca * @@ -25,7 +25,7 @@ class WebPage; class RecoveryJsObject; -class QUPZILLA_EXPORT RestoreManager +class FALKON_EXPORT RestoreManager { public: struct WindowData { diff --git a/src/lib/session/sessionmanager.cpp b/src/lib/session/sessionmanager.cpp index e55e57531..920aa261a 100644 --- a/src/lib/session/sessionmanager.cpp +++ b/src/lib/session/sessionmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2017 Razi Alavizadeh * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/session/sessionmanager.h b/src/lib/session/sessionmanager.h index 0223c14f2..bf6179c56 100644 --- a/src/lib/session/sessionmanager.h +++ b/src/lib/session/sessionmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2017 Razi Alavizadeh * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class QAction; class QMenu; class QFileInfo; -class QUPZILLA_EXPORT SessionManager : public QObject +class FALKON_EXPORT SessionManager : public QObject { Q_OBJECT diff --git a/src/lib/session/sessionmanagerdialog.cpp b/src/lib/session/sessionmanagerdialog.cpp index c756eb38e..eeb391c61 100644 --- a/src/lib/session/sessionmanagerdialog.cpp +++ b/src/lib/session/sessionmanagerdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/session/sessionmanagerdialog.h b/src/lib/session/sessionmanagerdialog.h index 21a2fb6ca..69e151b38 100644 --- a/src/lib/session/sessionmanagerdialog.h +++ b/src/lib/session/sessionmanagerdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/sidebar/bookmarkssidebar.cpp b/src/lib/sidebar/bookmarkssidebar.cpp index f76507126..0df13dc91 100644 --- a/src/lib/sidebar/bookmarkssidebar.cpp +++ b/src/lib/sidebar/bookmarkssidebar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/sidebar/bookmarkssidebar.h b/src/lib/sidebar/bookmarkssidebar.h index 70f3cadc0..c4a6ed797 100644 --- a/src/lib/sidebar/bookmarkssidebar.h +++ b/src/lib/sidebar/bookmarkssidebar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -31,7 +31,7 @@ class BrowserWindow; class Bookmarks; class BookmarkItem; -class QUPZILLA_EXPORT BookmarksSidebar : public QWidget +class FALKON_EXPORT BookmarksSidebar : public QWidget { Q_OBJECT diff --git a/src/lib/sidebar/historysidebar.cpp b/src/lib/sidebar/historysidebar.cpp index b3cf7d379..e23161762 100644 --- a/src/lib/sidebar/historysidebar.cpp +++ b/src/lib/sidebar/historysidebar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/sidebar/historysidebar.h b/src/lib/sidebar/historysidebar.h index 85b3f918e..c6f63d280 100644 --- a/src/lib/sidebar/historysidebar.h +++ b/src/lib/sidebar/historysidebar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ class HistorySideBar; class BrowserWindow; -class QUPZILLA_EXPORT HistorySideBar : public QWidget +class FALKON_EXPORT HistorySideBar : public QWidget { Q_OBJECT diff --git a/src/lib/sidebar/sidebar.cpp b/src/lib/sidebar/sidebar.cpp index 147861f86..8c6957328 100644 --- a/src/lib/sidebar/sidebar.cpp +++ b/src/lib/sidebar/sidebar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/sidebar/sidebar.h b/src/lib/sidebar/sidebar.h index f34b3b8a8..519b00be9 100644 --- a/src/lib/sidebar/sidebar.h +++ b/src/lib/sidebar/sidebar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -32,7 +32,7 @@ class SideBarInterface; class SideBarManager; class BrowserWindow; -class QUPZILLA_EXPORT SideBar : public QWidget +class FALKON_EXPORT SideBar : public QWidget { Q_OBJECT public: @@ -54,7 +54,7 @@ private: SideBarManager* m_manager; }; -class QUPZILLA_EXPORT SideBarManager : public QObject +class FALKON_EXPORT SideBarManager : public QObject { Q_OBJECT public: diff --git a/src/lib/sidebar/sidebarinterface.h b/src/lib/sidebar/sidebarinterface.h index 677963bc0..bf63c1116 100644 --- a/src/lib/sidebar/sidebarinterface.h +++ b/src/lib/sidebar/sidebarinterface.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -26,7 +26,7 @@ class QAction; class BrowserWindow; -class QUPZILLA_EXPORT SideBarInterface : public QObject +class FALKON_EXPORT SideBarInterface : public QObject { public: explicit SideBarInterface(QObject* parent = 0) : QObject(parent) { } diff --git a/src/lib/tabwidget/combotabbar.cpp b/src/lib/tabwidget/combotabbar.cpp index 1817f0fd7..346b6a844 100644 --- a/src/lib/tabwidget/combotabbar.cpp +++ b/src/lib/tabwidget/combotabbar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 S. Razi Alavizadeh * Copyright (C) 2014-2017 David Rosca * diff --git a/src/lib/tabwidget/combotabbar.h b/src/lib/tabwidget/combotabbar.h index 84afe5c0b..ce567c621 100644 --- a/src/lib/tabwidget/combotabbar.h +++ b/src/lib/tabwidget/combotabbar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 S. Razi Alavizadeh * Copyright (C) 2014-2017 David Rosca * @@ -36,7 +36,7 @@ class TabBarScrollWidget; class TabBarHelper; class ToolButton; -class QUPZILLA_EXPORT ComboTabBar : public QWidget +class FALKON_EXPORT ComboTabBar : public QWidget { Q_OBJECT Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentChanged) @@ -214,7 +214,7 @@ private: friend class TabStackedWidget; }; -class QUPZILLA_EXPORT TabBarHelper : public QTabBar +class FALKON_EXPORT TabBarHelper : public QTabBar { Q_OBJECT @@ -268,7 +268,7 @@ private: bool m_useFastTabSizeHint; }; -class QUPZILLA_EXPORT TabScrollBar : public QScrollBar +class FALKON_EXPORT TabScrollBar : public QScrollBar { Q_OBJECT public: @@ -284,7 +284,7 @@ private: }; -class QUPZILLA_EXPORT TabBarScrollWidget : public QWidget +class FALKON_EXPORT TabBarScrollWidget : public QWidget { Q_OBJECT public: diff --git a/src/lib/tabwidget/tabbar.cpp b/src/lib/tabwidget/tabbar.cpp index 8cf8deed5..df225e063 100644 --- a/src/lib/tabwidget/tabbar.cpp +++ b/src/lib/tabwidget/tabbar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tabwidget/tabbar.h b/src/lib/tabwidget/tabbar.h index 086da1f3b..6897ae275 100644 --- a/src/lib/tabwidget/tabbar.h +++ b/src/lib/tabwidget/tabbar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -28,7 +28,7 @@ class BrowserWindow; class TabWidget; class WebTab; -class QUPZILLA_EXPORT TabBar : public ComboTabBar +class FALKON_EXPORT TabBar : public ComboTabBar { Q_OBJECT public: diff --git a/src/lib/tabwidget/tabicon.cpp b/src/lib/tabwidget/tabicon.cpp index 33d8b3bb7..94c0002df 100644 --- a/src/lib/tabwidget/tabicon.cpp +++ b/src/lib/tabwidget/tabicon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -90,7 +90,7 @@ void TabIcon::updateIcon() { m_sitePixmap = m_tab->icon(/*allowNull*/ true).pixmap(16); if (m_sitePixmap.isNull()) { - if (m_tab->url().isEmpty() || m_tab->url().scheme() == QL1S("qupzilla")) { + if (m_tab->url().isEmpty() || m_tab->url().scheme() == QL1S("falkon")) { hide(); } else { m_hideTimer->start(); diff --git a/src/lib/tabwidget/tabicon.h b/src/lib/tabwidget/tabicon.h index ce0854854..7d601c8db 100644 --- a/src/lib/tabwidget/tabicon.h +++ b/src/lib/tabwidget/tabicon.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ class QTimer; class WebTab; -class QUPZILLA_EXPORT TabIcon : public QWidget +class FALKON_EXPORT TabIcon : public QWidget { Q_OBJECT diff --git a/src/lib/tabwidget/tabstackedwidget.cpp b/src/lib/tabwidget/tabstackedwidget.cpp index 171a088d8..e8499149a 100644 --- a/src/lib/tabwidget/tabstackedwidget.cpp +++ b/src/lib/tabwidget/tabstackedwidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 S. Razi Alavizadeh * * Some code was taken from qtabwidget.cpp diff --git a/src/lib/tabwidget/tabstackedwidget.h b/src/lib/tabwidget/tabstackedwidget.h index 1e1037cc4..2c3b47638 100644 --- a/src/lib/tabwidget/tabstackedwidget.h +++ b/src/lib/tabwidget/tabstackedwidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 S. Razi Alavizadeh * * This program is free software: you can redistribute it and/or modify @@ -28,7 +28,7 @@ class QStackedWidget; class QVBoxLayout; -class QUPZILLA_EXPORT TabStackedWidget : public QWidget +class FALKON_EXPORT TabStackedWidget : public QWidget { Q_OBJECT public: diff --git a/src/lib/tabwidget/tabwidget.cpp b/src/lib/tabwidget/tabwidget.cpp index aaa612c49..09cdeb419 100644 --- a/src/lib/tabwidget/tabwidget.cpp +++ b/src/lib/tabwidget/tabwidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -195,7 +195,7 @@ void TabWidget::loadSettings() settings.endGroup(); settings.beginGroup("Web-URL-Settings"); - m_urlOnNewTab = settings.value("newTabUrl", "qupzilla:speeddial").toUrl(); + m_urlOnNewTab = settings.value("newTabUrl", "falkon:speeddial").toUrl(); settings.endGroup(); m_tabBar->loadSettings(); @@ -445,7 +445,7 @@ void TabWidget::closeTab(int index) TabbedWebView *webView = webTab->webView(); // Save tab url and history - if (webView->url().toString() != QL1S("qupzilla:restore")) + if (webView->url().toString() != QL1S("falkon:restore")) m_closedTabsManager->saveTab(webTab, index); m_locationBars->removeWidget(webView->webTab()->locationBar()); @@ -480,7 +480,7 @@ void TabWidget::requestCloseTab(int index) TabbedWebView *webView = webTab->webView(); // Don't close restore page! - if (webView->url().toString() == QL1S("qupzilla:restore") && mApp->restoreManager()) + if (webView->url().toString() == QL1S("falkon:restore") && mApp->restoreManager()) return; // This would close last tab, so we close the window instead @@ -837,7 +837,7 @@ bool TabWidget::restoreState(const QVector &tabs, int currentT void TabWidget::closeRecoveryTab() { foreach (WebTab* tab, allTabs(false)) { - if (tab->url().toString() == QLatin1String("qupzilla:restore")) { + if (tab->url().toString() == QLatin1String("falkon:restore")) { closeTab(tab->tabIndex()); } } diff --git a/src/lib/tabwidget/tabwidget.h b/src/lib/tabwidget/tabwidget.h index ea4f02dc8..f5c267a88 100644 --- a/src/lib/tabwidget/tabwidget.h +++ b/src/lib/tabwidget/tabwidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -36,7 +36,7 @@ class BrowserWindow; class TabbedWebView; class ClosedTabsManager; -class QUPZILLA_EXPORT AddTabButton : public ToolButton +class FALKON_EXPORT AddTabButton : public ToolButton { public: explicit AddTabButton(TabWidget* tabWidget, TabBar* tabBar); @@ -51,7 +51,7 @@ private: TabWidget* m_tabWidget; }; -class QUPZILLA_EXPORT MenuTabs : public QMenu +class FALKON_EXPORT MenuTabs : public QMenu { Q_OBJECT public: @@ -64,7 +64,7 @@ private: void mouseReleaseEvent(QMouseEvent* event); }; -class QUPZILLA_EXPORT TabWidget : public TabStackedWidget +class FALKON_EXPORT TabWidget : public TabStackedWidget { Q_OBJECT public: diff --git a/src/lib/tools/aesinterface.cpp b/src/lib/tools/aesinterface.cpp index 51dc4d5e5..6d4a8523e 100644 --- a/src/lib/tools/aesinterface.cpp +++ b/src/lib/tools/aesinterface.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 S. Razi Alavizadeh * Copyright (C) 2013-2017 David Rosca * @@ -144,8 +144,8 @@ QByteArray AesInterface::decrypt(const QByteArray &cipherData, const QByteArray } if (cipherSections.at(0).toInt() > AesInterface::VERSION) { - QMessageBox::information(0, tr("Warning!"), tr("Data has been encrypted with a newer version of QupZilla." - "\nPlease install latest version of QupZilla.")); + QMessageBox::information(0, tr("Warning!"), tr("Data has been encrypted with a newer version of Falkon." + "\nPlease install latest version of Falkon.")); return QByteArray(); } diff --git a/src/lib/tools/aesinterface.h b/src/lib/tools/aesinterface.h index c3c940c25..8ca2e5787 100644 --- a/src/lib/tools/aesinterface.h +++ b/src/lib/tools/aesinterface.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 S. Razi Alavizadeh * Copyright (C) 2013-2014 David Rosca * @@ -29,7 +29,7 @@ #include #include -class QUPZILLA_EXPORT AesInterface : public QObject +class FALKON_EXPORT AesInterface : public QObject { Q_OBJECT diff --git a/src/lib/tools/animatedwidget.cpp b/src/lib/tools/animatedwidget.cpp index a4017ebac..cdae42f35 100644 --- a/src/lib/tools/animatedwidget.cpp +++ b/src/lib/tools/animatedwidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/animatedwidget.h b/src/lib/tools/animatedwidget.h index edb07017e..dfab5c9e0 100644 --- a/src/lib/tools/animatedwidget.h +++ b/src/lib/tools/animatedwidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT AnimatedWidget : public QWidget +class FALKON_EXPORT AnimatedWidget : public QWidget { Q_OBJECT diff --git a/src/lib/tools/buttonbox.cpp b/src/lib/tools/buttonbox.cpp index db754f8ff..8a675c572 100644 --- a/src/lib/tools/buttonbox.cpp +++ b/src/lib/tools/buttonbox.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/buttonbox.h b/src/lib/tools/buttonbox.h index 9f78991f7..ffe53a3f7 100644 --- a/src/lib/tools/buttonbox.h +++ b/src/lib/tools/buttonbox.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class QAbstractButton; -class QUPZILLA_EXPORT ButtonBox : public QDialogButtonBox +class FALKON_EXPORT ButtonBox : public QDialogButtonBox { Q_OBJECT public: diff --git a/src/lib/tools/buttonwithmenu.cpp b/src/lib/tools/buttonwithmenu.cpp index cfddb9b1e..2e6349dd6 100644 --- a/src/lib/tools/buttonwithmenu.cpp +++ b/src/lib/tools/buttonwithmenu.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/buttonwithmenu.h b/src/lib/tools/buttonwithmenu.h index 9d1025b6d..612cbf2cb 100644 --- a/src/lib/tools/buttonwithmenu.h +++ b/src/lib/tools/buttonwithmenu.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/certificateinfowidget.cpp b/src/lib/tools/certificateinfowidget.cpp index 6ed0b4871..cb0a92db0 100644 --- a/src/lib/tools/certificateinfowidget.cpp +++ b/src/lib/tools/certificateinfowidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/certificateinfowidget.h b/src/lib/tools/certificateinfowidget.h index 9e5fd6688..a0c78d5b3 100644 --- a/src/lib/tools/certificateinfowidget.h +++ b/src/lib/tools/certificateinfowidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ class CertificateInfoWidget; class QSslCertificate; -class QUPZILLA_EXPORT CertificateInfoWidget : public QWidget +class FALKON_EXPORT CertificateInfoWidget : public QWidget { public: explicit CertificateInfoWidget(const QSslCertificate &cert, QWidget* parent = 0); diff --git a/src/lib/tools/clickablelabel.cpp b/src/lib/tools/clickablelabel.cpp index 3a1aaa106..56b4fbae6 100644 --- a/src/lib/tools/clickablelabel.cpp +++ b/src/lib/tools/clickablelabel.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/clickablelabel.h b/src/lib/tools/clickablelabel.h index 1051f10b7..97e480319 100644 --- a/src/lib/tools/clickablelabel.h +++ b/src/lib/tools/clickablelabel.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -25,7 +25,7 @@ class QMouseEvent; -class QUPZILLA_EXPORT ClickableLabel : public QLabel +class FALKON_EXPORT ClickableLabel : public QLabel { Q_OBJECT Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize) diff --git a/src/lib/tools/closedtabsmanager.cpp b/src/lib/tools/closedtabsmanager.cpp index ea432a18c..323910c5b 100644 --- a/src/lib/tools/closedtabsmanager.cpp +++ b/src/lib/tools/closedtabsmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/closedtabsmanager.h b/src/lib/tools/closedtabsmanager.h index 5c26b66ea..cceb4a016 100644 --- a/src/lib/tools/closedtabsmanager.h +++ b/src/lib/tools/closedtabsmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -26,7 +26,7 @@ class WebTab; -class QUPZILLA_EXPORT ClosedTabsManager +class FALKON_EXPORT ClosedTabsManager { public: struct Tab { diff --git a/src/lib/tools/delayedfilewatcher.cpp b/src/lib/tools/delayedfilewatcher.cpp index c969c8b89..d351c8bc0 100644 --- a/src/lib/tools/delayedfilewatcher.cpp +++ b/src/lib/tools/delayedfilewatcher.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/delayedfilewatcher.h b/src/lib/tools/delayedfilewatcher.h index 062ef0d25..499fba420 100644 --- a/src/lib/tools/delayedfilewatcher.h +++ b/src/lib/tools/delayedfilewatcher.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT DelayedFileWatcher : public QFileSystemWatcher +class FALKON_EXPORT DelayedFileWatcher : public QFileSystemWatcher { Q_OBJECT diff --git a/src/lib/tools/docktitlebarwidget.cpp b/src/lib/tools/docktitlebarwidget.cpp index cba0eb71a..975dfd4ab 100644 --- a/src/lib/tools/docktitlebarwidget.cpp +++ b/src/lib/tools/docktitlebarwidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/docktitlebarwidget.h b/src/lib/tools/docktitlebarwidget.h index dd415e4fa..4a6f0260a 100644 --- a/src/lib/tools/docktitlebarwidget.h +++ b/src/lib/tools/docktitlebarwidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ #include "qzcommon.h" #include "ui_docktitlebarwidget.h" -class QUPZILLA_EXPORT DockTitleBarWidget : public QWidget, public Ui_DockTitleBarWidget +class FALKON_EXPORT DockTitleBarWidget : public QWidget, public Ui_DockTitleBarWidget { public: explicit DockTitleBarWidget(const QString &title, QWidget* parent = 0); diff --git a/src/lib/tools/emptynetworkreply.cpp b/src/lib/tools/emptynetworkreply.cpp index bfe168184..2be8c94c6 100644 --- a/src/lib/tools/emptynetworkreply.cpp +++ b/src/lib/tools/emptynetworkreply.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ EmptyNetworkReply::EmptyNetworkReply(QObject* parent) : QNetworkReply(parent) { setOperation(QNetworkAccessManager::GetOperation); - setError(QNetworkReply::OperationCanceledError, QSL("QupZilla:No Error")); + setError(QNetworkReply::OperationCanceledError, QSL("Falkon:No Error")); open(QIODevice::ReadOnly); diff --git a/src/lib/tools/emptynetworkreply.h b/src/lib/tools/emptynetworkreply.h index ad486484c..923e1e29b 100644 --- a/src/lib/tools/emptynetworkreply.h +++ b/src/lib/tools/emptynetworkreply.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT EmptyNetworkReply : public QNetworkReply +class FALKON_EXPORT EmptyNetworkReply : public QNetworkReply { Q_OBJECT public: diff --git a/src/lib/tools/enhancedmenu.cpp b/src/lib/tools/enhancedmenu.cpp index 6b00ba595..a06b5d657 100644 --- a/src/lib/tools/enhancedmenu.cpp +++ b/src/lib/tools/enhancedmenu.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/enhancedmenu.h b/src/lib/tools/enhancedmenu.h index b7827a153..c4556650e 100644 --- a/src/lib/tools/enhancedmenu.h +++ b/src/lib/tools/enhancedmenu.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -25,7 +25,7 @@ class Action; -class QUPZILLA_EXPORT Menu : public QMenu +class FALKON_EXPORT Menu : public QMenu { Q_OBJECT public: @@ -50,7 +50,7 @@ private: bool m_closeOnMiddleClick; }; -class QUPZILLA_EXPORT Action : public QAction +class FALKON_EXPORT Action : public QAction { Q_OBJECT public: diff --git a/src/lib/tools/focusselectlineedit.cpp b/src/lib/tools/focusselectlineedit.cpp index 0c68887a0..30f7728c1 100644 --- a/src/lib/tools/focusselectlineedit.cpp +++ b/src/lib/tools/focusselectlineedit.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/focusselectlineedit.h b/src/lib/tools/focusselectlineedit.h index 92b26f12d..f50abe32a 100644 --- a/src/lib/tools/focusselectlineedit.h +++ b/src/lib/tools/focusselectlineedit.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT FocusSelectLineEdit : public QLineEdit +class FALKON_EXPORT FocusSelectLineEdit : public QLineEdit { Q_OBJECT public: diff --git a/src/lib/tools/frame.cpp b/src/lib/tools/frame.cpp index 95af27945..c9a2383d8 100644 --- a/src/lib/tools/frame.cpp +++ b/src/lib/tools/frame.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/frame.h b/src/lib/tools/frame.h index f6bf1860c..1a0d9be3e 100644 --- a/src/lib/tools/frame.h +++ b/src/lib/tools/frame.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT Frame : public QFrame +class FALKON_EXPORT Frame : public QFrame { public: explicit Frame(QWidget* parent = 0); diff --git a/src/lib/tools/headerview.cpp b/src/lib/tools/headerview.cpp index 73bb49c47..5ace75c23 100644 --- a/src/lib/tools/headerview.cpp +++ b/src/lib/tools/headerview.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/headerview.h b/src/lib/tools/headerview.h index 9290957be..691a19dfd 100644 --- a/src/lib/tools/headerview.h +++ b/src/lib/tools/headerview.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class QContextMenuEvent; #include "qzcommon.h" -class QUPZILLA_EXPORT HeaderView : public QHeaderView +class FALKON_EXPORT HeaderView : public QHeaderView { Q_OBJECT public: diff --git a/src/lib/tools/horizontallistwidget.cpp b/src/lib/tools/horizontallistwidget.cpp index 9dec53c53..8a2c440ba 100644 --- a/src/lib/tools/horizontallistwidget.cpp +++ b/src/lib/tools/horizontallistwidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2013-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/horizontallistwidget.h b/src/lib/tools/horizontallistwidget.h index 92b9ebb3c..ddf2089de 100644 --- a/src/lib/tools/horizontallistwidget.h +++ b/src/lib/tools/horizontallistwidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/html5permissions/html5permissionsdialog.cpp b/src/lib/tools/html5permissions/html5permissionsdialog.cpp index b80cf6e93..f79ec974a 100644 --- a/src/lib/tools/html5permissions/html5permissionsdialog.cpp +++ b/src/lib/tools/html5permissions/html5permissionsdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/html5permissions/html5permissionsdialog.h b/src/lib/tools/html5permissions/html5permissionsdialog.h index 89b665421..82bae0c7f 100644 --- a/src/lib/tools/html5permissions/html5permissionsdialog.h +++ b/src/lib/tools/html5permissions/html5permissionsdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/html5permissions/html5permissionsmanager.cpp b/src/lib/tools/html5permissions/html5permissionsmanager.cpp index 5f0a09808..fc3bec16f 100644 --- a/src/lib/tools/html5permissions/html5permissionsmanager.cpp +++ b/src/lib/tools/html5permissions/html5permissionsmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2015 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/html5permissions/html5permissionsmanager.h b/src/lib/tools/html5permissions/html5permissionsmanager.h index 1854a1875..417f297c8 100644 --- a/src/lib/tools/html5permissions/html5permissionsmanager.h +++ b/src/lib/tools/html5permissions/html5permissionsmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2015 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ class QUrl; class WebPage; -class QUPZILLA_EXPORT HTML5PermissionsManager : public QObject +class FALKON_EXPORT HTML5PermissionsManager : public QObject { public: explicit HTML5PermissionsManager(QObject* parent); diff --git a/src/lib/tools/html5permissions/html5permissionsnotification.cpp b/src/lib/tools/html5permissions/html5permissionsnotification.cpp index 7ccb90e7e..ee08b8d0e 100644 --- a/src/lib/tools/html5permissions/html5permissionsnotification.cpp +++ b/src/lib/tools/html5permissions/html5permissionsnotification.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2013-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/html5permissions/html5permissionsnotification.h b/src/lib/tools/html5permissions/html5permissionsnotification.h index 2bf1b81a5..bc6ab0751 100644 --- a/src/lib/tools/html5permissions/html5permissionsnotification.h +++ b/src/lib/tools/html5permissions/html5permissionsnotification.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2015 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/iconprovider.cpp b/src/lib/tools/iconprovider.cpp index 27b5c865a..94d480c69 100644 --- a/src/lib/tools/iconprovider.cpp +++ b/src/lib/tools/iconprovider.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -55,7 +55,7 @@ void IconProvider::saveIcon(WebView* view) } const QStringList ignoredSchemes = { - QStringLiteral("qupzilla"), + QStringLiteral("falkon"), QStringLiteral("ftp"), QStringLiteral("file"), QStringLiteral("view-source"), diff --git a/src/lib/tools/iconprovider.h b/src/lib/tools/iconprovider.h index 0532dc38c..aa1a47f70 100644 --- a/src/lib/tools/iconprovider.h +++ b/src/lib/tools/iconprovider.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -33,7 +33,7 @@ class WebView; class AutoSaver; // Needs to be QWidget subclass, otherwise qproperty- setting won't work -class QUPZILLA_EXPORT IconProvider : public QWidget +class FALKON_EXPORT IconProvider : public QWidget { Q_OBJECT Q_PROPERTY(QIcon bookmarkIcon READ bookmarkIcon WRITE setBookmarkIcon) diff --git a/src/lib/tools/listitemdelegate.cpp b/src/lib/tools/listitemdelegate.cpp index 79819faec..94dbd6f43 100644 --- a/src/lib/tools/listitemdelegate.cpp +++ b/src/lib/tools/listitemdelegate.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/listitemdelegate.h b/src/lib/tools/listitemdelegate.h index f033c72b9..393c62ecd 100644 --- a/src/lib/tools/listitemdelegate.h +++ b/src/lib/tools/listitemdelegate.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT ListItemDelegate : public QStyledItemDelegate +class FALKON_EXPORT ListItemDelegate : public QStyledItemDelegate { public: explicit ListItemDelegate(int iconSize, QWidget* parent); diff --git a/src/lib/tools/mactoolbutton.cpp b/src/lib/tools/mactoolbutton.cpp index 7e2e2c9a7..f230bfbdb 100644 --- a/src/lib/tools/mactoolbutton.cpp +++ b/src/lib/tools/mactoolbutton.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2013-2017 David Rosca * Copyright (C) 2013-2014 S. Razi Alavizadeh * diff --git a/src/lib/tools/mactoolbutton.h b/src/lib/tools/mactoolbutton.h index a318bf32a..9ac797c1a 100644 --- a/src/lib/tools/mactoolbutton.h +++ b/src/lib/tools/mactoolbutton.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2013-2017 David Rosca * Copyright (C) 2013-2014 S. Razi Alavizadeh * @@ -24,7 +24,7 @@ #ifdef Q_OS_MACOS #include -class QUPZILLA_EXPORT MacToolButton : public QPushButton +class FALKON_EXPORT MacToolButton : public QPushButton { Q_OBJECT Q_PROPERTY(bool autoRaise READ autoRaise WRITE setAutoRaise) @@ -44,7 +44,7 @@ private: #else #include -class QUPZILLA_EXPORT MacToolButton : public QToolButton +class FALKON_EXPORT MacToolButton : public QToolButton { Q_OBJECT diff --git a/src/lib/tools/menubar.cpp b/src/lib/tools/menubar.cpp index dc4c7fd97..b129181df 100644 --- a/src/lib/tools/menubar.cpp +++ b/src/lib/tools/menubar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/menubar.h b/src/lib/tools/menubar.h index 93480f199..aa86d38cb 100644 --- a/src/lib/tools/menubar.h +++ b/src/lib/tools/menubar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class BrowserWindow; -class QUPZILLA_EXPORT MenuBar : public QMenuBar +class FALKON_EXPORT MenuBar : public QMenuBar { Q_OBJECT public: diff --git a/src/lib/tools/pagethumbnailer.cpp b/src/lib/tools/pagethumbnailer.cpp index ba8d0bd13..9e0e0e994 100644 --- a/src/lib/tools/pagethumbnailer.cpp +++ b/src/lib/tools/pagethumbnailer.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/pagethumbnailer.h b/src/lib/tools/pagethumbnailer.h index ffaa1b3dd..ed7eaf514 100644 --- a/src/lib/tools/pagethumbnailer.h +++ b/src/lib/tools/pagethumbnailer.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ class QQuickWidget; class QPixmap; -class QUPZILLA_EXPORT PageThumbnailer : public QObject +class FALKON_EXPORT PageThumbnailer : public QObject { Q_OBJECT diff --git a/src/lib/tools/progressbar.cpp b/src/lib/tools/progressbar.cpp index dc04ea702..a51ba0870 100644 --- a/src/lib/tools/progressbar.cpp +++ b/src/lib/tools/progressbar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/progressbar.h b/src/lib/tools/progressbar.h index 0823ded30..e8260a438 100644 --- a/src/lib/tools/progressbar.h +++ b/src/lib/tools/progressbar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class QStyleOptionProgressBar; -class QUPZILLA_EXPORT ProgressBar : public QWidget +class FALKON_EXPORT ProgressBar : public QWidget { Q_OBJECT public: diff --git a/src/lib/tools/qzregexp.cpp b/src/lib/tools/qzregexp.cpp index 40adcc5cb..473ea2257 100644 --- a/src/lib/tools/qzregexp.cpp +++ b/src/lib/tools/qzregexp.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/qzregexp.h b/src/lib/tools/qzregexp.h index 8c276d5d8..3f84b513a 100644 --- a/src/lib/tools/qzregexp.h +++ b/src/lib/tools/qzregexp.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT QzRegExp : public QRegularExpression +class FALKON_EXPORT QzRegExp : public QRegularExpression { public: QzRegExp(); diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp index 9571b392c..ea64f3d86 100644 --- a/src/lib/tools/qztools.cpp +++ b/src/lib/tools/qztools.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -829,7 +829,7 @@ void QzTools::setWmClass(const QString &name, const QWidget* widget) return; const QByteArray &nameData = name.toUtf8(); - const QByteArray &classData = QByteArrayLiteral("QupZilla"); + const QByteArray &classData = QByteArrayLiteral("Falkon"); uint32_t class_len = nameData.length() + 1 + classData.length() + 1; char *class_hint = (char*) malloc(class_len); diff --git a/src/lib/tools/qztools.h b/src/lib/tools/qztools.h index 33d5b5080..59de30428 100644 --- a/src/lib/tools/qztools.h +++ b/src/lib/tools/qztools.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ class QIcon; class QWidget; class QUrl; -class QUPZILLA_EXPORT QzTools +class FALKON_EXPORT QzTools { public: static QByteArray pixmapToByteArray(const QPixmap &pix); diff --git a/src/lib/tools/removeitemfocusdelegate.cpp b/src/lib/tools/removeitemfocusdelegate.cpp index e2117ac94..491f3f7c4 100644 --- a/src/lib/tools/removeitemfocusdelegate.cpp +++ b/src/lib/tools/removeitemfocusdelegate.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/removeitemfocusdelegate.h b/src/lib/tools/removeitemfocusdelegate.h index 6700d2f6d..4f91c7c3a 100644 --- a/src/lib/tools/removeitemfocusdelegate.h +++ b/src/lib/tools/removeitemfocusdelegate.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/scripts.cpp b/src/lib/tools/scripts.cpp index 42f5fb9df..6d51f1be5 100644 --- a/src/lib/tools/scripts.cpp +++ b/src/lib/tools/scripts.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2015-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ QString Scripts::setupWebChannel() " window.external = e;" " if (window.external) {" " var event = document.createEvent('Event');" - " event.initEvent('_qupzilla_external_created', true, true);" + " event.initEvent('_falkon_external_created', true, true);" " document.dispatchEvent(event);" " }" "}" @@ -39,7 +39,7 @@ QString Scripts::setupWebChannel() " if (top.external)" " registerExternal(top.external);" " else" - " top.document.addEventListener('_qupzilla_external_created', function() {" + " top.document.addEventListener('_falkon_external_created', function() {" " registerExternal(top.external);" " });" " return;" diff --git a/src/lib/tools/scripts.h b/src/lib/tools/scripts.h index b751bab40..04f6e46d3 100644 --- a/src/lib/tools/scripts.h +++ b/src/lib/tools/scripts.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2015-2016 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -25,7 +25,7 @@ class QWebEngineView; -class QUPZILLA_EXPORT Scripts +class FALKON_EXPORT Scripts { public: static QString setupWebChannel(); diff --git a/src/lib/tools/sqldatabase.cpp b/src/lib/tools/sqldatabase.cpp index 5e5e8ecff..b0203c7ac 100644 --- a/src/lib/tools/sqldatabase.cpp +++ b/src/lib/tools/sqldatabase.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -46,7 +46,7 @@ QSqlDatabase SqlDatabase::databaseForThread(QThread* thread) if (!m_databases.contains(thread)) { const QString threadStr = QString::number((quintptr) thread); - m_databases[thread] = QSqlDatabase::cloneDatabase(QSqlDatabase::database(), QL1S("QupZilla/") + threadStr); + m_databases[thread] = QSqlDatabase::cloneDatabase(QSqlDatabase::database(), QL1S("Falkon/") + threadStr); m_databases[thread].open(); } diff --git a/src/lib/tools/sqldatabase.h b/src/lib/tools/sqldatabase.h index 98e7e5dd7..3fa443040 100644 --- a/src/lib/tools/sqldatabase.h +++ b/src/lib/tools/sqldatabase.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT SqlDatabase : public QObject +class FALKON_EXPORT SqlDatabase : public QObject { Q_OBJECT diff --git a/src/lib/tools/toolbutton.cpp b/src/lib/tools/toolbutton.cpp index 6079742e5..7ae289c2d 100644 --- a/src/lib/tools/toolbutton.cpp +++ b/src/lib/tools/toolbutton.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/toolbutton.h b/src/lib/tools/toolbutton.h index 813316a55..416130269 100644 --- a/src/lib/tools/toolbutton.h +++ b/src/lib/tools/toolbutton.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT ToolButton : public QToolButton +class FALKON_EXPORT ToolButton : public QToolButton { Q_OBJECT diff --git a/src/lib/tools/treewidget.cpp b/src/lib/tools/treewidget.cpp index bb0ad9e9f..166578ecb 100644 --- a/src/lib/tools/treewidget.cpp +++ b/src/lib/tools/treewidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/treewidget.h b/src/lib/tools/treewidget.h index 3ff1bf568..f046a78d2 100644 --- a/src/lib/tools/treewidget.h +++ b/src/lib/tools/treewidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -22,7 +22,7 @@ #include -class QUPZILLA_EXPORT TreeWidget : public QTreeWidget +class FALKON_EXPORT TreeWidget : public QTreeWidget { Q_OBJECT public: diff --git a/src/lib/tools/wheelhelper.cpp b/src/lib/tools/wheelhelper.cpp index 9d9e919c9..16b4c37a6 100644 --- a/src/lib/tools/wheelhelper.cpp +++ b/src/lib/tools/wheelhelper.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/wheelhelper.h b/src/lib/tools/wheelhelper.h index a6c413705..4682bb671 100644 --- a/src/lib/tools/wheelhelper.h +++ b/src/lib/tools/wheelhelper.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class QWheelEvent; -class QUPZILLA_EXPORT WheelHelper +class FALKON_EXPORT WheelHelper { public: enum Direction { diff --git a/src/lib/tools/widget.cpp b/src/lib/tools/widget.cpp index b2550e73b..d1fb29023 100644 --- a/src/lib/tools/widget.cpp +++ b/src/lib/tools/widget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/tools/widget.h b/src/lib/tools/widget.h index c88abd6f9..4b65b0ef3 100644 --- a/src/lib/tools/widget.h +++ b/src/lib/tools/widget.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT Widget : public QWidget +class FALKON_EXPORT Widget : public QWidget { Q_OBJECT public: @@ -36,7 +36,7 @@ public slots: }; -class QUPZILLA_EXPORT ResizableFrame : public QFrame +class FALKON_EXPORT ResizableFrame : public QFrame { Q_OBJECT public: diff --git a/src/lib/webengine/javascript/autofilljsobject.cpp b/src/lib/webengine/javascript/autofilljsobject.cpp index ba23b2965..804a71825 100644 --- a/src/lib/webengine/javascript/autofilljsobject.cpp +++ b/src/lib/webengine/javascript/autofilljsobject.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - QtWebEngine based browser +* Falkon - Qt web browser * Copyright (C) 2015 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/webengine/javascript/autofilljsobject.h b/src/lib/webengine/javascript/autofilljsobject.h index 924706abb..4143d3e05 100644 --- a/src/lib/webengine/javascript/autofilljsobject.h +++ b/src/lib/webengine/javascript/autofilljsobject.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - QtWebEngine based browser +* Falkon - Qt web browser * Copyright (C) 2015 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/webengine/javascript/externaljsobject.cpp b/src/lib/webengine/javascript/externaljsobject.cpp index 754eb075f..52cda127f 100644 --- a/src/lib/webengine/javascript/externaljsobject.cpp +++ b/src/lib/webengine/javascript/externaljsobject.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -49,7 +49,7 @@ int ExternalJsObject::IsSearchProviderInstalled(const QString &engineURL) QObject *ExternalJsObject::speedDial() const { - if (m_page->url().toString() != QL1S("qupzilla:speeddial")) + if (m_page->url().toString() != QL1S("falkon:speeddial")) return Q_NULLPTR; return mApp->plugins()->speedDial(); @@ -62,7 +62,7 @@ QObject *ExternalJsObject::autoFill() const QObject *ExternalJsObject::recovery() const { - if (!mApp->restoreManager() || m_page->url().toString() != QL1S("qupzilla:restore")) + if (!mApp->restoreManager() || m_page->url().toString() != QL1S("falkon:restore")) return Q_NULLPTR; return mApp->restoreManager()->recoveryObject(m_page); diff --git a/src/lib/webengine/javascript/externaljsobject.h b/src/lib/webengine/javascript/externaljsobject.h index 5d7934ed8..9f01bc585 100644 --- a/src/lib/webengine/javascript/externaljsobject.h +++ b/src/lib/webengine/javascript/externaljsobject.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/webengine/loadrequest.cpp b/src/lib/webengine/loadrequest.cpp index 1d3b7209e..9c490ae09 100644 --- a/src/lib/webengine/loadrequest.cpp +++ b/src/lib/webengine/loadrequest.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/webengine/loadrequest.h b/src/lib/webengine/loadrequest.h index 3f71b07d1..eecf23b7e 100644 --- a/src/lib/webengine/loadrequest.h +++ b/src/lib/webengine/loadrequest.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -26,7 +26,7 @@ #include "qzcommon.h" -class QUPZILLA_EXPORT LoadRequest +class FALKON_EXPORT LoadRequest { public: enum Operation { diff --git a/src/lib/webengine/webhittestresult.cpp b/src/lib/webengine/webhittestresult.cpp index 1d6d79020..a82def835 100644 --- a/src/lib/webengine/webhittestresult.cpp +++ b/src/lib/webengine/webhittestresult.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2015-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/webengine/webhittestresult.h b/src/lib/webengine/webhittestresult.h index 43d8be941..1493464d7 100644 --- a/src/lib/webengine/webhittestresult.h +++ b/src/lib/webengine/webhittestresult.h @@ -29,7 +29,7 @@ class QWebEngineContextMenuData; class WebPage; -class QUPZILLA_EXPORT WebHitTestResult +class FALKON_EXPORT WebHitTestResult { public: explicit WebHitTestResult(const WebPage *page, const QPoint &pos); diff --git a/src/lib/webengine/webinspector.cpp b/src/lib/webengine/webinspector.cpp index 03e921d36..d9610911a 100644 --- a/src/lib/webengine/webinspector.cpp +++ b/src/lib/webengine/webinspector.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/webengine/webinspector.h b/src/lib/webengine/webinspector.h index 6c5a1c50c..07e0ffb67 100644 --- a/src/lib/webengine/webinspector.h +++ b/src/lib/webengine/webinspector.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ class ToolButton; -class QUPZILLA_EXPORT WebInspector : public QWebEngineView +class FALKON_EXPORT WebInspector : public QWebEngineView { Q_OBJECT diff --git a/src/lib/webengine/webpage.cpp b/src/lib/webengine/webpage.cpp index 12d8f947d..798d9eddd 100644 --- a/src/lib/webengine/webpage.cpp +++ b/src/lib/webengine/webpage.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -268,8 +268,8 @@ void WebPage::handleUnknownProtocol(const QUrl &url) CheckBoxDialog dialog(QMessageBox::Yes | QMessageBox::No, view()); const QString wrappedUrl = QzTools::alignTextToWidth(url.toString(), "
", dialog.fontMetrics(), 450); - const QString text = tr("QupZilla cannot handle %1: links. The requested link " - "is
  • %2
Do you want QupZilla to try " + const QString text = tr("Falkon cannot handle %1: links. The requested link " + "is
  • %2
Do you want Falkon to try " "open this link in system application?").arg(protocol, wrappedUrl); dialog.setText(text); diff --git a/src/lib/webengine/webpage.h b/src/lib/webengine/webpage.h index 147d8df54..ac05a6b71 100644 --- a/src/lib/webengine/webpage.h +++ b/src/lib/webengine/webpage.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -33,7 +33,7 @@ class WebView; class WebHitTestResult; class DelayedFileWatcher; -class QUPZILLA_EXPORT WebPage : public QWebEnginePage +class FALKON_EXPORT WebPage : public QWebEnginePage { Q_OBJECT diff --git a/src/lib/webengine/webscrollbar.cpp b/src/lib/webengine/webscrollbar.cpp index a4e4907df..36abd9801 100644 --- a/src/lib/webengine/webscrollbar.cpp +++ b/src/lib/webengine/webscrollbar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2016-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/webengine/webscrollbar.h b/src/lib/webengine/webscrollbar.h index d18b0c020..96e46c534 100644 --- a/src/lib/webengine/webscrollbar.h +++ b/src/lib/webengine/webscrollbar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/webengine/webscrollbarmanager.cpp b/src/lib/webengine/webscrollbarmanager.cpp index ff7c9635f..0ffb2fdb8 100644 --- a/src/lib/webengine/webscrollbarmanager.cpp +++ b/src/lib/webengine/webscrollbarmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2016-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -203,7 +203,7 @@ WebScrollBarManager *WebScrollBarManager::instance() void WebScrollBarManager::createUserScript(int thickness) { QWebEngineScript script; - script.setName(QSL("_qupzilla_scrollbar")); + script.setName(QSL("_falkon_scrollbar")); script.setInjectionPoint(QWebEngineScript::DocumentReady); script.setWorldId(WebPage::SafeJsWorld); script.setSourceCode(m_scrollbarJs.arg(thickness)); @@ -212,7 +212,7 @@ void WebScrollBarManager::createUserScript(int thickness) void WebScrollBarManager::removeUserScript() { - QWebEngineScript script = mApp->webProfile()->scripts()->findScript(QSL("_qupzilla_scrollbar")); + QWebEngineScript script = mApp->webProfile()->scripts()->findScript(QSL("_falkon_scrollbar")); mApp->webProfile()->scripts()->remove(script); } diff --git a/src/lib/webengine/webscrollbarmanager.h b/src/lib/webengine/webscrollbarmanager.h index 3c907fe9c..20e674b1c 100644 --- a/src/lib/webengine/webscrollbarmanager.h +++ b/src/lib/webengine/webscrollbarmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/webengine/webview.cpp b/src/lib/webengine/webview.cpp index 332925c40..1d86a610e 100644 --- a/src/lib/webengine/webview.cpp +++ b/src/lib/webengine/webview.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -401,7 +401,7 @@ void WebView::printPage() QPrintPreviewDialog* dialog = new QPrintPreviewDialog(this); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->resize(800, 750); - dialog->printer()->setCreator(tr("QupZilla %1 (%2)").arg(Qz::VERSION, Qz::WWWADDRESS)); + dialog->printer()->setCreator(tr("Falkon %1 (%2)").arg(Qz::VERSION, Qz::WWWADDRESS)); dialog->printer()->setDocName(QzTools::getFileNameFromUrl(m_page->url())); connect(dialog, &QPrintPreviewDialog::paintRequested, this, [=](QPrinter *printer) { @@ -533,7 +533,7 @@ void WebView::openActionUrl() void WebView::showSource() { // view-source: doesn't work on itself and custom schemes - if (url().scheme() == QL1S("view-source") || url().scheme() == QL1S("qupzilla") || url().scheme() == QL1S("qrc")) { + if (url().scheme() == QL1S("view-source") || url().scheme() == QL1S("falkon") || url().scheme() == QL1S("qrc")) { page()->toHtml([](const QString &html) { std::cout << html.toLocal8Bit().constData() << std::endl; }); @@ -736,7 +736,7 @@ void WebView::createPageContextMenu(QMenu* menu) action->setEnabled(history()->canGoForward()); // Special menu for Speed Dial page - if (url().toString() == QL1S("qupzilla:speeddial")) { + if (url().toString() == QL1S("falkon:speeddial")) { menu->addSeparator(); menu->addAction(QIcon::fromTheme("list-add"), tr("&Add New Page"), this, SLOT(addSpeedDial())); menu->addAction(IconProvider::settingsIcon(), tr("&Configure Speed Dial"), this, SLOT(configureSpeedDial())); diff --git a/src/lib/webengine/webview.h b/src/lib/webengine/webview.h index 0b1920f26..f352273bf 100644 --- a/src/lib/webengine/webview.h +++ b/src/lib/webengine/webview.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -29,7 +29,7 @@ class WebPage; class LoadRequest; class WebHitTestResult; -class QUPZILLA_EXPORT WebView : public QWebEngineView +class FALKON_EXPORT WebView : public QWebEngineView { Q_OBJECT diff --git a/src/lib/webtab/searchtoolbar.cpp b/src/lib/webtab/searchtoolbar.cpp index d233fc805..f52478748 100644 --- a/src/lib/webtab/searchtoolbar.cpp +++ b/src/lib/webtab/searchtoolbar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/webtab/searchtoolbar.h b/src/lib/webtab/searchtoolbar.h index 02eb02aa1..b7cd9fbcd 100644 --- a/src/lib/webtab/searchtoolbar.h +++ b/src/lib/webtab/searchtoolbar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -32,7 +32,7 @@ class QLineEdit; class WebView; class LineEdit; -class QUPZILLA_EXPORT SearchToolBar : public QWidget +class FALKON_EXPORT SearchToolBar : public QWidget { Q_OBJECT public: diff --git a/src/lib/webtab/tabbedwebview.cpp b/src/lib/webtab/tabbedwebview.cpp index 286f32a4d..9b40d1a91 100644 --- a/src/lib/webtab/tabbedwebview.cpp +++ b/src/lib/webtab/tabbedwebview.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/lib/webtab/tabbedwebview.h b/src/lib/webtab/tabbedwebview.h index 0e5c2c6b6..b30f1b115 100644 --- a/src/lib/webtab/tabbedwebview.h +++ b/src/lib/webtab/tabbedwebview.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2015 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -30,7 +30,7 @@ class WebPage; class WebTab; class Menu; -class QUPZILLA_EXPORT TabbedWebView : public WebView +class FALKON_EXPORT TabbedWebView : public WebView { Q_OBJECT public: diff --git a/src/lib/webtab/webtab.cpp b/src/lib/webtab/webtab.cpp index 3e63da4d9..8cdaefd35 100644 --- a/src/lib/webtab/webtab.cpp +++ b/src/lib/webtab/webtab.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -47,7 +47,7 @@ WebTab::SavedTab::SavedTab() WebTab::SavedTab::SavedTab(WebTab* webTab) { - if (webTab->url().toString() == QL1S("qupzilla:restore")) { + if (webTab->url().toString() == QL1S("falkon:restore")) { return; } @@ -458,7 +458,7 @@ void WebTab::titleChanged(const QString &title) } if (isCurrentTab()) { - m_window->setWindowTitle(tr("%1 - QupZilla").arg(title)); + m_window->setWindowTitle(tr("%1 - Falkon").arg(title)); } m_tabBar->setTabText(tabIndex(), title); diff --git a/src/lib/webtab/webtab.h b/src/lib/webtab/webtab.h index b08dbc617..fee25eff2 100644 --- a/src/lib/webtab/webtab.h +++ b/src/lib/webtab/webtab.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -35,7 +35,7 @@ class LocationBar; class TabIcon; class TabBar; -class QUPZILLA_EXPORT WebTab : public QWidget +class FALKON_EXPORT WebTab : public QWidget { Q_OBJECT public: @@ -53,8 +53,8 @@ public: bool isValid() const; void clear(); - friend QUPZILLA_EXPORT QDataStream &operator<<(QDataStream &stream, const SavedTab &tab); - friend QUPZILLA_EXPORT QDataStream &operator>>(QDataStream &stream, SavedTab &tab); + friend FALKON_EXPORT QDataStream &operator<<(QDataStream &stream, const SavedTab &tab); + friend FALKON_EXPORT QDataStream &operator>>(QDataStream &stream, SavedTab &tab); }; explicit WebTab(BrowserWindow* window); diff --git a/src/main/Info.plist b/src/main/Info.plist index e75d29a14..625332756 100644 --- a/src/main/Info.plist +++ b/src/main/Info.plist @@ -15,7 +15,7 @@ CFBundleExecutable @EXECUTABLE@ CFBundleIdentifier - com.qupzilla.QupZilla + org.kde.Falkon CFBundleURLTypes @@ -58,9 +58,9 @@ CFBundleDevelopmentRegion English CFBundleName - QupZilla + Falkon CFBundleDisplayName - QupZilla + Falkon LSApplicationCategoryType public.app-category.productivity diff --git a/src/main/appicon.rc b/src/main/appicon.rc index 154dbcb12..1d24ee833 100644 --- a/src/main/appicon.rc +++ b/src/main/appicon.rc @@ -1,33 +1,33 @@ -#include "winver.h" - -IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\qupzilla.ico" -IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,2,0 - PRODUCTVERSION 2,1,2,0 - FILEFLAGS 0x0L - FILEFLAGSMASK 0x3fL - FILEOS 0x00040004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "CompanyName", "QupZilla Team" - VALUE "FileDescription", "QupZilla Web Browser" - VALUE "FileVersion", "2.1.2" - VALUE "LegalCopyright", "Copyright (C) 2010-2017 David Rosca" - VALUE "InternalName", "qupzilla" - VALUE "OriginalFilename", "qupzilla.exe" - VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "2.1.2" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END +#include "winver.h" + +IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\qupzilla.ico" +IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,1,2,0 + PRODUCTVERSION 2,1,2,0 + FILEFLAGS 0x0L + FILEFLAGSMASK 0x3fL + FILEOS 0x00040004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "CompanyName", "Falkon Team" + VALUE "FileDescription", "Falkon Web Browser" + VALUE "FileVersion", "2.1.2" + VALUE "LegalCopyright", "Copyright (C) 2010-2017 David Rosca" + VALUE "InternalName", "falkon" + VALUE "OriginalFilename", "falkon.exe" + VALUE "ProductName", "Falkon" + VALUE "ProductVersion", "2.1.2" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/src/main/main.cpp b/src/main/main.cpp index 9c10a22d3..c1af1b6fd 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -31,7 +31,7 @@ #include #include -void qupzilla_signal_handler(int s) +void falkon_signal_handler(int s) { if (s != SIGSEGV) { return; @@ -43,7 +43,7 @@ void qupzilla_signal_handler(int s) } sigSegvServed = true; - std::cout << "QupZilla: Crashed :( Saving backtrace in " << qPrintable(DataPaths::path(DataPaths::Config)) << "/crashlog ..." << std::endl; + std::cout << "Falkon: Crashed :( Saving backtrace in " << qPrintable(DataPaths::path(DataPaths::Config)) << "/crashlog ..." << std::endl; void* array[100]; int size = backtrace(array, 100); @@ -80,7 +80,7 @@ void qupzilla_signal_handler(int s) QTextStream stream(&file); stream << "Time: " << currentDateTime.toString() << endl; stream << "Qt version: " << qVersion() << " (compiled with " << QT_VERSION_STR << ")" << endl; - stream << "QupZilla version: " << Qz::VERSION << endl; + stream << "Falkon version: " << Qz::VERSION << endl; stream << "Rendering engine: QtWebEngine" << endl; stream << endl; stream << "============== BACKTRACE ==============" << endl; @@ -130,7 +130,7 @@ int main(int argc, char* argv[]) #endif #if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) - signal(SIGSEGV, qupzilla_signal_handler); + signal(SIGSEGV, falkon_signal_handler); #endif // Hack to fix QT_STYLE_OVERRIDE with QProxyStyle diff --git a/src/main/main.pro b/src/main/main.pro index 5dfe1dc36..ee9ae20bb 100644 --- a/src/main/main.pro +++ b/src/main/main.pro @@ -2,17 +2,17 @@ include(../defines.pri) QT += webenginecore webenginewidgets network widgets sql -TARGET = qupzilla -mac: TARGET = QupZilla +TARGET = falkon +mac: TARGET = Falkon TEMPLATE = app compile_libtool { -LIBS += $$QZ_DESTDIR/libQupZilla.la +LIBS += $$QZ_DESTDIR/libFalkon.la } else { -!unix|mac: LIBS += -L$$QZ_DESTDIR -lQupZilla -!mac:unix: LIBS += $$QZ_DESTDIR/libQupZilla.so +!unix|mac: LIBS += -L$$QZ_DESTDIR -lFalkon +!mac:unix: LIBS += $$QZ_DESTDIR/libFalkon.so } unix:!contains(DEFINES, "DISABLE_DBUS") QT += dbus diff --git a/src/plugins.pri b/src/plugins.pri index 27d7cc0e1..92f6f362b 100644 --- a/src/plugins.pri +++ b/src/plugins.pri @@ -42,11 +42,11 @@ MOC_DIR = build RCC_DIR = build UI_DIR = build -!unix|mac: LIBS += -L$$QZ_DESTDIR -lQupZilla -!mac:unix: LIBS += $$QZ_DESTDIR/libQupZilla.so +!unix|mac: LIBS += -L$$QZ_DESTDIR -lFalkon +!mac:unix: LIBS += $$QZ_DESTDIR/libFalkon.so !mac:unix { - target.path = $$library_folder/qupzilla + target.path = $$library_folder/falkon INSTALLS += target } diff --git a/src/plugins/AutoScroll/autoscroller.cpp b/src/plugins/AutoScroll/autoscroller.cpp index b70082e26..f6342691f 100644 --- a/src/plugins/AutoScroll/autoscroller.cpp +++ b/src/plugins/AutoScroll/autoscroller.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* AutoScroll - Autoscroll for QupZilla +* AutoScroll - Autoscroll for Falkon * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/AutoScroll/autoscroller.h b/src/plugins/AutoScroll/autoscroller.h index b3676d33e..b63262277 100644 --- a/src/plugins/AutoScroll/autoscroller.h +++ b/src/plugins/AutoScroll/autoscroller.h @@ -1,5 +1,5 @@ /* ============================================================ -* AutoScroll - Autoscroll for QupZilla +* AutoScroll - Autoscroll for Falkon * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/AutoScroll/autoscrollplugin.cpp b/src/plugins/AutoScroll/autoscrollplugin.cpp index d4bc55193..dca806184 100644 --- a/src/plugins/AutoScroll/autoscrollplugin.cpp +++ b/src/plugins/AutoScroll/autoscrollplugin.cpp @@ -64,7 +64,7 @@ void AutoScrollPlugin::unload() bool AutoScrollPlugin::testPlugin() { // Require the version that the plugin was built with - return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION)); + return (Qz::VERSION == QLatin1String(FALKON_VERSION)); } QTranslator* AutoScrollPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/AutoScroll/autoscrollplugin.h b/src/plugins/AutoScroll/autoscrollplugin.h index 85b49488f..603569d85 100644 --- a/src/plugins/AutoScroll/autoscrollplugin.h +++ b/src/plugins/AutoScroll/autoscrollplugin.h @@ -27,7 +27,7 @@ class AutoScrollPlugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.TestPlugin") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.AutoScroll") public: explicit AutoScrollPlugin(); diff --git a/src/plugins/AutoScroll/autoscrollsettings.cpp b/src/plugins/AutoScroll/autoscrollsettings.cpp index 45fd45167..696856c9e 100644 --- a/src/plugins/AutoScroll/autoscrollsettings.cpp +++ b/src/plugins/AutoScroll/autoscrollsettings.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* AutoScroll - Autoscroll for QupZilla +* AutoScroll - Autoscroll for Falkon * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/AutoScroll/autoscrollsettings.h b/src/plugins/AutoScroll/autoscrollsettings.h index c4bd27800..369d54624 100644 --- a/src/plugins/AutoScroll/autoscrollsettings.h +++ b/src/plugins/AutoScroll/autoscrollsettings.h @@ -1,5 +1,5 @@ /* ============================================================ -* AutoScroll - Autoscroll for QupZilla +* AutoScroll - Autoscroll for Falkon * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/AutoScroll/framescroller.cpp b/src/plugins/AutoScroll/framescroller.cpp index 4153b29e1..9599c94b9 100644 --- a/src/plugins/AutoScroll/framescroller.cpp +++ b/src/plugins/AutoScroll/framescroller.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* AutoScroll - Autoscroll for QupZilla +* AutoScroll - Autoscroll for Falkon * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/AutoScroll/framescroller.h b/src/plugins/AutoScroll/framescroller.h index bb64244e3..b06f7e614 100644 --- a/src/plugins/AutoScroll/framescroller.h +++ b/src/plugins/AutoScroll/framescroller.h @@ -1,5 +1,5 @@ /* ============================================================ -* AutoScroll - Autoscroll for QupZilla +* AutoScroll - Autoscroll for Falkon * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/FlashCookieManager/fcm_dialog.cpp b/src/plugins/FlashCookieManager/fcm_dialog.cpp index ed1c1238c..4726d5667 100644 --- a/src/plugins/FlashCookieManager/fcm_dialog.cpp +++ b/src/plugins/FlashCookieManager/fcm_dialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* FlashCookieManager plugin for QupZilla +* FlashCookieManager plugin for Falkon * Copyright (C) 2014 S. Razi Alavizadeh * Copyright (C) 2010-2016 David Rosca * diff --git a/src/plugins/FlashCookieManager/fcm_dialog.h b/src/plugins/FlashCookieManager/fcm_dialog.h index 231b8b2be..03fa089fc 100644 --- a/src/plugins/FlashCookieManager/fcm_dialog.h +++ b/src/plugins/FlashCookieManager/fcm_dialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* FlashCookieManager plugin for QupZilla +* FlashCookieManager plugin for Falkon * Copyright (C) 2014 S. Razi Alavizadeh * Copyright (C) 2010-2014 David Rosca * diff --git a/src/plugins/FlashCookieManager/fcm_notification.cpp b/src/plugins/FlashCookieManager/fcm_notification.cpp index 228072a8e..3f8545523 100644 --- a/src/plugins/FlashCookieManager/fcm_notification.cpp +++ b/src/plugins/FlashCookieManager/fcm_notification.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* FlashCookieManager plugin for QupZilla +* FlashCookieManager plugin for Falkon * Copyright (C) 2014 S. Razi Alavizadeh * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/FlashCookieManager/fcm_notification.h b/src/plugins/FlashCookieManager/fcm_notification.h index 8711d2406..eb644227b 100644 --- a/src/plugins/FlashCookieManager/fcm_notification.h +++ b/src/plugins/FlashCookieManager/fcm_notification.h @@ -1,5 +1,5 @@ /* ============================================================ -* FlashCookieManager plugin for QupZilla +* FlashCookieManager plugin for Falkon * Copyright (C) 2014 S. Razi Alavizadeh * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/FlashCookieManager/fcm_plugin.cpp b/src/plugins/FlashCookieManager/fcm_plugin.cpp index 94f316031..2a3060d99 100644 --- a/src/plugins/FlashCookieManager/fcm_plugin.cpp +++ b/src/plugins/FlashCookieManager/fcm_plugin.cpp @@ -106,7 +106,7 @@ void FCM_Plugin::unload() bool FCM_Plugin::testPlugin() { - return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION)); + return (Qz::VERSION == QLatin1String(FALKON_VERSION)); } QTranslator* FCM_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/FlashCookieManager/fcm_plugin.h b/src/plugins/FlashCookieManager/fcm_plugin.h index 41a74774a..68aa54c2e 100644 --- a/src/plugins/FlashCookieManager/fcm_plugin.h +++ b/src/plugins/FlashCookieManager/fcm_plugin.h @@ -44,7 +44,7 @@ class FCM_Plugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.FlashCookieManager") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.FlashCookieManager") public: explicit FCM_Plugin(); diff --git a/src/plugins/GnomeKeyringPasswords/gnomekeyringpasswordbackend.cpp b/src/plugins/GnomeKeyringPasswords/gnomekeyringpasswordbackend.cpp index fc82974ff..02bece6e6 100644 --- a/src/plugins/GnomeKeyringPasswords/gnomekeyringpasswordbackend.cpp +++ b/src/plugins/GnomeKeyringPasswords/gnomekeyringpasswordbackend.cpp @@ -56,7 +56,7 @@ static GnomeKeyringAttributeList* createAttributes(const PasswordEntry &entry) { GnomeKeyringAttributeList* attributes = gnome_keyring_attribute_list_new(); - gnome_keyring_attribute_list_append_string(attributes, "application", "QupZilla"); + gnome_keyring_attribute_list_append_string(attributes, "application", "Falkon"); QByteArray value = entry.username.toUtf8(); gnome_keyring_attribute_list_append_string(attributes, "username", value.constData()); @@ -255,7 +255,7 @@ void GnomeKeyringPasswordBackend::initialize() GList* found; GnomeKeyringResult result = gnome_keyring_find_itemsv_sync(GNOME_KEYRING_ITEM_GENERIC_SECRET, &found, - "application", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, "QupZilla", + "application", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, "Falkon", NULL); if (result != GNOME_KEYRING_RESULT_OK && result != GNOME_KEYRING_RESULT_NO_MATCH) { diff --git a/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp b/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp index d91eab346..34f269695 100644 --- a/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp +++ b/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.cpp @@ -60,7 +60,7 @@ void GnomeKeyringPlugin::unload() bool GnomeKeyringPlugin::testPlugin() { // Require the version that the plugin was built with - return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION)); + return (Qz::VERSION == QLatin1String(FALKON_VERSION)); } QTranslator* GnomeKeyringPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.h b/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.h index f80a594b9..16e56b9a8 100644 --- a/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.h +++ b/src/plugins/GnomeKeyringPasswords/gnomekeyringplugin.h @@ -26,7 +26,7 @@ class GnomeKeyringPlugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.GnomeKeyringPasswords") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.GnomeKeyringPasswords") public: explicit GnomeKeyringPlugin(); diff --git a/src/plugins/GreaseMonkey/gm_addscriptdialog.cpp b/src/plugins/GreaseMonkey/gm_addscriptdialog.cpp index 5ce541d47..5f8e5e177 100644 --- a/src/plugins/GreaseMonkey/gm_addscriptdialog.cpp +++ b/src/plugins/GreaseMonkey/gm_addscriptdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/gm_addscriptdialog.h b/src/plugins/GreaseMonkey/gm_addscriptdialog.h index 8f2a1b0db..0ad8c07a3 100644 --- a/src/plugins/GreaseMonkey/gm_addscriptdialog.h +++ b/src/plugins/GreaseMonkey/gm_addscriptdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/gm_downloader.cpp b/src/plugins/GreaseMonkey/gm_downloader.cpp index 9dee07e8e..893488853 100644 --- a/src/plugins/GreaseMonkey/gm_downloader.cpp +++ b/src/plugins/GreaseMonkey/gm_downloader.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/gm_downloader.h b/src/plugins/GreaseMonkey/gm_downloader.h index ca3e9e84e..8a656e104 100644 --- a/src/plugins/GreaseMonkey/gm_downloader.h +++ b/src/plugins/GreaseMonkey/gm_downloader.h @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/gm_icon.cpp b/src/plugins/GreaseMonkey/gm_icon.cpp index fd2e442a1..0efc017fb 100644 --- a/src/plugins/GreaseMonkey/gm_icon.cpp +++ b/src/plugins/GreaseMonkey/gm_icon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2013-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/gm_icon.h b/src/plugins/GreaseMonkey/gm_icon.h index 4278c67cb..823e486de 100644 --- a/src/plugins/GreaseMonkey/gm_icon.h +++ b/src/plugins/GreaseMonkey/gm_icon.h @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/gm_manager.cpp b/src/plugins/GreaseMonkey/gm_manager.cpp index 34178a9a5..338fb4ffd 100644 --- a/src/plugins/GreaseMonkey/gm_manager.cpp +++ b/src/plugins/GreaseMonkey/gm_manager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/gm_manager.h b/src/plugins/GreaseMonkey/gm_manager.h index e66bd6509..bed11ae22 100644 --- a/src/plugins/GreaseMonkey/gm_manager.h +++ b/src/plugins/GreaseMonkey/gm_manager.h @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2013-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/gm_notification.cpp b/src/plugins/GreaseMonkey/gm_notification.cpp index ecad1be94..6d518b769 100644 --- a/src/plugins/GreaseMonkey/gm_notification.cpp +++ b/src/plugins/GreaseMonkey/gm_notification.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/gm_notification.h b/src/plugins/GreaseMonkey/gm_notification.h index ca1807203..c030e4a2f 100644 --- a/src/plugins/GreaseMonkey/gm_notification.h +++ b/src/plugins/GreaseMonkey/gm_notification.h @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/gm_plugin.cpp b/src/plugins/GreaseMonkey/gm_plugin.cpp index b211803c9..884176307 100644 --- a/src/plugins/GreaseMonkey/gm_plugin.cpp +++ b/src/plugins/GreaseMonkey/gm_plugin.cpp @@ -38,7 +38,7 @@ PluginSpec GM_Plugin::pluginSpec() { PluginSpec spec; spec.name = "GreaseMonkey"; - spec.info = "Userscripts for QupZilla"; + spec.info = "Userscripts for Falkon"; spec.description = "Provides support for userscripts"; spec.version = "0.8.0"; spec.author = "David Rosca "; @@ -72,7 +72,7 @@ void GM_Plugin::unload() bool GM_Plugin::testPlugin() { // Require the version that the plugin was built with - return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION)); + return (Qz::VERSION == QLatin1String(FALKON_VERSION)); } QTranslator* GM_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/GreaseMonkey/gm_plugin.h b/src/plugins/GreaseMonkey/gm_plugin.h index 5a255be71..8f265acfe 100644 --- a/src/plugins/GreaseMonkey/gm_plugin.h +++ b/src/plugins/GreaseMonkey/gm_plugin.h @@ -27,7 +27,7 @@ class GM_Plugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.GreaseMonkey") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.GreaseMonkey") public: explicit GM_Plugin(); diff --git a/src/plugins/GreaseMonkey/gm_script.cpp b/src/plugins/GreaseMonkey/gm_script.cpp index 1f6a520e3..82ad0cd10 100644 --- a/src/plugins/GreaseMonkey/gm_script.cpp +++ b/src/plugins/GreaseMonkey/gm_script.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/gm_script.h b/src/plugins/GreaseMonkey/gm_script.h index 013e9e904..28796209b 100644 --- a/src/plugins/GreaseMonkey/gm_script.h +++ b/src/plugins/GreaseMonkey/gm_script.h @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/settings/gm_settings.cpp b/src/plugins/GreaseMonkey/settings/gm_settings.cpp index b46dbc23d..bb0ec02f4 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settings.cpp +++ b/src/plugins/GreaseMonkey/settings/gm_settings.cpp @@ -125,7 +125,7 @@ void GM_Settings::newScript() const QString script = QL1S("// ==UserScript== \n" "// @name %1 \n" - "// @namespace qupzilla.com \n" + "// @namespace kde.org \n" "// @description Script description \n" "// @include * \n" "// @version 1.0.0 \n" diff --git a/src/plugins/GreaseMonkey/settings/gm_settings.h b/src/plugins/GreaseMonkey/settings/gm_settings.h index 050ae5aab..e10784522 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settings.h +++ b/src/plugins/GreaseMonkey/settings/gm_settings.h @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2013 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.cpp b/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.cpp index 74cc6926c..a7decfda3 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.cpp +++ b/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h b/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h index 30668f408..c5a50cedc 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h +++ b/src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.h @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.cpp b/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.cpp index a0b9dcb76..340aa70a1 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.cpp +++ b/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h b/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h index d43598caa..ae3e87dce 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h +++ b/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.cpp b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.cpp index ba67870c5..990f05140 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.cpp +++ b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012-2013 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h index 187eb2284..e22707980 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h +++ b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h @@ -1,5 +1,5 @@ /* ============================================================ -* GreaseMonkey plugin for QupZilla +* GreaseMonkey plugin for Falkon * Copyright (C) 2012 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/ImageFinder/imagefinder.cpp b/src/plugins/ImageFinder/imagefinder.cpp index 035403eac..b818145a7 100644 --- a/src/plugins/ImageFinder/imagefinder.cpp +++ b/src/plugins/ImageFinder/imagefinder.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* ImageFinder plugin for QupZilla +* ImageFinder plugin for Falkon * Copyright (C) 2016 Vladislav Tronko * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/ImageFinder/imagefinder.h b/src/plugins/ImageFinder/imagefinder.h index cabb4a297..656b50f43 100644 --- a/src/plugins/ImageFinder/imagefinder.h +++ b/src/plugins/ImageFinder/imagefinder.h @@ -1,5 +1,5 @@ /* ============================================================ -* ImageFinder plugin for QupZilla +* ImageFinder plugin for Falkon * Copyright (C) 2016 Vladislav Tronko * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/ImageFinder/imagefinderplugin.cpp b/src/plugins/ImageFinder/imagefinderplugin.cpp index bb592bba8..d4e4e7d1e 100644 --- a/src/plugins/ImageFinder/imagefinderplugin.cpp +++ b/src/plugins/ImageFinder/imagefinderplugin.cpp @@ -62,7 +62,7 @@ void ImageFinderPlugin::unload() bool ImageFinderPlugin::testPlugin() { // Require the version that the plugin was built with - return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION)); + return (Qz::VERSION == QLatin1String(FALKON_VERSION)); } QTranslator *ImageFinderPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/ImageFinder/imagefinderplugin.h b/src/plugins/ImageFinder/imagefinderplugin.h index cd07d868b..08a84fe73 100644 --- a/src/plugins/ImageFinder/imagefinderplugin.h +++ b/src/plugins/ImageFinder/imagefinderplugin.h @@ -28,7 +28,7 @@ class ImageFinderPlugin : public QObject, public PluginInterface Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.ImageFinderPlugin") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.ImageFinderPlugin") public: explicit ImageFinderPlugin(); diff --git a/src/plugins/ImageFinder/imagefindersettings.cpp b/src/plugins/ImageFinder/imagefindersettings.cpp index 02a0b6c2f..fdaad2b22 100644 --- a/src/plugins/ImageFinder/imagefindersettings.cpp +++ b/src/plugins/ImageFinder/imagefindersettings.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* ImageFinder plugin for QupZilla +* ImageFinder plugin for Falkon * Copyright (C) 2016 Vladislav Tronko * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/ImageFinder/imagefindersettings.h b/src/plugins/ImageFinder/imagefindersettings.h index 583d0601c..7b8b3ab95 100644 --- a/src/plugins/ImageFinder/imagefindersettings.h +++ b/src/plugins/ImageFinder/imagefindersettings.h @@ -1,5 +1,5 @@ /* ============================================================ -* ImageFinder plugin for QupZilla +* ImageFinder plugin for Falkon * Copyright (C) 2016 Vladislav Tronko * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/KWalletPasswords/kwalletpasswordbackend.cpp b/src/plugins/KWalletPasswords/kwalletpasswordbackend.cpp index 4b0b532c0..9aa22c321 100644 --- a/src/plugins/KWalletPasswords/kwalletpasswordbackend.cpp +++ b/src/plugins/KWalletPasswords/kwalletpasswordbackend.cpp @@ -144,8 +144,8 @@ void KWalletPasswordBackend::removeAll() m_allEntries.clear(); - m_wallet->removeFolder("QupZilla"); - m_wallet->createFolder("QupZilla"); + m_wallet->removeFolder("Falkon"); + m_wallet->createFolder("Falkon"); } void KWalletPasswordBackend::initialize() @@ -161,13 +161,13 @@ void KWalletPasswordBackend::initialize() return; } - if (!m_wallet->hasFolder("QupZilla") && !m_wallet->createFolder("QupZilla")) { - qWarning() << "KWalletPasswordBackend::initialize Cannot create folder \"QupZilla\"!"; + if (!m_wallet->hasFolder("Falkon") && !m_wallet->createFolder("Falkon")) { + qWarning() << "KWalletPasswordBackend::initialize Cannot create folder \"Falkon\"!"; return; } - if (!m_wallet->setFolder("QupZilla")) { - qWarning() << "KWalletPasswordBackend::initialize Cannot set folder \"QupZilla\"!"; + if (!m_wallet->setFolder("Falkon")) { + qWarning() << "KWalletPasswordBackend::initialize Cannot set folder \"Falkon\"!"; return; } diff --git a/src/plugins/KWalletPasswords/kwalletplugin.cpp b/src/plugins/KWalletPasswords/kwalletplugin.cpp index ec2a0ae80..6e64fdb98 100644 --- a/src/plugins/KWalletPasswords/kwalletplugin.cpp +++ b/src/plugins/KWalletPasswords/kwalletplugin.cpp @@ -60,7 +60,7 @@ void KWalletPlugin::unload() bool KWalletPlugin::testPlugin() { // Require the version that the plugin was built with - return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION)); + return (Qz::VERSION == QLatin1String(FALKON_VERSION)); } QTranslator* KWalletPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/KWalletPasswords/kwalletplugin.h b/src/plugins/KWalletPasswords/kwalletplugin.h index 70380f74f..3365e266b 100644 --- a/src/plugins/KWalletPasswords/kwalletplugin.h +++ b/src/plugins/KWalletPasswords/kwalletplugin.h @@ -28,7 +28,7 @@ class KWalletPlugin : public QObject, public PluginInterface Q_INTERFACES(PluginInterface) #if QT_VERSION >= 0x050000 - Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.KWalletPasswords") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.KWalletPasswords") #endif public: diff --git a/src/plugins/MouseGestures/mousegestures.cpp b/src/plugins/MouseGestures/mousegestures.cpp index f416181a0..01142c7a6 100644 --- a/src/plugins/MouseGestures/mousegestures.cpp +++ b/src/plugins/MouseGestures/mousegestures.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* Mouse Gestures plugin for QupZilla +* Mouse Gestures plugin for Falkon * Copyright (C) 2013-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/MouseGestures/mousegestures.h b/src/plugins/MouseGestures/mousegestures.h index 99d23133f..ea1b3c088 100644 --- a/src/plugins/MouseGestures/mousegestures.h +++ b/src/plugins/MouseGestures/mousegestures.h @@ -1,5 +1,5 @@ /* ============================================================ -* Mouse Gestures plugin for QupZilla +* Mouse Gestures plugin for Falkon * Copyright (C) 2012-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/MouseGestures/mousegesturesplugin.cpp b/src/plugins/MouseGestures/mousegesturesplugin.cpp index b64c08208..a9a49af01 100644 --- a/src/plugins/MouseGestures/mousegesturesplugin.cpp +++ b/src/plugins/MouseGestures/mousegesturesplugin.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* Mouse Gestures plugin for QupZilla +* Mouse Gestures plugin for Falkon * Copyright (C) 2012-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -33,7 +33,7 @@ PluginSpec MouseGesturesPlugin::pluginSpec() { PluginSpec spec; spec.name = "Mouse Gestures"; - spec.info = "Mouse gestures for QupZilla"; + spec.info = "Mouse gestures for Falkon"; spec.description = "Provides support for navigating in webpages by mouse gestures"; spec.version = "0.5.0"; spec.author = "David Rosca "; @@ -63,7 +63,7 @@ void MouseGesturesPlugin::unload() bool MouseGesturesPlugin::testPlugin() { // Require the version that the plugin was built with - return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION)); + return (Qz::VERSION == QLatin1String(FALKON_VERSION)); } QTranslator* MouseGesturesPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/MouseGestures/mousegesturesplugin.h b/src/plugins/MouseGestures/mousegesturesplugin.h index dfe8d9415..fa29d92ac 100644 --- a/src/plugins/MouseGestures/mousegesturesplugin.h +++ b/src/plugins/MouseGestures/mousegesturesplugin.h @@ -1,5 +1,5 @@ /* ============================================================ -* Mouse Gestures plugin for QupZilla +* Mouse Gestures plugin for Falkon * Copyright (C) 2012-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -25,7 +25,7 @@ class MouseGesturesPlugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.MouseGestures") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.MouseGestures") public: MouseGesturesPlugin(); diff --git a/src/plugins/MouseGestures/mousegesturessettingsdialog.cpp b/src/plugins/MouseGestures/mousegesturessettingsdialog.cpp index f1868b46d..ced707543 100644 --- a/src/plugins/MouseGestures/mousegesturessettingsdialog.cpp +++ b/src/plugins/MouseGestures/mousegesturessettingsdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* Mouse Gestures plugin for QupZilla +* Mouse Gestures plugin for Falkon * Copyright (C) 2012-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/MouseGestures/mousegesturessettingsdialog.h b/src/plugins/MouseGestures/mousegesturessettingsdialog.h index ed23e04d4..96b01d400 100644 --- a/src/plugins/MouseGestures/mousegesturessettingsdialog.h +++ b/src/plugins/MouseGestures/mousegesturessettingsdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* Mouse Gestures plugin for QupZilla +* Mouse Gestures plugin for Falkon * Copyright (C) 2012-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/PIM/PIM_handler.cpp b/src/plugins/PIM/PIM_handler.cpp index 6acc65fb1..27e380271 100644 --- a/src/plugins/PIM/PIM_handler.cpp +++ b/src/plugins/PIM/PIM_handler.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* Personal Information Manager plugin for QupZilla +* Personal Information Manager plugin for Falkon * Copyright (C) 2012-2016 David Rosca * Copyright (C) 2012-2014 Mladen Pejaković * diff --git a/src/plugins/PIM/PIM_handler.h b/src/plugins/PIM/PIM_handler.h index c977ab1de..e85357007 100644 --- a/src/plugins/PIM/PIM_handler.h +++ b/src/plugins/PIM/PIM_handler.h @@ -1,5 +1,5 @@ /* ============================================================ -* Personal Information Manager plugin for QupZilla +* Personal Information Manager plugin for Falkon * Copyright (C) 2012-2014 David Rosca * Copyright (C) 2012-2014 Mladen Pejaković * diff --git a/src/plugins/PIM/PIM_plugin.cpp b/src/plugins/PIM/PIM_plugin.cpp index 0dad8b639..e3fb4638e 100644 --- a/src/plugins/PIM/PIM_plugin.cpp +++ b/src/plugins/PIM/PIM_plugin.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* Personal Information Manager plugin for QupZilla +* Personal Information Manager plugin for Falkon * Copyright (C) 2012-2014 David Rosca * Copyright (C) 2012-2014 Mladen Pejaković * @@ -37,7 +37,7 @@ PluginSpec PIM_Plugin::pluginSpec() PluginSpec spec; spec.name = "PIM"; spec.info = "Personal Information Manager"; - spec.description = "Adds ability for QupZilla to store some personal data"; + spec.description = "Adds ability for Falkon to store some personal data"; spec.version = "0.2.0"; spec.author = QString::fromUtf8("Mladen Pejaković "); spec.icon = QPixmap(":/PIM/data/PIM.png"); @@ -66,7 +66,7 @@ void PIM_Plugin::unload() bool PIM_Plugin::testPlugin() { // Require the version that the plugin was built with - return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION)); + return (Qz::VERSION == QLatin1String(FALKON_VERSION)); } QTranslator* PIM_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/PIM/PIM_plugin.h b/src/plugins/PIM/PIM_plugin.h index 1a8e860d6..5f68b59e1 100644 --- a/src/plugins/PIM/PIM_plugin.h +++ b/src/plugins/PIM/PIM_plugin.h @@ -1,5 +1,5 @@ /* ============================================================ -* Personal Information Manager plugin for QupZilla +* Personal Information Manager plugin for Falkon * Copyright (C) 2012-2014 David Rosca * Copyright (C) 2012-2014 Mladen Pejaković * @@ -29,7 +29,7 @@ class PIM_Plugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.PIM") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.PIM") public: PIM_Plugin(); diff --git a/src/plugins/PIM/PIM_settings.cpp b/src/plugins/PIM/PIM_settings.cpp index 1a505d413..452a2dc39 100644 --- a/src/plugins/PIM/PIM_settings.cpp +++ b/src/plugins/PIM/PIM_settings.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* Personal Information Manager plugin for QupZilla +* Personal Information Manager plugin for Falkon * Copyright (C) 2012-2014 David Rosca * Copyright (C) 2012-2014 Mladen Pejaković * diff --git a/src/plugins/PIM/PIM_settings.h b/src/plugins/PIM/PIM_settings.h index 23cc68d37..60b6a411b 100644 --- a/src/plugins/PIM/PIM_settings.h +++ b/src/plugins/PIM/PIM_settings.h @@ -1,5 +1,5 @@ /* ============================================================ -* Personal Information Manager plugin for QupZilla +* Personal Information Manager plugin for Falkon * Copyright (C) 2012-2014 David Rosca * Copyright (C) 2012-2014 Mladen Pejaković * diff --git a/src/plugins/PIM/PIM_settings.ui b/src/plugins/PIM/PIM_settings.ui index 8bbf53f2f..cd7ca559d 100644 --- a/src/plugins/PIM/PIM_settings.ui +++ b/src/plugins/PIM/PIM_settings.ui @@ -257,7 +257,7 @@ - <b>Note:</b> Press Ctrl+ENTER to autofill form fields for which QupZilla finds personal entries. + <b>Note:</b> Press Ctrl+ENTER to autofill form fields for which Falkon finds personal entries. diff --git a/src/plugins/StatusBarIcons/sbi_icon.cpp b/src/plugins/StatusBarIcons/sbi_icon.cpp index 752f84f15..8b16548df 100644 --- a/src/plugins/StatusBarIcons/sbi_icon.cpp +++ b/src/plugins/StatusBarIcons/sbi_icon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_icon.h b/src/plugins/StatusBarIcons/sbi_icon.h index c450c4989..e45198e82 100644 --- a/src/plugins/StatusBarIcons/sbi_icon.h +++ b/src/plugins/StatusBarIcons/sbi_icon.h @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp b/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp index 84c34038b..82b1db6d2 100644 --- a/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp +++ b/src/plugins/StatusBarIcons/sbi_iconsmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_iconsmanager.h b/src/plugins/StatusBarIcons/sbi_iconsmanager.h index 175528e2c..fe0d9b47f 100644 --- a/src/plugins/StatusBarIcons/sbi_iconsmanager.h +++ b/src/plugins/StatusBarIcons/sbi_iconsmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_imagesicon.cpp b/src/plugins/StatusBarIcons/sbi_imagesicon.cpp index e851ece66..83719ab6e 100644 --- a/src/plugins/StatusBarIcons/sbi_imagesicon.cpp +++ b/src/plugins/StatusBarIcons/sbi_imagesicon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_imagesicon.h b/src/plugins/StatusBarIcons/sbi_imagesicon.h index 4b9c287ac..378e4b329 100644 --- a/src/plugins/StatusBarIcons/sbi_imagesicon.h +++ b/src/plugins/StatusBarIcons/sbi_imagesicon.h @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_javascripticon.cpp b/src/plugins/StatusBarIcons/sbi_javascripticon.cpp index d17675635..aae999c52 100644 --- a/src/plugins/StatusBarIcons/sbi_javascripticon.cpp +++ b/src/plugins/StatusBarIcons/sbi_javascripticon.cpp @@ -57,8 +57,8 @@ void SBI_JavaScriptIcon::showMenu(const QPoint &point) menu.addAction(tr("Enable JavaScript (temporarily)"), this, SLOT(toggleJavaScript())); } - // JavaScript needs to be always enabled for qupzilla: sites - if (currentPage() && currentPage()->url().scheme() == QLatin1String("qupzilla")) { + // JavaScript needs to be always enabled for falkon: sites + if (currentPage() && currentPage()->url().scheme() == QLatin1String("falkon")) { menu.actions().at(1)->setEnabled(false); } diff --git a/src/plugins/StatusBarIcons/sbi_javascripticon.h b/src/plugins/StatusBarIcons/sbi_javascripticon.h index 8f436ccbc..70e201f10 100644 --- a/src/plugins/StatusBarIcons/sbi_javascripticon.h +++ b/src/plugins/StatusBarIcons/sbi_javascripticon.h @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_networkicon.cpp b/src/plugins/StatusBarIcons/sbi_networkicon.cpp index f61cccd2c..38b28e296 100644 --- a/src/plugins/StatusBarIcons/sbi_networkicon.cpp +++ b/src/plugins/StatusBarIcons/sbi_networkicon.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_networkicon.h b/src/plugins/StatusBarIcons/sbi_networkicon.h index e941f2b7b..b4c8a0e08 100644 --- a/src/plugins/StatusBarIcons/sbi_networkicon.h +++ b/src/plugins/StatusBarIcons/sbi_networkicon.h @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_networkicondialog.cpp b/src/plugins/StatusBarIcons/sbi_networkicondialog.cpp index 6e9288c5d..319c13a27 100644 --- a/src/plugins/StatusBarIcons/sbi_networkicondialog.cpp +++ b/src/plugins/StatusBarIcons/sbi_networkicondialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2016 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_networkicondialog.h b/src/plugins/StatusBarIcons/sbi_networkicondialog.h index 699831407..54a418bc1 100644 --- a/src/plugins/StatusBarIcons/sbi_networkicondialog.h +++ b/src/plugins/StatusBarIcons/sbi_networkicondialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_networkmanager.cpp b/src/plugins/StatusBarIcons/sbi_networkmanager.cpp index aac53b33c..7f207fac2 100644 --- a/src/plugins/StatusBarIcons/sbi_networkmanager.cpp +++ b/src/plugins/StatusBarIcons/sbi_networkmanager.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_networkmanager.h b/src/plugins/StatusBarIcons/sbi_networkmanager.h index bb4f22148..112fcdef0 100644 --- a/src/plugins/StatusBarIcons/sbi_networkmanager.h +++ b/src/plugins/StatusBarIcons/sbi_networkmanager.h @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_networkproxy.cpp b/src/plugins/StatusBarIcons/sbi_networkproxy.cpp index 28a8922e0..cf9de19aa 100644 --- a/src/plugins/StatusBarIcons/sbi_networkproxy.cpp +++ b/src/plugins/StatusBarIcons/sbi_networkproxy.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_networkproxy.h b/src/plugins/StatusBarIcons/sbi_networkproxy.h index 3ba4e32af..0125acb8b 100644 --- a/src/plugins/StatusBarIcons/sbi_networkproxy.h +++ b/src/plugins/StatusBarIcons/sbi_networkproxy.h @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_proxywidget.cpp b/src/plugins/StatusBarIcons/sbi_proxywidget.cpp index 59f3640b2..00375f86b 100644 --- a/src/plugins/StatusBarIcons/sbi_proxywidget.cpp +++ b/src/plugins/StatusBarIcons/sbi_proxywidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_proxywidget.h b/src/plugins/StatusBarIcons/sbi_proxywidget.h index 3f3c5bb97..3e97c3bde 100644 --- a/src/plugins/StatusBarIcons/sbi_proxywidget.h +++ b/src/plugins/StatusBarIcons/sbi_proxywidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_settingsdialog.cpp b/src/plugins/StatusBarIcons/sbi_settingsdialog.cpp index 823112671..8a2aecfa5 100644 --- a/src/plugins/StatusBarIcons/sbi_settingsdialog.cpp +++ b/src/plugins/StatusBarIcons/sbi_settingsdialog.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_settingsdialog.h b/src/plugins/StatusBarIcons/sbi_settingsdialog.h index 1b5fef0be..16545f344 100644 --- a/src/plugins/StatusBarIcons/sbi_settingsdialog.h +++ b/src/plugins/StatusBarIcons/sbi_settingsdialog.h @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2013-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_zoomwidget.cpp b/src/plugins/StatusBarIcons/sbi_zoomwidget.cpp index 1d403b2d1..4b5f661c2 100644 --- a/src/plugins/StatusBarIcons/sbi_zoomwidget.cpp +++ b/src/plugins/StatusBarIcons/sbi_zoomwidget.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2014-2017 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/sbi_zoomwidget.h b/src/plugins/StatusBarIcons/sbi_zoomwidget.h index 086ff483c..c2e583baf 100644 --- a/src/plugins/StatusBarIcons/sbi_zoomwidget.h +++ b/src/plugins/StatusBarIcons/sbi_zoomwidget.h @@ -1,5 +1,5 @@ /* ============================================================ -* StatusBarIcons - Extra icons in statusbar for QupZilla +* StatusBarIcons - Extra icons in statusbar for Falkon * Copyright (C) 2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/StatusBarIcons/statusbariconsplugin.cpp b/src/plugins/StatusBarIcons/statusbariconsplugin.cpp index 372d9879c..53e7e4f27 100644 --- a/src/plugins/StatusBarIcons/statusbariconsplugin.cpp +++ b/src/plugins/StatusBarIcons/statusbariconsplugin.cpp @@ -73,7 +73,7 @@ void StatusBarIconsPlugin::unload() bool StatusBarIconsPlugin::testPlugin() { // Require the version that the plugin was built with - return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION)); + return (Qz::VERSION == QLatin1String(FALKON_VERSION)); } QTranslator* StatusBarIconsPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/StatusBarIcons/statusbariconsplugin.h b/src/plugins/StatusBarIcons/statusbariconsplugin.h index 422a710df..37079503c 100644 --- a/src/plugins/StatusBarIcons/statusbariconsplugin.h +++ b/src/plugins/StatusBarIcons/statusbariconsplugin.h @@ -26,7 +26,7 @@ class StatusBarIconsPlugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.StatusBarIcons") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.StatusBarIcons") public: explicit StatusBarIconsPlugin(); diff --git a/src/plugins/TabManager/tabmanagerdelegate.cpp b/src/plugins/TabManager/tabmanagerdelegate.cpp index 21add9118..0a233416f 100644 --- a/src/plugins/TabManager/tabmanagerdelegate.cpp +++ b/src/plugins/TabManager/tabmanagerdelegate.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - Qt web browser +* Falkon - Qt web browser * Copyright (C) 2016-2017 S. Razi Alavizadeh * Copyright (C) 2017 David Rosca * diff --git a/src/plugins/TabManager/tabmanagerdelegate.h b/src/plugins/TabManager/tabmanagerdelegate.h index 5b76db256..f8a08bce4 100644 --- a/src/plugins/TabManager/tabmanagerdelegate.h +++ b/src/plugins/TabManager/tabmanagerdelegate.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2016-2017 S. Razi Alavizadeh * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/TabManager/tabmanagerplugin.cpp b/src/plugins/TabManager/tabmanagerplugin.cpp index 98c7512f1..8647af990 100644 --- a/src/plugins/TabManager/tabmanagerplugin.cpp +++ b/src/plugins/TabManager/tabmanagerplugin.cpp @@ -49,7 +49,7 @@ PluginSpec TabManagerPlugin::pluginSpec() { PluginSpec spec; spec.name = "Tab Manager"; - spec.info = "Simple yet powerful tab manager for QupZilla"; + spec.info = "Simple yet powerful tab manager for Falkon"; spec.description = "Adds ability to managing tabs and windows"; spec.version = "0.7.0"; spec.author = "Razi Alavizadeh "; @@ -96,7 +96,7 @@ void TabManagerPlugin::unload() bool TabManagerPlugin::testPlugin() { - return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION)); + return (Qz::VERSION == QLatin1String(FALKON_VERSION)); } QTranslator* TabManagerPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/TabManager/tabmanagerplugin.h b/src/plugins/TabManager/tabmanagerplugin.h index b0a410485..be89cb415 100644 --- a/src/plugins/TabManager/tabmanagerplugin.h +++ b/src/plugins/TabManager/tabmanagerplugin.h @@ -34,7 +34,7 @@ class TabManagerPlugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.TabManagerPlugin") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.TabManagerPlugin") public: explicit TabManagerPlugin(); diff --git a/src/plugins/TabManager/tabmanagerwidget.cpp b/src/plugins/TabManager/tabmanagerwidget.cpp index 4c1f202bc..9146cdc8c 100644 --- a/src/plugins/TabManager/tabmanagerwidget.cpp +++ b/src/plugins/TabManager/tabmanagerwidget.cpp @@ -45,7 +45,7 @@ TLDExtractor* TabManagerWidget::s_tldExtractor = 0; TabManagerWidget::TabManagerWidget(BrowserWindow* mainClass, QWidget* parent, bool defaultWidget) : QWidget(parent) , ui(new Ui::TabManagerWidget) - , p_QupZilla(mainClass) + , m_window(mainClass) , m_webPage(0) , m_isRefreshing(false) , m_refreshBlocked(false) @@ -105,8 +105,8 @@ QString TabManagerWidget::domainFromUrl(const QUrl &url, bool useHostName) if (url.scheme() == "file") { return tr("Local File System:"); } - else if (url.scheme() == "qupzilla" || urlString.isEmpty()) { - return tr("QupZilla:"); + else if (url.scheme() == "falkon" || urlString.isEmpty()) { + return tr("Falkon:"); } else if (url.scheme() == "ftp") { appendString.prepend(tr(" [FTP]")); @@ -215,7 +215,7 @@ void TabManagerWidget::onItemActivated(QTreeWidgetItem* item, int column) return; } - BrowserWindow* mainWindow = qobject_cast(qvariant_cast(item->data(0, QupZillaPointerRole))); + BrowserWindow* mainWindow = qobject_cast(qvariant_cast(item->data(0, BrowserWindowPointerRole))); QWidget* tabWidget = qvariant_cast(item->data(0, WebTabPointerRole)); if (column == 1) { @@ -423,7 +423,7 @@ void TabManagerWidget::processActions() continue; } - BrowserWindow* mainWindow = qobject_cast(qvariant_cast(tabItem->data(0, QupZillaPointerRole))); + BrowserWindow* mainWindow = qobject_cast(qvariant_cast(tabItem->data(0, BrowserWindowPointerRole))); WebTab* webTab = qobject_cast(qvariant_cast(tabItem->data(0, WebTabPointerRole))); // current supported actions are not applied to pinned tabs @@ -433,7 +433,7 @@ void TabManagerWidget::processActions() } if (command == "closeSelection") { - if (webTab->url().toString() == "qupzilla:restore") { + if (webTab->url().toString() == "falkon:restore") { continue; } selectedTabs.insertMulti(mainWindow, webTab); @@ -529,7 +529,7 @@ void TabManagerWidget::detachSelectedTabs(const QHash & bool TabManagerWidget::bookmarkSelectedTabs(const QHash &tabsHash) { - QDialog* dialog = new QDialog(getQupZilla(), Qt::WindowStaysOnTopHint | Qt::MSWindowsFixedSizeDialogHint); + QDialog* dialog = new QDialog(getWindow(), Qt::WindowStaysOnTopHint | Qt::MSWindowsFixedSizeDialogHint); QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom, dialog); QLabel* label = new QLabel(dialog); BookmarksFoldersButton* folderButton = new BookmarksFoldersButton(dialog); @@ -581,9 +581,9 @@ QTreeWidgetItem* TabManagerWidget::createEmptyItem(QTreeWidgetItem* parent, bool void TabManagerWidget::groupByDomainName(bool useHostName) { QList windows = mApp->windows(); - int currentWindowIdx = windows.indexOf(getQupZilla()); + int currentWindowIdx = windows.indexOf(getWindow()); if (currentWindowIdx == -1) { - // getQupZilla() instance is closing + // getWindow() instance is closing return; } windows.move(currentWindowIdx, 0); @@ -636,7 +636,7 @@ void TabManagerWidget::groupByDomainName(bool useHostName) tabItem->setData(0, UrlRole, webTab->url().toString()); tabItem->setData(0, WebTabPointerRole, QVariant::fromValue(qobject_cast(webTab))); - tabItem->setData(0, QupZillaPointerRole, QVariant::fromValue(qobject_cast(mainWin))); + tabItem->setData(0, BrowserWindowPointerRole, QVariant::fromValue(qobject_cast(mainWin))); makeWebViewConnections(webTab->webView()); } @@ -648,7 +648,7 @@ void TabManagerWidget::groupByDomainName(bool useHostName) void TabManagerWidget::groupByWindow() { QList windows = mApp->windows(); - int currentWindowIdx = windows.indexOf(getQupZilla()); + int currentWindowIdx = windows.indexOf(getWindow()); if (currentWindowIdx == -1) { return; } @@ -670,7 +670,7 @@ void TabManagerWidget::groupByWindow() winItem->setFont(0, font); } - winItem->setData(0, QupZillaPointerRole, QVariant::fromValue(qobject_cast(mainWin))); + winItem->setData(0, BrowserWindowPointerRole, QVariant::fromValue(qobject_cast(mainWin))); QList tabs = mainWin->tabWidget()->allTabs(); for (int tab = 0; tab < tabs.count(); ++tab) { @@ -701,20 +701,20 @@ void TabManagerWidget::groupByWindow() tabItem->setData(0, UrlRole, webTab->url().toString()); tabItem->setData(0, WebTabPointerRole, QVariant::fromValue(qobject_cast(webTab))); - tabItem->setData(0, QupZillaPointerRole, QVariant::fromValue(qobject_cast(mainWin))); + tabItem->setData(0, BrowserWindowPointerRole, QVariant::fromValue(qobject_cast(mainWin))); makeWebViewConnections(webTab->webView()); } } } -BrowserWindow* TabManagerWidget::getQupZilla() +BrowserWindow* TabManagerWidget::getWindow() { - if (m_isDefaultWidget || !p_QupZilla) { + if (m_isDefaultWidget || !m_window) { return mApp->getWindow(); } else { - return p_QupZilla.data(); + return m_window.data(); } } diff --git a/src/plugins/TabManager/tabmanagerwidget.h b/src/plugins/TabManager/tabmanagerwidget.h index a2918f25f..d2ebab231 100644 --- a/src/plugins/TabManager/tabmanagerwidget.h +++ b/src/plugins/TabManager/tabmanagerwidget.h @@ -63,19 +63,19 @@ public slots: private: enum TabDataRole { WebTabPointerRole = Qt::UserRole + 10, - QupZillaPointerRole = Qt::UserRole + 20, + BrowserWindowPointerRole = Qt::UserRole + 20, UrlRole = Qt::UserRole + 30 }; QTreeWidgetItem* createEmptyItem(QTreeWidgetItem* parent = 0, bool addToTree = true); void groupByDomainName(bool useHostName = false); void groupByWindow(); - BrowserWindow* getQupZilla(); + BrowserWindow* getWindow(); void makeWebViewConnections(WebView *view); Ui::TabManagerWidget* ui; - QPointer p_QupZilla; + QPointer m_window; WebPage* m_webPage; bool m_isRefreshing; diff --git a/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp b/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp index a27346256..7a2a4ea44 100644 --- a/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp +++ b/src/plugins/TabManager/tabmanagerwidgetcontroller.cpp @@ -196,11 +196,11 @@ void TabManagerWidgetController::showSideBySide() QRect managerRect(availableGeometry.left() + frameWidth, availableGeometry.top() + titleBarHeight, defaultTabManager()->width(), availableGeometry.height() - titleBarHeight - frameWidth); - QRect qupzillaRect(managerRect.topRight().x() + 2 * frameWidth, managerRect.top(), + QRect windowRect(managerRect.topRight().x() + 2 * frameWidth, managerRect.top(), availableGeometry.width() - managerRect.width() - 4 * frameWidth, managerRect.height()); defaultTabManager()->setGeometry(managerRect); - mApp->getWindow()->setGeometry(qupzillaRect); + mApp->getWindow()->setGeometry(windowRect); mApp->getWindow()->showNormal(); mApp->getWindow()->raise(); diff --git a/src/plugins/TabManager/tabmanagerwidgetcontroller.h b/src/plugins/TabManager/tabmanagerwidgetcontroller.h index 713c143ce..57c8cb208 100644 --- a/src/plugins/TabManager/tabmanagerwidgetcontroller.h +++ b/src/plugins/TabManager/tabmanagerwidgetcontroller.h @@ -1,5 +1,5 @@ /* ============================================================ -* TabManager plugin for QupZilla +* TabManager plugin for Falkon * Copyright (C) 2013 S. Razi Alavizadeh * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp index 3be7db07f..ee856ca6d 100644 --- a/src/plugins/TestPlugin/testplugin.cpp +++ b/src/plugins/TestPlugin/testplugin.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -56,7 +56,7 @@ void TestPlugin::init(InitState state, const QString &settingsPath) // This function is called right after plugin is loaded // it will be called even if we return false from testPlugin() - // so it is recommended not to call any QupZilla function here + // so it is recommended not to call any Falkon function here // Settings path is PROFILE/extensions (without trailign slash), // in this directory you can use global .ini file for QSettings @@ -98,7 +98,7 @@ bool TestPlugin::testPlugin() // There should be some testing if plugin is loaded correctly // If this function returns false, plugin is automatically unloaded - return (Qz::VERSION == QLatin1String(QUPZILLA_VERSION)); + return (Qz::VERSION == QLatin1String(FALKON_VERSION)); } QTranslator* TestPlugin::getTranslator(const QString &locale) @@ -168,7 +168,7 @@ bool TestPlugin::mousePress(const Qz::ObjectName &type, QObject* obj, QMouseEven qDebug() << "mousePress" << type << obj << event; // Returning false means, that we don't want to block propagating this event - // Returning true may affect behaviour of QupZilla, so make sure you know what + // Returning true may affect behaviour of Falkon, so make sure you know what // you are doing! return false; } diff --git a/src/plugins/TestPlugin/testplugin.h b/src/plugins/TestPlugin/testplugin.h index 4c122e59f..68ea75fa3 100644 --- a/src/plugins/TestPlugin/testplugin.h +++ b/src/plugins/TestPlugin/testplugin.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify @@ -18,7 +18,7 @@ #ifndef TESTPLUGIN_H #define TESTPLUGIN_H -// Include plugininterface.h for your version of QupZilla +// Include plugininterface.h for your version of Falkon #include "plugininterface.h" #include @@ -30,7 +30,7 @@ class TestPlugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID "QupZilla.Browser.plugin.TestPlugin") + Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.TestPlugin") public: explicit TestPlugin(); diff --git a/src/plugins/TestPlugin/testplugin_sidebar.cpp b/src/plugins/TestPlugin/testplugin_sidebar.cpp index 1bc224360..738dbe9f4 100644 --- a/src/plugins/TestPlugin/testplugin_sidebar.cpp +++ b/src/plugins/TestPlugin/testplugin_sidebar.cpp @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/TestPlugin/testplugin_sidebar.h b/src/plugins/TestPlugin/testplugin_sidebar.h index 279d39aee..efdd19fba 100644 --- a/src/plugins/TestPlugin/testplugin_sidebar.h +++ b/src/plugins/TestPlugin/testplugin_sidebar.h @@ -1,5 +1,5 @@ /* ============================================================ -* QupZilla - WebKit based browser +* Falkon - Qt web browser * Copyright (C) 2010-2014 David Rosca * * This program is free software: you can redistribute it and/or modify diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 694746a7f..eb16f93f3 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -26,8 +26,8 @@ defineTest(disablePlugin) { addSubdir($$PWD) -outOfDirPlugins = $$(QUPZILLA_PLUGINS_SRCDIR) -!equals(outOfDirPlugins, ""): addSubdir($$(QUPZILLA_PLUGINS_SRCDIR)) +outOfDirPlugins = $$(FALKON_PLUGINS_SRCDIR) +!equals(outOfDirPlugins, ""): addSubdir($$(FALKON_PLUGINS_SRCDIR)) # TestPlugin only in debug build !CONFIG(debug, debug|release): disablePlugin(TestPlugin) diff --git a/tests/autotests/autotests.pro b/tests/autotests/autotests.pro index 972f3e3b9..ea1c29c6f 100644 --- a/tests/autotests/autotests.pro +++ b/tests/autotests/autotests.pro @@ -6,8 +6,8 @@ TARGET = autotests CONFIG -= app_bundle -!unix|mac: LIBS += -L$$PWD/../../bin -lQupZilla -!mac:unix: LIBS += $$PWD/../../bin/libQupZilla.so +!unix|mac: LIBS += -L$$PWD/../../bin -lFalkon +!mac:unix: LIBS += $$PWD/../../bin/libFalkon.so QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}$$PWD/../../bin diff --git a/tests/benchmarks/benchmarks.pri b/tests/benchmarks/benchmarks.pri index 9a791274e..459613a1e 100644 --- a/tests/benchmarks/benchmarks.pri +++ b/tests/benchmarks/benchmarks.pri @@ -7,8 +7,8 @@ isEqual(QT_MAJOR_VERSION, 5) { CONFIG += qtestlib } -!unix|mac: LIBS += -L$$PWD/../../bin -lQupZilla -!mac:unix: LIBS += $$PWD/../../bin/libQupZilla.so +!unix|mac: LIBS += -L$$PWD/../../bin -lFalkon +!mac:unix: LIBS += $$PWD/../../bin/libFalkon.so QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}$$PWD/../../bin diff --git a/windows/installer.nsi b/windows/installer.nsi index 6d4461996..349873ac9 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -1,465 +1,465 @@ -; QupZilla Windows Installer NSIS Script -; Copyright (C) 2010-2017 David Rosca -; 2012-2017 S. Razi Alavizadeh -; -; For compiling this script you need following plugins: -; FindProcDLL_plug-in, KillProcDLL_plug-in and 'AllAssociation.nsh' needs -; Registry_plug-in, Application_Association_Registration_plug-in -; Unicode version of them can be downloaded from: -; http://sourceforge.net/projects/findkillprocuni/files/bin/ -; http://nsis.sourceforge.net/Application_Association_Registration_plug-in -; http://nsis.sourceforge.net/Registry_plug-in - -!ifndef CUSTOM - !define VERSION 2.1.2 - !define ARCH x86 - !define MSVC_VER 140 - !define OPENSSL_BIN_DIR . - !define MSVC_REDIST_DIR . - !define QZ_BIN_DIR . - !define ICU_BIN_DIR . - !define QT_DIR . - !define QT_BIN_DIR . - !define QT_PLUGINS_DIR . - !define QTWEBENGINE_DICTIONARIES_DIR qtwebengine_dictionaries - !undef PORTABLE -!endif - -; WinVer.nsh was added in the same release that RequestExecutionLevel so check -; if ___WINVER__NSH___ is defined to determine if RequestExecutionLevel is -; available. -!include /NONFATAL WinVer.nsh -!include x64.nsh - -!ifndef PORTABLE - RequestExecutionLevel admin -!else - RequestExecutionLevel user -!endif - -!addplugindir "wininstall\" - -!include "StdUtils.nsh" -!include "FileFunc.nsh" -!include "wininstall\AllAssociation.nsh" -SetCompressor /SOLID /FINAL lzma - -!define PRODUCT_NAME "QupZilla" -!define /date PRODUCT_VERSION "${VERSION}" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" -!define PRODUCT_CAPABILITIES_KEY "Software\${PRODUCT_NAME}\Capabilities" - -!include "MUI.nsh" -!define MUI_ABORTWARNING -!define MUI_ICON "wininstall\install.ico" -!define MUI_UNICON "wininstall\uninstall.ico" -!define MUI_WELCOMEFINISHPAGE_BITMAP "wininstall\welcome.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "wininstall\welcome.bmp" - -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE ${QZ_BIN_DIR}\COPYRIGHT.txt -!insertmacro MUI_PAGE_COMPONENTS -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES - -!define MUI_FINISHPAGE_RUN -!define MUI_FINISHPAGE_RUN_FUNCTION "RunQupZillaAsUser" -!insertmacro MUI_PAGE_FINISH - -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -!insertmacro MUI_LANGUAGE "English" -!insertmacro MUI_LANGUAGE "Czech" -!insertmacro MUI_LANGUAGE "Slovak" -!insertmacro MUI_LANGUAGE "German" -!insertmacro MUI_LANGUAGE "Dutch" -!insertmacro MUI_LANGUAGE "Portuguese" -!insertmacro MUI_LANGUAGE "Greek" -!insertmacro MUI_LANGUAGE "French" -!insertmacro MUI_LANGUAGE "Italian" -!insertmacro MUI_LANGUAGE "Romanian" -!insertmacro MUI_LANGUAGE "Tradchinese" -!insertmacro MUI_LANGUAGE "Simpchinese" -!insertmacro MUI_LANGUAGE "Indonesian" -!insertmacro MUI_LANGUAGE "Georgian" -!insertmacro MUI_LANGUAGE "Japanese" -!insertmacro MUI_LANGUAGE "Swedish" -!insertmacro MUI_LANGUAGE "Polish" -!insertmacro MUI_LANGUAGE "Ukrainian" -!insertmacro MUI_LANGUAGE "Catalan" -!insertmacro MUI_LANGUAGE "Serbian" -!insertmacro MUI_LANGUAGE "SerbianLatin" -!insertmacro MUI_LANGUAGE "Farsi" -!insertmacro MUI_LANGUAGE "Hebrew" -!insertmacro MUI_LANGUAGE "Spanish" -!insertmacro MUI_LANGUAGE "Arabic" -!insertmacro MUI_LANGUAGE "Basque" -!insertmacro MUI_LANGUAGE "Danish" - -!insertmacro MUI_RESERVEFILE_LANGDLL - -Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "${PRODUCT_NAME} ${PRODUCT_VERSION} Installer.exe" -InstallDir "$PROGRAMFILES\${PRODUCT_NAME}\" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" -ShowInstDetails show -ShowUnInstDetails show - -!include "wininstall\languages.nsh" - -Section !$(TITLE_SecMain) SecMain - SectionIn RO - FindProcDLL::FindProc "qupzilla.exe" - IntCmp $R0 1 0 notRunning - MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(MSG_RunningInstance)" /SD IDOK IDCANCEL AbortInstallation - KillProcDLL::KillProc "qupzilla.exe" - Sleep 100 - Goto notRunning -AbortInstallation: - Abort "$(MSG_InstallationCanceled)" - -notRunning: - SetOverwrite on - - SetOutPath "$INSTDIR" - File "${QZ_BIN_DIR}\COPYRIGHT.txt" - File "${QZ_BIN_DIR}\qupzilla.exe" - File "${QZ_BIN_DIR}\qupzilla.dll" - File "${QZ_BIN_DIR}\qt.conf" - File "${OPENSSL_BIN_DIR}\libeay32.dll" - File "${OPENSSL_BIN_DIR}\ssleay32.dll" - File "${MSVC_REDIST_DIR}\*" - File "${ICU_BIN_DIR}\icudt54.dll" - File "${ICU_BIN_DIR}\icuin54.dll" - File "${ICU_BIN_DIR}\icuuc54.dll" - File "${QT_BIN_DIR}\libEGL.dll" - File "${QT_BIN_DIR}\libGLESv2.dll" - File "${QT_BIN_DIR}\opengl32sw.dll" - File "${QT_BIN_DIR}\D3Dcompiler_47.dll" - File "${QT_BIN_DIR}\Qt5Core.dll" - File "${QT_BIN_DIR}\Qt5Gui.dll" - File "${QT_BIN_DIR}\Qt5Network.dll" - File "${QT_BIN_DIR}\Qt5Positioning.dll" - File "${QT_BIN_DIR}\Qt5PrintSupport.dll" - File "${QT_BIN_DIR}\Qt5Qml.dll" - File "${QT_BIN_DIR}\Qt5Quick.dll" - File "${QT_BIN_DIR}\Qt5QuickWidgets.dll" - File "${QT_BIN_DIR}\Qt5Sql.dll" - File "${QT_BIN_DIR}\Qt5Svg.dll" - File "${QT_BIN_DIR}\Qt5WinExtras.dll" - File "${QT_BIN_DIR}\Qt5WebEngine.dll" - File "${QT_BIN_DIR}\Qt5WebEngineCore.dll" - File "${QT_BIN_DIR}\Qt5WebEngineWidgets.dll" - File "${QT_BIN_DIR}\Qt5WebChannel.dll" - File "${QT_BIN_DIR}\Qt5Widgets.dll" - File "${QT_BIN_DIR}\QtWebEngineProcess.exe" - - SetOutPath "$INSTDIR\iconengines" - File "${QT_PLUGINS_DIR}\iconengines\qsvgicon.dll" - - SetOutPath "$INSTDIR\imageformats" - File "${QT_PLUGINS_DIR}\imageformats\*.dll" - - SetOutPath "$INSTDIR\platforms" - File "${QT_PLUGINS_DIR}\platforms\qwindows.dll" - - SetOutPath "$INSTDIR\printsupport" - File "${QT_PLUGINS_DIR}\printsupport\windowsprintersupport.dll" - - SetOutPath "$INSTDIR\qml\QtQuick.2" - File "${QT_DIR}\qml\QtQuick.2\*" - - SetOutPath "$INSTDIR\qml\QtWebEngine" - File "${QT_DIR}\qml\QtWebEngine\*" - - SetOutPath "$INSTDIR\resources" - File "${QT_DIR}\resources\*" - - SetOutPath "$INSTDIR\sqldrivers" - File "${QT_PLUGINS_DIR}\sqldrivers\qsqlite.dll" - - SetOutPath "$INSTDIR\translations\qtwebengine_locales" - File "${QT_DIR}\translations\qtwebengine_locales\*" - - SetOutPath "$INSTDIR\qtwebengine_dictionaries\doc" - ; In some packages underline '_' is used and in some other packages dash '-' is used so we use wildcard - File "${QTWEBENGINE_DICTIONARIES_DIR}\doc\README*en*US.txt" - - SetOutPath "$INSTDIR\qtwebengine_dictionaries" - ; in some packages *.bdic files use dash '-' instead of underline '_' followed by a version number. e.g. en-US-3-0.bdic - File "${QTWEBENGINE_DICTIONARIES_DIR}\en*US*.bdic" - - !ifndef PORTABLE - call RegisterCapabilities - !endif -SectionEnd - -SectionGroup $(TITLE_SecThemes) SecThemes - - Section Default SecDefault - SectionIn RO - SetOutPath "$INSTDIR\themes\windows" - File "${QZ_BIN_DIR}\themes\windows\*" - SetOutPath "$INSTDIR\themes\windows\images" - File "${QZ_BIN_DIR}\themes\windows\images\*" - SectionEnd - - Section Chrome SecChrome - SetOutPath "$INSTDIR\themes\chrome" - File "${QZ_BIN_DIR}\themes\chrome\*" - SetOutPath "$INSTDIR\themes\chrome\images" - File "${QZ_BIN_DIR}\themes\chrome\images\*" - SectionEnd - - Section Mac SecMac - SetOutPath "$INSTDIR\themes\mac" - File "${QZ_BIN_DIR}\themes\mac\*" - SetOutPath "$INSTDIR\themes\mac\images" - File "${QZ_BIN_DIR}\themes\mac\images\*" - SectionEnd - - Section Breathe SecBreathe - SetOutPath "$INSTDIR\themes\breathe" - File "${QZ_BIN_DIR}\themes\breathe\*" - SetOutPath "$INSTDIR\themes\breathe\images" - File "${QZ_BIN_DIR}\themes\breathe\images\*" - SectionEnd -SectionGroupEnd - -Section $(TITLE_SecTranslations) SecTranslations - SetOutPath "$INSTDIR\locale" - File "${QZ_BIN_DIR}\locale\*.qm" - SetOutPath "$INSTDIR\qtwebengine_dictionaries\doc" - File "${QTWEBENGINE_DICTIONARIES_DIR}\doc\*" - SetOutPath "$INSTDIR\qtwebengine_dictionaries" - File "${QTWEBENGINE_DICTIONARIES_DIR}\*.bdic" -SectionEnd - -Section $(TITLE_SecPlugins) SecPlugins - SetOutPath "$INSTDIR\plugins" - File "${QZ_BIN_DIR}\plugins\*.dll" -SectionEnd - - -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SecMain} $(DESC_SecMain) - !insertmacro MUI_DESCRIPTION_TEXT ${SecTranslations} $(DESC_SecTranslations) - !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} $(DESC_SecPlugins) - !ifndef PORTABLE - !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} $(DESC_SecDesktop) - !insertmacro MUI_DESCRIPTION_TEXT ${SecExtensions} $(DESC_SecExtensions) - !endif - !insertmacro MUI_DESCRIPTION_TEXT ${SecThemes} $(DESC_SecThemes) - - !ifndef PORTABLE - !insertmacro MUI_DESCRIPTION_TEXT ${SecSetASDefault} $(DESC_SecSetASDefault) - !insertmacro MUI_DESCRIPTION_TEXT ${SecProtocols} $(DESC_SecProtocols) - !endif -!insertmacro MUI_FUNCTION_DESCRIPTION_END - - -!ifndef PORTABLE - SectionGroup $(TITLE_SecSetASDefault) SecSetASDefault - Section $(TITLE_SecExtensions) SecExtensions - SetOutPath "$INSTDIR" - ${RegisterAssociation} ".htm" "$INSTDIR\qupzilla.exe" "QupZilla.HTM" $(FILE_Htm) "$INSTDIR\qupzilla.exe,1" "file" - ${RegisterAssociation} ".html" "$INSTDIR\qupzilla.exe" "QupZilla.HTML" $(FILE_Html) "$INSTDIR\qupzilla.exe,1" "file" - ${UpdateSystemIcons} - SectionEnd - - Section $(TITLE_SecProtocols) SecProtocols - ${RegisterAssociation} "http" "$INSTDIR\qupzilla.exe" "QupZilla.HTTP" "URL:HyperText Transfer Protocol" "$INSTDIR\qupzilla.exe,0" "protocol" - ${RegisterAssociation} "https" "$INSTDIR\qupzilla.exe" "QupZilla.HTTPS" "URL:HyperText Transfer Protocol with Privacy" "$INSTDIR\qupzilla.exe,0" "protocol" - ${UpdateSystemIcons} - SectionEnd - SectionGroupEnd - - Section -StartMenu - SetOutPath "$INSTDIR" - SetShellVarContext all - CreateDirectory "$SMPROGRAMS\QupZilla" - CreateShortCut "$SMPROGRAMS\QupZilla\Uninstall.lnk" "$INSTDIR\Uninstall.exe" - CreateShortCut "$SMPROGRAMS\QupZilla\QupZilla.lnk" "$INSTDIR\qupzilla.exe" - CreateShortCut "$SMPROGRAMS\QupZilla\License.lnk" "$INSTDIR\COPYRIGHT.txt" - SectionEnd - - Section $(TITLE_SecDesktop) SecDesktop - SetOutPath "$INSTDIR" - CreateShortCut "$DESKTOP\QupZilla.lnk" "$INSTDIR\qupzilla.exe" "" - SectionEnd - - Section -Uninstaller - WriteUninstaller "$INSTDIR\uninstall.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\qupzilla.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\qupzilla.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "QupZilla Team" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "HelpLink" "https://github.com/QupZilla/qupzilla/wiki" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallLocation" "$INSTDIR" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallSource" "$EXEDIR" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "http://www.qupzilla.com" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLUpdateInfo" "http://blog.qupzilla.com/" - ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 - WriteRegDWORD ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "EstimatedSize" "$0" - SectionEnd - - Section Uninstall - FindProcDLL::FindProc "qupzilla.exe" - IntCmp $R0 1 0 notRunning - MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(MSG_RunningInstance)" /SD IDOK IDCANCEL AbortInstallation - KillProcDLL::KillProc "qupzilla.exe" - Sleep 100 - Goto notRunning - AbortInstallation: - Abort "$(MSG_InstallationCanceled)" - - notRunning: - SetShellVarContext all - Delete "$DESKTOP\QupZilla.lnk" - RMDir /r "$INSTDIR" - RMDir /r "$SMPROGRAMS\QupZilla" - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - - DeleteRegKey HKLM "Software\${PRODUCT_NAME}" - DeleteRegValue HKLM "SOFTWARE\RegisteredApplications" "${PRODUCT_NAME}" - - ${UnRegisterAssociation} ".htm" "QupZilla.HTM" "$INSTDIR\qupzilla.exe" "file" - ${UnRegisterAssociation} ".html" "QupZilla.HTML" "$INSTDIR\qupzilla.exe" "file" - ${UnRegisterAssociation} "http" "QupZilla.HTTP" "$INSTDIR\qupzilla.exe" "protocol" - ${UnRegisterAssociation} "https" "QupZilla.HTTPS" "$INSTDIR\qupzilla.exe" "protocol" - ${UpdateSystemIcons} - SectionEnd -!endif - -BrandingText "${PRODUCT_NAME} ${PRODUCT_VERSION} Installer" - -Function .onInit - ;Prevent running installer of 64-bit QupZilla on 32-bit Windows - ${If} ${RunningX64} - ${If} ${ARCH} == "x64" - StrCpy $InstDir "$PROGRAMFILES64\${PRODUCT_NAME}\" - ${Else} - StrCpy $InstDir "$PROGRAMFILES32\${PRODUCT_NAME}\" - ${Endif} - ${Else} - ${If} ${ARCH} == "x64" - MessageBox MB_OK|MB_ICONEXCLAMATION "This installation requiers Windows x64!" - Quit - ${Else} - StrCpy $InstDir "$PROGRAMFILES\${PRODUCT_NAME}\" - ${Endif} - ${EndIf} - - !ifdef PORTABLE - StrCpy $InstDir "$DESKTOP\${PRODUCT_NAME} Portable\" - !endif - - ;Prevent Multiple Instances - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "QupZillaInstaller-4ECB4694-2C39-4f93-9122-A986344C4E7B") i .r1 ?e' - Pop $R0 - StrCmp $R0 0 +3 - MessageBox MB_OK|MB_ICONEXCLAMATION "QupZilla installer is already running!" /SD IDOK - Abort - - ;Language selection dialog¨ - ;Return when running silent instalation - - IfSilent 0 +2 - return - - Push "" - Push ${LANG_ENGLISH} - Push English - Push ${LANG_CZECH} - Push Czech - Push ${LANG_SLOVAK} - Push Slovak - Push ${LANG_GERMAN} - Push German - Push ${LANG_DUTCH} - Push Dutch - Push ${LANG_PORTUGUESE} - Push Portuguese - Push ${LANG_GREEK} - Push Greek - Push ${LANG_FRENCH} - Push French - Push ${LANG_ITALIAN} - Push Italian - Push ${LANG_ROMANIAN} - Push Romanian - Push ${LANG_TRADCHINESE} - Push TraditionalChinese - Push ${LANG_SIMPCHINESE} - Push SimplifiedChinese - Push ${LANG_INDONESIAN} - Push Indonesian - Push ${LANG_GEORGIAN} - Push Georgian - Push ${LANG_JAPANESE} - Push Japanese - Push ${LANG_SWEDISH} - Push Swedish - Push ${LANG_POLISH} - Push Polish - Push ${LANG_UKRAINIAN} - Push Ukrainian - Push ${LANG_CATALAN} - Push Catalan - Push ${LANG_SERBIAN} - Push Serbian - Push ${LANG_SERBIANLATIN} - Push SerbianLatin - Push ${LANG_FARSI} - Push Persian - Push ${LANG_HEBREW} - Push Hebrew - Push ${LANG_SPANISH} - Push Spanish - Push ${LANG_DANISH} - Push Danish - Push A ; A means auto count languages - ; for the auto count to work the first empty push (Push "") must remain - LangDLL::LangDialog "Installer Language" "Please select the language of the installer" - - Pop $LANGUAGE - StrCmp $LANGUAGE "cancel" 0 +2 - Abort -FunctionEnd - -Function RegisterCapabilities - !ifdef ___WINVER__NSH___ - ${If} ${AtLeastWinVista} - ; even if we don't associate QupZilla as default for ".htm" and ".html" - ; we need to write these ProgIds for future use! - ;(e.g.: user uses "Default Programs" on Win7 or Vista to set QupZilla as default.) - ${CreateProgId} "QupZilla.HTM" "$INSTDIR\qupzilla.exe" $(FILE_Htm) "$INSTDIR\qupzilla.exe,1" - ${CreateProgId} "QupZilla.HTML" "$INSTDIR\qupzilla.exe" $(FILE_Html) "$INSTDIR\qupzilla.exe,1" - ${CreateProgId} "QupZilla.HTTP" "$INSTDIR\qupzilla.exe" "URL:HyperText Transfer Protocol" "$INSTDIR\qupzilla.exe,0" - ${CreateProgId} "QupZilla.HTTPS" "$INSTDIR\qupzilla.exe" "URL:HyperText Transfer Protocol with Privacy" "$INSTDIR\qupzilla.exe,0" - - ; note: these lines just introduce capabilities of QupZilla to OS and don't change defaults! - WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}" "ApplicationDescription" "$(PRODUCT_DESC)" - WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}" "ApplicationIcon" "$INSTDIR\qupzilla.exe,0" - WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}" "ApplicationName" "${PRODUCT_NAME}" - WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\FileAssociations" ".htm" "QupZilla.HTM" - WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\FileAssociations" ".html" "QupZilla.HTML" - WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\URLAssociations" "http" "QupZilla.HTTP" - WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\URLAssociations" "https" "QupZilla.HTTPS" - WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\Startmenu" "StartMenuInternet" "$INSTDIR\qupzilla.exe" - WriteRegStr HKLM "SOFTWARE\RegisteredApplications" "${PRODUCT_NAME}" "${PRODUCT_CAPABILITIES_KEY}" - ${EndIf} - !endif -FunctionEnd - -Function RunQupZillaAsUser - ${StdUtils.ExecShellAsUser} $0 "$INSTDIR\qupzilla.exe" "open" "" -FunctionEnd +; Falkon Windows Installer NSIS Script +; Copyright (C) 2010-2017 David Rosca +; 2012-2017 S. Razi Alavizadeh +; +; For compiling this script you need following plugins: +; FindProcDLL_plug-in, KillProcDLL_plug-in and 'AllAssociation.nsh' needs +; Registry_plug-in, Application_Association_Registration_plug-in +; Unicode version of them can be downloaded from: +; http://sourceforge.net/projects/findkillprocuni/files/bin/ +; http://nsis.sourceforge.net/Application_Association_Registration_plug-in +; http://nsis.sourceforge.net/Registry_plug-in + +!ifndef CUSTOM + !define VERSION 2.1.2 + !define ARCH x86 + !define MSVC_VER 140 + !define OPENSSL_BIN_DIR . + !define MSVC_REDIST_DIR . + !define QZ_BIN_DIR . + !define ICU_BIN_DIR . + !define QT_DIR . + !define QT_BIN_DIR . + !define QT_PLUGINS_DIR . + !define QTWEBENGINE_DICTIONARIES_DIR qtwebengine_dictionaries + !undef PORTABLE +!endif + +; WinVer.nsh was added in the same release that RequestExecutionLevel so check +; if ___WINVER__NSH___ is defined to determine if RequestExecutionLevel is +; available. +!include /NONFATAL WinVer.nsh +!include x64.nsh + +!ifndef PORTABLE + RequestExecutionLevel admin +!else + RequestExecutionLevel user +!endif + +!addplugindir "wininstall\" + +!include "StdUtils.nsh" +!include "FileFunc.nsh" +!include "wininstall\AllAssociation.nsh" +SetCompressor /SOLID /FINAL lzma + +!define PRODUCT_NAME "Falkon" +!define /date PRODUCT_VERSION "${VERSION}" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\falkon.exe" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +!define PRODUCT_UNINST_ROOT_KEY "HKLM" +!define PRODUCT_CAPABILITIES_KEY "Software\${PRODUCT_NAME}\Capabilities" + +!include "MUI.nsh" +!define MUI_ABORTWARNING +!define MUI_ICON "wininstall\install.ico" +!define MUI_UNICON "wininstall\uninstall.ico" +!define MUI_WELCOMEFINISHPAGE_BITMAP "wininstall\welcome.bmp" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "wininstall\welcome.bmp" + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE ${QZ_BIN_DIR}\COPYRIGHT.txt +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES + +!define MUI_FINISHPAGE_RUN +!define MUI_FINISHPAGE_RUN_FUNCTION "RunFalkonAsUser" +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "Czech" +!insertmacro MUI_LANGUAGE "Slovak" +!insertmacro MUI_LANGUAGE "German" +!insertmacro MUI_LANGUAGE "Dutch" +!insertmacro MUI_LANGUAGE "Portuguese" +!insertmacro MUI_LANGUAGE "Greek" +!insertmacro MUI_LANGUAGE "French" +!insertmacro MUI_LANGUAGE "Italian" +!insertmacro MUI_LANGUAGE "Romanian" +!insertmacro MUI_LANGUAGE "Tradchinese" +!insertmacro MUI_LANGUAGE "Simpchinese" +!insertmacro MUI_LANGUAGE "Indonesian" +!insertmacro MUI_LANGUAGE "Georgian" +!insertmacro MUI_LANGUAGE "Japanese" +!insertmacro MUI_LANGUAGE "Swedish" +!insertmacro MUI_LANGUAGE "Polish" +!insertmacro MUI_LANGUAGE "Ukrainian" +!insertmacro MUI_LANGUAGE "Catalan" +!insertmacro MUI_LANGUAGE "Serbian" +!insertmacro MUI_LANGUAGE "SerbianLatin" +!insertmacro MUI_LANGUAGE "Farsi" +!insertmacro MUI_LANGUAGE "Hebrew" +!insertmacro MUI_LANGUAGE "Spanish" +!insertmacro MUI_LANGUAGE "Arabic" +!insertmacro MUI_LANGUAGE "Basque" +!insertmacro MUI_LANGUAGE "Danish" + +!insertmacro MUI_RESERVEFILE_LANGDLL + +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +OutFile "${PRODUCT_NAME} ${PRODUCT_VERSION} Installer.exe" +InstallDir "$PROGRAMFILES\${PRODUCT_NAME}\" +InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" +ShowInstDetails show +ShowUnInstDetails show + +!include "wininstall\languages.nsh" + +Section !$(TITLE_SecMain) SecMain + SectionIn RO + FindProcDLL::FindProc "falkon.exe" + IntCmp $R0 1 0 notRunning + MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(MSG_RunningInstance)" /SD IDOK IDCANCEL AbortInstallation + KillProcDLL::KillProc "falkon.exe" + Sleep 100 + Goto notRunning +AbortInstallation: + Abort "$(MSG_InstallationCanceled)" + +notRunning: + SetOverwrite on + + SetOutPath "$INSTDIR" + File "${QZ_BIN_DIR}\COPYRIGHT.txt" + File "${QZ_BIN_DIR}\falkon.exe" + File "${QZ_BIN_DIR}\falkon.dll" + File "${QZ_BIN_DIR}\qt.conf" + File "${OPENSSL_BIN_DIR}\libeay32.dll" + File "${OPENSSL_BIN_DIR}\ssleay32.dll" + File "${MSVC_REDIST_DIR}\*" + File "${ICU_BIN_DIR}\icudt54.dll" + File "${ICU_BIN_DIR}\icuin54.dll" + File "${ICU_BIN_DIR}\icuuc54.dll" + File "${QT_BIN_DIR}\libEGL.dll" + File "${QT_BIN_DIR}\libGLESv2.dll" + File "${QT_BIN_DIR}\opengl32sw.dll" + File "${QT_BIN_DIR}\D3Dcompiler_47.dll" + File "${QT_BIN_DIR}\Qt5Core.dll" + File "${QT_BIN_DIR}\Qt5Gui.dll" + File "${QT_BIN_DIR}\Qt5Network.dll" + File "${QT_BIN_DIR}\Qt5Positioning.dll" + File "${QT_BIN_DIR}\Qt5PrintSupport.dll" + File "${QT_BIN_DIR}\Qt5Qml.dll" + File "${QT_BIN_DIR}\Qt5Quick.dll" + File "${QT_BIN_DIR}\Qt5QuickWidgets.dll" + File "${QT_BIN_DIR}\Qt5Sql.dll" + File "${QT_BIN_DIR}\Qt5Svg.dll" + File "${QT_BIN_DIR}\Qt5WinExtras.dll" + File "${QT_BIN_DIR}\Qt5WebEngine.dll" + File "${QT_BIN_DIR}\Qt5WebEngineCore.dll" + File "${QT_BIN_DIR}\Qt5WebEngineWidgets.dll" + File "${QT_BIN_DIR}\Qt5WebChannel.dll" + File "${QT_BIN_DIR}\Qt5Widgets.dll" + File "${QT_BIN_DIR}\QtWebEngineProcess.exe" + + SetOutPath "$INSTDIR\iconengines" + File "${QT_PLUGINS_DIR}\iconengines\qsvgicon.dll" + + SetOutPath "$INSTDIR\imageformats" + File "${QT_PLUGINS_DIR}\imageformats\*.dll" + + SetOutPath "$INSTDIR\platforms" + File "${QT_PLUGINS_DIR}\platforms\qwindows.dll" + + SetOutPath "$INSTDIR\printsupport" + File "${QT_PLUGINS_DIR}\printsupport\windowsprintersupport.dll" + + SetOutPath "$INSTDIR\qml\QtQuick.2" + File "${QT_DIR}\qml\QtQuick.2\*" + + SetOutPath "$INSTDIR\qml\QtWebEngine" + File "${QT_DIR}\qml\QtWebEngine\*" + + SetOutPath "$INSTDIR\resources" + File "${QT_DIR}\resources\*" + + SetOutPath "$INSTDIR\sqldrivers" + File "${QT_PLUGINS_DIR}\sqldrivers\qsqlite.dll" + + SetOutPath "$INSTDIR\translations\qtwebengine_locales" + File "${QT_DIR}\translations\qtwebengine_locales\*" + + SetOutPath "$INSTDIR\qtwebengine_dictionaries\doc" + ; In some packages underline '_' is used and in some other packages dash '-' is used so we use wildcard + File "${QTWEBENGINE_DICTIONARIES_DIR}\doc\README*en*US.txt" + + SetOutPath "$INSTDIR\qtwebengine_dictionaries" + ; in some packages *.bdic files use dash '-' instead of underline '_' followed by a version number. e.g. en-US-3-0.bdic + File "${QTWEBENGINE_DICTIONARIES_DIR}\en*US*.bdic" + + !ifndef PORTABLE + call RegisterCapabilities + !endif +SectionEnd + +SectionGroup $(TITLE_SecThemes) SecThemes + + Section Default SecDefault + SectionIn RO + SetOutPath "$INSTDIR\themes\windows" + File "${QZ_BIN_DIR}\themes\windows\*" + SetOutPath "$INSTDIR\themes\windows\images" + File "${QZ_BIN_DIR}\themes\windows\images\*" + SectionEnd + + Section Chrome SecChrome + SetOutPath "$INSTDIR\themes\chrome" + File "${QZ_BIN_DIR}\themes\chrome\*" + SetOutPath "$INSTDIR\themes\chrome\images" + File "${QZ_BIN_DIR}\themes\chrome\images\*" + SectionEnd + + Section Mac SecMac + SetOutPath "$INSTDIR\themes\mac" + File "${QZ_BIN_DIR}\themes\mac\*" + SetOutPath "$INSTDIR\themes\mac\images" + File "${QZ_BIN_DIR}\themes\mac\images\*" + SectionEnd + + Section Breathe SecBreathe + SetOutPath "$INSTDIR\themes\breathe" + File "${QZ_BIN_DIR}\themes\breathe\*" + SetOutPath "$INSTDIR\themes\breathe\images" + File "${QZ_BIN_DIR}\themes\breathe\images\*" + SectionEnd +SectionGroupEnd + +Section $(TITLE_SecTranslations) SecTranslations + SetOutPath "$INSTDIR\locale" + File "${QZ_BIN_DIR}\locale\*.qm" + SetOutPath "$INSTDIR\qtwebengine_dictionaries\doc" + File "${QTWEBENGINE_DICTIONARIES_DIR}\doc\*" + SetOutPath "$INSTDIR\qtwebengine_dictionaries" + File "${QTWEBENGINE_DICTIONARIES_DIR}\*.bdic" +SectionEnd + +Section $(TITLE_SecPlugins) SecPlugins + SetOutPath "$INSTDIR\plugins" + File "${QZ_BIN_DIR}\plugins\*.dll" +SectionEnd + + +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SecMain} $(DESC_SecMain) + !insertmacro MUI_DESCRIPTION_TEXT ${SecTranslations} $(DESC_SecTranslations) + !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} $(DESC_SecPlugins) + !ifndef PORTABLE + !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} $(DESC_SecDesktop) + !insertmacro MUI_DESCRIPTION_TEXT ${SecExtensions} $(DESC_SecExtensions) + !endif + !insertmacro MUI_DESCRIPTION_TEXT ${SecThemes} $(DESC_SecThemes) + + !ifndef PORTABLE + !insertmacro MUI_DESCRIPTION_TEXT ${SecSetASDefault} $(DESC_SecSetASDefault) + !insertmacro MUI_DESCRIPTION_TEXT ${SecProtocols} $(DESC_SecProtocols) + !endif +!insertmacro MUI_FUNCTION_DESCRIPTION_END + + +!ifndef PORTABLE + SectionGroup $(TITLE_SecSetASDefault) SecSetASDefault + Section $(TITLE_SecExtensions) SecExtensions + SetOutPath "$INSTDIR" + ${RegisterAssociation} ".htm" "$INSTDIR\falkon.exe" "Falkon.HTM" $(FILE_Htm) "$INSTDIR\falkon.exe,1" "file" + ${RegisterAssociation} ".html" "$INSTDIR\falkon.exe" "Falkon.HTML" $(FILE_Html) "$INSTDIR\falkon.exe,1" "file" + ${UpdateSystemIcons} + SectionEnd + + Section $(TITLE_SecProtocols) SecProtocols + ${RegisterAssociation} "http" "$INSTDIR\falkon.exe" "Falkon.HTTP" "URL:HyperText Transfer Protocol" "$INSTDIR\falkon.exe,0" "protocol" + ${RegisterAssociation} "https" "$INSTDIR\falkon.exe" "Falkon.HTTPS" "URL:HyperText Transfer Protocol with Privacy" "$INSTDIR\falkon.exe,0" "protocol" + ${UpdateSystemIcons} + SectionEnd + SectionGroupEnd + + Section -StartMenu + SetOutPath "$INSTDIR" + SetShellVarContext all + CreateDirectory "$SMPROGRAMS\Falkon" + CreateShortCut "$SMPROGRAMS\Falkon\Uninstall.lnk" "$INSTDIR\Uninstall.exe" + CreateShortCut "$SMPROGRAMS\Falkon\Falkon.lnk" "$INSTDIR\falkon.exe" + CreateShortCut "$SMPROGRAMS\Falkon\License.lnk" "$INSTDIR\COPYRIGHT.txt" + SectionEnd + + Section $(TITLE_SecDesktop) SecDesktop + SetOutPath "$INSTDIR" + CreateShortCut "$DESKTOP\Falkon.lnk" "$INSTDIR\falkon.exe" "" + SectionEnd + + Section -Uninstaller + WriteUninstaller "$INSTDIR\uninstall.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\falkon.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\falkon.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "Falkon Team" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "HelpLink" "https://github.com/QupZilla/qupzilla/wiki" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallLocation" "$INSTDIR" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallSource" "$EXEDIR" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "http://www.qupzilla.com" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLUpdateInfo" "http://blog.qupzilla.com/" + ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 + WriteRegDWORD ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "EstimatedSize" "$0" + SectionEnd + + Section Uninstall + FindProcDLL::FindProc "falkon.exe" + IntCmp $R0 1 0 notRunning + MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(MSG_RunningInstance)" /SD IDOK IDCANCEL AbortInstallation + KillProcDLL::KillProc "falkon.exe" + Sleep 100 + Goto notRunning + AbortInstallation: + Abort "$(MSG_InstallationCanceled)" + + notRunning: + SetShellVarContext all + Delete "$DESKTOP\Falkon.lnk" + RMDir /r "$INSTDIR" + RMDir /r "$SMPROGRAMS\Falkon" + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + + DeleteRegKey HKLM "Software\${PRODUCT_NAME}" + DeleteRegValue HKLM "SOFTWARE\RegisteredApplications" "${PRODUCT_NAME}" + + ${UnRegisterAssociation} ".htm" "Falkon.HTM" "$INSTDIR\falkon.exe" "file" + ${UnRegisterAssociation} ".html" "Falkon.HTML" "$INSTDIR\falkon.exe" "file" + ${UnRegisterAssociation} "http" "Falkon.HTTP" "$INSTDIR\falkon.exe" "protocol" + ${UnRegisterAssociation} "https" "Falkon.HTTPS" "$INSTDIR\falkon.exe" "protocol" + ${UpdateSystemIcons} + SectionEnd +!endif + +BrandingText "${PRODUCT_NAME} ${PRODUCT_VERSION} Installer" + +Function .onInit + ;Prevent running installer of 64-bit Falkon on 32-bit Windows + ${If} ${RunningX64} + ${If} ${ARCH} == "x64" + StrCpy $InstDir "$PROGRAMFILES64\${PRODUCT_NAME}\" + ${Else} + StrCpy $InstDir "$PROGRAMFILES32\${PRODUCT_NAME}\" + ${Endif} + ${Else} + ${If} ${ARCH} == "x64" + MessageBox MB_OK|MB_ICONEXCLAMATION "This installation requiers Windows x64!" + Quit + ${Else} + StrCpy $InstDir "$PROGRAMFILES\${PRODUCT_NAME}\" + ${Endif} + ${EndIf} + + !ifdef PORTABLE + StrCpy $InstDir "$DESKTOP\${PRODUCT_NAME} Portable\" + !endif + + ;Prevent Multiple Instances + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "FalkonInstaller-4ECB4694-2C39-4f93-9122-A986344C4E7B") i .r1 ?e' + Pop $R0 + StrCmp $R0 0 +3 + MessageBox MB_OK|MB_ICONEXCLAMATION "Falkon installer is already running!" /SD IDOK + Abort + + ;Language selection dialog¨ + ;Return when running silent instalation + + IfSilent 0 +2 + return + + Push "" + Push ${LANG_ENGLISH} + Push English + Push ${LANG_CZECH} + Push Czech + Push ${LANG_SLOVAK} + Push Slovak + Push ${LANG_GERMAN} + Push German + Push ${LANG_DUTCH} + Push Dutch + Push ${LANG_PORTUGUESE} + Push Portuguese + Push ${LANG_GREEK} + Push Greek + Push ${LANG_FRENCH} + Push French + Push ${LANG_ITALIAN} + Push Italian + Push ${LANG_ROMANIAN} + Push Romanian + Push ${LANG_TRADCHINESE} + Push TraditionalChinese + Push ${LANG_SIMPCHINESE} + Push SimplifiedChinese + Push ${LANG_INDONESIAN} + Push Indonesian + Push ${LANG_GEORGIAN} + Push Georgian + Push ${LANG_JAPANESE} + Push Japanese + Push ${LANG_SWEDISH} + Push Swedish + Push ${LANG_POLISH} + Push Polish + Push ${LANG_UKRAINIAN} + Push Ukrainian + Push ${LANG_CATALAN} + Push Catalan + Push ${LANG_SERBIAN} + Push Serbian + Push ${LANG_SERBIANLATIN} + Push SerbianLatin + Push ${LANG_FARSI} + Push Persian + Push ${LANG_HEBREW} + Push Hebrew + Push ${LANG_SPANISH} + Push Spanish + Push ${LANG_DANISH} + Push Danish + Push A ; A means auto count languages + ; for the auto count to work the first empty push (Push "") must remain + LangDLL::LangDialog "Installer Language" "Please select the language of the installer" + + Pop $LANGUAGE + StrCmp $LANGUAGE "cancel" 0 +2 + Abort +FunctionEnd + +Function RegisterCapabilities + !ifdef ___WINVER__NSH___ + ${If} ${AtLeastWinVista} + ; even if we don't associate Falkon as default for ".htm" and ".html" + ; we need to write these ProgIds for future use! + ;(e.g.: user uses "Default Programs" on Win7 or Vista to set Falkon as default.) + ${CreateProgId} "Falkon.HTM" "$INSTDIR\falkon.exe" $(FILE_Htm) "$INSTDIR\falkon.exe,1" + ${CreateProgId} "Falkon.HTML" "$INSTDIR\falkon.exe" $(FILE_Html) "$INSTDIR\falkon.exe,1" + ${CreateProgId} "Falkon.HTTP" "$INSTDIR\falkon.exe" "URL:HyperText Transfer Protocol" "$INSTDIR\falkon.exe,0" + ${CreateProgId} "Falkon.HTTPS" "$INSTDIR\falkon.exe" "URL:HyperText Transfer Protocol with Privacy" "$INSTDIR\falkon.exe,0" + + ; note: these lines just introduce capabilities of Falkon to OS and don't change defaults! + WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}" "ApplicationDescription" "$(PRODUCT_DESC)" + WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}" "ApplicationIcon" "$INSTDIR\falkon.exe,0" + WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}" "ApplicationName" "${PRODUCT_NAME}" + WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\FileAssociations" ".htm" "Falkon.HTM" + WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\FileAssociations" ".html" "Falkon.HTML" + WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\URLAssociations" "http" "Falkon.HTTP" + WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\URLAssociations" "https" "Falkon.HTTPS" + WriteRegStr HKLM "${PRODUCT_CAPABILITIES_KEY}\Startmenu" "StartMenuInternet" "$INSTDIR\falkon.exe" + WriteRegStr HKLM "SOFTWARE\RegisteredApplications" "${PRODUCT_NAME}" "${PRODUCT_CAPABILITIES_KEY}" + ${EndIf} + !endif +FunctionEnd + +Function RunFalkonAsUser + ${StdUtils.ExecShellAsUser} $0 "$INSTDIR\falkon.exe" "open" "" +FunctionEnd diff --git a/windows/languages.nsh b/windows/languages.nsh index 6b3a2303e..44676f8ff 100644 --- a/windows/languages.nsh +++ b/windows/languages.nsh @@ -1,748 +1,748 @@ -;;;;English -LangString PRODUCT_DESC ${LANG_ENGLISH} "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." -; -LangString TITLE_SecMain ${LANG_ENGLISH} "Main Components" -LangString TITLE_SecTranslations ${LANG_ENGLISH} "Translations" -LangString TITLE_SecPlugins ${LANG_ENGLISH} "Plugins" -LangString TITLE_SecDesktop ${LANG_ENGLISH} "Desktop Icon" -LangString TITLE_SecExtensions ${LANG_ENGLISH} "File Associations" -LangString TITLE_SecThemes ${LANG_ENGLISH} "Themes" -LangString TITLE_SecSetASDefault ${LANG_ENGLISH} "Default Browser" -LangString TITLE_SecProtocols ${LANG_ENGLISH} "Protocol Associations" - -LangString FILE_Htm ${LANG_ENGLISH} "HTM File" -LangString FILE_Html ${LANG_ENGLISH} "HTML File" -; -LangString DESC_SecMain ${LANG_ENGLISH} "Main components of application." -LangString DESC_SecTranslations ${LANG_ENGLISH} "Other translations available to install. Default is English." -LangString DESC_SecPlugins ${LANG_ENGLISH} "Other plugins available to install." -LangString DESC_SecDesktop ${LANG_ENGLISH} "Add launcher to desktop." -LangString DESC_SecExtensions ${LANG_ENGLISH} "Associate QupZilla with .htm(l) files" -LangString DESC_SecThemes ${LANG_ENGLISH} "Additional themes for QupZilla" -LangString DESC_SecSetASDefault ${LANG_ENGLISH} "Set QupZilla as default internet browser" -LangString DESC_SecProtocols ${LANG_ENGLISH} "Associate QupZilla with http(s) and ftp protocols" -; -LangString MSG_RunningInstance ${LANG_ENGLISH} "QupZilla is already running! Do you want the installer try to terminate it?" -LangString MSG_InstallationCanceled ${LANG_ENGLISH} "Process cancelled by user." - -;;;;Arabic -LangString PRODUCT_DESC ${LANG_ARABIC} "كَبزيلّا متصفّح للوب جديد سريع وآمن ومفتوح المصدر. يُرخَّص استخدامه وفق الإصدار الثالث من رخصة جنو العمومية (GPL) أو أي إصدار أحدث من ذلك (اختر كما تشاء). يُبنى كَبزيلّا على محرّك العرض WebKitوإطار العمل Qt." -; -LangString TITLE_SecMain ${LANG_ARABIC} "المكونات الأساسية" -LangString TITLE_SecTranslations ${LANG_ARABIC} "الترجمات" -LangString TITLE_SecPlugins ${LANG_ARABIC} "الإضافات" -LangString TITLE_SecDesktop ${LANG_ARABIC} "رمز على سطح المكتب" -LangString TITLE_SecExtensions ${LANG_ARABIC} "ارتباطات الملفات" -LangString TITLE_SecThemes ${LANG_ARABIC} "السمات" -LangString TITLE_SecSetASDefault ${LANG_ARABIC} "المتصفح المبدئي" -LangString TITLE_SecProtocols ${LANG_ARABIC} "ارتباطات البروتوكولات" - -LangString FILE_Htm ${LANG_ARABIC} "ملف HTM" -LangString FILE_Html ${LANG_ARABIC} "ملف HTML" -; -LangString DESC_SecMain ${LANG_ARABIC} "المكونات الرئيسية للبرنامج." -LangString DESC_SecTranslations ${LANG_ARABIC} "ترجمات أخرى متوفرة للتثبيت. اللغة المبدئية هي الإنكليزية." -LangString DESC_SecPlugins ${LANG_ARABIC} "إضافات أخرى متوفّرة للتنزيل." -LangString DESC_SecDesktop ${LANG_ARABIC} "أضف اختصارًا لتشغيل كَبزيلا من سطح المكتب." -LangString DESC_SecExtensions ${LANG_ARABIC} "اربط كَبزيلّا بملفات HTML ذات اللواحق .htm أو .html." -LangString DESC_SecThemes ${LANG_ARABIC} "سمات أخرى لكَبزيلّا" -LangString DESC_SecSetASDefault ${LANG_ARABIC} "اجعل كَبزيلا المتصفح المبدئيّ" -LangString DESC_SecProtocols ${LANG_ARABIC} "اربط كَبزيلّا ببروتوكولات HTTP وHTTPS وFTP." -; -LangString MSG_RunningInstance ${LANG_ARABIC} "كَبزيلّا مفتوح الآن! أتريد من المُثبِّت إنهاءه الآن؟" -LangString MSG_InstallationCanceled ${LANG_ARABIC} "ألغى المستخدم العملية." - -;;;;Spanish -LangString PRODUCT_DESC ${LANG_SPANISH} "QupZilla es un nuevo, rápido y seguro navegador web de código abierto. QupZilla está bajo licencia GPL versión 3 o (o en su opción) en cualquier versión. Está basado en el motor WebKit y en Qt Framework." -; -LangString TITLE_SecMain ${LANG_SPANISH} "Componentes iniciales" -LangString TITLE_SecTranslations ${LANG_SPANISH} "Traducciones" -LangString TITLE_SecPlugins ${LANG_SPANISH} "Plugins" -LangString TITLE_SecDesktop ${LANG_SPANISH} "Icono de escritorio" -LangString TITLE_SecExtensions ${LANG_SPANISH} "Asociación de archivos" -LangString TITLE_SecThemes ${LANG_SPANISH} "Temas" -LangString TITLE_SecSetASDefault ${LANG_SPANISH} "Navegador por defecto" -LangString TITLE_SecProtocols ${LANG_SPANISH} "Asociaciones de protocolo" - -LangString FILE_Htm ${LANG_SPANISH} "Archivo HTM" -LangString FILE_Html ${LANG_SPANISH} "Archivo HTML" -; -LangString DESC_SecMain ${LANG_SPANISH} "Componentes iniciales de aplicación" -LangString DESC_SecTranslations ${LANG_SPANISH} "Otras traduciones disponibles al instalar. Por defecto en inglés." -LangString DESC_SecPlugins ${LANG_SPANISH} "Otros plugins disponibles al instalar." -LangString DESC_SecDesktop ${LANG_SPANISH} "Añade acceso directo al escritorio." -LangString DESC_SecExtensions ${LANG_SPANISH} "Asociar QupZilla con archivos .htm(l)" -LangString DESC_SecThemes ${LANG_SPANISH} "Temas adicionales para QupZilla" -LangString DESC_SecSetASDefault ${LANG_SPANISH} "Hacer QupZilla tu navegador web por defecto" -LangString DESC_SecProtocols ${LANG_SPANISH} "Asociar QupZilla con los protocolos http(s) y ftp" -; -LangString MSG_RunningInstance ${LANG_SPANISH} "QupZilla se está ejecutando, Quieres que el instalador intente finalizarlo?" -LangString MSG_InstallationCanceled ${LANG_SPANISH} "Proceso cancelado por usuario." - -;;;;Czech -LangString TITLE_SecMain ${LANG_CZECH} "Hlavní komponenty" -LangString TITLE_SecTranslations ${LANG_CZECH} "Překlady" -LangString TITLE_SecPlugins ${LANG_CZECH} "Doplňky" -LangString TITLE_SecDesktop ${LANG_CZECH} "Zástupce na ploše" -LangString TITLE_SecExtensions ${LANG_CZECH} "Asociace souborů" -LangString TITLE_SecThemes ${LANG_CZECH} "Témata" - -LangString FILE_Htm ${LANG_CZECH} "Soubor HTM" -LangString FILE_Html ${LANG_CZECH} "Soubor HTML" -; -LangString DESC_SecMain ${LANG_CZECH} "Hlavní komponenty aplikace." -LangString DESC_SecTranslations ${LANG_CZECH} "Ostatní překlady dostupné k instalaci. Angličtina je defaultní." -LangString DESC_SecPlugins ${LANG_CZECH} "Ostatní doplňky dostupné k instalaci." -LangString DESC_SecDesktop ${LANG_CZECH} "Přidat zástupce na plochu." -LangString DESC_SecExtensions ${LANG_CZECH} "Associovat QupZillu s .htm(l) soubory" -LangString DESC_SecThemes ${LANG_CZECH} "Dodatečná témata pro QupZillu" - -LangString PRODUCT_DESC ${LANG_CZECH} "QupZilla je nový, rychlý a bezpečný open-source WWW prohlížeč. QupZilla je licencována pod GPL verze 3 nebo (podle vaší volby) jakékoliv vyšší verze. Prohlížeč je založen na jádru WebKit a Qt Frameworku." -LangString TITLE_SecSetASDefault ${LANG_CZECH} "Výchozí prohlížeč" -LangString TITLE_SecProtocols ${LANG_CZECH} "Asociace protokolů" -LangString DESC_SecSetASDefault ${LANG_CZECH} "Nastavit QupZillu jako výchozí internetový prohlížeč" -LangString DESC_SecProtocols ${LANG_CZECH} "Asociovat QupZillu s http(s) a ftp protokoly" -LangString MSG_RunningInstance ${LANG_CZECH} "QupZilla je právě spuštěna. Chcete aby ji instalátor zkusil ukončit?" -LangString MSG_InstallationCanceled ${LANG_CZECH} "Proces zrušen uživatelem." - -;;;;Catalan -LangString PRODUCT_DESC ${LANG_CATALAN} "El QupZilla és un navegador web de codi obert nou, ràpid i segur. QupZilla està llicenciat sota GPL versió 3.0 o (si ho preferiu) qualsevol versió posterior. Està basat en WebKit i Qt." -; -LangString TITLE_SecMain ${LANG_CATALAN} "Components principals" -LangString TITLE_SecTranslations ${LANG_CATALAN} "Traduccions" -LangString TITLE_SecPlugins ${LANG_CATALAN} "Complements" -LangString TITLE_SecDesktop ${LANG_CATALAN} "Icona de l'escriptori" -LangString TITLE_SecExtensions ${LANG_CATALAN} "Associacions de fitxers" -LangString TITLE_SecThemes ${LANG_CATALAN} "Temes" -LangString TITLE_SecSetASDefault ${LANG_CATALAN} "Navegador per defecte" -LangString TITLE_SecProtocols ${LANG_CATALAN} "Associacions de protocols" - -LangString FILE_Htm ${LANG_CATALAN} "Fitxer HTM" -LangString FILE_Html ${LANG_CATALAN} "Fitxer HTML" -; -LangString DESC_SecMain ${LANG_CATALAN} "Components principals de l'aplicació." -LangString DESC_SecTranslations ${LANG_CATALAN} "Altres traduccions disponibles per instal·lar. L'idioma predeterminat és l'anglès." -LangString DESC_SecPlugins ${LANG_CATALAN} "Altres plugins disponibles per instal·lar." -LangString DESC_SecDesktop ${LANG_CATALAN} "Afegeix una drecera a l'escriptori." -LangString DESC_SecExtensions ${LANG_CATALAN} "Associa el QupZilla amb els fitxers .htm i .html" -LangString DESC_SecThemes ${LANG_CATALAN} "Temes addicionals per al QupZilla" -LangString DESC_SecSetASDefault ${LANG_CATALAN} "Fes que el QupZilla sigui el navegador predeterminat" -LangString DESC_SecProtocols ${LANG_CATALAN} "Associa el QupZilla amb els protocols http i https" -; -LangString MSG_RunningInstance ${LANG_CATALAN} "El QupZilla ja està actiu. Voleu que l'instal·lador provi d'aturar-lo?" -LangString MSG_InstallationCanceled ${LANG_CATALAN} "L'usuari ha cancel·lat el procés." - -;;;;Slovak -LangString PRODUCT_DESC ${LANG_SLOVAK} "QupZilla je nový, rýchly a bezpečný open-source internetový prehliadač. QupZilla je licencovaná pod licenciou GPL verzie 3 alebo (podľa vášho uváženia) hocijakej novšej verzie. Je založená na jadre WebKit a frameworku Qt." -; -LangString TITLE_SecMain ${LANG_SLOVAK} "Hlavné komponenty" -LangString TITLE_SecTranslations ${LANG_SLOVAK} "Preklady" -LangString TITLE_SecPlugins ${LANG_SLOVAK} "Doplnky" -LangString TITLE_SecDesktop ${LANG_SLOVAK} "Odkaz na ploche" -LangString TITLE_SecExtensions ${LANG_SLOVAK} "Asociácia súborov" -LangString TITLE_SecThemes ${LANG_SLOVAK} "Témy" -LangString TITLE_SecSetASDefault ${LANG_SLOVAK} "Predvolený prehliadač" -LangString TITLE_SecProtocols ${LANG_SLOVAK} "Asociácie protokolov" - -LangString FILE_Htm ${LANG_SLOVAK} "Súbor HTM" -LangString FILE_Html ${LANG_SLOVAK} "Súbor HTML" -; -LangString DESC_SecMain ${LANG_SLOVAK} "Hlavné komponenty programu." -LangString DESC_SecTranslations ${LANG_SLOVAK} "Ostatné preklady dostupné na inštaláciu. Angličtina je predvolená" -LangString DESC_SecPlugins ${LANG_SLOVAK} "Ostatné doplnky dustupné na inštaláciu" -LangString DESC_SecDesktop ${LANG_SLOVAK} "Pridať odkaz na plochu." -LangString DESC_SecExtensions ${LANG_SLOVAK} "Associovať QupZillu s .htm(l) súbormi" -LangString DESC_SecThemes ${LANG_SLOVAK} "Ďalšie témy vzhľadu pre QupZillu" -LangString DESC_SecSetASDefault ${LANG_SLOVAK} "Nastaviť Qupzillu ako predvolený internetový prehliadač" -LangString DESC_SecProtocols ${LANG_SLOVAK} "Asociovať QupZillu s http(s) a ftp protokolmi" -; -LangString MSG_RunningInstance ${LANG_SLOVAK} "QupZilla je už spustená! Chcete, aby sa inštalátor pokúsil ju násilne ukončiť?" -LangString MSG_InstallationCanceled ${LANG_SLOVAK} "Proces zrušený používateľom." - -;;;;German -LangString PRODUCT_DESC ${LANG_GERMAN} "QupZilla ist ein neuer, schneller und sicherer, quelloffener Web Browser. QupZilla ist lizensiert unter GPL Version 3 oder später. Er nutzt Webkit und das Qt Framework." -; -LangString TITLE_SecMain ${LANG_GERMAN} "Hauptkomponenten" -LangString TITLE_SecTranslations ${LANG_GERMAN} "Übersetzungen" -LangString TITLE_SecPlugins ${LANG_GERMAN} "Plugins" -LangString TITLE_SecDesktop ${LANG_GERMAN} "Desktop Symbol" -LangString TITLE_SecExtensions ${LANG_GERMAN} "Dateiverknüpfungen" -LangString TITLE_SecThemes ${LANG_GERMAN} "Themen" -LangString TITLE_SecSetASDefault ${LANG_GERMAN} "Standard-Browser" -LangString TITLE_SecProtocols ${LANG_GERMAN} "Protokollverknüpfungen" - -LangString FILE_Htm ${LANG_GERMAN} "HTM-Datei" -LangString FILE_Html ${LANG_GERMAN} "HTML-Datei" - -LangString DESC_SecMain ${LANG_GERMAN} "Hauptkomponenten der Anwendung." -LangString DESC_SecTranslations ${LANG_GERMAN} "Weitere Übersetzungen sind verfügbar. Die Standardsprache ist Englisch." -LangString DESC_SecPlugins ${LANG_GERMAN} "Weitere Plugins stehen zur Verfügung." -LangString DESC_SecDesktop ${LANG_GERMAN} "Starter zum Desktop hinzufügen." -LangString DESC_SecExtensions ${LANG_GERMAN} "Verknüpfe QupZilla mit *.htm(l) Dateien" -LangString DESC_SecThemes ${LANG_GERMAN} "Weitere Themen für QupZilla" -LangString DESC_SecSetASDefault ${LANG_GERMAN} "QupZilla als Standard-Browser verwenden" -LangString DESC_SecProtocols ${LANG_GERMAN} "Verknüpfe QupZilla mit HTTP(S)- und FTP-Protokoll" -; -LangString MSG_RunningInstance ${LANG_GERMAN} "QupZilla ist bereits gestartet! Soll die Installationsroutine versuchen, QupZilla zu beenden?" -LangString MSG_InstallationCanceled ${LANG_GERMAN} "Die Installation wurde vom Benutzer abgebrochen." - -;;;;Dutch -LangString TITLE_SecMain ${LANG_DUTCH} "Hoofdonderdelen" -LangString TITLE_SecTranslations ${LANG_DUTCH} "Vertalingen" -LangString TITLE_SecPlugins ${LANG_DUTCH} "Plugins" -LangString TITLE_SecDesktop ${LANG_DUTCH} "Bureaublad-pictogram" -LangString TITLE_SecExtensions ${LANG_DUTCH} "Bestandsassociaties" -LangString TITLE_SecThemes ${LANG_DUTCH} "Thema's" - -LangString FILE_Htm ${LANG_DUTCH} "HTM-bestand" -LangString FILE_Html ${LANG_DUTCH} "HTML-bestand" - -LangString DESC_SecMain ${LANG_DUTCH} "Hoofdonderdelen van het programma." -LangString DESC_SecTranslations ${LANG_DUTCH} "Beschikbare vertalingen om te installeren. Standaardtaal is Engels." -LangString DESC_SecPlugins ${LANG_DUTCH} "Beschikbare plugins om te installeren." -LangString DESC_SecDesktop ${LANG_DUTCH} "Voeg starter toe op bureaublad." -LangString DESC_SecExtensions ${LANG_DUTCH} "Associeer QupZilla met .htm en .html-bestanden" -LangString DESC_SecThemes ${LANG_DUTCH} "Extra thema's voor QupZilla" - -;;;;Portuguese -LangString PRODUCT_DESC ${LANG_PORTUGUESE} "O QupZilla é um navegador web rápido, seguro e de código livre. O QupZilla está sujeito aos termos da GPL versão 3 ou (por opção) qualquer versão posterior. O QupZilla é baseado nas tecnologias WebKit e Qt." -; -LangString TITLE_SecMain ${LANG_PORTUGUESE} "Principais componentes" -LangString TITLE_SecTranslations ${LANG_PORTUGUESE} "Traduções" -LangString TITLE_SecPlugins ${LANG_PORTUGUESE} "Plugins" -LangString TITLE_SecDesktop ${LANG_PORTUGUESE} "Ícone no ambiente de trabalho" -LangString TITLE_SecExtensions ${LANG_PORTUGUESE} "Associação de ficheiros" -LangString TITLE_SecThemes ${LANG_PORTUGUESE} "Temas" -LangString TITLE_SecSetASDefault ${LANG_PORTUGUESE} "Navegador pré-definido" -LangString TITLE_SecProtocols ${LANG_PORTUGUESE} "Associações" - -LangString FILE_Htm ${LANG_PORTUGUESE} "Ficheiro HTM" -LangString FILE_Html ${LANG_PORTUGUESE} "Ficheiro HTML" -; -LangString DESC_SecMain ${LANG_PORTUGUESE} "Principais componentes da aplicação" -LangString DESC_SecTranslations ${LANG_PORTUGUESE} "Outros idiomas disponíveis. O idioma padrão é inglês" -LangString DESC_SecPlugins ${LANG_PORTUGUESE} "Outros plugins disponíveis" -LangString DESC_SecDesktop ${LANG_PORTUGUESE} "Adicionar ícone ao ambiente de trabalho" -LangString DESC_SecExtensions ${LANG_PORTUGUESE} "Associar QupZilla aos ficheiros .htm e .html" -LangString DESC_SecThemes ${LANG_PORTUGUESE} "Temas extra para o QupZilla" -LangString DESC_SecSetASDefault ${LANG_PORTUGUESE} "Definir o QupZilla como navegador web padrão" -LangString DESC_SecProtocols ${LANG_PORTUGUESE} "Associar o QupZilla com os protocolos http e https" -; -LangString MSG_RunningInstance ${LANG_PORTUGUESE} "O QupZilla está em execução! Pretende que o instalador tente terminar o processo?" -LangString MSG_InstallationCanceled ${LANG_PORTUGUESE} "Processo cancelado pelo utilizador" -; -;;;;Greek -LangString TITLE_SecMain ${LANG_GREEK} "Κύρια στοιχεία" -LangString TITLE_SecTranslations ${LANG_GREEK} "Μεταφράσεις" -LangString TITLE_SecPlugins ${LANG_GREEK} "Πρόσθετα" -LangString TITLE_SecDesktop ${LANG_GREEK} "Εικονίδιο επιφάνειας" -LangString TITLE_SecExtensions ${LANG_GREEK} "Συσχετίσεις αρχείων" -LangString TITLE_SecThemes ${LANG_GREEK} "Θέματα" - -LangString FILE_Htm ${LANG_GREEK} "Αρχείο HTM" -LangString FILE_Html ${LANG_GREEK} "Αρχείο HTML" - -LangString DESC_SecMain ${LANG_GREEK} "Κυρια στοιχεία της εφαρμογής." -LangString DESC_SecTranslations ${LANG_GREEK} "Άλλες μεταφράσεις διαθέσιμες προς εγκατάσταση. Η προεπιλεγμένη είναι Αγγλικά." -LangString DESC_SecPlugins ${LANG_GREEK} "Άλλα πρόσθετα διαθέσιμα προς εγκατάσταση." -LangString DESC_SecDesktop ${LANG_GREEK} "Προσθήκη εκκινητή στην επιφάνεια." -LangString DESC_SecExtensions ${LANG_GREEK} "Συσχέτιση του QupZilla με αρχεία .htm και .html" -LangString DESC_SecThemes ${LANG_GREEK} "Πρόσθετα θέματα για το QupZilla" - -;;;;French -LangString PRODUCT_DESC ${LANG_FRENCH} "QupZilla est un nouveau navigateur Internet, libre, rapide et sûr. QupZilla est sous licence GPLv3 ou (selon votre version) une version plus récente. Il est basé sur WebKit et le framework Qt." - -LangString TITLE_SecMain ${LANG_FRENCH} "Composants principaux" -LangString TITLE_SecTranslations ${LANG_FRENCH} "Langues" -LangString TITLE_SecPlugins ${LANG_FRENCH} "Plugins" -LangString TITLE_SecDesktop ${LANG_FRENCH} "Icône de Bureau" -LangString TITLE_SecExtensions ${LANG_FRENCH} "Associations de fichiers" -LangString TITLE_SecThemes ${LANG_FRENCH} "Thèmes" -LangString TITLE_SecSetASDefault ${LANG_FRENCH} "Navigateur par défaut" -LangString TITLE_SecProtocols ${LANG_FRENCH} "Associations de protocoles" - -LangString FILE_Htm ${LANG_FRENCH} "Fichiers HTM " -LangString FILE_Html ${LANG_FRENCH} "Fichiers HTML" - -LangString DESC_SecMain ${LANG_FRENCH} "Composants principaux de l'application." -LangString DESC_SecTranslations ${LANG_FRENCH} "Autres langues disponibles à l'installation. La langue par défaut est l'anglais." -LangString DESC_SecPlugins ${LANG_FRENCH} "Autres plugins disponibles pour l'installation." -LangString DESC_SecDesktop ${LANG_FRENCH} "Ajouter une icône sur le bureau." -LangString DESC_SecExtensions ${LANG_FRENCH} "Associer QupZilla aux fichiers .htm et .html" -LangString DESC_SecThemes ${LANG_FRENCH} "Thèmes supplémentaires pour QupZilla" -LangString DESC_SecSetASDefault ${LANG_FRENCH} "Utiliser QupZilla comme navigateur par défaut" -LangString DESC_SecProtocols ${LANG_FRENCH} "Associer QupZilla aux protocoles http(s) et ftp" - -LangString MSG_RunningInstance ${LANG_FRENCH} "QupZilla est déjà en fonctionnement ! Voulez vous que l'installeur le ferme pour vous ?" -LangString MSG_InstallationCanceled ${LANG_FRENCH} "Processus annulé par l'utilisateur." - -;;;;Italian -LangString TITLE_SecMain ${LANG_ITALIAN} "Componenti principali" -LangString TITLE_SecTranslations ${LANG_ITALIAN} "Traduzioni" -LangString TITLE_SecPlugins ${LANG_ITALIAN} "Plugins" -LangString TITLE_SecDesktop ${LANG_ITALIAN} "Icona Desktop" -LangString TITLE_SecExtensions ${LANG_ITALIAN} "Associazione file" -LangString TITLE_SecThemes ${LANG_ITALIAN} "Temi" - -LangString FILE_Htm ${LANG_ITALIAN} "File HTM" -LangString FILE_Html ${LANG_ITALIAN} "File HTML" -; -LangString DESC_SecMain ${LANG_ITALIAN} "Componenti principali dell'applicazione." -LangString DESC_SecTranslations ${LANG_ITALIAN} "Altre traduzioni disponibili per l'installazione. Quella predefinita è l'Inglese." -LangString DESC_SecPlugins ${LANG_ITALIAN} "Altri plugins disponibili per l'installazione." -LangString DESC_SecDesktop ${LANG_ITALIAN} "Aggiunge il lanciatore al desktop." -LangString DESC_SecExtensions ${LANG_ITALIAN} "Associa QupZilla ai file .htm and .html" -LangString DESC_SecThemes ${LANG_ITALIAN} "Temi aggiuntivi per QupZilla" - -;;;;Romanian -LangString TITLE_SecMain ${LANG_ROMANIAN} "Componente principale" -LangString TITLE_SecTranslations ${LANG_ROMANIAN} "Traduceri" -LangString TITLE_SecPlugins ${LANG_ROMANIAN} "Plugin-uri" -LangString TITLE_SecDesktop ${LANG_ROMANIAN} "Iconiță Desktop" -LangString TITLE_SecExtensions ${LANG_ROMANIAN} "Asocieri fișiere" -LangString TITLE_SecThemes ${LANG_ROMANIAN} "Teme" - -LangString FILE_Htm ${LANG_ROMANIAN} "Fișier HTM" -LangString FILE_Html ${LANG_ROMANIAN} "Fișier HTML" -; -LangString DESC_SecMain ${LANG_ROMANIAN} "Componentele principale ale aplicației." -LangString DESC_SecTranslations ${LANG_ROMANIAN} "Alte traduceri disponibile pentru instalare. Predefinită este Engleza." -LangString DESC_SecPlugins ${LANG_ROMANIAN} "Alte plugin-uri sunt disponibile pentru instalare." -LangString DESC_SecDesktop ${LANG_ROMANIAN} "Adaugă scurtătură pe Desktop." -LangString DESC_SecExtensions ${LANG_ROMANIAN} "Asociază QupZilla cu .htm și fișiere .html" -LangString DESC_SecThemes ${LANG_ROMANIAN} "Teme adiționale pentru QupZilla" - -;;;;Hongkongese -LangString PRODUCT_DESC ${LANG_HONGKONG} "QupZilla是一個嶄新、快速、安全和開放原始碼的網頁瀏覽器。QupZilla基於GPL的3或（你意願下的）較新版本釋出授權。QupZilla使用WebKit核心和Qt框架。" -; -LangString TITLE_SecMain ${LANG_HONGKONG} "主要組件" -LangString TITLE_SecTranslations ${LANG_HONGKONG} "語言" -LangString TITLE_SecPlugins ${LANG_HONGKONG} "外掛程式" -LangString TITLE_SecDesktop ${LANG_HONGKONG} "桌面圖示" -LangString TITLE_SecExtensions ${LANG_HONGKONG} "檔案管理" -LangString TITLE_SecThemes ${LANG_HONGKONG} "主題" -LangString TITLE_SecSetASDefault ${LANG_HONGKONG} "預設瀏覽器" -LangString TITLE_SecProtocols ${LANG_HONGKONG} "網絡協定關聯" - -LangString FILE_Htm ${LANG_HONGKONG} "HTM檔案" -LangString FILE_Html ${LANG_HONGKONG} "HTML檔案" -; -LangString DESC_SecMain ${LANG_HONGKONG} "程式主要組件。" -LangString DESC_SecTranslations ${LANG_HONGKONG} "可選用的語言，預設為英語。" -LangString DESC_SecPlugins ${LANG_HONGKONG} "可選用的外掛程式。" -LangString DESC_SecDesktop ${LANG_HONGKONG} "建立桌面捷徑。" -LangString DESC_SecExtensions ${LANG_HONGKONG} "預設QupZilla為開啟「.htm」和「.html」檔案的瀏覽器。" -LangString DESC_SecThemes ${LANG_HONGKONG} "其他QupZilla主題。" -LangString DESC_SecSetASDefault ${LANG_HONGKONG} "設定QupZilla為預設瀏覽器。" -LangString DESC_SecProtocols ${LANG_HONGKONG} "關聯QupZilla到http、https和ftp協定。" -; -LangString MSG_RunningInstance ${LANG_HONGKONG} "QupZilla啟用中。是否要求安裝程式代為關閉QupZilla？" -LangString MSG_InstallationCanceled ${LANG_HONGKONG} "用戶主動終止安裝。" - -;;;;Traditional Chinese -LangString PRODUCT_DESC ${LANG_TRADCHINESE} "QupZilla 是一個新穎、快速、安全且開放原始碼的 WWW 瀏覽器。QupZilla 以 GPLv3 或是 (在您的選擇下) 更新的版本釋出。QupZilla 是基於 WebKit 內核及 Qt 框架。" -; -LangString TITLE_SecMain ${LANG_TRADCHINESE} "主要組件" -LangString TITLE_SecTranslations ${LANG_TRADCHINESE} "語言版本" -LangString TITLE_SecPlugins ${LANG_TRADCHINESE} "外掛" -LangString TITLE_SecDesktop ${LANG_TRADCHINESE} "桌面圖示" -LangString TITLE_SecExtensions ${LANG_TRADCHINESE} "檔案管理" -LangString TITLE_SecThemes ${LANG_TRADCHINESE} "主題" -LangString TITLE_SecSetASDefault ${LANG_TRADCHINESE} "預設瀏覽器" -LangString TITLE_SecProtocols ${LANG_TRADCHINESE} "通訊協定關聯" - -LangString FILE_Htm ${LANG_TRADCHINESE} "HTM 檔案" -LangString FILE_Html ${LANG_TRADCHINESE} "HTML 檔案" -; -LangString DESC_SecMain ${LANG_TRADCHINESE} "程式主要組件。" -LangString DESC_SecTranslations ${LANG_TRADCHINESE} "可安裝的語言版本，預設是英語。" -LangString DESC_SecPlugins ${LANG_TRADCHINESE} "可安裝的外掛。" -LangString DESC_SecDesktop ${LANG_TRADCHINESE} "在桌面新增啟動圖示。" -LangString DESC_SecExtensions ${LANG_TRADCHINESE} "將 QupZilla 做為預設開啟 .htm 以及 .html 檔案的瀏覽器。" -LangString DESC_SecThemes ${LANG_TRADCHINESE} "額外的 QupZilla 主題。" -LangString DESC_SecSetASDefault ${LANG_TRADCHINESE} "將 QupZilla 做為預設瀏覽器。" -LangString DESC_SecProtocols ${LANG_TRADCHINESE} "關聯 http、https 與 ftp 協定至 QupZilla。" -; -LangString MSG_RunningInstance ${LANG_TRADCHINESE} "正在執行 QupZilla。要求安裝程式嘗試終止它嗎？" -LangString MSG_InstallationCanceled ${LANG_TRADCHINESE} "使用者取消安裝。" - -;;;;Simplified Chinese -LangString PRODUCT_DESC ${LANG_SIMPCHINESE} "QupZilla 是新出、高速、安全的开源 WWW 浏览器。QupZilla 基于 GPL 协议第 3 版或（如果您需要）任何之后的版本。它使用 WebKit 排版引擎。" -; -LangString TITLE_SecMain ${LANG_SIMPCHINESE} "核心部件" -LangString TITLE_SecTranslations ${LANG_SIMPCHINESE} "翻译" -LangString TITLE_SecPlugins ${LANG_SIMPCHINESE} "应用扩展" -LangString TITLE_SecDesktop ${LANG_SIMPCHINESE} "桌面图标" -LangString TITLE_SecExtensions ${LANG_SIMPCHINESE} "文件管理" -LangString TITLE_SecThemes ${LANG_SIMPCHINESE} "皮肤" -LangString TITLE_SecSetASDefault ${LANG_SIMPCHINESE} "默认浏览器" -LangString TITLE_SecProtocols ${LANG_SIMPCHINESE} "关联协议" - -LangString FILE_Htm ${LANG_SIMPCHINESE} "HTM 文件" -LangString FILE_Html ${LANG_SIMPCHINESE} "HTML 文件" -; -LangString DESC_SecMain ${LANG_SIMPCHINESE} "程序核心部件。" -LangString DESC_SecTranslations ${LANG_SIMPCHINESE} "可以安装其它翻译，默认为英文。" -LangString DESC_SecPlugins ${LANG_SIMPCHINESE} "可以安装其它应用扩展。" -LangString DESC_SecDesktop ${LANG_SIMPCHINESE} "在桌面新建启动图标。" -LangString DESC_SecExtensions ${LANG_SIMPCHINESE} "将 QupZilla 做为默认打开 .htm 以及 .html 文件的浏览器。" -LangString DESC_SecThemes ${LANG_SIMPCHINESE} "其它的 QupZilla 皮肤。" -LangString DESC_SecSetASDefault ${LANG_SIMPCHINESE} "将 QupZilla 做为默认浏览器。" -LangString DESC_SecProtocols ${LANG_SIMPCHINESE} "关联 http、https 与 ftp 协议至 QupZilla。" -; -LangString MSG_RunningInstance ${LANG_SIMPCHINESE} "正在使用 QupZilla。您希望安装程序试着结束它吗？" -LangString MSG_InstallationCanceled ${LANG_SIMPCHINESE} "用户撤销程序。" - -;;;;Bahasa Indonesia -LangString TITLE_SecMain ${LANG_INDONESIAN} "Komponen Utama" -LangString TITLE_SecTranslations ${LANG_INDONESIAN} "Terjemahan" -LangString TITLE_SecPlugins ${LANG_INDONESIAN} "Pengaya" -LangString TITLE_SecDesktop ${LANG_INDONESIAN} "Ikon Desktop" -LangString TITLE_SecExtensions ${LANG_INDONESIAN} "Asosiasi Berkas" -LangString TITLE_SecThemes ${LANG_INDONESIAN} "Tema" - -LangString FILE_Htm ${LANG_INDONESIAN} "Berkas HTM" -LangString FILE_Html ${LANG_INDONESIAN} "Berkas HTML" -; -LangString DESC_SecMain ${LANG_INDONESIAN} "Komponen utama dari aplikasi." -LangString DESC_SecTranslations ${LANG_INDONESIAN} "Tersedia terjemahan lain untuk diinstal. Default adalah Bahasa Inggris." -LangString DESC_SecPlugins ${LANG_INDONESIAN} "Tersedia pengaya lain untuk diinstal." -LangString DESC_SecDesktop ${LANG_INDONESIAN} "Tambahkan peluncur ke desktop." -LangString DESC_SecExtensions ${LANG_INDONESIAN} "Asosiasikan QupZilla dengan berkas .htm dan .html" -LangString DESC_SecThemes ${LANG_INDONESIAN} "Tema tambahan untuk QupZilla" - -;;;;Georgian -LangString TITLE_SecMain ${LANG_GEORGIAN} "მთავარი კომპონენტები" -LangString TITLE_SecTranslations ${LANG_GEORGIAN} "თარგმანები" -LangString TITLE_SecPlugins ${LANG_GEORGIAN} "მოდულები" -LangString TITLE_SecDesktop ${LANG_GEORGIAN} "სამუშაო მაგიდის ხატულა" -LangString TITLE_SecExtensions ${LANG_GEORGIAN} "ფაილებთან ასოცირება" -LangString TITLE_SecThemes ${LANG_GEORGIAN} "თემები" - -LangString FILE_Htm ${LANG_GEORGIAN} "HTM ფაილი" -LangString FILE_Html ${LANG_GEORGIAN} "HTML ფაილი" -; -LangString DESC_SecMain ${LANG_GEORGIAN} "პროგრამის მთავარი კომპონენტები." -LangString DESC_SecTranslations ${LANG_GEORGIAN} "სხვა ენები რომელთა დაყენებაც შესაძლებელია. ნაგულისხმევი არის ინგლისური." -LangString DESC_SecPlugins ${LANG_GEORGIAN} "სხვა მოდულები რომელთა დაყენებაც შესაძლებელია." -LangString DESC_SecDesktop ${LANG_GEORGIAN} "გამშვების დამატება სამუშაო მაგიდაზე." -LangString DESC_SecExtensions ${LANG_GEORGIAN} "QupZilla-ს ასოცირება .htm და .html ფაილებთან" -LangString DESC_SecThemes ${LANG_GEORGIAN} "დამატებითი თემები QupZilla-სთვის" - -;;;;Japanese -LangString PRODUCT_DESC ${LANG_JAPANESE} "QupZilla は新しくて、高速で、安全なオープンソース WWW ブラウザです。 QupZilla は GPL version 3 (任意の)それ以降のバージョンでライセンスされています。WebKit コアと Qt Framework ベースで開発されています。" -; -LangString TITLE_SecMain ${LANG_JAPANESE} "メインコンポーネント" -LangString TITLE_SecTranslations ${LANG_JAPANESE} "言語ファイル" -LangString TITLE_SecPlugins ${LANG_JAPANESE} "エクステンション(拡張機能)" -LangString TITLE_SecDesktop ${LANG_JAPANESE} "デスクトップアイコン" -LangString TITLE_SecExtensions ${LANG_JAPANESE} "ファイルの関連付け" -LangString TITLE_SecThemes ${LANG_JAPANESE} "テーマ" -LangString TITLE_SecSetASDefault ${LANG_JAPANESE} "既定のブラウザ" -LangString TITLE_SecProtocols ${LANG_JAPANESE} "プロトコルの関連付け" - -LangString FILE_Htm ${LANG_JAPANESE} "HTM ファイル" -LangString FILE_Html ${LANG_JAPANESE} "HTML ファイル" -; -LangString DESC_SecMain ${LANG_JAPANESE} "アプリケーションのメインとなる部分です。" -LangString DESC_SecTranslations ${LANG_JAPANESE} "他の言語でも QupZilla を使えるようになります。デフォルトでは英語です。" -LangString DESC_SecPlugins ${LANG_JAPANESE} "プラグイン(拡張機能)を追加してダウンロードします。" -LangString DESC_SecDesktop ${LANG_JAPANESE} "デスクトップにアイコンを作成します。" -LangString DESC_SecExtensions ${LANG_JAPANESE} "QupZilla に htm, html ファイルを関連付けます。" -LangString DESC_SecThemes ${LANG_JAPANESE} "QupZilla のデフォルトテーマ以外のテーマをダウンロードします。" -LangString DESC_SecSetASDefault ${LANG_JAPANESE} "QupZilla を既定の Web ブラウザに設定する。" -LangString DESC_SecProtocols ${LANG_JAPANESE} "QupZilla を http, https プロトコルに関連付けます。" -; -LangString MSG_RunningInstance ${LANG_JAPANESE} "QupZilla は起動中です！インストーラーによって終了させますか？" -LangString MSG_InstallationCanceled ${LANG_JAPANESE} "プロセスはユーザーによって中止されました。" - -;;;;SWEDISH -LangString TITLE_SecMain ${LANG_SWEDISH} "Huvudkomponenter" -LangString DESC_SecMain ${LANG_SWEDISH} "Programmets viktigaste komponenter." -LangString TITLE_SecTranslations ${LANG_SWEDISH} "Översättningar" -LangString DESC_SecTranslations ${LANG_SWEDISH} "Andra översättningar tillgängliga för installation. Förval är Engelska." -LangString TITLE_SecPlugins ${LANG_SWEDISH} "Insticksmoduler" -LangString DESC_SecPlugins ${LANG_SWEDISH} "Andra insticksmoduler tillgängliga för installation." -LangString TITLE_SecDesktop ${LANG_SWEDISH} "Skrivbordsikon" -LangString DESC_SecDesktop ${LANG_SWEDISH} "Lägg till en ikon på skrivbordet." -LangString TITLE_SecExtensions ${LANG_SWEDISH} "Filbindningar" -LangString DESC_SecExtensions ${LANG_SWEDISH} "Associera QupZilla med .htm- och .html-filer" -LangString FILE_Htm ${LANG_SWEDISH} "HTM-fil" -LangString FILE_Html ${LANG_SWEDISH} "HTML-fil" -LangString TITLE_SecThemes ${LANG_SWEDISH} "Teman" -LangString DESC_SecThemes ${LANG_SWEDISH} "Ytterligare teman för QupZilla" - -;;;;Polish -LangString TITLE_SecMain ${LANG_POLISH} "Składniki podstawowe" -LangString TITLE_SecTranslations ${LANG_POLISH} "Tłumaczenia" -LangString TITLE_SecPlugins ${LANG_POLISH} "Wtyczki" -LangString TITLE_SecDesktop ${LANG_POLISH} "Ikona pulpitu" -LangString TITLE_SecExtensions ${LANG_POLISH} "Skojarzenia plików" -LangString TITLE_SecThemes ${LANG_POLISH} "Motywy" - -LangString FILE_Htm ${LANG_POLISH} "Plik HTM" -LangString FILE_Html ${LANG_POLISH} "Plik HTML" -; -LangString DESC_SecMain ${LANG_POLISH} "Podstawowe składniki programu." -LangString DESC_SecTranslations ${LANG_POLISH} "Instalacja dodatkowych wersji językowych. Domyślnie tylko język angielski." -LangString DESC_SecPlugins ${LANG_POLISH} "Instalacja dodatkowych wtyczek." -LangString DESC_SecDesktop ${LANG_POLISH} "Dodaj skrót do pulpitu." -LangString DESC_SecExtensions ${LANG_POLISH} "Skojarz przeglądarkę QupZilla z plikami .htm i .html" -LangString DESC_SecThemes ${LANG_POLISH} "Dodatkowe motywy dla przeglądarki QupZilla" - -LangString MSG_InstallationCanceled ${LANG_POLISH} "Proces anulowany przez użytkownika." -LangString MSG_RunningInstance ${LANG_POLISH} "QupZilla jest już uruchomiona! Chcesz aby instalator spróbował ją wyłączyć?" -LangString DESC_SecProtocols ${LANG_POLISH} "Skojarz QupZille z linkami http(s) i protokołem ftp" -LangString DESC_SecSetASDefault ${LANG_POLISH} "Ustaw QupZille jako domyślną przeglądarke" -LangString TITLE_SecProtocols ${LANG_POLISH} "Protokół Skojarzeń" -LangString TITLE_SecSetASDefault ${LANG_POLISH} "Domyślna Przeglądarka" - -LangString PRODUCT_DESC ${LANG_POLISH} "QupZilla jest nową, szybką i bezpieczną zbudowaną na otwartych źródłach przeglądarką . QupZilla podlega licencji GPL wersji 3 lub każdej późniejszej. Bazuje na silniku WebKit oraz Frameworku Qt." - -;;;;Ukrainian -LangString TITLE_SecMain ${LANG_UKRAINIAN} "Основні компоненти" -LangString TITLE_SecTranslations ${LANG_UKRAINIAN} "Переклади" -LangString TITLE_SecPlugins ${LANG_UKRAINIAN} "Плаґіни" -LangString TITLE_SecDesktop ${LANG_UKRAINIAN} "Іконка на робочому столі" -LangString TITLE_SecExtensions ${LANG_UKRAINIAN} "Асоціювання файлів" -LangString TITLE_SecThemes ${LANG_UKRAINIAN} "Теми" - -LangString FILE_Htm ${LANG_UKRAINIAN} "Файл HTM" -LangString FILE_Html ${LANG_UKRAINIAN} "Файл HTML" -; -LangString DESC_SecMain ${LANG_UKRAINIAN} "Основні компоненти програми." -LangString DESC_SecTranslations ${LANG_UKRAINIAN} "Доступні інші переклади для встановлення. Мова за умовчуванням - англійська." -LangString DESC_SecPlugins ${LANG_UKRAINIAN} "Доступні інші плаґіни для встановлення." -LangString DESC_SecDesktop ${LANG_UKRAINIAN} "Додати посилання на робочий стіл." -LangString DESC_SecExtensions ${LANG_UKRAINIAN} "Асоціювати QupZill'у з файлами .htm і .html" -LangString DESC_SecThemes ${LANG_UKRAINIAN} "Додаткові теми для QupZill'и" - -;;;;Persian (Farsi) -LangString PRODUCT_DESC ${LANG_FARSI} "‫کوپزیلا مرورگر اینترنتی متن‌باز، جدید، سریع و ایمنی است. کوپزیلا تحت توافقنامه GPL نسخه ۳ یا هر نسخه جدیدتر آن است. کوپزیلا تحت هسته وب‌کیت و چارچوب کیوت می‌باشد.‬" -; -LangString TITLE_SecMain ${LANG_FARSI} "بخش اصلی" -LangString TITLE_SecTranslations ${LANG_FARSI} "برگردان‌ها" -LangString TITLE_SecPlugins ${LANG_FARSI} "افزونه‌ها" -LangString TITLE_SecDesktop ${LANG_FARSI} "آیکون میزکار" -LangString TITLE_SecExtensions ${LANG_FARSI} "تخصیص فایل" -LangString TITLE_SecThemes ${LANG_FARSI} "فرهشت‌ها" -LangString TITLE_SecSetASDefault ${LANG_FARSI} "مرورگر پیش‌فرض" -LangString TITLE_SecProtocols ${LANG_FARSI} "تخصیص پروتکل" - -LangString FILE_Htm ${LANG_FARSI} "HTM File" -LangString FILE_Html ${LANG_FARSI} "HTML File" -; -LangString DESC_SecMain ${LANG_FARSI} "بخش اصلی نرم‌افزار." -LangString DESC_SecTranslations ${LANG_FARSI} "دیگر برگردان‌های دردسترس. پیش فرض انگلیسی است." -LangString DESC_SecPlugins ${LANG_FARSI} "افزونه‌های دیگر که برای نصب در دسترس هستند." -LangString DESC_SecDesktop ${LANG_FARSI} "افزودن میان‌برِ آغازگر به میزکار" -LangString DESC_SecExtensions ${LANG_FARSI} "کوپزیلا را برای بازکردن فایل‌های ‎.htm(l)‎ اختصاص می‌دهد." -LangString DESC_SecThemes ${LANG_FARSI} "فرهشت‌های اضافی برای کوپزیلا" -LangString DESC_SecSetASDefault ${LANG_FARSI} "تنظیم کوپزیلا به عنوان مرورگر پیش‌فرض" -LangString DESC_SecProtocols ${LANG_FARSI} "کوپزیلا را به پروتکل‌های http(s)‎ و ftp اختصاص می‌دهد." -; -LangString MSG_RunningInstance ${LANG_FARSI} "کوپزیلا هم‌اکنون در حال اجراست! آیا می‌خواهید برنامه نصب تلاش کند به اجرای آن خاتمه دهد؟" -LangString MSG_InstallationCanceled ${LANG_FARSI} "فرایند توسط کاربر لغو گردید." - -;;;;Serbian -LangString PRODUCT_DESC ${LANG_SERBIAN} "Капзила је нови, брз и сигуран веб прегледач отвореног кода. Лиценцирана под ГПЛ в3 лиценцом или (по властитом нахођењу) каснијим издањем те лиценце. Заснована на ВебКит језгри и Кјут програмском окружењу." -; -LangString TITLE_SecMain ${LANG_SERBIAN} "Главне компоненте" -LangString TITLE_SecTranslations ${LANG_SERBIAN} "Преводи" -LangString TITLE_SecPlugins ${LANG_SERBIAN} "Проширења" -LangString TITLE_SecDesktop ${LANG_SERBIAN} "Икона на радној површи" -LangString TITLE_SecExtensions ${LANG_SERBIAN} "Придружења фајлова" -LangString TITLE_SecThemes ${LANG_SERBIAN} "Теме" -LangString TITLE_SecSetASDefault ${LANG_SERBIAN} "Подразумеван прегледач" -LangString TITLE_SecProtocols ${LANG_SERBIAN} "Придружења протокола" - -LangString FILE_Htm ${LANG_SERBIAN} "ХТМ фајл" -LangString FILE_Html ${LANG_SERBIAN} "ХТМЛ фајл" -; -LangString DESC_SecMain ${LANG_SERBIAN} "Главне компоненте програма." -LangString DESC_SecTranslations ${LANG_SERBIAN} "Остали доступни преводи. Енглески је подразумеван." -LangString DESC_SecPlugins ${LANG_SERBIAN} "Остала проширења - прикључци." -LangString DESC_SecDesktop ${LANG_SERBIAN} "Покретач програма на радној површи." -LangString DESC_SecExtensions ${LANG_SERBIAN} "Отварај .htm(l) фајлове у Капзили." -LangString DESC_SecThemes ${LANG_SERBIAN} "Додатне теме за Капзилу" -LangString DESC_SecSetASDefault ${LANG_SERBIAN} "Постави Капзилу за подразумевани веб прегледач." -LangString DESC_SecProtocols ${LANG_SERBIAN} "Отварај http(s) и ftp протоколе у Капзили." -; -LangString MSG_RunningInstance ${LANG_SERBIAN} "Капзила је већ покренута! Желите ли да инсталатер покуша да је угаси?" -LangString MSG_InstallationCanceled ${LANG_SERBIAN} "Корисник је отказао процес." - -;;;;SerbianLatin -LangString PRODUCT_DESC ${LANG_SERBIANLATIN} "Kapzila je novi, brz i siguran veb pregledač otvorenog koda. Licencirana pod GPL v3 licencom ili (po vlastitom nahođenju) kasnijim izdanjem te licence. Zasnovana na VebKit jezgri i Kjut programskom okruženju." -; -LangString TITLE_SecMain ${LANG_SERBIANLATIN} "Glavne komponente" -LangString TITLE_SecTranslations ${LANG_SERBIANLATIN} "Prevodi" -LangString TITLE_SecPlugins ${LANG_SERBIANLATIN} "Proširenja" -LangString TITLE_SecDesktop ${LANG_SERBIANLATIN} "Ikona na radnoj površi" -LangString TITLE_SecExtensions ${LANG_SERBIANLATIN} "Pridruženja fajlova" -LangString TITLE_SecThemes ${LANG_SERBIANLATIN} "Teme" -LangString TITLE_SecSetASDefault ${LANG_SERBIANLATIN} "Podrazumevan pregledač" -LangString TITLE_SecProtocols ${LANG_SERBIANLATIN} "Pridruženja protokola" - -LangString FILE_Htm ${LANG_SERBIANLATIN} "HTM fajl" -LangString FILE_Html ${LANG_SERBIANLATIN} "HTML fajl" -; -LangString DESC_SecMain ${LANG_SERBIANLATIN} "Glavne komponente programa." -LangString DESC_SecTranslations ${LANG_SERBIANLATIN} "Ostali dostupni prevodi. Engleski je podrazumevan." -LangString DESC_SecPlugins ${LANG_SERBIANLATIN} "Ostala proširenja - priključci." -LangString DESC_SecDesktop ${LANG_SERBIANLATIN} "Pokretač programa na radnoj površi." -LangString DESC_SecExtensions ${LANG_SERBIANLATIN} "Otvaraj .htm(l) fajlove u Kapzili." -LangString DESC_SecThemes ${LANG_SERBIANLATIN} "Dodatne teme za Kapzilu" -LangString DESC_SecSetASDefault ${LANG_SERBIANLATIN} "Postavi Kapzilu za podrazumevani veb pregledač." -LangString DESC_SecProtocols ${LANG_SERBIANLATIN} "Otvaraj http(s) i ftp protokole u Kapzili." -; -LangString MSG_RunningInstance ${LANG_SERBIANLATIN} "Kapzila je već pokrenuta! Želite li da instalater pokuša da je ugasi?" -LangString MSG_InstallationCanceled ${LANG_SERBIANLATIN} "Korisnik je otkazao proces." - -;;;;Hebrew -LangString PRODUCT_DESC ${LANG_HEBREW} "QupZilla הינו דפדפן WWW קוד פתוח חדש, מהיר ומאובטח. QupZilla רשוי תחת הרשיון GPL גרסא 3 או (כאופציה השמורה לך) כל גרסא מאוחרת יותר. זה מבוסס על ליבת WebKit ועל Qt Framework." -; -LangString TITLE_SecMain ${LANG_HEBREW} "רכיבים עיקריים" -LangString TITLE_SecTranslations ${LANG_HEBREW} "תרגומים" -LangString TITLE_SecPlugins ${LANG_HEBREW} "תוספות" -LangString TITLE_SecDesktop ${LANG_HEBREW} "סמל שולחן עבודה" -LangString TITLE_SecExtensions ${LANG_HEBREW} "שיוכי קובץ" -LangString TITLE_SecThemes ${LANG_HEBREW} "ערכות נושא" -LangString TITLE_SecSetASDefault ${LANG_HEBREW} "דפדפן ברירת מחדל" -LangString TITLE_SecProtocols ${LANG_HEBREW} "שיוכי פרוטוקול" - -LangString FILE_Htm ${LANG_HEBREW} "קובץ HTM" -LangString FILE_Html ${LANG_HEBREW} "קובץ HTML" -; -LangString DESC_SecMain ${LANG_HEBREW} "רכיבים עיקריים של יישום." -LangString DESC_SecTranslations ${LANG_HEBREW} "תרגומים אחרים זמינים להתקנה. ברירת מחדל הינה English." -LangString DESC_SecPlugins ${LANG_HEBREW} "תוספות אחרות זמינות להתקנה." -LangString DESC_SecDesktop ${LANG_HEBREW} "הוסף משגר אל שולחן עבודה." -LangString DESC_SecExtensions ${LANG_HEBREW} "שייך את QupZilla עם קבצי .htm(l)" -LangString DESC_SecThemes ${LANG_HEBREW} "ערכות נושא נוספות עבור QupZilla" -LangString DESC_SecSetASDefault ${LANG_HEBREW} "הגדר את QupZilla כדפדפן אינטרנט ברירת מחדל" -LangString DESC_SecProtocols ${LANG_HEBREW} "שייך את QupZilla עם פרוטוקול http(s) ופרוטוקול ftp" -; -LangString MSG_RunningInstance ${LANG_HEBREW} "QupZilla כבר מורץ כעת! האם ברצונך מהמתקין לנסות לסיימו?" -LangString MSG_InstallationCanceled ${LANG_HEBREW} "תהליך בוטל על ידי משתמש." - -;;;;Basque -LangString PRODUCT_DESC ${LANG_BASQUE} "QupZilla iturburu-irekiko WWW nabigatzaile berri, azkar eta seguru bat da. QupZilla GPL 3 bertsioa baimenpean dago edo (zure aukeran) edozein bertsio berriagoan. WebKit nukleoan eta Qt Framework-ean ohinarrituta dago." -; -LangString TITLE_SecMain ${LANG_BASQUE} "Osagai Nagusiak" -LangString TITLE_SecTranslations ${LANG_BASQUE} "Itzulpenak" -LangString TITLE_SecPlugins ${LANG_BASQUE} "Pluginak" -LangString TITLE_SecDesktop ${LANG_BASQUE} "Mahaigain Ikurra" -LangString TITLE_SecExtensions ${LANG_BASQUE} "Agiri Elkarketa" -LangString TITLE_SecThemes ${LANG_BASQUE} "Azalgaiak" -LangString TITLE_SecSetASDefault ${LANG_BASQUE} "Berezko Nabigatzailea" -LangString TITLE_SecProtocols ${LANG_BASQUE} "Protokolo Elkarketak" - -LangString FILE_Htm ${LANG_BASQUE} "HTM Agiria" -LangString FILE_Html ${LANG_BASQUE} "HTML Agiria" -; -LangString DESC_SecMain ${LANG_BASQUE} "Aplikazioaren osagai nagusiak." -LangString DESC_SecTranslations ${LANG_BASQUE} "Ezartzeko eskuragarri dauden beste itzulpenak. Berezkoa Ingelera da." -LangString DESC_SecPlugins ${LANG_BASQUE} "Ezartzeko eskuragarri dauden beste pluginak." -LangString DESC_SecDesktop ${LANG_BASQUE} "Gehitu abiarazlea mahaigainean." -LangString DESC_SecExtensions ${LANG_BASQUE} "Elkartu QupZilla .htm(l) agiriekin" -LangString DESC_SecThemes ${LANG_BASQUE} "QupZilla-rentzako azalgai gehigarriak" -LangString DESC_SecSetASDefault ${LANG_BASQUE} "Ezarri QupZilla berezko internet nabigatzaile bezala" -LangString DESC_SecProtocols ${LANG_BASQUE} "Elkartu QupZilla http(s) eta ftp protokoloekin" -; -LangString MSG_RunningInstance ${LANG_BASQUE} "QupZilla jadanik ekinean dago! Nahi duzu ezartzaileak hura amaitzen saiatzea?" -LangString MSG_InstallationCanceled ${LANG_BASQUE} "Prozesua erabiltzaileak ezeztaturik." - -;;;;Danish -LangString PRODUCT_DESC ${LANG_DANISH} "QupZilla er en ny, hurtig og sikker open source WWW-browser. QupZilla er licenseret under GPL version 3 eller (efter eget valg) en senere version. Den er baseret på WebKit-kerne og Qt-framework." -; -LangString TITLE_SecMain ${LANG_DANISH} "Hovedkomponenter" -LangString TITLE_SecTranslations ${LANG_DANISH} "Oversættelser" -LangString TITLE_SecPlugins ${LANG_DANISH} "Plugins" -LangString TITLE_SecDesktop ${LANG_DANISH} "Skrivebordsikon" -LangString TITLE_SecExtensions ${LANG_DANISH} "Filtilknytninger" -LangString TITLE_SecThemes ${LANG_DANISH} "Temaer" -LangString TITLE_SecSetASDefault ${LANG_DANISH} "Standardbrowser" -LangString TITLE_SecProtocols ${LANG_DANISH} "Protokoltilknytninger" - -LangString FILE_Htm ${LANG_DANISH} "HTM-fil" -LangString FILE_Html ${LANG_DANISH} "HTML-fil" -; -LangString DESC_SecMain ${LANG_DANISH} "Programmets hovedkomponenter." -LangString DESC_SecTranslations ${LANG_DANISH} "Andre oversættelser som kan installeres. Engelsk er standard." -LangString DESC_SecPlugins ${LANG_DANISH} "Andre plugins som kan installeres." -LangString DESC_SecDesktop ${LANG_DANISH} "Tilføj genvej på skrivebordet." -LangString DESC_SecExtensions ${LANG_DANISH} "Tilknyt QupZilla med .htm(l)-filer" -LangString DESC_SecThemes ${LANG_DANISH} "Yderligere temaer til QupZilla" -LangString DESC_SecSetASDefault ${LANG_DANISH} "Indstil QupZilla som standardinternetbrowser" -LangString DESC_SecProtocols ${LANG_DANISH} "Tilknyt QupZilla med http(s)- og ftp-protokoller" -; -LangString MSG_RunningInstance ${LANG_DANISH} "QupZilla kører allerede! Vil du have installationsprogrammet til at stoppe den?" -LangString MSG_InstallationCanceled ${LANG_DANISH} "Proces annulleret af bruger." - -;;;;;;;;; -;;;;;;;;; -; Unfinished translations -;;;;;;;;; -;;;;;;;;; -LangString PRODUCT_DESC ${LANG_DUTCH} "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." -LangString PRODUCT_DESC ${LANG_GREEK} "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." -LangString PRODUCT_DESC ${LANG_ITALIAN} "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." -LangString PRODUCT_DESC ${LANG_ROMANIAN} "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." -LangString PRODUCT_DESC ${LANG_INDONESIAN} "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." -LangString PRODUCT_DESC ${LANG_GEORGIAN} "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." -LangString PRODUCT_DESC ${LANG_SWEDISH} "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." -LangString PRODUCT_DESC ${LANG_UKRAINIAN} "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." - -LangString TITLE_SecSetASDefault ${LANG_DUTCH} "Default Browser" -LangString TITLE_SecSetASDefault ${LANG_GREEK} "Default Browser" -LangString TITLE_SecSetASDefault ${LANG_ITALIAN} "Default Browser" -LangString TITLE_SecSetASDefault ${LANG_ROMANIAN} "Default Browser" -LangString TITLE_SecSetASDefault ${LANG_INDONESIAN} "Default Browser" -LangString TITLE_SecSetASDefault ${LANG_GEORGIAN} "Default Browser" -LangString TITLE_SecSetASDefault ${LANG_SWEDISH} "Default Browser" -LangString TITLE_SecSetASDefault ${LANG_UKRAINIAN} "Default Browser" - -LangString TITLE_SecProtocols ${LANG_DUTCH} "Protocol Associations" -LangString TITLE_SecProtocols ${LANG_GREEK} "Protocol Associations" -LangString TITLE_SecProtocols ${LANG_ITALIAN} "Protocol Associations" -LangString TITLE_SecProtocols ${LANG_ROMANIAN} "Protocol Associations" -LangString TITLE_SecProtocols ${LANG_INDONESIAN} "Protocol Associations" -LangString TITLE_SecProtocols ${LANG_GEORGIAN} "Protocol Associations" -LangString TITLE_SecProtocols ${LANG_SWEDISH} "Protocol Associations" -LangString TITLE_SecProtocols ${LANG_UKRAINIAN} "Protocol Associations" - -LangString DESC_SecSetASDefault ${LANG_DUTCH} "Set QupZilla as default internet browser" -LangString DESC_SecSetASDefault ${LANG_GREEK} "Set QupZilla as default internet browser" -LangString DESC_SecSetASDefault ${LANG_ITALIAN} "Set QupZilla as default internet browser" -LangString DESC_SecSetASDefault ${LANG_ROMANIAN} "Set QupZilla as default internet browser" -LangString DESC_SecSetASDefault ${LANG_INDONESIAN} "Set QupZilla as default internet browser" -LangString DESC_SecSetASDefault ${LANG_GEORGIAN} "Set QupZilla as default internet browser" -LangString DESC_SecSetASDefault ${LANG_SWEDISH} "Set QupZilla as default internet browser" -LangString DESC_SecSetASDefault ${LANG_UKRAINIAN} "Set QupZilla as default internet browser" - -LangString DESC_SecProtocols ${LANG_DUTCH} "Associate QupZilla with http(s) and ftp protocols" -LangString DESC_SecProtocols ${LANG_GREEK} "Associate QupZilla with http(s) and ftp protocols" -LangString DESC_SecProtocols ${LANG_ITALIAN} "Associate QupZilla with http(s) and ftp protocols" -LangString DESC_SecProtocols ${LANG_ROMANIAN} "Associate QupZilla with http(s) and ftp protocols" -LangString DESC_SecProtocols ${LANG_INDONESIAN} "Associate QupZilla with http(s) and ftp protocols" -LangString DESC_SecProtocols ${LANG_GEORGIAN} "Associate QupZilla with http(s) and ftp protocols" -LangString DESC_SecProtocols ${LANG_SWEDISH} "Associate QupZilla with http(s) and ftp protocols" -LangString DESC_SecProtocols ${LANG_UKRAINIAN} "Associate QupZilla with http(s) and ftp protocols" - -LangString MSG_RunningInstance ${LANG_DUTCH} "QupZilla is already running! Do you want the installer try to terminate it?" -LangString MSG_RunningInstance ${LANG_GREEK} "QupZilla is already running! Do you want the installer try to terminate it?" -LangString MSG_RunningInstance ${LANG_ITALIAN} "QupZilla is already running! Do you want the installer try to terminate it?" -LangString MSG_RunningInstance ${LANG_ROMANIAN} "QupZilla is already running! Do you want the installer try to terminate it?" -LangString MSG_RunningInstance ${LANG_INDONESIAN} "QupZilla is already running! Do you want the installer try to terminate it?" -LangString MSG_RunningInstance ${LANG_GEORGIAN} "QupZilla is already running! Do you want the installer try to terminate it?" -LangString MSG_RunningInstance ${LANG_SWEDISH} "QupZilla is already running! Do you want the installer try to terminate it?" -LangString MSG_RunningInstance ${LANG_UKRAINIAN} "QupZilla is already running! Do you want the installer try to terminate it?" - -LangString MSG_InstallationCanceled ${LANG_DUTCH} "Process cancelled by user." -LangString MSG_InstallationCanceled ${LANG_GREEK} "Process cancelled by user." -LangString MSG_InstallationCanceled ${LANG_ITALIAN} "Process cancelled by user." -LangString MSG_InstallationCanceled ${LANG_ROMANIAN} "Process cancelled by user." -LangString MSG_InstallationCanceled ${LANG_INDONESIAN} "Process cancelled by user." -LangString MSG_InstallationCanceled ${LANG_GEORGIAN} "Process cancelled by user." -LangString MSG_InstallationCanceled ${LANG_SWEDISH} "Process cancelled by user." -LangString MSG_InstallationCanceled ${LANG_UKRAINIAN} "Process cancelled by user." +;;;;English +LangString PRODUCT_DESC ${LANG_ENGLISH} "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." +; +LangString TITLE_SecMain ${LANG_ENGLISH} "Main Components" +LangString TITLE_SecTranslations ${LANG_ENGLISH} "Translations" +LangString TITLE_SecPlugins ${LANG_ENGLISH} "Plugins" +LangString TITLE_SecDesktop ${LANG_ENGLISH} "Desktop Icon" +LangString TITLE_SecExtensions ${LANG_ENGLISH} "File Associations" +LangString TITLE_SecThemes ${LANG_ENGLISH} "Themes" +LangString TITLE_SecSetASDefault ${LANG_ENGLISH} "Default Browser" +LangString TITLE_SecProtocols ${LANG_ENGLISH} "Protocol Associations" + +LangString FILE_Htm ${LANG_ENGLISH} "HTM File" +LangString FILE_Html ${LANG_ENGLISH} "HTML File" +; +LangString DESC_SecMain ${LANG_ENGLISH} "Main components of application." +LangString DESC_SecTranslations ${LANG_ENGLISH} "Other translations available to install. Default is English." +LangString DESC_SecPlugins ${LANG_ENGLISH} "Other plugins available to install." +LangString DESC_SecDesktop ${LANG_ENGLISH} "Add launcher to desktop." +LangString DESC_SecExtensions ${LANG_ENGLISH} "Associate Falkon with .htm(l) files" +LangString DESC_SecThemes ${LANG_ENGLISH} "Additional themes for Falkon" +LangString DESC_SecSetASDefault ${LANG_ENGLISH} "Set Falkon as default internet browser" +LangString DESC_SecProtocols ${LANG_ENGLISH} "Associate Falkon with http(s) and ftp protocols" +; +LangString MSG_RunningInstance ${LANG_ENGLISH} "Falkon is already running! Do you want the installer try to terminate it?" +LangString MSG_InstallationCanceled ${LANG_ENGLISH} "Process cancelled by user." + +;;;;Arabic +LangString PRODUCT_DESC ${LANG_ARABIC} "كَبزيلّا متصفّح للوب جديد سريع وآمن ومفتوح المصدر. يُرخَّص استخدامه وفق الإصدار الثالث من رخصة جنو العمومية (GPL) أو أي إصدار أحدث من ذلك (اختر كما تشاء). يُبنى كَبزيلّا على محرّك العرض WebKitوإطار العمل Qt." +; +LangString TITLE_SecMain ${LANG_ARABIC} "المكونات الأساسية" +LangString TITLE_SecTranslations ${LANG_ARABIC} "الترجمات" +LangString TITLE_SecPlugins ${LANG_ARABIC} "الإضافات" +LangString TITLE_SecDesktop ${LANG_ARABIC} "رمز على سطح المكتب" +LangString TITLE_SecExtensions ${LANG_ARABIC} "ارتباطات الملفات" +LangString TITLE_SecThemes ${LANG_ARABIC} "السمات" +LangString TITLE_SecSetASDefault ${LANG_ARABIC} "المتصفح المبدئي" +LangString TITLE_SecProtocols ${LANG_ARABIC} "ارتباطات البروتوكولات" + +LangString FILE_Htm ${LANG_ARABIC} "ملف HTM" +LangString FILE_Html ${LANG_ARABIC} "ملف HTML" +; +LangString DESC_SecMain ${LANG_ARABIC} "المكونات الرئيسية للبرنامج." +LangString DESC_SecTranslations ${LANG_ARABIC} "ترجمات أخرى متوفرة للتثبيت. اللغة المبدئية هي الإنكليزية." +LangString DESC_SecPlugins ${LANG_ARABIC} "إضافات أخرى متوفّرة للتنزيل." +LangString DESC_SecDesktop ${LANG_ARABIC} "أضف اختصارًا لتشغيل كَبزيلا من سطح المكتب." +LangString DESC_SecExtensions ${LANG_ARABIC} "اربط كَبزيلّا بملفات HTML ذات اللواحق .htm أو .html." +LangString DESC_SecThemes ${LANG_ARABIC} "سمات أخرى لكَبزيلّا" +LangString DESC_SecSetASDefault ${LANG_ARABIC} "اجعل كَبزيلا المتصفح المبدئيّ" +LangString DESC_SecProtocols ${LANG_ARABIC} "اربط كَبزيلّا ببروتوكولات HTTP وHTTPS وFTP." +; +LangString MSG_RunningInstance ${LANG_ARABIC} "كَبزيلّا مفتوح الآن! أتريد من المُثبِّت إنهاءه الآن؟" +LangString MSG_InstallationCanceled ${LANG_ARABIC} "ألغى المستخدم العملية." + +;;;;Spanish +LangString PRODUCT_DESC ${LANG_SPANISH} "Falkon es un nuevo, rápido y seguro navegador web de código abierto. Falkon está bajo licencia GPL versión 3 o (o en su opción) en cualquier versión. Está basado en el motor WebKit y en Qt Framework." +; +LangString TITLE_SecMain ${LANG_SPANISH} "Componentes iniciales" +LangString TITLE_SecTranslations ${LANG_SPANISH} "Traducciones" +LangString TITLE_SecPlugins ${LANG_SPANISH} "Plugins" +LangString TITLE_SecDesktop ${LANG_SPANISH} "Icono de escritorio" +LangString TITLE_SecExtensions ${LANG_SPANISH} "Asociación de archivos" +LangString TITLE_SecThemes ${LANG_SPANISH} "Temas" +LangString TITLE_SecSetASDefault ${LANG_SPANISH} "Navegador por defecto" +LangString TITLE_SecProtocols ${LANG_SPANISH} "Asociaciones de protocolo" + +LangString FILE_Htm ${LANG_SPANISH} "Archivo HTM" +LangString FILE_Html ${LANG_SPANISH} "Archivo HTML" +; +LangString DESC_SecMain ${LANG_SPANISH} "Componentes iniciales de aplicación" +LangString DESC_SecTranslations ${LANG_SPANISH} "Otras traduciones disponibles al instalar. Por defecto en inglés." +LangString DESC_SecPlugins ${LANG_SPANISH} "Otros plugins disponibles al instalar." +LangString DESC_SecDesktop ${LANG_SPANISH} "Añade acceso directo al escritorio." +LangString DESC_SecExtensions ${LANG_SPANISH} "Asociar Falkon con archivos .htm(l)" +LangString DESC_SecThemes ${LANG_SPANISH} "Temas adicionales para Falkon" +LangString DESC_SecSetASDefault ${LANG_SPANISH} "Hacer Falkon tu navegador web por defecto" +LangString DESC_SecProtocols ${LANG_SPANISH} "Asociar Falkon con los protocolos http(s) y ftp" +; +LangString MSG_RunningInstance ${LANG_SPANISH} "Falkon se está ejecutando, Quieres que el instalador intente finalizarlo?" +LangString MSG_InstallationCanceled ${LANG_SPANISH} "Proceso cancelado por usuario." + +;;;;Czech +LangString TITLE_SecMain ${LANG_CZECH} "Hlavní komponenty" +LangString TITLE_SecTranslations ${LANG_CZECH} "Překlady" +LangString TITLE_SecPlugins ${LANG_CZECH} "Doplňky" +LangString TITLE_SecDesktop ${LANG_CZECH} "Zástupce na ploše" +LangString TITLE_SecExtensions ${LANG_CZECH} "Asociace souborů" +LangString TITLE_SecThemes ${LANG_CZECH} "Témata" + +LangString FILE_Htm ${LANG_CZECH} "Soubor HTM" +LangString FILE_Html ${LANG_CZECH} "Soubor HTML" +; +LangString DESC_SecMain ${LANG_CZECH} "Hlavní komponenty aplikace." +LangString DESC_SecTranslations ${LANG_CZECH} "Ostatní překlady dostupné k instalaci. Angličtina je defaultní." +LangString DESC_SecPlugins ${LANG_CZECH} "Ostatní doplňky dostupné k instalaci." +LangString DESC_SecDesktop ${LANG_CZECH} "Přidat zástupce na plochu." +LangString DESC_SecExtensions ${LANG_CZECH} "Associovat QupZillu s .htm(l) soubory" +LangString DESC_SecThemes ${LANG_CZECH} "Dodatečná témata pro QupZillu" + +LangString PRODUCT_DESC ${LANG_CZECH} "Falkon je nový, rychlý a bezpečný open-source WWW prohlížeč. Falkon je licencována pod GPL verze 3 nebo (podle vaší volby) jakékoliv vyšší verze. Prohlížeč je založen na jádru WebKit a Qt Frameworku." +LangString TITLE_SecSetASDefault ${LANG_CZECH} "Výchozí prohlížeč" +LangString TITLE_SecProtocols ${LANG_CZECH} "Asociace protokolů" +LangString DESC_SecSetASDefault ${LANG_CZECH} "Nastavit QupZillu jako výchozí internetový prohlížeč" +LangString DESC_SecProtocols ${LANG_CZECH} "Asociovat QupZillu s http(s) a ftp protokoly" +LangString MSG_RunningInstance ${LANG_CZECH} "Falkon je právě spuštěna. Chcete aby ji instalátor zkusil ukončit?" +LangString MSG_InstallationCanceled ${LANG_CZECH} "Proces zrušen uživatelem." + +;;;;Catalan +LangString PRODUCT_DESC ${LANG_CATALAN} "El Falkon és un navegador web de codi obert nou, ràpid i segur. Falkon està llicenciat sota GPL versió 3.0 o (si ho preferiu) qualsevol versió posterior. Està basat en WebKit i Qt." +; +LangString TITLE_SecMain ${LANG_CATALAN} "Components principals" +LangString TITLE_SecTranslations ${LANG_CATALAN} "Traduccions" +LangString TITLE_SecPlugins ${LANG_CATALAN} "Complements" +LangString TITLE_SecDesktop ${LANG_CATALAN} "Icona de l'escriptori" +LangString TITLE_SecExtensions ${LANG_CATALAN} "Associacions de fitxers" +LangString TITLE_SecThemes ${LANG_CATALAN} "Temes" +LangString TITLE_SecSetASDefault ${LANG_CATALAN} "Navegador per defecte" +LangString TITLE_SecProtocols ${LANG_CATALAN} "Associacions de protocols" + +LangString FILE_Htm ${LANG_CATALAN} "Fitxer HTM" +LangString FILE_Html ${LANG_CATALAN} "Fitxer HTML" +; +LangString DESC_SecMain ${LANG_CATALAN} "Components principals de l'aplicació." +LangString DESC_SecTranslations ${LANG_CATALAN} "Altres traduccions disponibles per instal·lar. L'idioma predeterminat és l'anglès." +LangString DESC_SecPlugins ${LANG_CATALAN} "Altres plugins disponibles per instal·lar." +LangString DESC_SecDesktop ${LANG_CATALAN} "Afegeix una drecera a l'escriptori." +LangString DESC_SecExtensions ${LANG_CATALAN} "Associa el Falkon amb els fitxers .htm i .html" +LangString DESC_SecThemes ${LANG_CATALAN} "Temes addicionals per al Falkon" +LangString DESC_SecSetASDefault ${LANG_CATALAN} "Fes que el Falkon sigui el navegador predeterminat" +LangString DESC_SecProtocols ${LANG_CATALAN} "Associa el Falkon amb els protocols http i https" +; +LangString MSG_RunningInstance ${LANG_CATALAN} "El Falkon ja està actiu. Voleu que l'instal·lador provi d'aturar-lo?" +LangString MSG_InstallationCanceled ${LANG_CATALAN} "L'usuari ha cancel·lat el procés." + +;;;;Slovak +LangString PRODUCT_DESC ${LANG_SLOVAK} "Falkon je nový, rýchly a bezpečný open-source internetový prehliadač. Falkon je licencovaná pod licenciou GPL verzie 3 alebo (podľa vášho uváženia) hocijakej novšej verzie. Je založená na jadre WebKit a frameworku Qt." +; +LangString TITLE_SecMain ${LANG_SLOVAK} "Hlavné komponenty" +LangString TITLE_SecTranslations ${LANG_SLOVAK} "Preklady" +LangString TITLE_SecPlugins ${LANG_SLOVAK} "Doplnky" +LangString TITLE_SecDesktop ${LANG_SLOVAK} "Odkaz na ploche" +LangString TITLE_SecExtensions ${LANG_SLOVAK} "Asociácia súborov" +LangString TITLE_SecThemes ${LANG_SLOVAK} "Témy" +LangString TITLE_SecSetASDefault ${LANG_SLOVAK} "Predvolený prehliadač" +LangString TITLE_SecProtocols ${LANG_SLOVAK} "Asociácie protokolov" + +LangString FILE_Htm ${LANG_SLOVAK} "Súbor HTM" +LangString FILE_Html ${LANG_SLOVAK} "Súbor HTML" +; +LangString DESC_SecMain ${LANG_SLOVAK} "Hlavné komponenty programu." +LangString DESC_SecTranslations ${LANG_SLOVAK} "Ostatné preklady dostupné na inštaláciu. Angličtina je predvolená" +LangString DESC_SecPlugins ${LANG_SLOVAK} "Ostatné doplnky dustupné na inštaláciu" +LangString DESC_SecDesktop ${LANG_SLOVAK} "Pridať odkaz na plochu." +LangString DESC_SecExtensions ${LANG_SLOVAK} "Associovať QupZillu s .htm(l) súbormi" +LangString DESC_SecThemes ${LANG_SLOVAK} "Ďalšie témy vzhľadu pre QupZillu" +LangString DESC_SecSetASDefault ${LANG_SLOVAK} "Nastaviť Qupzillu ako predvolený internetový prehliadač" +LangString DESC_SecProtocols ${LANG_SLOVAK} "Asociovať QupZillu s http(s) a ftp protokolmi" +; +LangString MSG_RunningInstance ${LANG_SLOVAK} "Falkon je už spustená! Chcete, aby sa inštalátor pokúsil ju násilne ukončiť?" +LangString MSG_InstallationCanceled ${LANG_SLOVAK} "Proces zrušený používateľom." + +;;;;German +LangString PRODUCT_DESC ${LANG_GERMAN} "Falkon ist ein neuer, schneller und sicherer, quelloffener Web Browser. Falkon ist lizensiert unter GPL Version 3 oder später. Er nutzt Webkit und das Qt Framework." +; +LangString TITLE_SecMain ${LANG_GERMAN} "Hauptkomponenten" +LangString TITLE_SecTranslations ${LANG_GERMAN} "Übersetzungen" +LangString TITLE_SecPlugins ${LANG_GERMAN} "Plugins" +LangString TITLE_SecDesktop ${LANG_GERMAN} "Desktop Symbol" +LangString TITLE_SecExtensions ${LANG_GERMAN} "Dateiverknüpfungen" +LangString TITLE_SecThemes ${LANG_GERMAN} "Themen" +LangString TITLE_SecSetASDefault ${LANG_GERMAN} "Standard-Browser" +LangString TITLE_SecProtocols ${LANG_GERMAN} "Protokollverknüpfungen" + +LangString FILE_Htm ${LANG_GERMAN} "HTM-Datei" +LangString FILE_Html ${LANG_GERMAN} "HTML-Datei" + +LangString DESC_SecMain ${LANG_GERMAN} "Hauptkomponenten der Anwendung." +LangString DESC_SecTranslations ${LANG_GERMAN} "Weitere Übersetzungen sind verfügbar. Die Standardsprache ist Englisch." +LangString DESC_SecPlugins ${LANG_GERMAN} "Weitere Plugins stehen zur Verfügung." +LangString DESC_SecDesktop ${LANG_GERMAN} "Starter zum Desktop hinzufügen." +LangString DESC_SecExtensions ${LANG_GERMAN} "Verknüpfe Falkon mit *.htm(l) Dateien" +LangString DESC_SecThemes ${LANG_GERMAN} "Weitere Themen für Falkon" +LangString DESC_SecSetASDefault ${LANG_GERMAN} "Falkon als Standard-Browser verwenden" +LangString DESC_SecProtocols ${LANG_GERMAN} "Verknüpfe Falkon mit HTTP(S)- und FTP-Protokoll" +; +LangString MSG_RunningInstance ${LANG_GERMAN} "Falkon ist bereits gestartet! Soll die Installationsroutine versuchen, Falkon zu beenden?" +LangString MSG_InstallationCanceled ${LANG_GERMAN} "Die Installation wurde vom Benutzer abgebrochen." + +;;;;Dutch +LangString TITLE_SecMain ${LANG_DUTCH} "Hoofdonderdelen" +LangString TITLE_SecTranslations ${LANG_DUTCH} "Vertalingen" +LangString TITLE_SecPlugins ${LANG_DUTCH} "Plugins" +LangString TITLE_SecDesktop ${LANG_DUTCH} "Bureaublad-pictogram" +LangString TITLE_SecExtensions ${LANG_DUTCH} "Bestandsassociaties" +LangString TITLE_SecThemes ${LANG_DUTCH} "Thema's" + +LangString FILE_Htm ${LANG_DUTCH} "HTM-bestand" +LangString FILE_Html ${LANG_DUTCH} "HTML-bestand" + +LangString DESC_SecMain ${LANG_DUTCH} "Hoofdonderdelen van het programma." +LangString DESC_SecTranslations ${LANG_DUTCH} "Beschikbare vertalingen om te installeren. Standaardtaal is Engels." +LangString DESC_SecPlugins ${LANG_DUTCH} "Beschikbare plugins om te installeren." +LangString DESC_SecDesktop ${LANG_DUTCH} "Voeg starter toe op bureaublad." +LangString DESC_SecExtensions ${LANG_DUTCH} "Associeer Falkon met .htm en .html-bestanden" +LangString DESC_SecThemes ${LANG_DUTCH} "Extra thema's voor Falkon" + +;;;;Portuguese +LangString PRODUCT_DESC ${LANG_PORTUGUESE} "O Falkon é um navegador web rápido, seguro e de código livre. O Falkon está sujeito aos termos da GPL versão 3 ou (por opção) qualquer versão posterior. O Falkon é baseado nas tecnologias WebKit e Qt." +; +LangString TITLE_SecMain ${LANG_PORTUGUESE} "Principais componentes" +LangString TITLE_SecTranslations ${LANG_PORTUGUESE} "Traduções" +LangString TITLE_SecPlugins ${LANG_PORTUGUESE} "Plugins" +LangString TITLE_SecDesktop ${LANG_PORTUGUESE} "Ícone no ambiente de trabalho" +LangString TITLE_SecExtensions ${LANG_PORTUGUESE} "Associação de ficheiros" +LangString TITLE_SecThemes ${LANG_PORTUGUESE} "Temas" +LangString TITLE_SecSetASDefault ${LANG_PORTUGUESE} "Navegador pré-definido" +LangString TITLE_SecProtocols ${LANG_PORTUGUESE} "Associações" + +LangString FILE_Htm ${LANG_PORTUGUESE} "Ficheiro HTM" +LangString FILE_Html ${LANG_PORTUGUESE} "Ficheiro HTML" +; +LangString DESC_SecMain ${LANG_PORTUGUESE} "Principais componentes da aplicação" +LangString DESC_SecTranslations ${LANG_PORTUGUESE} "Outros idiomas disponíveis. O idioma padrão é inglês" +LangString DESC_SecPlugins ${LANG_PORTUGUESE} "Outros plugins disponíveis" +LangString DESC_SecDesktop ${LANG_PORTUGUESE} "Adicionar ícone ao ambiente de trabalho" +LangString DESC_SecExtensions ${LANG_PORTUGUESE} "Associar Falkon aos ficheiros .htm e .html" +LangString DESC_SecThemes ${LANG_PORTUGUESE} "Temas extra para o Falkon" +LangString DESC_SecSetASDefault ${LANG_PORTUGUESE} "Definir o Falkon como navegador web padrão" +LangString DESC_SecProtocols ${LANG_PORTUGUESE} "Associar o Falkon com os protocolos http e https" +; +LangString MSG_RunningInstance ${LANG_PORTUGUESE} "O Falkon está em execução! Pretende que o instalador tente terminar o processo?" +LangString MSG_InstallationCanceled ${LANG_PORTUGUESE} "Processo cancelado pelo utilizador" +; +;;;;Greek +LangString TITLE_SecMain ${LANG_GREEK} "Κύρια στοιχεία" +LangString TITLE_SecTranslations ${LANG_GREEK} "Μεταφράσεις" +LangString TITLE_SecPlugins ${LANG_GREEK} "Πρόσθετα" +LangString TITLE_SecDesktop ${LANG_GREEK} "Εικονίδιο επιφάνειας" +LangString TITLE_SecExtensions ${LANG_GREEK} "Συσχετίσεις αρχείων" +LangString TITLE_SecThemes ${LANG_GREEK} "Θέματα" + +LangString FILE_Htm ${LANG_GREEK} "Αρχείο HTM" +LangString FILE_Html ${LANG_GREEK} "Αρχείο HTML" + +LangString DESC_SecMain ${LANG_GREEK} "Κυρια στοιχεία της εφαρμογής." +LangString DESC_SecTranslations ${LANG_GREEK} "Άλλες μεταφράσεις διαθέσιμες προς εγκατάσταση. Η προεπιλεγμένη είναι Αγγλικά." +LangString DESC_SecPlugins ${LANG_GREEK} "Άλλα πρόσθετα διαθέσιμα προς εγκατάσταση." +LangString DESC_SecDesktop ${LANG_GREEK} "Προσθήκη εκκινητή στην επιφάνεια." +LangString DESC_SecExtensions ${LANG_GREEK} "Συσχέτιση του Falkon με αρχεία .htm και .html" +LangString DESC_SecThemes ${LANG_GREEK} "Πρόσθετα θέματα για το Falkon" + +;;;;French +LangString PRODUCT_DESC ${LANG_FRENCH} "Falkon est un nouveau navigateur Internet, libre, rapide et sûr. Falkon est sous licence GPLv3 ou (selon votre version) une version plus récente. Il est basé sur WebKit et le framework Qt." + +LangString TITLE_SecMain ${LANG_FRENCH} "Composants principaux" +LangString TITLE_SecTranslations ${LANG_FRENCH} "Langues" +LangString TITLE_SecPlugins ${LANG_FRENCH} "Plugins" +LangString TITLE_SecDesktop ${LANG_FRENCH} "Icône de Bureau" +LangString TITLE_SecExtensions ${LANG_FRENCH} "Associations de fichiers" +LangString TITLE_SecThemes ${LANG_FRENCH} "Thèmes" +LangString TITLE_SecSetASDefault ${LANG_FRENCH} "Navigateur par défaut" +LangString TITLE_SecProtocols ${LANG_FRENCH} "Associations de protocoles" + +LangString FILE_Htm ${LANG_FRENCH} "Fichiers HTM " +LangString FILE_Html ${LANG_FRENCH} "Fichiers HTML" + +LangString DESC_SecMain ${LANG_FRENCH} "Composants principaux de l'application." +LangString DESC_SecTranslations ${LANG_FRENCH} "Autres langues disponibles à l'installation. La langue par défaut est l'anglais." +LangString DESC_SecPlugins ${LANG_FRENCH} "Autres plugins disponibles pour l'installation." +LangString DESC_SecDesktop ${LANG_FRENCH} "Ajouter une icône sur le bureau." +LangString DESC_SecExtensions ${LANG_FRENCH} "Associer Falkon aux fichiers .htm et .html" +LangString DESC_SecThemes ${LANG_FRENCH} "Thèmes supplémentaires pour Falkon" +LangString DESC_SecSetASDefault ${LANG_FRENCH} "Utiliser Falkon comme navigateur par défaut" +LangString DESC_SecProtocols ${LANG_FRENCH} "Associer Falkon aux protocoles http(s) et ftp" + +LangString MSG_RunningInstance ${LANG_FRENCH} "Falkon est déjà en fonctionnement ! Voulez vous que l'installeur le ferme pour vous ?" +LangString MSG_InstallationCanceled ${LANG_FRENCH} "Processus annulé par l'utilisateur." + +;;;;Italian +LangString TITLE_SecMain ${LANG_ITALIAN} "Componenti principali" +LangString TITLE_SecTranslations ${LANG_ITALIAN} "Traduzioni" +LangString TITLE_SecPlugins ${LANG_ITALIAN} "Plugins" +LangString TITLE_SecDesktop ${LANG_ITALIAN} "Icona Desktop" +LangString TITLE_SecExtensions ${LANG_ITALIAN} "Associazione file" +LangString TITLE_SecThemes ${LANG_ITALIAN} "Temi" + +LangString FILE_Htm ${LANG_ITALIAN} "File HTM" +LangString FILE_Html ${LANG_ITALIAN} "File HTML" +; +LangString DESC_SecMain ${LANG_ITALIAN} "Componenti principali dell'applicazione." +LangString DESC_SecTranslations ${LANG_ITALIAN} "Altre traduzioni disponibili per l'installazione. Quella predefinita è l'Inglese." +LangString DESC_SecPlugins ${LANG_ITALIAN} "Altri plugins disponibili per l'installazione." +LangString DESC_SecDesktop ${LANG_ITALIAN} "Aggiunge il lanciatore al desktop." +LangString DESC_SecExtensions ${LANG_ITALIAN} "Associa Falkon ai file .htm and .html" +LangString DESC_SecThemes ${LANG_ITALIAN} "Temi aggiuntivi per Falkon" + +;;;;Romanian +LangString TITLE_SecMain ${LANG_ROMANIAN} "Componente principale" +LangString TITLE_SecTranslations ${LANG_ROMANIAN} "Traduceri" +LangString TITLE_SecPlugins ${LANG_ROMANIAN} "Plugin-uri" +LangString TITLE_SecDesktop ${LANG_ROMANIAN} "Iconiță Desktop" +LangString TITLE_SecExtensions ${LANG_ROMANIAN} "Asocieri fișiere" +LangString TITLE_SecThemes ${LANG_ROMANIAN} "Teme" + +LangString FILE_Htm ${LANG_ROMANIAN} "Fișier HTM" +LangString FILE_Html ${LANG_ROMANIAN} "Fișier HTML" +; +LangString DESC_SecMain ${LANG_ROMANIAN} "Componentele principale ale aplicației." +LangString DESC_SecTranslations ${LANG_ROMANIAN} "Alte traduceri disponibile pentru instalare. Predefinită este Engleza." +LangString DESC_SecPlugins ${LANG_ROMANIAN} "Alte plugin-uri sunt disponibile pentru instalare." +LangString DESC_SecDesktop ${LANG_ROMANIAN} "Adaugă scurtătură pe Desktop." +LangString DESC_SecExtensions ${LANG_ROMANIAN} "Asociază Falkon cu .htm și fișiere .html" +LangString DESC_SecThemes ${LANG_ROMANIAN} "Teme adiționale pentru Falkon" + +;;;;Hongkongese +LangString PRODUCT_DESC ${LANG_HONGKONG} "Falkon是一個嶄新、快速、安全和開放原始碼的網頁瀏覽器。Falkon基於GPL的3或（你意願下的）較新版本釋出授權。Falkon使用WebKit核心和Qt框架。" +; +LangString TITLE_SecMain ${LANG_HONGKONG} "主要組件" +LangString TITLE_SecTranslations ${LANG_HONGKONG} "語言" +LangString TITLE_SecPlugins ${LANG_HONGKONG} "外掛程式" +LangString TITLE_SecDesktop ${LANG_HONGKONG} "桌面圖示" +LangString TITLE_SecExtensions ${LANG_HONGKONG} "檔案管理" +LangString TITLE_SecThemes ${LANG_HONGKONG} "主題" +LangString TITLE_SecSetASDefault ${LANG_HONGKONG} "預設瀏覽器" +LangString TITLE_SecProtocols ${LANG_HONGKONG} "網絡協定關聯" + +LangString FILE_Htm ${LANG_HONGKONG} "HTM檔案" +LangString FILE_Html ${LANG_HONGKONG} "HTML檔案" +; +LangString DESC_SecMain ${LANG_HONGKONG} "程式主要組件。" +LangString DESC_SecTranslations ${LANG_HONGKONG} "可選用的語言，預設為英語。" +LangString DESC_SecPlugins ${LANG_HONGKONG} "可選用的外掛程式。" +LangString DESC_SecDesktop ${LANG_HONGKONG} "建立桌面捷徑。" +LangString DESC_SecExtensions ${LANG_HONGKONG} "預設Falkon為開啟「.htm」和「.html」檔案的瀏覽器。" +LangString DESC_SecThemes ${LANG_HONGKONG} "其他Falkon主題。" +LangString DESC_SecSetASDefault ${LANG_HONGKONG} "設定Falkon為預設瀏覽器。" +LangString DESC_SecProtocols ${LANG_HONGKONG} "關聯Falkon到http、https和ftp協定。" +; +LangString MSG_RunningInstance ${LANG_HONGKONG} "Falkon啟用中。是否要求安裝程式代為關閉Falkon？" +LangString MSG_InstallationCanceled ${LANG_HONGKONG} "用戶主動終止安裝。" + +;;;;Traditional Chinese +LangString PRODUCT_DESC ${LANG_TRADCHINESE} "Falkon 是一個新穎、快速、安全且開放原始碼的 WWW 瀏覽器。Falkon 以 GPLv3 或是 (在您的選擇下) 更新的版本釋出。Falkon 是基於 WebKit 內核及 Qt 框架。" +; +LangString TITLE_SecMain ${LANG_TRADCHINESE} "主要組件" +LangString TITLE_SecTranslations ${LANG_TRADCHINESE} "語言版本" +LangString TITLE_SecPlugins ${LANG_TRADCHINESE} "外掛" +LangString TITLE_SecDesktop ${LANG_TRADCHINESE} "桌面圖示" +LangString TITLE_SecExtensions ${LANG_TRADCHINESE} "檔案管理" +LangString TITLE_SecThemes ${LANG_TRADCHINESE} "主題" +LangString TITLE_SecSetASDefault ${LANG_TRADCHINESE} "預設瀏覽器" +LangString TITLE_SecProtocols ${LANG_TRADCHINESE} "通訊協定關聯" + +LangString FILE_Htm ${LANG_TRADCHINESE} "HTM 檔案" +LangString FILE_Html ${LANG_TRADCHINESE} "HTML 檔案" +; +LangString DESC_SecMain ${LANG_TRADCHINESE} "程式主要組件。" +LangString DESC_SecTranslations ${LANG_TRADCHINESE} "可安裝的語言版本，預設是英語。" +LangString DESC_SecPlugins ${LANG_TRADCHINESE} "可安裝的外掛。" +LangString DESC_SecDesktop ${LANG_TRADCHINESE} "在桌面新增啟動圖示。" +LangString DESC_SecExtensions ${LANG_TRADCHINESE} "將 Falkon 做為預設開啟 .htm 以及 .html 檔案的瀏覽器。" +LangString DESC_SecThemes ${LANG_TRADCHINESE} "額外的 Falkon 主題。" +LangString DESC_SecSetASDefault ${LANG_TRADCHINESE} "將 Falkon 做為預設瀏覽器。" +LangString DESC_SecProtocols ${LANG_TRADCHINESE} "關聯 http、https 與 ftp 協定至 Falkon。" +; +LangString MSG_RunningInstance ${LANG_TRADCHINESE} "正在執行 Falkon。要求安裝程式嘗試終止它嗎？" +LangString MSG_InstallationCanceled ${LANG_TRADCHINESE} "使用者取消安裝。" + +;;;;Simplified Chinese +LangString PRODUCT_DESC ${LANG_SIMPCHINESE} "Falkon 是新出、高速、安全的开源 WWW 浏览器。Falkon 基于 GPL 协议第 3 版或（如果您需要）任何之后的版本。它使用 WebKit 排版引擎。" +; +LangString TITLE_SecMain ${LANG_SIMPCHINESE} "核心部件" +LangString TITLE_SecTranslations ${LANG_SIMPCHINESE} "翻译" +LangString TITLE_SecPlugins ${LANG_SIMPCHINESE} "应用扩展" +LangString TITLE_SecDesktop ${LANG_SIMPCHINESE} "桌面图标" +LangString TITLE_SecExtensions ${LANG_SIMPCHINESE} "文件管理" +LangString TITLE_SecThemes ${LANG_SIMPCHINESE} "皮肤" +LangString TITLE_SecSetASDefault ${LANG_SIMPCHINESE} "默认浏览器" +LangString TITLE_SecProtocols ${LANG_SIMPCHINESE} "关联协议" + +LangString FILE_Htm ${LANG_SIMPCHINESE} "HTM 文件" +LangString FILE_Html ${LANG_SIMPCHINESE} "HTML 文件" +; +LangString DESC_SecMain ${LANG_SIMPCHINESE} "程序核心部件。" +LangString DESC_SecTranslations ${LANG_SIMPCHINESE} "可以安装其它翻译，默认为英文。" +LangString DESC_SecPlugins ${LANG_SIMPCHINESE} "可以安装其它应用扩展。" +LangString DESC_SecDesktop ${LANG_SIMPCHINESE} "在桌面新建启动图标。" +LangString DESC_SecExtensions ${LANG_SIMPCHINESE} "将 Falkon 做为默认打开 .htm 以及 .html 文件的浏览器。" +LangString DESC_SecThemes ${LANG_SIMPCHINESE} "其它的 Falkon 皮肤。" +LangString DESC_SecSetASDefault ${LANG_SIMPCHINESE} "将 Falkon 做为默认浏览器。" +LangString DESC_SecProtocols ${LANG_SIMPCHINESE} "关联 http、https 与 ftp 协议至 Falkon。" +; +LangString MSG_RunningInstance ${LANG_SIMPCHINESE} "正在使用 Falkon。您希望安装程序试着结束它吗？" +LangString MSG_InstallationCanceled ${LANG_SIMPCHINESE} "用户撤销程序。" + +;;;;Bahasa Indonesia +LangString TITLE_SecMain ${LANG_INDONESIAN} "Komponen Utama" +LangString TITLE_SecTranslations ${LANG_INDONESIAN} "Terjemahan" +LangString TITLE_SecPlugins ${LANG_INDONESIAN} "Pengaya" +LangString TITLE_SecDesktop ${LANG_INDONESIAN} "Ikon Desktop" +LangString TITLE_SecExtensions ${LANG_INDONESIAN} "Asosiasi Berkas" +LangString TITLE_SecThemes ${LANG_INDONESIAN} "Tema" + +LangString FILE_Htm ${LANG_INDONESIAN} "Berkas HTM" +LangString FILE_Html ${LANG_INDONESIAN} "Berkas HTML" +; +LangString DESC_SecMain ${LANG_INDONESIAN} "Komponen utama dari aplikasi." +LangString DESC_SecTranslations ${LANG_INDONESIAN} "Tersedia terjemahan lain untuk diinstal. Default adalah Bahasa Inggris." +LangString DESC_SecPlugins ${LANG_INDONESIAN} "Tersedia pengaya lain untuk diinstal." +LangString DESC_SecDesktop ${LANG_INDONESIAN} "Tambahkan peluncur ke desktop." +LangString DESC_SecExtensions ${LANG_INDONESIAN} "Asosiasikan Falkon dengan berkas .htm dan .html" +LangString DESC_SecThemes ${LANG_INDONESIAN} "Tema tambahan untuk Falkon" + +;;;;Georgian +LangString TITLE_SecMain ${LANG_GEORGIAN} "მთავარი კომპონენტები" +LangString TITLE_SecTranslations ${LANG_GEORGIAN} "თარგმანები" +LangString TITLE_SecPlugins ${LANG_GEORGIAN} "მოდულები" +LangString TITLE_SecDesktop ${LANG_GEORGIAN} "სამუშაო მაგიდის ხატულა" +LangString TITLE_SecExtensions ${LANG_GEORGIAN} "ფაილებთან ასოცირება" +LangString TITLE_SecThemes ${LANG_GEORGIAN} "თემები" + +LangString FILE_Htm ${LANG_GEORGIAN} "HTM ფაილი" +LangString FILE_Html ${LANG_GEORGIAN} "HTML ფაილი" +; +LangString DESC_SecMain ${LANG_GEORGIAN} "პროგრამის მთავარი კომპონენტები." +LangString DESC_SecTranslations ${LANG_GEORGIAN} "სხვა ენები რომელთა დაყენებაც შესაძლებელია. ნაგულისხმევი არის ინგლისური." +LangString DESC_SecPlugins ${LANG_GEORGIAN} "სხვა მოდულები რომელთა დაყენებაც შესაძლებელია." +LangString DESC_SecDesktop ${LANG_GEORGIAN} "გამშვების დამატება სამუშაო მაგიდაზე." +LangString DESC_SecExtensions ${LANG_GEORGIAN} "Falkon-ს ასოცირება .htm და .html ფაილებთან" +LangString DESC_SecThemes ${LANG_GEORGIAN} "დამატებითი თემები Falkon-სთვის" + +;;;;Japanese +LangString PRODUCT_DESC ${LANG_JAPANESE} "Falkon は新しくて、高速で、安全なオープンソース WWW ブラウザです。 Falkon は GPL version 3 (任意の)それ以降のバージョンでライセンスされています。WebKit コアと Qt Framework ベースで開発されています。" +; +LangString TITLE_SecMain ${LANG_JAPANESE} "メインコンポーネント" +LangString TITLE_SecTranslations ${LANG_JAPANESE} "言語ファイル" +LangString TITLE_SecPlugins ${LANG_JAPANESE} "エクステンション(拡張機能)" +LangString TITLE_SecDesktop ${LANG_JAPANESE} "デスクトップアイコン" +LangString TITLE_SecExtensions ${LANG_JAPANESE} "ファイルの関連付け" +LangString TITLE_SecThemes ${LANG_JAPANESE} "テーマ" +LangString TITLE_SecSetASDefault ${LANG_JAPANESE} "既定のブラウザ" +LangString TITLE_SecProtocols ${LANG_JAPANESE} "プロトコルの関連付け" + +LangString FILE_Htm ${LANG_JAPANESE} "HTM ファイル" +LangString FILE_Html ${LANG_JAPANESE} "HTML ファイル" +; +LangString DESC_SecMain ${LANG_JAPANESE} "アプリケーションのメインとなる部分です。" +LangString DESC_SecTranslations ${LANG_JAPANESE} "他の言語でも Falkon を使えるようになります。デフォルトでは英語です。" +LangString DESC_SecPlugins ${LANG_JAPANESE} "プラグイン(拡張機能)を追加してダウンロードします。" +LangString DESC_SecDesktop ${LANG_JAPANESE} "デスクトップにアイコンを作成します。" +LangString DESC_SecExtensions ${LANG_JAPANESE} "Falkon に htm, html ファイルを関連付けます。" +LangString DESC_SecThemes ${LANG_JAPANESE} "Falkon のデフォルトテーマ以外のテーマをダウンロードします。" +LangString DESC_SecSetASDefault ${LANG_JAPANESE} "Falkon を既定の Web ブラウザに設定する。" +LangString DESC_SecProtocols ${LANG_JAPANESE} "Falkon を http, https プロトコルに関連付けます。" +; +LangString MSG_RunningInstance ${LANG_JAPANESE} "Falkon は起動中です！インストーラーによって終了させますか？" +LangString MSG_InstallationCanceled ${LANG_JAPANESE} "プロセスはユーザーによって中止されました。" + +;;;;SWEDISH +LangString TITLE_SecMain ${LANG_SWEDISH} "Huvudkomponenter" +LangString DESC_SecMain ${LANG_SWEDISH} "Programmets viktigaste komponenter." +LangString TITLE_SecTranslations ${LANG_SWEDISH} "Översättningar" +LangString DESC_SecTranslations ${LANG_SWEDISH} "Andra översättningar tillgängliga för installation. Förval är Engelska." +LangString TITLE_SecPlugins ${LANG_SWEDISH} "Insticksmoduler" +LangString DESC_SecPlugins ${LANG_SWEDISH} "Andra insticksmoduler tillgängliga för installation." +LangString TITLE_SecDesktop ${LANG_SWEDISH} "Skrivbordsikon" +LangString DESC_SecDesktop ${LANG_SWEDISH} "Lägg till en ikon på skrivbordet." +LangString TITLE_SecExtensions ${LANG_SWEDISH} "Filbindningar" +LangString DESC_SecExtensions ${LANG_SWEDISH} "Associera Falkon med .htm- och .html-filer" +LangString FILE_Htm ${LANG_SWEDISH} "HTM-fil" +LangString FILE_Html ${LANG_SWEDISH} "HTML-fil" +LangString TITLE_SecThemes ${LANG_SWEDISH} "Teman" +LangString DESC_SecThemes ${LANG_SWEDISH} "Ytterligare teman för Falkon" + +;;;;Polish +LangString TITLE_SecMain ${LANG_POLISH} "Składniki podstawowe" +LangString TITLE_SecTranslations ${LANG_POLISH} "Tłumaczenia" +LangString TITLE_SecPlugins ${LANG_POLISH} "Wtyczki" +LangString TITLE_SecDesktop ${LANG_POLISH} "Ikona pulpitu" +LangString TITLE_SecExtensions ${LANG_POLISH} "Skojarzenia plików" +LangString TITLE_SecThemes ${LANG_POLISH} "Motywy" + +LangString FILE_Htm ${LANG_POLISH} "Plik HTM" +LangString FILE_Html ${LANG_POLISH} "Plik HTML" +; +LangString DESC_SecMain ${LANG_POLISH} "Podstawowe składniki programu." +LangString DESC_SecTranslations ${LANG_POLISH} "Instalacja dodatkowych wersji językowych. Domyślnie tylko język angielski." +LangString DESC_SecPlugins ${LANG_POLISH} "Instalacja dodatkowych wtyczek." +LangString DESC_SecDesktop ${LANG_POLISH} "Dodaj skrót do pulpitu." +LangString DESC_SecExtensions ${LANG_POLISH} "Skojarz przeglądarkę Falkon z plikami .htm i .html" +LangString DESC_SecThemes ${LANG_POLISH} "Dodatkowe motywy dla przeglądarki Falkon" + +LangString MSG_InstallationCanceled ${LANG_POLISH} "Proces anulowany przez użytkownika." +LangString MSG_RunningInstance ${LANG_POLISH} "Falkon jest już uruchomiona! Chcesz aby instalator spróbował ją wyłączyć?" +LangString DESC_SecProtocols ${LANG_POLISH} "Skojarz QupZille z linkami http(s) i protokołem ftp" +LangString DESC_SecSetASDefault ${LANG_POLISH} "Ustaw QupZille jako domyślną przeglądarke" +LangString TITLE_SecProtocols ${LANG_POLISH} "Protokół Skojarzeń" +LangString TITLE_SecSetASDefault ${LANG_POLISH} "Domyślna Przeglądarka" + +LangString PRODUCT_DESC ${LANG_POLISH} "Falkon jest nową, szybką i bezpieczną zbudowaną na otwartych źródłach przeglądarką . Falkon podlega licencji GPL wersji 3 lub każdej późniejszej. Bazuje na silniku WebKit oraz Frameworku Qt." + +;;;;Ukrainian +LangString TITLE_SecMain ${LANG_UKRAINIAN} "Основні компоненти" +LangString TITLE_SecTranslations ${LANG_UKRAINIAN} "Переклади" +LangString TITLE_SecPlugins ${LANG_UKRAINIAN} "Плаґіни" +LangString TITLE_SecDesktop ${LANG_UKRAINIAN} "Іконка на робочому столі" +LangString TITLE_SecExtensions ${LANG_UKRAINIAN} "Асоціювання файлів" +LangString TITLE_SecThemes ${LANG_UKRAINIAN} "Теми" + +LangString FILE_Htm ${LANG_UKRAINIAN} "Файл HTM" +LangString FILE_Html ${LANG_UKRAINIAN} "Файл HTML" +; +LangString DESC_SecMain ${LANG_UKRAINIAN} "Основні компоненти програми." +LangString DESC_SecTranslations ${LANG_UKRAINIAN} "Доступні інші переклади для встановлення. Мова за умовчуванням - англійська." +LangString DESC_SecPlugins ${LANG_UKRAINIAN} "Доступні інші плаґіни для встановлення." +LangString DESC_SecDesktop ${LANG_UKRAINIAN} "Додати посилання на робочий стіл." +LangString DESC_SecExtensions ${LANG_UKRAINIAN} "Асоціювати QupZill'у з файлами .htm і .html" +LangString DESC_SecThemes ${LANG_UKRAINIAN} "Додаткові теми для QupZill'и" + +;;;;Persian (Farsi) +LangString PRODUCT_DESC ${LANG_FARSI} "‫کوپزیلا مرورگر اینترنتی متن‌باز، جدید، سریع و ایمنی است. کوپزیلا تحت توافقنامه GPL نسخه ۳ یا هر نسخه جدیدتر آن است. کوپزیلا تحت هسته وب‌کیت و چارچوب کیوت می‌باشد.‬" +; +LangString TITLE_SecMain ${LANG_FARSI} "بخش اصلی" +LangString TITLE_SecTranslations ${LANG_FARSI} "برگردان‌ها" +LangString TITLE_SecPlugins ${LANG_FARSI} "افزونه‌ها" +LangString TITLE_SecDesktop ${LANG_FARSI} "آیکون میزکار" +LangString TITLE_SecExtensions ${LANG_FARSI} "تخصیص فایل" +LangString TITLE_SecThemes ${LANG_FARSI} "فرهشت‌ها" +LangString TITLE_SecSetASDefault ${LANG_FARSI} "مرورگر پیش‌فرض" +LangString TITLE_SecProtocols ${LANG_FARSI} "تخصیص پروتکل" + +LangString FILE_Htm ${LANG_FARSI} "HTM File" +LangString FILE_Html ${LANG_FARSI} "HTML File" +; +LangString DESC_SecMain ${LANG_FARSI} "بخش اصلی نرم‌افزار." +LangString DESC_SecTranslations ${LANG_FARSI} "دیگر برگردان‌های دردسترس. پیش فرض انگلیسی است." +LangString DESC_SecPlugins ${LANG_FARSI} "افزونه‌های دیگر که برای نصب در دسترس هستند." +LangString DESC_SecDesktop ${LANG_FARSI} "افزودن میان‌برِ آغازگر به میزکار" +LangString DESC_SecExtensions ${LANG_FARSI} "کوپزیلا را برای بازکردن فایل‌های ‎.htm(l)‎ اختصاص می‌دهد." +LangString DESC_SecThemes ${LANG_FARSI} "فرهشت‌های اضافی برای کوپزیلا" +LangString DESC_SecSetASDefault ${LANG_FARSI} "تنظیم کوپزیلا به عنوان مرورگر پیش‌فرض" +LangString DESC_SecProtocols ${LANG_FARSI} "کوپزیلا را به پروتکل‌های http(s)‎ و ftp اختصاص می‌دهد." +; +LangString MSG_RunningInstance ${LANG_FARSI} "کوپزیلا هم‌اکنون در حال اجراست! آیا می‌خواهید برنامه نصب تلاش کند به اجرای آن خاتمه دهد؟" +LangString MSG_InstallationCanceled ${LANG_FARSI} "فرایند توسط کاربر لغو گردید." + +;;;;Serbian +LangString PRODUCT_DESC ${LANG_SERBIAN} "Капзила је нови, брз и сигуран веб прегледач отвореног кода. Лиценцирана под ГПЛ в3 лиценцом или (по властитом нахођењу) каснијим издањем те лиценце. Заснована на ВебКит језгри и Кјут програмском окружењу." +; +LangString TITLE_SecMain ${LANG_SERBIAN} "Главне компоненте" +LangString TITLE_SecTranslations ${LANG_SERBIAN} "Преводи" +LangString TITLE_SecPlugins ${LANG_SERBIAN} "Проширења" +LangString TITLE_SecDesktop ${LANG_SERBIAN} "Икона на радној површи" +LangString TITLE_SecExtensions ${LANG_SERBIAN} "Придружења фајлова" +LangString TITLE_SecThemes ${LANG_SERBIAN} "Теме" +LangString TITLE_SecSetASDefault ${LANG_SERBIAN} "Подразумеван прегледач" +LangString TITLE_SecProtocols ${LANG_SERBIAN} "Придружења протокола" + +LangString FILE_Htm ${LANG_SERBIAN} "ХТМ фајл" +LangString FILE_Html ${LANG_SERBIAN} "ХТМЛ фајл" +; +LangString DESC_SecMain ${LANG_SERBIAN} "Главне компоненте програма." +LangString DESC_SecTranslations ${LANG_SERBIAN} "Остали доступни преводи. Енглески је подразумеван." +LangString DESC_SecPlugins ${LANG_SERBIAN} "Остала проширења - прикључци." +LangString DESC_SecDesktop ${LANG_SERBIAN} "Покретач програма на радној површи." +LangString DESC_SecExtensions ${LANG_SERBIAN} "Отварај .htm(l) фајлове у Капзили." +LangString DESC_SecThemes ${LANG_SERBIAN} "Додатне теме за Капзилу" +LangString DESC_SecSetASDefault ${LANG_SERBIAN} "Постави Капзилу за подразумевани веб прегледач." +LangString DESC_SecProtocols ${LANG_SERBIAN} "Отварај http(s) и ftp протоколе у Капзили." +; +LangString MSG_RunningInstance ${LANG_SERBIAN} "Капзила је већ покренута! Желите ли да инсталатер покуша да је угаси?" +LangString MSG_InstallationCanceled ${LANG_SERBIAN} "Корисник је отказао процес." + +;;;;SerbianLatin +LangString PRODUCT_DESC ${LANG_SERBIANLATIN} "Kapzila je novi, brz i siguran veb pregledač otvorenog koda. Licencirana pod GPL v3 licencom ili (po vlastitom nahođenju) kasnijim izdanjem te licence. Zasnovana na VebKit jezgri i Kjut programskom okruženju." +; +LangString TITLE_SecMain ${LANG_SERBIANLATIN} "Glavne komponente" +LangString TITLE_SecTranslations ${LANG_SERBIANLATIN} "Prevodi" +LangString TITLE_SecPlugins ${LANG_SERBIANLATIN} "Proširenja" +LangString TITLE_SecDesktop ${LANG_SERBIANLATIN} "Ikona na radnoj površi" +LangString TITLE_SecExtensions ${LANG_SERBIANLATIN} "Pridruženja fajlova" +LangString TITLE_SecThemes ${LANG_SERBIANLATIN} "Teme" +LangString TITLE_SecSetASDefault ${LANG_SERBIANLATIN} "Podrazumevan pregledač" +LangString TITLE_SecProtocols ${LANG_SERBIANLATIN} "Pridruženja protokola" + +LangString FILE_Htm ${LANG_SERBIANLATIN} "HTM fajl" +LangString FILE_Html ${LANG_SERBIANLATIN} "HTML fajl" +; +LangString DESC_SecMain ${LANG_SERBIANLATIN} "Glavne komponente programa." +LangString DESC_SecTranslations ${LANG_SERBIANLATIN} "Ostali dostupni prevodi. Engleski je podrazumevan." +LangString DESC_SecPlugins ${LANG_SERBIANLATIN} "Ostala proširenja - priključci." +LangString DESC_SecDesktop ${LANG_SERBIANLATIN} "Pokretač programa na radnoj površi." +LangString DESC_SecExtensions ${LANG_SERBIANLATIN} "Otvaraj .htm(l) fajlove u Kapzili." +LangString DESC_SecThemes ${LANG_SERBIANLATIN} "Dodatne teme za Kapzilu" +LangString DESC_SecSetASDefault ${LANG_SERBIANLATIN} "Postavi Kapzilu za podrazumevani veb pregledač." +LangString DESC_SecProtocols ${LANG_SERBIANLATIN} "Otvaraj http(s) i ftp protokole u Kapzili." +; +LangString MSG_RunningInstance ${LANG_SERBIANLATIN} "Kapzila je već pokrenuta! Želite li da instalater pokuša da je ugasi?" +LangString MSG_InstallationCanceled ${LANG_SERBIANLATIN} "Korisnik je otkazao proces." + +;;;;Hebrew +LangString PRODUCT_DESC ${LANG_HEBREW} "Falkon הינו דפדפן WWW קוד פתוח חדש, מהיר ומאובטח. Falkon רשוי תחת הרשיון GPL גרסא 3 או (כאופציה השמורה לך) כל גרסא מאוחרת יותר. זה מבוסס על ליבת WebKit ועל Qt Framework." +; +LangString TITLE_SecMain ${LANG_HEBREW} "רכיבים עיקריים" +LangString TITLE_SecTranslations ${LANG_HEBREW} "תרגומים" +LangString TITLE_SecPlugins ${LANG_HEBREW} "תוספות" +LangString TITLE_SecDesktop ${LANG_HEBREW} "סמל שולחן עבודה" +LangString TITLE_SecExtensions ${LANG_HEBREW} "שיוכי קובץ" +LangString TITLE_SecThemes ${LANG_HEBREW} "ערכות נושא" +LangString TITLE_SecSetASDefault ${LANG_HEBREW} "דפדפן ברירת מחדל" +LangString TITLE_SecProtocols ${LANG_HEBREW} "שיוכי פרוטוקול" + +LangString FILE_Htm ${LANG_HEBREW} "קובץ HTM" +LangString FILE_Html ${LANG_HEBREW} "קובץ HTML" +; +LangString DESC_SecMain ${LANG_HEBREW} "רכיבים עיקריים של יישום." +LangString DESC_SecTranslations ${LANG_HEBREW} "תרגומים אחרים זמינים להתקנה. ברירת מחדל הינה English." +LangString DESC_SecPlugins ${LANG_HEBREW} "תוספות אחרות זמינות להתקנה." +LangString DESC_SecDesktop ${LANG_HEBREW} "הוסף משגר אל שולחן עבודה." +LangString DESC_SecExtensions ${LANG_HEBREW} "שייך את Falkon עם קבצי .htm(l)" +LangString DESC_SecThemes ${LANG_HEBREW} "ערכות נושא נוספות עבור Falkon" +LangString DESC_SecSetASDefault ${LANG_HEBREW} "הגדר את Falkon כדפדפן אינטרנט ברירת מחדל" +LangString DESC_SecProtocols ${LANG_HEBREW} "שייך את Falkon עם פרוטוקול http(s) ופרוטוקול ftp" +; +LangString MSG_RunningInstance ${LANG_HEBREW} "Falkon כבר מורץ כעת! האם ברצונך מהמתקין לנסות לסיימו?" +LangString MSG_InstallationCanceled ${LANG_HEBREW} "תהליך בוטל על ידי משתמש." + +;;;;Basque +LangString PRODUCT_DESC ${LANG_BASQUE} "Falkon iturburu-irekiko WWW nabigatzaile berri, azkar eta seguru bat da. Falkon GPL 3 bertsioa baimenpean dago edo (zure aukeran) edozein bertsio berriagoan. WebKit nukleoan eta Qt Framework-ean ohinarrituta dago." +; +LangString TITLE_SecMain ${LANG_BASQUE} "Osagai Nagusiak" +LangString TITLE_SecTranslations ${LANG_BASQUE} "Itzulpenak" +LangString TITLE_SecPlugins ${LANG_BASQUE} "Pluginak" +LangString TITLE_SecDesktop ${LANG_BASQUE} "Mahaigain Ikurra" +LangString TITLE_SecExtensions ${LANG_BASQUE} "Agiri Elkarketa" +LangString TITLE_SecThemes ${LANG_BASQUE} "Azalgaiak" +LangString TITLE_SecSetASDefault ${LANG_BASQUE} "Berezko Nabigatzailea" +LangString TITLE_SecProtocols ${LANG_BASQUE} "Protokolo Elkarketak" + +LangString FILE_Htm ${LANG_BASQUE} "HTM Agiria" +LangString FILE_Html ${LANG_BASQUE} "HTML Agiria" +; +LangString DESC_SecMain ${LANG_BASQUE} "Aplikazioaren osagai nagusiak." +LangString DESC_SecTranslations ${LANG_BASQUE} "Ezartzeko eskuragarri dauden beste itzulpenak. Berezkoa Ingelera da." +LangString DESC_SecPlugins ${LANG_BASQUE} "Ezartzeko eskuragarri dauden beste pluginak." +LangString DESC_SecDesktop ${LANG_BASQUE} "Gehitu abiarazlea mahaigainean." +LangString DESC_SecExtensions ${LANG_BASQUE} "Elkartu Falkon .htm(l) agiriekin" +LangString DESC_SecThemes ${LANG_BASQUE} "Falkon-rentzako azalgai gehigarriak" +LangString DESC_SecSetASDefault ${LANG_BASQUE} "Ezarri Falkon berezko internet nabigatzaile bezala" +LangString DESC_SecProtocols ${LANG_BASQUE} "Elkartu Falkon http(s) eta ftp protokoloekin" +; +LangString MSG_RunningInstance ${LANG_BASQUE} "Falkon jadanik ekinean dago! Nahi duzu ezartzaileak hura amaitzen saiatzea?" +LangString MSG_InstallationCanceled ${LANG_BASQUE} "Prozesua erabiltzaileak ezeztaturik." + +;;;;Danish +LangString PRODUCT_DESC ${LANG_DANISH} "Falkon er en ny, hurtig og sikker open source WWW-browser. Falkon er licenseret under GPL version 3 eller (efter eget valg) en senere version. Den er baseret på WebKit-kerne og Qt-framework." +; +LangString TITLE_SecMain ${LANG_DANISH} "Hovedkomponenter" +LangString TITLE_SecTranslations ${LANG_DANISH} "Oversættelser" +LangString TITLE_SecPlugins ${LANG_DANISH} "Plugins" +LangString TITLE_SecDesktop ${LANG_DANISH} "Skrivebordsikon" +LangString TITLE_SecExtensions ${LANG_DANISH} "Filtilknytninger" +LangString TITLE_SecThemes ${LANG_DANISH} "Temaer" +LangString TITLE_SecSetASDefault ${LANG_DANISH} "Standardbrowser" +LangString TITLE_SecProtocols ${LANG_DANISH} "Protokoltilknytninger" + +LangString FILE_Htm ${LANG_DANISH} "HTM-fil" +LangString FILE_Html ${LANG_DANISH} "HTML-fil" +; +LangString DESC_SecMain ${LANG_DANISH} "Programmets hovedkomponenter." +LangString DESC_SecTranslations ${LANG_DANISH} "Andre oversættelser som kan installeres. Engelsk er standard." +LangString DESC_SecPlugins ${LANG_DANISH} "Andre plugins som kan installeres." +LangString DESC_SecDesktop ${LANG_DANISH} "Tilføj genvej på skrivebordet." +LangString DESC_SecExtensions ${LANG_DANISH} "Tilknyt Falkon med .htm(l)-filer" +LangString DESC_SecThemes ${LANG_DANISH} "Yderligere temaer til Falkon" +LangString DESC_SecSetASDefault ${LANG_DANISH} "Indstil Falkon som standardinternetbrowser" +LangString DESC_SecProtocols ${LANG_DANISH} "Tilknyt Falkon med http(s)- og ftp-protokoller" +; +LangString MSG_RunningInstance ${LANG_DANISH} "Falkon kører allerede! Vil du have installationsprogrammet til at stoppe den?" +LangString MSG_InstallationCanceled ${LANG_DANISH} "Proces annulleret af bruger." + +;;;;;;;;; +;;;;;;;;; +; Unfinished translations +;;;;;;;;; +;;;;;;;;; +LangString PRODUCT_DESC ${LANG_DUTCH} "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." +LangString PRODUCT_DESC ${LANG_GREEK} "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." +LangString PRODUCT_DESC ${LANG_ITALIAN} "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." +LangString PRODUCT_DESC ${LANG_ROMANIAN} "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." +LangString PRODUCT_DESC ${LANG_INDONESIAN} "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." +LangString PRODUCT_DESC ${LANG_GEORGIAN} "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." +LangString PRODUCT_DESC ${LANG_SWEDISH} "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." +LangString PRODUCT_DESC ${LANG_UKRAINIAN} "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." + +LangString TITLE_SecSetASDefault ${LANG_DUTCH} "Default Browser" +LangString TITLE_SecSetASDefault ${LANG_GREEK} "Default Browser" +LangString TITLE_SecSetASDefault ${LANG_ITALIAN} "Default Browser" +LangString TITLE_SecSetASDefault ${LANG_ROMANIAN} "Default Browser" +LangString TITLE_SecSetASDefault ${LANG_INDONESIAN} "Default Browser" +LangString TITLE_SecSetASDefault ${LANG_GEORGIAN} "Default Browser" +LangString TITLE_SecSetASDefault ${LANG_SWEDISH} "Default Browser" +LangString TITLE_SecSetASDefault ${LANG_UKRAINIAN} "Default Browser" + +LangString TITLE_SecProtocols ${LANG_DUTCH} "Protocol Associations" +LangString TITLE_SecProtocols ${LANG_GREEK} "Protocol Associations" +LangString TITLE_SecProtocols ${LANG_ITALIAN} "Protocol Associations" +LangString TITLE_SecProtocols ${LANG_ROMANIAN} "Protocol Associations" +LangString TITLE_SecProtocols ${LANG_INDONESIAN} "Protocol Associations" +LangString TITLE_SecProtocols ${LANG_GEORGIAN} "Protocol Associations" +LangString TITLE_SecProtocols ${LANG_SWEDISH} "Protocol Associations" +LangString TITLE_SecProtocols ${LANG_UKRAINIAN} "Protocol Associations" + +LangString DESC_SecSetASDefault ${LANG_DUTCH} "Set Falkon as default internet browser" +LangString DESC_SecSetASDefault ${LANG_GREEK} "Set Falkon as default internet browser" +LangString DESC_SecSetASDefault ${LANG_ITALIAN} "Set Falkon as default internet browser" +LangString DESC_SecSetASDefault ${LANG_ROMANIAN} "Set Falkon as default internet browser" +LangString DESC_SecSetASDefault ${LANG_INDONESIAN} "Set Falkon as default internet browser" +LangString DESC_SecSetASDefault ${LANG_GEORGIAN} "Set Falkon as default internet browser" +LangString DESC_SecSetASDefault ${LANG_SWEDISH} "Set Falkon as default internet browser" +LangString DESC_SecSetASDefault ${LANG_UKRAINIAN} "Set Falkon as default internet browser" + +LangString DESC_SecProtocols ${LANG_DUTCH} "Associate Falkon with http(s) and ftp protocols" +LangString DESC_SecProtocols ${LANG_GREEK} "Associate Falkon with http(s) and ftp protocols" +LangString DESC_SecProtocols ${LANG_ITALIAN} "Associate Falkon with http(s) and ftp protocols" +LangString DESC_SecProtocols ${LANG_ROMANIAN} "Associate Falkon with http(s) and ftp protocols" +LangString DESC_SecProtocols ${LANG_INDONESIAN} "Associate Falkon with http(s) and ftp protocols" +LangString DESC_SecProtocols ${LANG_GEORGIAN} "Associate Falkon with http(s) and ftp protocols" +LangString DESC_SecProtocols ${LANG_SWEDISH} "Associate Falkon with http(s) and ftp protocols" +LangString DESC_SecProtocols ${LANG_UKRAINIAN} "Associate Falkon with http(s) and ftp protocols" + +LangString MSG_RunningInstance ${LANG_DUTCH} "Falkon is already running! Do you want the installer try to terminate it?" +LangString MSG_RunningInstance ${LANG_GREEK} "Falkon is already running! Do you want the installer try to terminate it?" +LangString MSG_RunningInstance ${LANG_ITALIAN} "Falkon is already running! Do you want the installer try to terminate it?" +LangString MSG_RunningInstance ${LANG_ROMANIAN} "Falkon is already running! Do you want the installer try to terminate it?" +LangString MSG_RunningInstance ${LANG_INDONESIAN} "Falkon is already running! Do you want the installer try to terminate it?" +LangString MSG_RunningInstance ${LANG_GEORGIAN} "Falkon is already running! Do you want the installer try to terminate it?" +LangString MSG_RunningInstance ${LANG_SWEDISH} "Falkon is already running! Do you want the installer try to terminate it?" +LangString MSG_RunningInstance ${LANG_UKRAINIAN} "Falkon is already running! Do you want the installer try to terminate it?" + +LangString MSG_InstallationCanceled ${LANG_DUTCH} "Process cancelled by user." +LangString MSG_InstallationCanceled ${LANG_GREEK} "Process cancelled by user." +LangString MSG_InstallationCanceled ${LANG_ITALIAN} "Process cancelled by user." +LangString MSG_InstallationCanceled ${LANG_ROMANIAN} "Process cancelled by user." +LangString MSG_InstallationCanceled ${LANG_INDONESIAN} "Process cancelled by user." +LangString MSG_InstallationCanceled ${LANG_GEORGIAN} "Process cancelled by user." +LangString MSG_InstallationCanceled ${LANG_SWEDISH} "Process cancelled by user." +LangString MSG_InstallationCanceled ${LANG_UKRAINIAN} "Process cancelled by user."