diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-25 11:10:35 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-25 11:10:35 +0100 |
| commit | e0fa463ebb64c671a92862da600df70c8b76e0cc (patch) | |
| tree | 9a4a3fa4b2861768e5ce8f834978bb8ab308a69b /src/mainwindow.h | |
| parent | Just close tab on middle mouse click (diff) | |
| parent | A better popup implementation (diff) | |
| download | rekonq-e0fa463ebb64c671a92862da600df70c8b76e0cc.tar.xz | |
Merge commit 'refs/merge-requests/1902' of git://gitorious.org/rekonq/mainline into Lasts1
Diffstat (limited to 'src/mainwindow.h')
| -rw-r--r-- | src/mainwindow.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index 41687e60..7c42e58f 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -69,11 +69,9 @@ public: QAction *actionByName(const QString name); virtual QSize sizeHint() const; virtual KActionCollection *actionCollection () const; - + bool homePage(const KUrl &url = KUrl("rekonq:home")); - void setFlickeringZone(bool b); - private: void setupActions(); void setupTools(); @@ -97,16 +95,16 @@ public slots: void notifyMessage(const QString &msg, Rekonq::Notify status = Rekonq::Info); void printRequested(QWebFrame *frame = 0); - - + + signals: // switching tabs void ctrlTabPressed(); void shiftCtrlTabPressed(); - + protected: bool queryClose(); - + /** * Filters (SHIFT + ) CTRL + TAB events and emit (shift)ctrlTabPressed() * to make switch tab @@ -120,7 +118,7 @@ private slots: void slotBrowserLoading(bool); void slotUpdateActions(); void slotUpdateWindowTitle(const QString &title = QString()); - + // history related void slotOpenPrevious(); void slotOpenNext(); @@ -172,8 +170,6 @@ private: QPointer<KPassivePopup> m_popup; KActionCollection *m_ac; - - bool m_flickeringZone; }; #endif // MAINWINDOW_H |