From c7048563b95f8d27b20aac0a0e1fbc5c4584c514 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 27 Dec 2008 12:54:30 +0100 Subject: BrowserMainWindow --> MainWindow --- src/mainwindow.h | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 src/mainwindow.h (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h new file mode 100644 index 00000000..6f78fd59 --- /dev/null +++ b/src/mainwindow.h @@ -0,0 +1,149 @@ +/* ============================================================ + * + * 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 MAINWINDOW_H +#define MAINWINDOW_H + +// Local Includes +#include "findbar.h" +#include "searchbar.h" + +// KDE Includes +#include +#include +#include +#include +#include +#include +#include + + +class AutoSaver; +class QWebFrame; +class TabWidget; +class WebView; + +/** + The MainWindow of the Browser Application. + Handles the tab widget and all the actions +*/ +class MainWindow : public KMainWindow +{ + Q_OBJECT + +public: + MainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); + ~MainWindow(); + + static KUrl guessUrlFromString(const QString &url); + TabWidget *tabWidget() const; + WebView *currentTab() const; + + + QByteArray saveState() const; + void restoreState(const QByteArray &state); + +public slots: + void loadPage(const QString &url); + void slotHome(); + void slotFind(const QString &); + void slotFindNext(); + void slotFindPrevious(); + +protected: + void closeEvent(QCloseEvent *event); + +private slots: + void save(); + + void slotLoadProgress(int); + void slotUpdateStatusbar(const QString &string); + void slotUpdateWindowTitle(const QString &title = QString()); + + void loadUrl(const KUrl &url); + void slotPreferences(); + + void slotFileNew(); + void slotFileOpen(); + void slotFilePrintPreview(); + void slotFilePrint(); + void slotPrivateBrowsing(); + void slotFileSaveAs(); + + void slotViewTextBigger(); + void slotViewTextNormal(); + void slotViewTextSmaller(); + void slotViewStatusbar(); + void slotViewPageSource(); + void slotViewFullScreen(bool enable); + void slotViewFindBar(); + + void slotToggleInspector(bool enable); + void slotDownloadManager(); + void slotSelectLineEdit(); + + void slotAboutToShowBackMenu(); + + // history related + void slotOpenActionUrl(QAction *action); + void slotOpenPrevious(); + void slotOpenNext(); + + void slotShowWindow(); + void slotSwapFocus(); + + void printRequested(QWebFrame *frame); + void geometryChangeRequested(const QRect &geometry); + +private: + void loadDefaultState(); + void setupMenu(); + void setupToolBar(); + void updateStatusbarActionText(bool visible); + +private: + + KToolBar *m_navigationBar; + SearchBar *m_searchBar; + TabWidget *m_tabWidget; + AutoSaver *m_autoSaver; + + KAction *m_historyBack; + KMenu *m_historyBackMenu; + KAction *m_historyForward; + KMenu *m_windowMenu; + + KAction *m_stop; + KAction *m_reload; + KAction *m_stopReload; + KAction *m_goHome; + KToggleAction *m_viewStatusbar; + KAction *m_restoreLastSession; + + KIcon m_reloadIcon; + KIcon m_stopIcon; + + FindBar *m_findBar; + QString m_lastSearch; +}; + +#endif // MAINWINDOW_H + -- cgit v1.2.1 From 9e7f74269e25062a33af0a2603bf258cd4b228e2 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 29 Dec 2008 01:52:07 +0100 Subject: Ported from KMainWindow to KXmlGuiWindow. Yeah! .. --- src/mainwindow.h | 46 +++++++++++----------------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 6f78fd59..aa8e3d65 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -28,7 +28,7 @@ // KDE Includes #include -#include +#include #include #include #include @@ -36,7 +36,6 @@ #include -class AutoSaver; class QWebFrame; class TabWidget; class WebView; @@ -45,21 +44,21 @@ class WebView; The MainWindow of the Browser Application. Handles the tab widget and all the actions */ -class MainWindow : public KMainWindow +class MainWindow : public KXmlGuiWindow { Q_OBJECT public: - MainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); + MainWindow(); ~MainWindow(); static KUrl guessUrlFromString(const QString &url); TabWidget *tabWidget() const; WebView *currentTab() const; - - QByteArray saveState() const; - void restoreState(const QByteArray &state); +private: + void setupActions(); + void setupCustomMenu(); public slots: void loadPage(const QString &url); @@ -68,12 +67,7 @@ public slots: void slotFindNext(); void slotFindPrevious(); -protected: - void closeEvent(QCloseEvent *event); - private slots: - void save(); - void slotLoadProgress(int); void slotUpdateStatusbar(const QString &string); void slotUpdateWindowTitle(const QString &title = QString()); @@ -91,14 +85,13 @@ private slots: void slotViewTextBigger(); void slotViewTextNormal(); void slotViewTextSmaller(); - void slotViewStatusbar(); void slotViewPageSource(); void slotViewFullScreen(bool enable); void slotViewFindBar(); void slotToggleInspector(bool enable); void slotDownloadManager(); - void slotSelectLineEdit(); + void slotOpenLocation(); void slotAboutToShowBackMenu(); @@ -113,36 +106,19 @@ private slots: void printRequested(QWebFrame *frame); void geometryChangeRequested(const QRect &geometry); -private: - void loadDefaultState(); - void setupMenu(); - void setupToolBar(); - void updateStatusbarActionText(bool visible); private: - - KToolBar *m_navigationBar; SearchBar *m_searchBar; - TabWidget *m_tabWidget; - AutoSaver *m_autoSaver; + FindBar *m_findBar; - KAction *m_historyBack; KMenu *m_historyBackMenu; - KAction *m_historyForward; KMenu *m_windowMenu; - KAction *m_stop; - KAction *m_reload; - KAction *m_stopReload; - KAction *m_goHome; - KToggleAction *m_viewStatusbar; - KAction *m_restoreLastSession; - - KIcon m_reloadIcon; - KIcon m_stopIcon; + QAction *m_stopReload; - FindBar *m_findBar; QString m_lastSearch; + + TabWidget *m_tabWidget; }; #endif // MAINWINDOW_H -- cgit v1.2.1 From 6cf7ab65f009f07cdc0ded9ec377665c124a84ac Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 8 Jan 2009 02:35:46 +0100 Subject: Created mainview! Other minor adjs.. --- src/mainwindow.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index aa8e3d65..8a13d7f9 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -25,6 +25,7 @@ // Local Includes #include "findbar.h" #include "searchbar.h" +#include "mainview.h" // KDE Includes #include @@ -37,7 +38,6 @@ class QWebFrame; -class TabWidget; class WebView; /** @@ -53,7 +53,7 @@ public: ~MainWindow(); static KUrl guessUrlFromString(const QString &url); - TabWidget *tabWidget() const; + MainView *tabWidget() const; WebView *currentTab() const; private: @@ -118,7 +118,7 @@ private: QString m_lastSearch; - TabWidget *m_tabWidget; + MainView *m_tabWidget; }; #endif // MAINWINDOW_H -- cgit v1.2.1 From 3118e255ecf417553a6750950da4cd4880a7a42c Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 9 Jan 2009 02:26:59 +0100 Subject: Last commit before loadPage REMOVAL.. .. --- src/mainwindow.h | 59 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 25 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 8a13d7f9..fb251657 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -40,10 +40,16 @@ class QWebFrame; class WebView; + /** - The MainWindow of the Browser Application. - Handles the tab widget and all the actions -*/ + * This class serves as the main window for rekonq. + * It handles the menus, toolbars, and status bars. + * + * @short Main window class + * @author Andrea Diamantini adjam7_AT_gmail_DOT_com + * + */ + class MainWindow : public KXmlGuiWindow { Q_OBJECT @@ -60,28 +66,42 @@ private: void setupActions(); void setupCustomMenu(); -public slots: +private slots: + void loadPage(const QString &url); void slotHome(); - void slotFind(const QString &); - void slotFindNext(); - void slotFindPrevious(); - -private slots: + void loadUrl(const KUrl &url); void slotLoadProgress(int); void slotUpdateStatusbar(const QString &string); void slotUpdateWindowTitle(const QString &title = QString()); + void slotOpenLocation(); + void slotAboutToShowBackMenu(); - void loadUrl(const KUrl &url); - void slotPreferences(); + // history related + void slotOpenActionUrl(QAction *action); + void slotOpenPrevious(); + void slotOpenNext(); + void slotShowWindow(); + void slotSwapFocus(); + void geometryChangeRequested(const QRect &geometry); + + + // File Menu slots void slotFileNew(); void slotFileOpen(); void slotFilePrintPreview(); void slotFilePrint(); void slotPrivateBrowsing(); void slotFileSaveAs(); + void printRequested(QWebFrame *frame); + // Edit Menu slots + void slotFind(const QString &); + void slotFindNext(); + void slotFindPrevious(); + + // View Menu slots void slotViewTextBigger(); void slotViewTextNormal(); void slotViewTextSmaller(); @@ -89,23 +109,12 @@ private slots: void slotViewFullScreen(bool enable); void slotViewFindBar(); + // Tools Menu slots void slotToggleInspector(bool enable); void slotDownloadManager(); - void slotOpenLocation(); - - void slotAboutToShowBackMenu(); - - // history related - void slotOpenActionUrl(QAction *action); - void slotOpenPrevious(); - void slotOpenNext(); - - void slotShowWindow(); - void slotSwapFocus(); - - void printRequested(QWebFrame *frame); - void geometryChangeRequested(const QRect &geometry); + // Settings Menu slots + void slotPreferences(); private: SearchBar *m_searchBar; -- cgit v1.2.1 From a14af0874d4ceac743727af1665ea1d5f15839d9 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 9 Jan 2009 02:44:50 +0100 Subject: removed LoadPage method to semplify API Now we have just loadUrl slot to run pages.. --- src/mainwindow.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index fb251657..e34c799e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -45,9 +45,6 @@ class WebView; * This class serves as the main window for rekonq. * It handles the menus, toolbars, and status bars. * - * @short Main window class - * @author Andrea Diamantini adjam7_AT_gmail_DOT_com - * */ class MainWindow : public KXmlGuiWindow @@ -66,11 +63,11 @@ private: void setupActions(); void setupCustomMenu(); -private slots: - - void loadPage(const QString &url); +public slots: void slotHome(); void loadUrl(const KUrl &url); + +private slots: void slotLoadProgress(int); void slotUpdateStatusbar(const QString &string); void slotUpdateWindowTitle(const QString &title = QString()); -- cgit v1.2.1 From 886bdb99cd998c045e111a2d7e6f77e29d30b784 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 9 Jan 2009 16:37:41 +0100 Subject: Every action is now in ActionCollection!! Fully adopted xmlgui && mainview concepts.. --- src/mainwindow.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index e34c799e..fd7f13d6 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -62,6 +62,7 @@ public: private: void setupActions(); void setupCustomMenu(); + void setupTabBar(); public slots: void slotHome(); -- cgit v1.2.1 From 195641eb0e7972b32756e95340ebd48c21a7feaf Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 18 Jan 2009 02:10:22 +0100 Subject: Partially ported rekonq to KConfigXT technology.. Perhaps ~50%..going on!! --- src/mainwindow.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index fd7f13d6..e666e405 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -65,6 +65,8 @@ private: void setupTabBar(); public slots: + void updateConfiguration(); + void slotHome(); void loadUrl(const KUrl &url); @@ -126,6 +128,8 @@ private: QString m_lastSearch; MainView *m_tabWidget; + + QString m_homePage; }; #endif // MAINWINDOW_H -- cgit v1.2.1 From 93755c7a74614c795036d0830cf080b7e4ff5654 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 18 Jan 2009 02:18:29 +0100 Subject: m_tabWidget --> m_view --- src/mainwindow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index e666e405..816597ee 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -127,7 +127,7 @@ private: QString m_lastSearch; - MainView *m_tabWidget; + MainView *m_view; QString m_homePage; }; -- cgit v1.2.1 From 76d30285358bedd8b2fc6caf48d2a871f7546685 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 19 Jan 2009 02:26:13 +0100 Subject: Ported tons of code to KConfigXT. To merge kcfg branch we need just to port cookie settings.. --- src/mainwindow.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 816597ee..86a3e30d 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -65,12 +65,11 @@ private: void setupTabBar(); public slots: - void updateConfiguration(); - void slotHome(); void loadUrl(const KUrl &url); private slots: + void slotUpdateConf(); void slotLoadProgress(int); void slotUpdateStatusbar(const QString &string); void slotUpdateWindowTitle(const QString &title = QString()); -- cgit v1.2.1 From 504311e2a45c18e08865269985f00f7f3f3e6e8a Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 20 Jan 2009 19:03:00 +0100 Subject: Implemented a new function to download data with KJob technologies.. It's not working. For now. But we are nearing the goal.. --- src/mainwindow.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 86a3e30d..8b8f1cbe 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -110,7 +110,6 @@ private slots: // Tools Menu slots void slotToggleInspector(bool enable); - void slotDownloadManager(); // Settings Menu slots void slotPreferences(); -- cgit v1.2.1 From de1b2a26f7eaebd3fa1fa2eeb30f4e26afb534fe Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 27 Jan 2009 17:33:26 +0100 Subject: Fixed MenuBar. Fixed BookmarkLine in rekonqui.rc Now we need just the code to implement it.. --- src/mainwindow.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 8b8f1cbe..476a6fe6 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -26,6 +26,7 @@ #include "findbar.h" #include "searchbar.h" #include "mainview.h" +#include "bookmarks.h" // KDE Includes #include @@ -61,7 +62,7 @@ public: private: void setupActions(); - void setupCustomMenu(); + void setupHistoryMenu(); void setupTabBar(); public slots: @@ -121,6 +122,8 @@ private: KMenu *m_historyBackMenu; KMenu *m_windowMenu; + KBookmarkManager *m_manager; + QAction *m_stopReload; QString m_lastSearch; -- cgit v1.2.1 From 1024f77ad03ef3d30d8be6aa61542a057a100868 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 28 Jan 2009 00:59:08 +0100 Subject: Removed unuseful "Select All" action. If someone needs it, I can try to implement it one day.. --- src/mainwindow.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 476a6fe6..d1eba1a4 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -25,8 +25,6 @@ // Local Includes #include "findbar.h" #include "searchbar.h" -#include "mainview.h" -#include "bookmarks.h" // KDE Includes #include @@ -37,7 +35,8 @@ #include #include - +class KBookmarkManager; +class MainView; class QWebFrame; class WebView; -- cgit v1.2.1 From d467ccf90fb3e8c851db97c44f551aeaa9fa289f Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 28 Jan 2009 15:58:37 +0100 Subject: New BookmarkBar!! 1st version, Yeah!! --- src/mainwindow.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index d1eba1a4..2ec5c1bd 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -35,7 +35,7 @@ #include #include -class KBookmarkManager; +class BookmarksProvider; class MainView; class QWebFrame; class WebView; @@ -121,7 +121,7 @@ private: KMenu *m_historyBackMenu; KMenu *m_windowMenu; - KBookmarkManager *m_manager; + BookmarksProvider *m_bookmarksProvider; QAction *m_stopReload; -- cgit v1.2.1 From ba12e93de03b052ade877b0ddfaef125579e15eb Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 29 Jan 2009 11:59:45 +0100 Subject: Definitely fixed FindBar (orat least, I hope so) Add some comments --- src/mainwindow.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 2ec5c1bd..fa96eb0e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -75,15 +75,16 @@ private slots: void slotUpdateWindowTitle(const QString &title = QString()); void slotOpenLocation(); void slotAboutToShowBackMenu(); + void geometryChangeRequested(const QRect &geometry); // history related void slotOpenActionUrl(QAction *action); void slotOpenPrevious(); void slotOpenNext(); - void slotShowWindow(); - void slotSwapFocus(); - void geometryChangeRequested(const QRect &geometry); +/* void slotShowWindow(); + void slotSwapFocus();*/ + // File Menu slots -- cgit v1.2.1 From f168eab1529acb33d48857e29c6ddf22a626f41b Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 20 Feb 2009 18:05:22 +0100 Subject: On the street to SingleRekonq.. --- src/mainwindow.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index fa96eb0e..1a1d14d1 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -86,7 +86,6 @@ private slots: void slotSwapFocus();*/ - // File Menu slots void slotFileNew(); void slotFileOpen(); -- cgit v1.2.1 From 75310e79287a8bdffb86cc1dfda1a0f069383cd6 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 20 Feb 2009 19:06:41 +0100 Subject: Last commit before branching "di brutto".. --- src/mainwindow.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 1a1d14d1..a1f4464b 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -117,18 +117,12 @@ private slots: private: SearchBar *m_searchBar; FindBar *m_findBar; - KMenu *m_historyBackMenu; KMenu *m_windowMenu; - BookmarksProvider *m_bookmarksProvider; - QAction *m_stopReload; - QString m_lastSearch; - MainView *m_view; - QString m_homePage; }; -- cgit v1.2.1 From ea94738bf6c59ce254a6f177e978814019c856a4 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 1 Mar 2009 12:10:53 +0100 Subject: Fixing Font Troubles. Try 1.. --- src/mainwindow.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index a1f4464b..4864f347 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -46,7 +46,6 @@ class WebView; * It handles the menus, toolbars, and status bars. * */ - class MainWindow : public KXmlGuiWindow { Q_OBJECT @@ -82,10 +81,6 @@ private slots: void slotOpenPrevious(); void slotOpenNext(); -/* void slotShowWindow(); - void slotSwapFocus();*/ - - // File Menu slots void slotFileNew(); void slotFileOpen(); -- 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/mainwindow.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 4864f347..d620990e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -25,18 +25,18 @@ // Local Includes #include "findbar.h" #include "searchbar.h" +#include "bookmarks.h" +#include "mainview.h" // KDE Includes -#include #include #include -#include #include -#include +#include #include -class BookmarksProvider; -class MainView; +// Forward Declarations +class KUrl; class QWebFrame; class WebView; @@ -114,11 +114,12 @@ private: FindBar *m_findBar; KMenu *m_historyBackMenu; KMenu *m_windowMenu; - BookmarksProvider *m_bookmarksProvider; QAction *m_stopReload; QString m_lastSearch; - MainView *m_view; QString m_homePage; + + MainView *m_view; + BookmarksProvider *m_bookmarksProvider; }; #endif // MAINWINDOW_H -- cgit v1.2.1 From 33af8415b29e428d926bb6e61f77e7faf91c4ff6 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 12 Mar 2009 00:53:37 +0100 Subject: Solved initial size problem! --- src/mainwindow.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index d620990e..0082a2c0 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -57,6 +57,7 @@ public: static KUrl guessUrlFromString(const QString &url); MainView *tabWidget() const; WebView *currentTab() const; + virtual QSize sizeHint() const; private: void setupActions(); -- 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/mainwindow.h | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 0082a2c0..e2212535 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -1,22 +1,23 @@ /* ============================================================ - * - * 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. - * - * ============================================================ */ +* +* 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 MAINWINDOW_H -- cgit v1.2.1 From 5cb207d1e190efc5ebe8d202bde35ad48c1e9212 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 24 Mar 2009 02:02:25 +0100 Subject: Some fixes on font dim. Updating data still doesn't work.. --- src/mainwindow.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index e2212535..ee07707d 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -68,6 +68,7 @@ private: public slots: void slotHome(); void loadUrl(const KUrl &url); + void slotUpdateBrowser(); private slots: void slotUpdateConf(); -- cgit v1.2.1 From 48b25611c94d380b40948a3de0bfab5678668e1d Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 25 Mar 2009 00:47:24 +0100 Subject: Huge update. Fixed quite all of the settings troubles.. From now on, we (mainly) go on WebView bugfixing.. --- src/mainwindow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index ee07707d..15eda7ec 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -56,7 +56,7 @@ public: ~MainWindow(); static KUrl guessUrlFromString(const QString &url); - MainView *tabWidget() const; + MainView *mainView() const; WebView *currentTab() const; virtual QSize sizeHint() const; -- 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/mainwindow.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 15eda7ec..220fceca 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -43,11 +43,11 @@ class WebView; /** - * This class serves as the main window for rekonq. + * This class serves as the main window for rekonq. * It handles the menus, toolbars, and status bars. * */ -class MainWindow : public KXmlGuiWindow +class MainWindow : public KXmlGuiWindow { Q_OBJECT -- cgit v1.2.1 From 651f97d0652e90ab1af4e80418f42468cc5932e2 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 28 Mar 2009 23:46:38 +0100 Subject: pedantic --- src/mainwindow.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 220fceca..c9bec75e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -74,6 +74,7 @@ private slots: void slotUpdateConf(); void slotLoadProgress(int); void slotUpdateStatusbar(const QString &string); + void slotUpdateActions(); void slotUpdateWindowTitle(const QString &title = QString()); void slotOpenLocation(); void slotAboutToShowBackMenu(); @@ -117,7 +118,11 @@ private: FindBar *m_findBar; KMenu *m_historyBackMenu; KMenu *m_windowMenu; - QAction *m_stopReload; + KAction *m_stopReloadAction; + KAction *m_stopAction; + KAction *m_reloadAction; + KAction *m_historyBackAction; + KAction *m_historyForwardAction; QString m_lastSearch; QString m_homePage; -- cgit v1.2.1 From 98f53721514116b876d18bf0a2da89d2a53cc97d Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 29 Mar 2009 00:05:45 +0100 Subject: Revert "pedantic" Too much things committed a time.. This reverts commit 651f97d0652e90ab1af4e80418f42468cc5932e2. --- src/mainwindow.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index c9bec75e..220fceca 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -74,7 +74,6 @@ private slots: void slotUpdateConf(); void slotLoadProgress(int); void slotUpdateStatusbar(const QString &string); - void slotUpdateActions(); void slotUpdateWindowTitle(const QString &title = QString()); void slotOpenLocation(); void slotAboutToShowBackMenu(); @@ -118,11 +117,7 @@ private: FindBar *m_findBar; KMenu *m_historyBackMenu; KMenu *m_windowMenu; - KAction *m_stopReloadAction; - KAction *m_stopAction; - KAction *m_reloadAction; - KAction *m_historyBackAction; - KAction *m_historyForwardAction; + QAction *m_stopReload; QString m_lastSearch; QString m_homePage; -- cgit v1.2.1 From 08deb6b161ef0cdda7ed8e49870b16f41d78eb4e Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 29 Mar 2009 00:13:01 +0100 Subject: Revert "Revert "pedantic"" Reapplied previous changes. Sorry for confusion. Time to bed.. This reverts commit 98f53721514116b876d18bf0a2da89d2a53cc97d. --- src/mainwindow.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 220fceca..c9bec75e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -74,6 +74,7 @@ private slots: void slotUpdateConf(); void slotLoadProgress(int); void slotUpdateStatusbar(const QString &string); + void slotUpdateActions(); void slotUpdateWindowTitle(const QString &title = QString()); void slotOpenLocation(); void slotAboutToShowBackMenu(); @@ -117,7 +118,11 @@ private: FindBar *m_findBar; KMenu *m_historyBackMenu; KMenu *m_windowMenu; - QAction *m_stopReload; + KAction *m_stopReloadAction; + KAction *m_stopAction; + KAction *m_reloadAction; + KAction *m_historyBackAction; + KAction *m_historyForwardAction; QString m_lastSearch; QString m_homePage; -- cgit v1.2.1 From fb612bbc722ef83c65c63961723f10969f9a6cee Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 1 Apr 2009 12:48:03 +0200 Subject: Importing clones PART 1 I apologies for this "strange" way of importing code. But we have 3 (or 4) different ideas about UIs.. and I have to decide one. So, best way I found is importing manually changes. I'll write something about that soon. We basically need to better learn git cooperation (I'm first). Anyway, thank you a lot for your time and your ideas. I really apprecciate your efforts ;) --- src/mainwindow.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index c9bec75e..c12f8fce 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -64,6 +64,7 @@ private: void setupActions(); void setupHistoryMenu(); void setupTabBar(); + void setupToolBars(); public slots: void slotHome(); @@ -71,7 +72,7 @@ public slots: void slotUpdateBrowser(); private slots: - void slotUpdateConf(); + void slotUpdateConfiguration(); void slotLoadProgress(int); void slotUpdateStatusbar(const QString &string); void slotUpdateActions(); @@ -114,20 +115,22 @@ private slots: void slotPreferences(); private: - SearchBar *m_searchBar; - FindBar *m_findBar; KMenu *m_historyBackMenu; KMenu *m_windowMenu; + KAction *m_stopReloadAction; KAction *m_stopAction; KAction *m_reloadAction; KAction *m_historyBackAction; KAction *m_historyForwardAction; + QString m_lastSearch; QString m_homePage; MainView *m_view; BookmarksProvider *m_bookmarksProvider; + FindBar *m_findBar; + SearchBar *m_searchBar; }; #endif // MAINWINDOW_H -- cgit v1.2.1 From f2372797940d2e2eea16592cbb855fd4ec828fca Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 2 Apr 2009 02:01:43 +0200 Subject: Added show/hide menubar action --- src/mainwindow.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index c12f8fce..9e64022e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -112,6 +112,7 @@ private slots: void slotToggleInspector(bool enable); // Settings Menu slots + void slotShowMenubar(bool enable); void slotPreferences(); private: -- cgit v1.2.1 From 8daa07c56435cd2892bd5f0a85e9db0755c0df85 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 5 Apr 2009 16:33:18 +0200 Subject: Upgrading rekonq UI, 1st step Updating menubar and main toolbar. --- src/mainwindow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 9e64022e..372d90a1 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -87,7 +87,7 @@ private slots: void slotOpenNext(); // File Menu slots - void slotFileNew(); +// void slotFileNew(); void slotFileOpen(); void slotFilePrintPreview(); void slotFilePrint(); -- cgit v1.2.1 From ea971b44ba71143d9cf2e622b91aa4fbe23f456a Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 5 Apr 2009 16:39:22 +0200 Subject: removed new/close tab tabbar buttons --- src/mainwindow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 372d90a1..dc01d990 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -63,7 +63,7 @@ public: private: void setupActions(); void setupHistoryMenu(); - void setupTabBar(); +// void setupTabBar(); void setupToolBars(); public slots: -- cgit v1.2.1 From b19f1410a9f0f0a0b6c9141fe399a98248eed594 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 7 Apr 2009 21:17:14 +0200 Subject: Fixed Webkit settings, removing tools actions (no use case in settings, for me) Private Browsing & Web Inspector. Fixed that actions in tools menu --- src/mainwindow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index dc01d990..c062e86b 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -91,7 +91,7 @@ private slots: void slotFileOpen(); void slotFilePrintPreview(); void slotFilePrint(); - void slotPrivateBrowsing(); + void slotPrivateBrowsing(bool); void slotFileSaveAs(); void printRequested(QWebFrame *frame); -- cgit v1.2.1 From 5a9d9ad3b251ab1ff3c62af465f37bdf5fd0bf6e Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 8 Apr 2009 10:51:29 +0200 Subject: Removed unuseful commented code --- src/mainwindow.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index c062e86b..0ca76498 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -63,7 +63,6 @@ public: private: void setupActions(); void setupHistoryMenu(); -// void setupTabBar(); void setupToolBars(); public slots: -- cgit v1.2.1 From 11fa0d96626b4417718aeef2cf8316a97bce02ed Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 8 Apr 2009 10:59:12 +0200 Subject: Asking user to close rekonq if there are more than 1 tabs opened.. (Oh, Dear.. my English..) --- src/mainwindow.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 0ca76498..1c65c5d7 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -70,6 +70,9 @@ public slots: void loadUrl(const KUrl &url); void slotUpdateBrowser(); +protected: + bool queryClose(); + private slots: void slotUpdateConfiguration(); void slotLoadProgress(int); -- cgit v1.2.1 From 7a93d8a59aa0f693ae533a35b0bc3e4607d3f5ff Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 9 Apr 2009 19:03:50 +0200 Subject: Refactoring find bar following (a bit) Pawel suggestions.. Applied match Case search --- src/mainwindow.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 1c65c5d7..a9363d8a 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -89,7 +89,6 @@ private slots: void slotOpenNext(); // File Menu slots -// void slotFileNew(); void slotFileOpen(); void slotFilePrintPreview(); void slotFilePrint(); -- cgit v1.2.1 From cc6c9e776848b49dc717a8d351d103f3f7be9642 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 18 Apr 2009 03:24:47 +0200 Subject: clear location bar action. As requested --- src/mainwindow.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index a9363d8a..b9b90b5e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -82,6 +82,7 @@ private slots: void slotOpenLocation(); void slotAboutToShowBackMenu(); void geometryChangeRequested(const QRect &geometry); + void slotClearLocationBar(); // history related void slotOpenActionUrl(QAction *action); -- cgit v1.2.1 From 2612c0c79ceeed46f432421ee09a45a466824ee7 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 21 Apr 2009 23:44:58 +0200 Subject: Fixing MainWindow code --- src/mainwindow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index b9b90b5e..76f5431b 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -58,6 +58,7 @@ public: static KUrl guessUrlFromString(const QString &url); MainView *mainView() const; WebView *currentTab() const; + QAction *actionByName(const QString name); virtual QSize sizeHint() const; private: @@ -131,7 +132,6 @@ private: QString m_homePage; MainView *m_view; - BookmarksProvider *m_bookmarksProvider; FindBar *m_findBar; SearchBar *m_searchBar; }; -- 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/mainwindow.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 76f5431b..74fee529 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -24,21 +24,27 @@ #define MAINWINDOW_H // Local Includes -#include "findbar.h" #include "searchbar.h" #include "bookmarks.h" #include "mainview.h" +#include "webview.h" // KDE Includes #include -#include -#include #include -#include // Forward Declarations -class KUrl; class QWebFrame; + +class KUrl; +class KAction; +class KActionMenu; +class KIcon; +class KMenu; + +class FindBar; +class HistoryMenu; +class SidePanel; class WebView; @@ -65,6 +71,8 @@ private: void setupActions(); void setupHistoryMenu(); void setupToolBars(); + void setupSidePanel(); + SidePanel *sidePanel() { return m_sidePanel; } public slots: void slotHome(); @@ -134,6 +142,7 @@ private: MainView *m_view; FindBar *m_findBar; SearchBar *m_searchBar; + SidePanel *m_sidePanel; }; #endif // MAINWINDOW_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/mainwindow.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 74fee529..249360c2 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -146,4 +146,3 @@ private: }; #endif // MAINWINDOW_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/mainwindow.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 249360c2..c22da43f 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -3,7 +3,8 @@ * This file is a part of the rekonq project * * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved -* 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 2399843ceb70b45b2c1a47b680e11ba1e623ef45 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 25 Apr 2009 23:55:14 +0200 Subject: Another importing step. Need to fix cookies' classes and then (I think) we are near the goal.. --- src/mainwindow.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index c22da43f..a02fcee7 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -92,7 +92,6 @@ private slots: void slotOpenLocation(); void slotAboutToShowBackMenu(); void geometryChangeRequested(const QRect &geometry); - void slotClearLocationBar(); // history related void slotOpenActionUrl(QAction *action); -- 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/mainwindow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index a02fcee7..aedf049d 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -4,7 +4,7 @@ * * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved * Copyright (C) 2008-2009 by Andrea Diamantini -* Copyright (C) 2009 rekonq team. Please, see AUTHORS file for details +* 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/mainwindow.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index aedf049d..6a162005 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -77,7 +77,6 @@ private: public slots: void slotHome(); - void loadUrl(const KUrl &url); void slotUpdateBrowser(); protected: -- 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/mainwindow.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 6a162005..aedf049d 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -77,6 +77,7 @@ private: public slots: void slotHome(); + void loadUrl(const KUrl &url); void slotUpdateBrowser(); protected: -- cgit v1.2.1 From ae7ac6a017bce310a160bb9152062635fdc72188 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 29 Apr 2009 10:50:22 +0200 Subject: Some fixes and warning on webview createWindow --- src/mainwindow.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index aedf049d..045287cb 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -84,6 +84,7 @@ protected: bool queryClose(); private slots: + void postLaunch(); void slotUpdateConfiguration(); void slotLoadProgress(int); void slotUpdateStatusbar(const QString &string); @@ -127,8 +128,14 @@ private slots: void slotPreferences(); private: + MainView *m_view; + FindBar *m_findBar; + SearchBar *m_searchBar; + SidePanel *m_sidePanel; + KMenu *m_historyBackMenu; KMenu *m_windowMenu; + KActionMenu *m_historyActionMenu; KAction *m_stopReloadAction; KAction *m_stopAction; @@ -138,11 +145,6 @@ private: QString m_lastSearch; QString m_homePage; - - MainView *m_view; - FindBar *m_findBar; - SearchBar *m_searchBar; - SidePanel *m_sidePanel; }; #endif // MAINWINDOW_H -- 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/mainwindow.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/mainwindow.h') diff --git a/src/mainwindow.h b/src/mainwindow.h index 045287cb..cdb7151d 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -73,7 +73,10 @@ private: void setupHistoryMenu(); void setupToolBars(); void setupSidePanel(); - SidePanel *sidePanel() { return m_sidePanel; } + SidePanel *sidePanel() + { + return m_sidePanel; + } public slots: void slotHome(); -- cgit v1.2.1