summaryrefslogtreecommitdiff
path: root/src/mainview.h
diff options
context:
space:
mode:
authorPanagiotis Papadopoulos <pano_90@gmx.net>2010-04-21 13:34:20 +0200
committerPanagiotis Papadopoulos <pano_90@gmx.net>2010-04-21 13:34:20 +0200
commitf9153663cb8210ac4d6e7055838344839b4e19b6 (patch)
treeb70233b32eadfbebff062c0000f007ca2f99d732 /src/mainview.h
parentMerge branch 'master' of git://gitorious.org/rekonq/mainline into i18n (diff)
parentNebulon's patch. (diff)
downloadrekonq-f9153663cb8210ac4d6e7055838344839b4e19b6.tar.xz
Merge branch 'master' of git://gitorious.org/rekonq/mainline into i18n
Diffstat (limited to 'src/mainview.h')
-rw-r--r--src/mainview.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/mainview.h b/src/mainview.h
index 908389b1..272cf82e 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -2,9 +2,10 @@
*
* 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>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -43,6 +44,7 @@
// Qt Includes
#include <QtGui/QToolButton>
+#include <QStackedWidget>
// Forward Declarations
class QUrl;
@@ -68,8 +70,7 @@ public:
MainView(MainWindow *parent);
~MainView();
-public:
-
+ QWidget *urlBarWidget() const;
UrlBar *urlBar() const;
WebTab *webTab(int index) const;
@@ -86,7 +87,6 @@ public:
void setTabBarHidden(bool hide);
QToolButton *addTabButton() const;
- void clear();
/**
* This function creates a new empty tab
@@ -106,7 +106,7 @@ signals:
void lastTabClosed();
// current tab signals
- void setCurrentTitle(const QString &url);
+ void currentTitle(const QString &url);
void showStatusBarMessage(const QString &message, Rekonq::Notify status = Rekonq::Info);
void linkHovered(const QString &link);
void browserTabLoading(bool);
@@ -147,7 +147,7 @@ private slots:
void windowCloseRequested();
void postLaunch();
-
+ void movedTab(int,int);
protected:
virtual void resizeEvent(QResizeEvent *event);
@@ -167,8 +167,10 @@ private:
*/
QLabel *animatedLoading(int index, bool addMovie);
- UrlBar *m_urlBar;
- TabBar *m_tabBar;
+
+// --------------------------------------------------------------------------
+
+ QStackedWidget *_bars;
QString m_loadingGitPath;