From 02ce36f8b274534a7c843c1a8acacb9a31b4d3d3 Mon Sep 17 00:00:00 2001 From: mlaurent Date: Thu, 11 Jun 2009 11:22:06 +0000 Subject: Fix forward declaration git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@980178 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/mainview.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/mainview.h') diff --git a/src/mainview.h b/src/mainview.h index dfa498f7..8a8ae3dc 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -31,17 +31,14 @@ #include // Forward Declarations -class QLineEdit; class QUrl; class QWebFrame; class QLabel; class KAction; -class KCompletion; class KMenu; class KUrl; -class HistoryCompletionModel; class StackedUrlBar; class TabBar; class UrlBar; -- cgit v1.2.1 From 5257a168febf317f90a6383373586fcb535393d1 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 19 Jun 2009 17:37:10 +0200 Subject: New Tab tool button --- src/mainview.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/mainview.h') diff --git a/src/mainview.h b/src/mainview.h index 8a8ae3dc..8ff32473 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -30,6 +30,9 @@ // KDE Includes #include +// Qt Includes +#include + // Forward Declarations class QUrl; class QWebFrame; @@ -160,6 +163,8 @@ protected: private: + void addTabButtonPosition(); + /** * This function creates (if not exists) and returns a QLabel * with a loading QMovie. @@ -184,6 +189,8 @@ private: QString m_loadingGitPath; bool m_makeBackTab; + + QToolButton *m_addTabButton; }; #endif -- cgit v1.2.1 From 0a8e7f56c426639dd140558dd685c72d24a22e79 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 19 Jun 2009 18:33:59 +0200 Subject: Removed recently closed tabs history --- src/mainview.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/mainview.h') diff --git a/src/mainview.h b/src/mainview.h index 8ff32473..9ee2f12a 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -133,8 +133,8 @@ public slots: private slots: void slotCurrentChanged(int index); - void aboutToShowRecentTabsMenu(); - void aboutToShowRecentTriggeredAction(QAction *action); // need QAction! +// void aboutToShow/*Rec*/entTabsMenu(); +// void aboutToShowRecentTriggeredAction(QAction *action); // need QAction! void webViewLoadStarted(); void webViewLoadProgress(int progress); @@ -177,12 +177,6 @@ private: */ QLabel *animatedLoading(int index, bool addMovie); - static const int m_recentlyClosedTabsSize = 10; - KAction *m_recentlyClosedTabsAction; - - KMenu *m_recentlyClosedTabsMenu; - QList m_recentlyClosedTabs; - StackedUrlBar *m_urlBars; TabBar *m_tabBar; @@ -194,4 +188,3 @@ private: }; #endif - -- cgit v1.2.1 From 0e4a3b6077a276767f76bf52b5c09036b3d89114 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 20 Jun 2009 19:25:43 +0200 Subject: Finally fixed F5 shortcut --- src/mainview.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/mainview.h') diff --git a/src/mainview.h b/src/mainview.h index 9ee2f12a..36fadfb4 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -133,8 +133,6 @@ public slots: private slots: void slotCurrentChanged(int index); -// void aboutToShow/*Rec*/entTabsMenu(); -// void aboutToShowRecentTriggeredAction(QAction *action); // need QAction! void webViewLoadStarted(); void webViewLoadProgress(int progress); -- cgit v1.2.1 From 8e094f1119d4073e78697052397c42a90c527601 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 21 Jun 2009 01:29:05 +0200 Subject: New notify system --- src/mainview.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'src/mainview.h') diff --git a/src/mainview.h b/src/mainview.h index 36fadfb4..aad99ddd 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -47,6 +47,23 @@ class TabBar; class UrlBar; +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 + }; +} + + /** * This class represent rekonq Main View. It contains all WebViews and a stack widget * of associated line edits. @@ -112,6 +129,7 @@ public slots: * @param url The url to load */ void loadUrl(const KUrl &url); + void slotCloneTab(int index = -1); void slotCloseTab(int index = -1); void slotCloseOtherTabs(int index); @@ -135,7 +153,6 @@ private slots: void slotCurrentChanged(int index); void webViewLoadStarted(); - void webViewLoadProgress(int progress); void webViewLoadFinished(bool ok); void webViewIconChanged(); void webViewTitleChanged(const QString &title); -- cgit v1.2.1 From 27a1d6d45142134c849f40fd9662cff29f2b9645 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 21 Jun 2009 01:34:55 +0200 Subject: Comments and Fixes --- src/mainview.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/mainview.h') diff --git a/src/mainview.h b/src/mainview.h index aad99ddd..91a09e09 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -47,23 +47,6 @@ class TabBar; class UrlBar; -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 - }; -} - - /** * This class represent rekonq Main View. It contains all WebViews and a stack widget * of associated line edits. -- cgit v1.2.1 From 9501cf849628c5aeef669f12db87d43ed03c357a Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 21 Jun 2009 22:11:39 +0200 Subject: New notifying system. Perhaps this should be default for rekonq 0.2. Anyway, there are a lot of improvements needed. We'll see.. --- src/mainview.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mainview.h') diff --git a/src/mainview.h b/src/mainview.h index 91a09e09..7cb4e035 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -91,7 +91,7 @@ signals: // current tab signals void setCurrentTitle(const QString &url); - void showStatusBarMessage(const QString &message); + void showStatusBarMessage(const QString &message, Rekonq::Notify status = Rekonq::Info); void linkHovered(const QString &link); void loadProgress(int progress); -- cgit v1.2.1