diff options
author | aqua <aqua@iserlohn-fortress.net> | 2022-08-17 22:48:01 +0300 |
---|---|---|
committer | aqua <aqua@iserlohn-fortress.net> | 2022-08-18 10:47:39 +0300 |
commit | ce06956d314dc8d7080ba96b76f4ee8ad851912a (patch) | |
tree | c01cd1d1e61acb7ef11cbc439f120d7540f3add5 /src/application.hpp | |
parent | Pass command line from secondary to primary instance (diff) | |
download | rekonq-ce06956d314dc8d7080ba96b76f4ee8ad851912a.tar.xz |
Show main window
- added Task Manager, showing all plugins, windows and view
Diffstat (limited to 'src/application.hpp')
-rw-r--r-- | src/application.hpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/application.hpp b/src/application.hpp index e74350f1..ce4bbfd1 100644 --- a/src/application.hpp +++ b/src/application.hpp @@ -11,7 +11,9 @@ #pragma once +#include "mainwindow/rekonqwindow.h" #include "rekonq.hpp" +#include <QPointer> #include <QUrl> #include <QWidget> #include <SingleApplication> @@ -19,13 +21,13 @@ // Forward Declarations class rView; class PluginLoader; -// class RekonqWindow; // class WebTab; // class WebPage; -// typedef QList< QWeakPointer<RekonqWindow> > RekonqWindowList; -// typedef QList<WebTab *> WebAppList; +typedef QList<QPointer<PluginLoader>> RekonqPluginList; +typedef QList<QPointer<RekonqWindow>> RekonqWindowList; +typedef QList<QPointer<rView>> RekonqViewList; // --------------------------------------------------------------------------------------------------------------- @@ -40,12 +42,14 @@ public: ~Application() override; bool registerPlugin(const QString &path); + [[nodiscard]] auto pluginList() const { return m_plugins; }; // int newInstance(); - [[deprecated]] static Application *instance() { return (qobject_cast<Application *>(QCoreApplication::instance())); } + static Application *instance() { return (qobject_cast<Application *>(QCoreApplication::instance())); } // RekonqWindow *rekonqWindow(const QString &activityID = QString()); - // RekonqWindowList rekonqWindowList(); + [[nodiscard]] auto windowList() const { return m_windows; } + [[nodiscard]] auto viewList() const { return m_views; } /** * @returns the list of windows associated with activity whose id is @param activityID @@ -90,7 +94,8 @@ public slots: // RekonqWindow *newWindow(bool withTab = true, bool PrivateBrowsingMode = false); // RekonqWindow *newWindow(WebPage *pg); - rView *newWebApp(const QUrl &url = QUrl()); + RekonqWindow *newWindow(); + rView *newView(const QUrl &url = QUrl(), RekonqWindow *window = nullptr); // void createWebAppShortcut(const QString & urlString = QString(), const QString & titleString = QString()); @@ -117,7 +122,7 @@ private slots: // void pageCreated(WebPage *); private: - QList<PluginLoader *> m_plugins; - // RekonqWindowList m_rekonqWindows; - QList<rView *> m_webApps; + RekonqPluginList m_plugins; + RekonqWindowList m_windows; + RekonqViewList m_views; }; |