diff options
Diffstat (limited to 'src/application.h')
| -rw-r--r-- | src/application.h | 80 |
1 files changed, 24 insertions, 56 deletions
diff --git a/src/application.h b/src/application.h index 4b951ded..7b58ab18 100644 --- a/src/application.h +++ b/src/application.h @@ -2,9 +2,9 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com> +* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com> * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com> -* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr> +* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr> * * * This program is free software; you can redistribute it and/or @@ -12,9 +12,9 @@ * published by the Free Software Foundation; either version 2 of * the License or (at your option) version 3 or any later version * accepted by the membership of KDE e.V. (or its successor approved -* by the membership of KDE e.V.), which shall act as a proxy +* by the membership of KDE e.V.), which shall act as a proxy * defined in Section 14 of version 3 of the license. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -30,15 +30,16 @@ #define APPLICATION_H +// Rekonq Includes +#include "rekonq_defines.h" + // KDE Includes #include <KUniqueApplication> #include <KIcon> -#include <kio/job.h> -#include <kio/jobclasses.h> #include <ThreadWeaver/Job> // Qt Includes -#include <QPointer> +#include <QWeakPointer> #include <QList> // Forward Declarations @@ -52,44 +53,13 @@ class AdBlockManager; class WebView; -typedef QList< QPointer<MainWindow> > MainWindowList; - - -namespace Rekonq -{ - /** - * @short notifying message status - * Different message status - */ - - enum Notify - { - Success, ///< url successfully (down)loaded - Error, ///< url failed to (down)load - Download, ///< downloading url - Info ///< information, (default) - }; - - /** - * @short Open link options - * Different modes of opening new tab - */ - enum OpenType - { - CurrentTab, ///< open url in current tab - SettingOpenTab, ///< open url according to users settings - NewCurrentTab, ///< open url in new tab and make it current - NewBackTab, ///< open url in new tab in background - NewWindow ///< open url in new window - }; - -} +typedef QList< QWeakPointer<MainWindow> > MainWindowList; /** * */ -class Application : public KUniqueApplication +class REKONQ_TESTS_EXPORT Application : public KUniqueApplication { Q_OBJECT @@ -100,15 +70,16 @@ public: static Application *instance(); MainWindow *mainWindow(); + MainWindow *newMainWindow(bool withTab = true); MainWindowList mainWindowList(); - + static KIcon icon(const KUrl &url); static HistoryManager *historyManager(); static BookmarkProvider *bookmarkProvider(); static SessionManager *sessionManager(); static AdBlockManager *adblockManager(); - + public slots: /** * Save application's configuration @@ -117,16 +88,11 @@ public slots: */ void saveConfiguration() const; - MainWindow *newMainWindow(); - - void loadUrl( const KUrl& url, - const Rekonq::OpenType& type = Rekonq::CurrentTab + void loadUrl(const KUrl& url, + const Rekonq::OpenType& type = Rekonq::CurrentTab ); - - void loadUrl( const QString& urlString, - const Rekonq::OpenType& type = Rekonq::CurrentTab - ); + void newWindow(); void removeMainWindow(MainWindow *window); private slots: @@ -137,13 +103,15 @@ private slots: void postLaunch(); void loadResolvedUrl(ThreadWeaver::Job *); - + + void updateConfiguration(); + private: - static QPointer<HistoryManager> s_historyManager; - static QPointer<BookmarkProvider> s_bookmarkProvider; - static QPointer<SessionManager> s_sessionManager; - static QPointer<AdBlockManager> s_adblockManager; - + static QWeakPointer<HistoryManager> s_historyManager; + static QWeakPointer<BookmarkProvider> s_bookmarkProvider; + static QWeakPointer<SessionManager> s_sessionManager; + static QWeakPointer<AdBlockManager> s_adblockManager; + MainWindowList m_mainWindows; }; |