From 0edb6762d04a9ba1cf3196668597b8cbe3703ce2 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 15 Feb 2009 15:27:40 +0100 Subject: Renamed Application class files --- src/application.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 src/application.h (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h new file mode 100644 index 00000000..9b47bfcc --- /dev/null +++ b/src/application.h @@ -0,0 +1,90 @@ +/* ============================================================ + * + * This file is a part of the rekonq project + * + * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved + * Copyright (C) 2008 by Andrea Diamantini + * + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; + * either version 2, or (at your option) any later version. + * + * 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 + * GNU General Public License for more details. + * + * ============================================================ */ + + +#ifndef BROWSERAPPLICATION_H +#define BROWSERAPPLICATION_H + +// KDE Includes +#include +#include +#include +#include +#include +#include +#include + +// Qt Includes +#include + +QT_BEGIN_NAMESPACE +class QLocalServer; +QT_END_NAMESPACE + +class MainWindow; +class CookieJar; +class HistoryManager; +class NetworkAccessManager; + +class BrowserApplication : public KApplication +{ + Q_OBJECT + +public: + BrowserApplication(KCmdLineArgs*, const QString &); + ~BrowserApplication(); + static BrowserApplication *instance(); + + bool isTheOnlyBrowser() const; + MainWindow *mainWindow(); + QList mainWindows(); + KIcon icon(const KUrl &url) const; + void downloadUrl(const KUrl &srcUrl, const KUrl &destUrl); + + void saveSession(); + bool canRestoreSession() const; + + static HistoryManager *historyManager(); + static CookieJar *cookieJar(); + static NetworkAccessManager *networkAccessManager(); + +public slots: + MainWindow *newMainWindow(); + void restoreLastSession(); + +private slots: + void postLaunch(); + void openUrl(const KUrl &url); + void newLocalSocketConnection(); + +private: + void clean(); + + static HistoryManager *s_historyManager; + static NetworkAccessManager *s_networkAccessManager; + + QList > m_mainWindows; + QLocalServer *m_localServer; + QByteArray m_lastSession; + mutable KIcon m_defaultIcon; +}; + +#endif // BROWSERAPPLICATION_H + -- cgit v1.2.1 From f7792e37654fb9d0509171d946d53e7697ad53e8 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 15 Feb 2009 15:35:47 +0100 Subject: BrowserApplication --> Application --- src/application.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 9b47bfcc..05fc008e 100644 --- a/src/application.h +++ b/src/application.h @@ -2,7 +2,6 @@  *  * This file is a part of the rekonq project  * - * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved * Copyright (C) 2008 by Andrea Diamantini  * * @@ -19,8 +18,8 @@  * ============================================================ */ -#ifndef BROWSERAPPLICATION_H -#define BROWSERAPPLICATION_H +#ifndef REKONQ_APPLICATION_H +#define REKONQ_APPLICATION_H // KDE Includes #include @@ -43,14 +42,14 @@ class CookieJar; class HistoryManager; class NetworkAccessManager; -class BrowserApplication : public KApplication +class Application : public KApplication { Q_OBJECT public: - BrowserApplication(KCmdLineArgs*, const QString &); - ~BrowserApplication(); - static BrowserApplication *instance(); + Application(KCmdLineArgs*, const QString &); + ~Application(); + static Application *instance(); bool isTheOnlyBrowser() const; MainWindow *mainWindow(); @@ -86,5 +85,5 @@ private: mutable KIcon m_defaultIcon; }; -#endif // BROWSERAPPLICATION_H +#endif // REKONQ_APPLICATION_H -- cgit v1.2.1 From 43fa9af21ff14b895b1d0ef3b559b9236208eb79 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 15 Feb 2009 16:10:16 +0100 Subject: First bits of documentation.. --- src/application.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 05fc008e..32d810f0 100644 --- a/src/application.h +++ b/src/application.h @@ -42,6 +42,9 @@ class CookieJar; class HistoryManager; class NetworkAccessManager; +/* + * + */ class Application : public KApplication { Q_OBJECT -- cgit v1.2.1 From 4150695c5fff0504cf19ad74b3f185bd67397497 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 16 Feb 2009 00:06:28 +0100 Subject: new singleton Application class. Try 1.. --- src/application.h | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 32d810f0..30f1cc5b 100644 --- a/src/application.h +++ b/src/application.h @@ -22,7 +22,7 @@ #define REKONQ_APPLICATION_H // KDE Includes -#include +#include #include #include #include @@ -38,53 +38,53 @@ class QLocalServer; QT_END_NAMESPACE class MainWindow; +class WebView; class CookieJar; class HistoryManager; class NetworkAccessManager; -/* - * - */ -class Application : public KApplication +/** + * + */ +class Application : public KUniqueApplication { Q_OBJECT public: - Application(KCmdLineArgs*, const QString &); + Application(); ~Application(); + int newInstance(); static Application *instance(); - bool isTheOnlyBrowser() const; MainWindow *mainWindow(); - QList mainWindows(); + WebView* newTab(); + KIcon icon(const KUrl &url) const; - void downloadUrl(const KUrl &srcUrl, const KUrl &destUrl); - void saveSession(); - bool canRestoreSession() const; + /** + * This method lets you to download a file from a source remote url + * to a local destination url. + */ + void downloadUrl(const KUrl &srcUrl, const KUrl &destUrl); static HistoryManager *historyManager(); static CookieJar *cookieJar(); static NetworkAccessManager *networkAccessManager(); -public slots: - MainWindow *newMainWindow(); - void restoreLastSession(); - private slots: + + /** + * Any actions that can be delayed until the window is visible + */ void postLaunch(); void openUrl(const KUrl &url); - void newLocalSocketConnection(); +// void newLocalSocketConnection(); private: - void clean(); - static HistoryManager *s_historyManager; static NetworkAccessManager *s_networkAccessManager; - QList > m_mainWindows; - QLocalServer *m_localServer; - QByteArray m_lastSession; + MainWindow* m_mainWindow; mutable KIcon m_defaultIcon; }; -- cgit v1.2.1 From 2b2b65ddca10b8e620825c2e91d2776752890415 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 20 Feb 2009 15:12:34 +0100 Subject: typo --- src/application.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 30f1cc5b..73e800e9 100644 --- a/src/application.h +++ b/src/application.h @@ -3,7 +3,6 @@  * This file is a part of the rekonq project  * * Copyright (C) 2008 by Andrea Diamantini - * *  * This program is free software; you can redistribute it  * and/or modify it under the terms of the GNU General -- cgit v1.2.1 From f2fc94f76377e5ccfec9469862f02d5461798c6e Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 20 Feb 2009 19:42:57 +0100 Subject: removed unuseful m_defaultIcon --- src/application.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 73e800e9..0c29b72b 100644 --- a/src/application.h +++ b/src/application.h @@ -84,7 +84,6 @@ private: static NetworkAccessManager *s_networkAccessManager; MainWindow* m_mainWindow; - mutable KIcon m_defaultIcon; }; #endif // REKONQ_APPLICATION_H -- cgit v1.2.1 From e6d902eb8dc2d6815d4606519b638c6ec0f435e2 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 21 Feb 2009 11:17:38 +0100 Subject: It seems good now. But we have to test it a lot with Qt 4.5.. --- src/application.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 0c29b72b..7a08eb1a 100644 --- a/src/application.h +++ b/src/application.h @@ -29,13 +29,6 @@ #include #include -// Qt Includes -#include - -QT_BEGIN_NAMESPACE -class QLocalServer; -QT_END_NAMESPACE - class MainWindow; class WebView; class CookieJar; @@ -77,7 +70,6 @@ private slots: */ void postLaunch(); void openUrl(const KUrl &url); -// void newLocalSocketConnection(); private: static HistoryManager *s_historyManager; -- cgit v1.2.1 From b5044060c9263d223c99055b9bd6b93c9fb966c7 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 11 Mar 2009 00:55:47 +0100 Subject: Forwarding class declarations to speed up compilation.. --- src/application.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 7a08eb1a..438a11e4 100644 --- a/src/application.h +++ b/src/application.h @@ -29,6 +29,7 @@ #include #include +// Forward Declarations class MainWindow; class WebView; class CookieJar; -- cgit v1.2.1 From 39409ac6a2880ad815d6096231d0fcdcfd2547f6 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 22 Mar 2009 10:21:09 +0100 Subject: Fixed Copyright intro --- src/application.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 438a11e4..438638c9 100644 --- a/src/application.h +++ b/src/application.h @@ -1,20 +1,22 @@ /* ============================================================ - * - * This file is a part of the rekonq project - * - * Copyright (C) 2008 by Andrea Diamantini - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; - * either version 2, or (at your option) any later version. - * - * 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 - * GNU General Public License for more details. - * - * ============================================================ */ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2008 by Andrea Diamantini +* +* +* This program is free software; you can redistribute it +* and/or modify it under the terms of the GNU General +* Public License as published by the Free Software Foundation; +* either version 2, or (at your option) any later version. +* +* 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 +* GNU General Public License for more details. +* +* ============================================================ */ + #ifndef REKONQ_APPLICATION_H -- cgit v1.2.1 From a934072cf9695e46e793898102590322f43c0733 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 28 Mar 2009 15:53:26 +0100 Subject: astyle. First round.. --- src/application.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 438638c9..fa731c4e 100644 --- a/src/application.h +++ b/src/application.h @@ -39,7 +39,7 @@ class HistoryManager; class NetworkAccessManager; /** - * + * */ class Application : public KUniqueApplication { -- cgit v1.2.1 From 0b151ba388d46c4112b4e861d45f0d8229c8a599 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 29 Mar 2009 08:04:31 +0200 Subject: API change (rename). In MainView, newTab --> newWebView --- src/application.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index fa731c4e..654d554f 100644 --- a/src/application.h +++ b/src/application.h @@ -52,7 +52,7 @@ public: static Application *instance(); MainWindow *mainWindow(); - WebView* newTab(); + WebView* newWebView(); KIcon icon(const KUrl &url) const; -- cgit v1.2.1 From 8eac211c434358cbe536eb6f1448f1d565a5f26f Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 21 Apr 2009 11:27:17 +0200 Subject: Moving new download system to mainline. I did some changes to fit things as simple as possible. We can obviously improve things in a second moment.. --- src/application.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 654d554f..8393e184 100644 --- a/src/application.h +++ b/src/application.h @@ -19,8 +19,12 @@ -#ifndef REKONQ_APPLICATION_H -#define REKONQ_APPLICATION_H +#ifndef APPLICATION_H +#define APPLICATION_H + + +// Local Includes +#include "download.h" // KDE Includes #include @@ -31,12 +35,14 @@ #include #include + // Forward Declarations class MainWindow; class WebView; -class CookieJar; class HistoryManager; +class CookieJar; class NetworkAccessManager; +class DownloadManager; /** * @@ -56,15 +62,10 @@ public: KIcon icon(const KUrl &url) const; - /** - * This method lets you to download a file from a source remote url - * to a local destination url. - */ - void downloadUrl(const KUrl &srcUrl, const KUrl &destUrl); - static HistoryManager *historyManager(); static CookieJar *cookieJar(); static NetworkAccessManager *networkAccessManager(); + static DownloadManager *downloadManager(); private slots: @@ -77,9 +78,10 @@ private slots: private: static HistoryManager *s_historyManager; static NetworkAccessManager *s_networkAccessManager; + static DownloadManager *s_downloadManager; MainWindow* m_mainWindow; }; -#endif // REKONQ_APPLICATION_H +#endif // APPLICATION_H -- cgit v1.2.1 From bd7bd0aa9da7cc738d8de52c1ec3a13dcc7817e7 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 21 Apr 2009 23:43:52 +0200 Subject: Updating Application class with missing static functions --- src/application.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 8393e184..ee3d3112 100644 --- a/src/application.h +++ b/src/application.h @@ -23,9 +23,6 @@ #define APPLICATION_H -// Local Includes -#include "download.h" - // KDE Includes #include #include @@ -37,12 +34,16 @@ // Forward Declarations -class MainWindow; -class WebView; -class HistoryManager; +class KIcon; +class KUrl; +class BookmarkProvider; class CookieJar; -class NetworkAccessManager; class DownloadManager; +class HistoryManager; +class MainWindow; +class NetworkAccessManager; +class WebView; + /** * @@ -66,6 +67,7 @@ public: static CookieJar *cookieJar(); static NetworkAccessManager *networkAccessManager(); static DownloadManager *downloadManager(); + static BookmarkProvider *bookmarkProvider(); private slots: @@ -79,6 +81,7 @@ private: static HistoryManager *s_historyManager; static NetworkAccessManager *s_networkAccessManager; static DownloadManager *s_downloadManager; + static BookmarkProvider *s_bookmarkProvider; MainWindow* m_mainWindow; }; -- cgit v1.2.1 From 182a330e250008177d05a5ef4ed0bd87226ee954 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 22 Apr 2009 01:18:22 +0200 Subject: Side Panel --- src/application.h | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index ee3d3112..5c0ee3cb 100644 --- a/src/application.h +++ b/src/application.h @@ -22,6 +22,8 @@ #ifndef APPLICATION_H #define APPLICATION_H +// Qt Includes +#include // KDE Includes #include @@ -69,6 +71,14 @@ public: static DownloadManager *downloadManager(); static BookmarkProvider *bookmarkProvider(); +public slots: + /** + * Save application's configuration + * @see ReKonfig::self()->writeConfig(); + */ + void slotSaveConfiguration() const; + + private slots: /** @@ -78,12 +88,12 @@ private slots: void openUrl(const KUrl &url); private: - static HistoryManager *s_historyManager; - static NetworkAccessManager *s_networkAccessManager; - static DownloadManager *s_downloadManager; - static BookmarkProvider *s_bookmarkProvider; + static QPointer s_historyManager; + static QPointer s_networkAccessManager; + static QPointer s_downloadManager; + static QPointer s_bookmarkProvider; - MainWindow* m_mainWindow; + QPointer m_mainWindow; }; #endif // APPLICATION_H -- cgit v1.2.1 From db75cbfd9bbb52858d6434e96ac914424a66fe09 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 22 Apr 2009 01:24:48 +0200 Subject: Trivial fixes --- src/application.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 5c0ee3cb..d351e95d 100644 --- a/src/application.h +++ b/src/application.h @@ -97,4 +97,3 @@ private: }; #endif // APPLICATION_H - -- cgit v1.2.1 From 7557af13f9f904cb9a6240d2101fb14e1ffdca99 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 22 Apr 2009 01:33:28 +0200 Subject: Fixing Copyrights --- src/application.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index d351e95d..36ba4bee 100644 --- a/src/application.h +++ b/src/application.h @@ -2,7 +2,8 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2008 by Andrea Diamantini +* Copyright (C) 2008-2009 by Andrea Diamantini +* Copyright (C) 2009 rekonq team. Please, see AUTHORS file for details * * * This program is free software; you can redistribute it -- cgit v1.2.1 From e657ef44ef1eef1f998101ab3dcce1a251d729fc Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 26 Apr 2009 01:45:38 +0200 Subject: Fixed copyright strings, per file, as decided --- src/application.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 36ba4bee..98b213a3 100644 --- a/src/application.h +++ b/src/application.h @@ -2,8 +2,8 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2008-2009 by Andrea Diamantini -* Copyright (C) 2009 rekonq team. Please, see AUTHORS file for details +* Copyright (C) 2008 by Andrea Diamantini +* Copyright (C) 2009 by Paweł Prażak * * * This program is free software; you can redistribute it -- cgit v1.2.1 From fdbd70a77a8c294e0a578073c738f3bc4dfa6ab5 Mon Sep 17 00:00:00 2001 From: Alexandr Domrachev Date: Mon, 27 Apr 2009 17:05:43 +0000 Subject: Some changes ported for merge to mainline (bookmarks & links handling related) Added author: me :) Bookmark owner: openFolderinTabs implemented Links handling ported from Pawel branch Issue #1 fixed --- src/application.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 98b213a3..dfcfab62 100644 --- a/src/application.h +++ b/src/application.h @@ -47,6 +47,18 @@ class MainWindow; class NetworkAccessManager; class WebView; +namespace Rekonq { + /** + * @short Open link options + * Defferent modes of opening new tab + */ + enum OpenType { + Default, ///< open url according to users settings + Current, ///< open url in current tab + New, ///< open url in new tab and make it current + Background ///< open url in new tab in background + }; +} /** * @@ -62,7 +74,7 @@ public: static Application *instance(); MainWindow *mainWindow(); - WebView* newWebView(); + WebView* newWebView(bool makeCurrent = true); KIcon icon(const KUrl &url) const; @@ -72,13 +84,16 @@ public: static DownloadManager *downloadManager(); static BookmarkProvider *bookmarkProvider(); +signals: + void openUrl(const KUrl &url, Rekonq::OpenType type=Rekonq::Current); + public slots: /** * Save application's configuration * @see ReKonfig::self()->writeConfig(); */ void slotSaveConfiguration() const; - + private slots: @@ -86,7 +101,6 @@ private slots: * Any actions that can be delayed until the window is visible */ void postLaunch(); - void openUrl(const KUrl &url); private: static QPointer s_historyManager; -- cgit v1.2.1 From 32da13f039241349c894f5c13cc1954c16c2e783 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 28 Apr 2009 03:19:14 +0200 Subject: Revert "Some changes ported for merge to mainline (bookmarks & links handling related)" links hadling problem This reverts commit fdbd70a77a8c294e0a578073c738f3bc4dfa6ab5. --- src/application.h | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index dfcfab62..98b213a3 100644 --- a/src/application.h +++ b/src/application.h @@ -47,18 +47,6 @@ class MainWindow; class NetworkAccessManager; class WebView; -namespace Rekonq { - /** - * @short Open link options - * Defferent modes of opening new tab - */ - enum OpenType { - Default, ///< open url according to users settings - Current, ///< open url in current tab - New, ///< open url in new tab and make it current - Background ///< open url in new tab in background - }; -} /** * @@ -74,7 +62,7 @@ public: static Application *instance(); MainWindow *mainWindow(); - WebView* newWebView(bool makeCurrent = true); + WebView* newWebView(); KIcon icon(const KUrl &url) const; @@ -84,16 +72,13 @@ public: static DownloadManager *downloadManager(); static BookmarkProvider *bookmarkProvider(); -signals: - void openUrl(const KUrl &url, Rekonq::OpenType type=Rekonq::Current); - public slots: /** * Save application's configuration * @see ReKonfig::self()->writeConfig(); */ void slotSaveConfiguration() const; - + private slots: @@ -101,6 +86,7 @@ private slots: * Any actions that can be delayed until the window is visible */ void postLaunch(); + void openUrl(const KUrl &url); private: static QPointer s_historyManager; -- cgit v1.2.1 From f7d0c1e847801b2ba303e6a0b60545779948fbbf Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 28 Apr 2009 03:40:54 +0200 Subject: Importing some reverted changes --- src/application.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 98b213a3..234ed8e9 100644 --- a/src/application.h +++ b/src/application.h @@ -62,7 +62,7 @@ public: static Application *instance(); MainWindow *mainWindow(); - WebView* newWebView(); + WebView* newWebView(bool makeCurrent = true); KIcon icon(const KUrl &url) const; -- cgit v1.2.1 From de7356aeb6fe480b13e7a9755388b1569090e24b Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 29 Apr 2009 00:59:30 +0200 Subject: Removed unused Application loadUrl method --- src/application.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 234ed8e9..271e31a9 100644 --- a/src/application.h +++ b/src/application.h @@ -86,7 +86,7 @@ private slots: * Any actions that can be delayed until the window is visible */ void postLaunch(); - void openUrl(const KUrl &url); + private: static QPointer s_historyManager; -- cgit v1.2.1 From 82862fbd150afae0101757d1d6081e0e6ddf7baa Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 29 Apr 2009 11:24:11 +0200 Subject: astyle --- src/application.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 271e31a9..10f18545 100644 --- a/src/application.h +++ b/src/application.h @@ -78,7 +78,7 @@ public slots: * @see ReKonfig::self()->writeConfig(); */ void slotSaveConfiguration() const; - + private slots: -- cgit v1.2.1 From 55816b45e681f10c9b45675dba65575d01d9efe3 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 1 May 2009 03:20:42 +0200 Subject: Managing user tab open settings. Step 2 --- src/application.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 10f18545..61f4af81 100644 --- a/src/application.h +++ b/src/application.h @@ -48,6 +48,21 @@ class NetworkAccessManager; class WebView; +namespace Rekonq +{ + /** + * @short Open link options + * Different modes of opening new tab + */ + enum OpenType + { + Default, ///< open url according to users settings + New, ///< open url in new tab and make it current + Background ///< open url in new tab in background + }; +} + + /** * */ @@ -62,7 +77,7 @@ public: static Application *instance(); MainWindow *mainWindow(); - WebView* newWebView(bool makeCurrent = true); + WebView* newWebView(Rekonq::OpenType type = Rekonq::Default); KIcon icon(const KUrl &url) const; -- cgit v1.2.1 From 06b2dc0ce6ec6dd4cb090c22e2f9f8521138146b Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 6 May 2009 03:09:23 +0200 Subject: EBN Krazy fixes. 1st round.. --- src/application.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 61f4af81..a09e008f 100644 --- a/src/application.h +++ b/src/application.h @@ -23,8 +23,6 @@ #ifndef APPLICATION_H #define APPLICATION_H -// Qt Includes -#include // KDE Includes #include @@ -35,6 +33,8 @@ #include #include +// Qt Includes +#include // Forward Declarations class KIcon; -- cgit v1.2.1