Merge branch 'Falkon/3.0'

CMakeLists.txt

@@ -101,9 +101,9 @@ set_package_properties(KF5Wallet PROPERTIES DESCRIPTION "KWallet password backen
 find_package(PySide2 "2.0.0")
 find_package(Shiboken2 "2.0.0")
 find_package(PythonLibs "3.0")
-set_package_properties(PySide2 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
-set_package_properties(Shiboken2 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
-set_package_properties(PythonLibs PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
+set_package_properties(PySide2 PROPERTIES DESCRIPTION "Python plugins (experimental)" TYPE OPTIONAL)
+set_package_properties(Shiboken2 PROPERTIES DESCRIPTION "Python plugins (experimental)" TYPE OPTIONAL)
+set_package_properties(PythonLibs PROPERTIES DESCRIPTION "Python plugins (experimental)" TYPE OPTIONAL)
 if (PySide2_FOUND AND Shiboken2_FOUND AND PythonLibs_FOUND)
     set(ENABLE_PYTHON_PLUGINS TRUE)
 endif()

linux/build-appimage.sh

@@ -71,7 +71,7 @@ ${BLD1}--disable-dbus${BLD0}
 
 ${BLD1}--sourcedir=${BLD0}
 
-          Assuming this script is located in ${ITL1}falkon/scripts${ITL0},
+          Assuming this script is located in ${ITL1}falkon/linux${ITL0},
           otherwise you must specify the path to
           Falkon source directory.
 
@@ -202,10 +202,8 @@ make DESTDIR="${PWD}" install
 fi
 
 mv usr/local bundle_build_dir
-mv bundle_build_dir/lib/plugins/falkon bundle_build_dir/share/falkon/plugins
-rmdir bundle_build_dir/lib/plugins
-pushd bundle_build_dir/share/falkon/plugins
-chrpath --replace '$ORIGIN/../../../lib' *.so 
+pushd bundle_build_dir/lib/plugins/falkon
+chrpath --replace '$ORIGIN/../..' *.so
 popd
 
 NEEDEDLIBSLIST="libicudata.so.56
@@ -286,7 +284,7 @@ ln -s falkon.png bundle_build_dir/.DirIcon
 
 pushd bundle_build_dir
 mv bin/falkon ./ && rm -fr bin
-chrpath --replace '$ORIGIN' lib/libFalkonPrivate.so.2
+chrpath --replace '$ORIGIN' lib/libFalkonPrivate.so.3.*
 chrpath --replace '$ORIGIN/lib' falkon
 chrpath --replace '$ORIGIN/lib' QtWebEngineProcess
 
@@ -306,7 +304,8 @@ set -e
 FALKON_DIR="\$(dirname "\$(readlink -f "\$0")")"
 
 XDG_DATA_DIRS="\${FALKON_DIR}/share:\${XDG_DATA_DIRS}"
-export XDG_DATA_DIRS
+FALKON_PLUGIN_PATH="\${FALKON_DIR}/lib/plugins/falkon"
+export XDG_DATA_DIRS FALKON_PLUGIN_PATH
 
 cd "\${FALKON_DIR}/"
 exec ./falkon "\$@"
@@ -337,7 +336,7 @@ fi
 
 if [[ ${TEST} != "yes" ]]  ; then
 printf "${RDFG}You must have the following tools installed:${DFFG}
-          ${ITL1}mmksquashfs, chrpath${ITL0}!\n"
+          ${ITL1}mksquashfs, chrpath${ITL0}!\n"
 exit 1
 fi
 

src/lib/app/browserwindow.cpp

@@ -582,7 +582,7 @@ void BrowserWindow::loadSettings()
     //Browser Window settings
     settings.beginGroup("Browser-View-Settings");
     bool showStatusBar = settings.value("showStatusBar", false).toBool();
-    bool showBookmarksToolbar = settings.value("showBookmarksToolbar", true).toBool();
+    bool showBookmarksToolbar = settings.value("showBookmarksToolbar", false).toBool();
     bool showNavigationToolbar = settings.value("showNavigationToolbar", true).toBool();
     bool showMenuBar = settings.value("showMenubar", false).toBool();
 
@@ -809,8 +809,8 @@ void BrowserWindow::loadAddress(const QUrl &url)
         int index = m_tabWidget->addView(url, qzSettings->newTabPosition);
         weView(index)->setFocus();
     } else {
-        weView()->load(url);
         weView()->setFocus();
+        weView()->load(url);
     }
 }
 

src/lib/app/profilemanager.cpp

@@ -183,8 +183,12 @@ void ProfileManager::updateProfile(const QString &current, const QString &profil
 
     Updater::Version prof(profile);
 
+    // Profile is from newer version than running application
     if (prof > Updater::Version(Qz::VERSION)) {
-        copyDataToProfile();
+        // Only copy data when profile is not from development version
+        if (prof.revisionNumber != 99) {
+            copyDataToProfile();
+        }
         return;
     }
 

src/lib/data/data/bookmarks.json

@@ -1,43 +1,7 @@
 {
  "roots": {
   "bookmark_bar": {
-   "children": [
-    {
-     "description": "Source code of Falkon",
-     "keyword": "falkon-git",
-     "name": "Falkon Git",
-     "type": "url",
-     "url": "https://phabricator.kde.org/source/falkon/",
-     "visit_count": 0
-    },
-    {
-     "description": "KDE Bug Tracker for Falkon",
-     "keyword": "falkon-bugs",
-     "name": "Falkon Bug Tracker",
-     "type": "url",
-     "url": "https://bugs.kde.org/describecomponents.cgi?product=Falkon",
-     "visit_count": 0
-    },
-    {
-     "description": "Falkon KDE UserBase Wiki",
-     "keyword": "falkon-wiki",
-     "name": "Falkon Wiki",
-     "type": "url",
-     "url": "https://userbase.kde.org/Falkon",
-     "visit_count": 0
-    },
-    {
-     "type": "separator"
-    },
-    {
-     "description": "KDE Community Home",
-     "keyword": "kde-home",
-     "name": "KDE Homepage",
-     "type": "url",
-     "url": "https://www.kde.org/",
-     "visit_count": 0
-    }
-   ],
+   "children": [ ],
    "description": "Bookmarks located in Bookmarks Toolbar",
    "expanded": true,
    "expanded_sidebar": true,

src/lib/plugins/speeddial.cpp

@@ -62,13 +62,6 @@ void SpeedDial::loadSettings()
     m_sdcentered = settings.value("sdcenter", false).toBool();
     settings.endGroup();
 
-    if (allPages.isEmpty()) {
-        allPages = "url:\"https:/kde.org\"|title:\"KDE Community Home\";"
-                   "url:\"https://phabricator.kde.org/source/falkon/\"|title:\"Falkon Git\";"
-                   "url:\"https://bugs.kde.org/describecomponents.cgi?product=Falkon\"|title:\"Falkon Bug Tracker\";"
-                   "url:\"https://duckduckgo.com\"|title:\"DuckDuckGo\";";
-
-    }
     changed(allPages);
 
     m_thumbnailsDir = DataPaths::currentProfilePath() + "/thumbnails/";
@@ -232,10 +225,6 @@ QString SpeedDial::initialScript()
 
 void SpeedDial::changed(const QString &allPages)
 {
-    if (allPages.isEmpty()) {
-        return;
-    }
-
     const QStringList entries = allPages.split(QLatin1String("\";"), QString::SkipEmptyParts);
     m_pages.clear();