PyFalkon: Export rest of the classes

src/plugins/PyFalkon/CMakeLists.txt

@@ -6,13 +6,17 @@ endif()
 # Get all relevant Qt include dirs, to pass them on to shiboken.
 get_property(QT_CORE_INCLUDE_DIRS TARGET Qt5::Core PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 get_property(QT_GUI_INCLUDE_DIRS TARGET Qt5::Gui PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+get_property(QT_SQL_INCLUDE_DIRS TARGET Qt5::Sql PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 get_property(QT_WIDGETS_INCLUDE_DIRS TARGET Qt5::Widgets PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+get_property(QT_NETWORK_INCLUDE_DIRS TARGET Qt5::Network PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 get_property(QT_WEBENGINECORE_INCLUDE_DIRS TARGET Qt5::WebEngineCore PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 get_property(QT_WEBENGINEWIDGETS_INCLUDE_DIRS TARGET Qt5::WebEngineWidgets PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-set(QT_INCLUDE_DIRS 
+set(QT_INCLUDE_DIRS
     ${QT_CORE_INCLUDE_DIRS}
     ${QT_GUI_INCLUDE_DIRS}
+    ${QT_SQL_INCLUDE_DIRS}
     ${QT_WIDGETS_INCLUDE_DIRS}
+    ${QT_NETWORK_INCLUDE_DIRS}
     ${QT_WEBENGINECORE_INCLUDE_DIRS}
     ${QT_WEBENGINEWIDGETS_INCLUDE_DIRS}
 )
@@ -47,7 +51,6 @@ set(GENERATED_SOURCES
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/desktopfile_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/plugininterface_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/loadrequest_wrapper.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/popupwebview_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/qz_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/desktopnotificationsfactory_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/externaljsobject_wrapper.cpp
@@ -62,6 +65,63 @@ set(GENERATED_SOURCES
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/sidewidget_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/webtab_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/mainapplication_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/datapaths_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/settings_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/autosaver_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/browserwindow_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/pageformdata_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/passwordentry_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/passwordbackend_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/autofill_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/passwordmanager_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/bookmarkitem_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/bookmarkstools_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/bookmarks_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/bookmarksmodel_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/bookmarksfoldersmenu_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/bookmarksfoldersbutton_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/cookiemanager_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/cookiejar_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/downloaditem_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/downloadmanager_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/downloadmanager_downloadinfo_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/history_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/history_historyentry_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/historyitem_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/historymodel_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/locationbar_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/locationbar_loadaction_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/navigationbar_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/networkmanager_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/searchenginesdialog_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/searchenginesmanager_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/searchenginesmanager_engine_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/sidebarmanager_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/sidebarinterface_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/webinspector_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/combotabbar_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/tabbar_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/tabcontextmenu_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/tabicon_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/tabicon_data_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/tabmodel_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/tabmrumodel_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/tabstackedwidget_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/tabtreemodel_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/tabwidget_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/searchtoolbar_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/checkboxdialog_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/qzsettings_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/statusbar_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/abstractbuttoninterface_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/abstractbuttoninterface_clickcontroller_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/clickablelabel_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/delayedfilewatcher_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/iconprovider_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/qztools_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/sqldatabase_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/toolbutton_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PyFalkon/wheelhelper_wrapper.cpp
 )
 set(GENERATED_SOURCES_DEPENDENCIES
     ${GLOBAL_HEADER}

src/plugins/PyFalkon/pyfalkon.xml

@@ -30,16 +30,15 @@
     </value-type>
     <object-type name="WebPage">
       <enum-type name="JsWorld"/>
-      <modify-function signature="execJavaScript(QString,quint32,int)" remove="all"/>
+      <modify-function signature="execJavaScript(QString,quint32,int)">
+        <modify-argument index="2">
+          <replace-default-expression with="WebPage::UnsafeJsWorld"/>
+        </modify-argument>
+      </modify-function>
     </object-type>
     <object-type name="WebView"/>
-    <object-type name="PopupWebView"/>
-    <object-type name="TabbedWebView"/>
+    <object-type name="WebInspector"/>
     <value-type name="WebHitTestResult"/>
-    <object-type name="WebTab">
-      <enum-type name="AddChildBehavior"/>
-    </object-type>
-    <value-type name="DesktopFile"/>
     <object-type name="PluginInterface">
       <enum-type name="InitState"/>
     </object-type>
@@ -58,10 +57,142 @@
     <object-type name="DesktopNotificationsFactory">
       <enum-type name="Type"/>
     </object-type>
+
+    <object-type name="AutoSaver"/>
+    <object-type name="BrowserWindow"/>
+    <object-type name="DataPaths">
+      <enum-type name="Path"/>
+    </object-type>
     <object-type name="MainApplication">
       <enum-type name="AfterLaunch"/>
       <modify-function signature="MainApplication(int&amp;,char**)" remove="all"/>
     </object-type>
+    <object-type name="Settings"/>
+
+    <object-type name="AutoFill"/>
+    <value-type name="PageFormData"/>
+    <object-type name="PasswordManager"/>
+    <value-type name="PasswordEntry"/>
+    <object-type name="PasswordBackend">
+      <include file-name="passwordbackends/passwordbackend.h" location="global"/>
+    </object-type>
+
+    <object-type name="BookmarkItem">
+      <enum-type name="Type"/>
+    </object-type>
+    <object-type name="Bookmarks"/>
+    <object-type name="BookmarksModel">
+      <enum-type name="Roles"/>
+    </object-type>
+    <object-type name="BookmarksFoldersMenu"/>
+    <object-type name="BookmarksFoldersButton"/>
+    <object-type name="BookmarksTools"/>
+
+    <object-type name="CookieJar"/>
+    <object-type name="CookieManager"/>
+
+    <object-type name="DownloadItem"/>
+    <object-type name="DownloadManager">
+      <enum-type name="DownloadOption"/>
+      <value-type name="DownloadInfo"/>
+    </object-type>
+
+    <object-type name="History">
+      <value-type name="HistoryEntry"/>
+    </object-type>
+    <object-type name="HistoryItem"/>
+    <object-type name="HistoryModel">
+      <enum-type name="Roles"/>
+    </object-type>
+
+    <object-type name="LocationBar">
+      <value-type name="LoadAction">
+        <enum-type name="Type"/>
+      </value-type>
+    </object-type>
+    <object-type name="NavigationBar"/>
+
+    <object-type name="NetworkManager"/>
+    <!-- FIXME: Missing QWebEngineUrlRequest{Info,Job} in PySide
+    <object-type name="UrlInterceptor"/>
+    <object-type name="ExtensionSchemeHandler">
+      <include file-name="schemehandlers/extensionschemehandler.h" location="global"/>
+    </object-type>
+    -->
+
+    <object-type name="SearchEnginesDialog"/>
+    <object-type name="SearchEnginesManager">
+      <value-type name="Engine"/>
+    </object-type>
+
+    <object-type name="CheckBoxDialog"/>
+    <object-type name="QzSettings"/>
+    <object-type name="StatusBar"/>
+
+    <object-type name="SideBarManager">
+      <modify-function signature="addSidebar(QString,SideBarInterface*)">
+        <modify-argument index="2">
+          <define-ownership owner="c++"/>
+        </modify-argument>
+      </modify-function>
+    </object-type>
+    <object-type name="SideBarInterface">
+      <modify-function signature="createMenuAction()">
+        <modify-argument index="return">
+          <define-ownership class="target" owner="c++"/>
+        </modify-argument>
+      </modify-function>
+      <modify-function signature="createSideBarWidget(BrowserWindow*)">
+        <modify-argument index="return">
+          <define-ownership class="target" owner="c++"/>
+        </modify-argument>
+      </modify-function>
+    </object-type>
+
+    <object-type name="ComboTabBar">
+      <enum-type name="SizeType"/>
+      <enum-type name="DropIndicatorPosition"/>
+    </object-type>
+    <object-type name="TabBar"/>
+    <object-type name="TabContextMenu">
+      <enum-type name="Option" flags="Options"/>
+    </object-type>
+    <object-type name="TabIcon">
+      <value-type name="Data"/>
+    </object-type>
+    <object-type name="TabModel">
+      <enum-type name="Roles"/>
+    </object-type>
+    <object-type name="TabMruModel"/>
+    <object-type name="TabStackedWidget"/>
+    <object-type name="TabTreeModel"/>
+    <object-type name="TabWidget">
+      <modify-function signature="addView(LoadRequest,QString,QFlags&lt;Qz::NewTabPositionFlag&gt;,bool,int,bool)">
+        <modify-argument index="2">
+          <replace-default-expression with="TabWidget::tr(&quot;New tab&quot;)"/>
+        </modify-argument>
+      </modify-function>
+    </object-type>
+
+    <object-type name="AbstractButtonInterface">
+      <object-type name="ClickController"/>
+    </object-type>
+    <object-type name="ClickableLabel"/>
+    <object-type name="DelayedFileWatcher"/>
+    <value-type name="DesktopFile"/>
+    <object-type name="IconProvider"/>
+    <object-type name="QzTools"/>
+    <object-type name="SqlDatabase"/>
+    <object-type name="ToolButton"/>
+    <value-type name="WheelHelper">
+      <enum-type name="Direction"/>
+    </value-type>
+
+    <object-type name="SearchToolBar"/>
+    <object-type name="TabbedWebView"/>
+    <object-type name="WebTab">
+      <enum-type name="AddChildBehavior"/>
+    </object-type>
 
     <add-function signature="registerPlugin(PluginInterface*)">
       <inject-code class="target" position="beginning">

src/plugins/PyFalkon/pyfalkon_global.h

@@ -16,6 +16,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 
+// Make "signals:", "slots:" visible as access specifiers
+#define QT_ANNOTATE_ACCESS_SPECIFIER(a) __attribute__((annotate(#a)))
+
 // 3rdparty
 #include "lineedit.h"
 #include "squeezelabelv1.h"
@@ -23,27 +26,97 @@
 #include "qtsingleapplication/qtsingleapplication.h"
 
 // app
+#include "autosaver.h"
+#include "browserwindow.h"
+#include "datapaths.h"
 #include "mainapplication.h"
+#include "settings.h"
+
+// autofill
+#include "autofill.h"
+#include "passwordmanager.h"
+#include "passwordbackends/passwordbackend.h"
+
+// bookmarks
+#include "bookmarkitem.h"
+#include "bookmarks.h"
+#include "bookmarksmodel.h"
+#include "bookmarkstools.h"
+
+// cookies
+#include "cookiejar.h"
+#include "cookiemanager.h"
+
+// downloads
+#include "downloaditem.h"
+#include "downloadmanager.h"
+
+// history
+#include "history.h"
+#include "historyitem.h"
+#include "historymodel.h"
+
+// navigation
+#include "locationbar.h"
+#include "navigationbar.h"
+
+// network
+#include "networkmanager.h"
+//#include "urlinterceptor.h"
+//#include "schemehandlers/extensionschemehandler.h"
 
 // notifications
 #include "desktopnotificationsfactory.h"
 
+// opensearch
+#include "searchenginesdialog.h"
+#include "searchenginesmanager.h"
+
+// other
+#include "checkboxdialog.h"
+#include "qzsettings.h"
+#include "statusbar.h"
+
 // plugins
 #include "pluginproxy.h"
 #include "plugininterface.h"
 
-// popupwindow
-#include "popupwebview.h"
+// sidebar
+#include "sidebar.h"
+#include "sidebarinterface.h"
+
+// tabwidget
+#include "combotabbar.h"
+#include "tabbar.h"
+#include "tabcontextmenu.h"
+#include "tabicon.h"
+#include "tabmodel.h"
+#include "tabmrumodel.h"
+#include "tabstackedwidget.h"
+#include "tabtreemodel.h"
+#include "tabwidget.h"
+#include <QItemSelection>
 
 // tools
+#include "abstractbuttoninterface.h"
+#include "clickablelabel.h"
+#include "delayedfilewatcher.h"
 #include "desktopfile.h"
+#include "iconprovider.h"
+#include "qztools.h"
+#include "sqldatabase.h"
+#include "toolbutton.h"
+#include "wheelhelper.h"
 
 // webengine
+#include "loadrequest.h"
+#include "webhittestresult.h"
+#include "webinspector.h"
 #include "webpage.h"
 #include "webview.h"
-#include "loadrequest.h"
 #include "javascript/externaljsobject.h"
 
 // webtab
-#include "webtab.h"
+#include "searchtoolbar.h"
 #include "tabbedwebview.h"
+#include "webtab.h"