diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-02-06 15:00:15 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-02-06 15:00:15 +0100 |
commit | 54ea0c94db8a98bf304f475cb7a7f1528c3a5e3b (patch) | |
tree | 5e5637a61f54a0a7659fd249b59c22181f6936e5 /src/mainwindow.h | |
parent | i18n, pointers & fixes.. (diff) | |
parent | Replace zoom setting submenu by a widget with a slider (diff) | |
download | rekonq-54ea0c94db8a98bf304f475cb7a7f1528c3a5e3b.tar.xz |
Merge commit 'refs/merge-requests/86' of git://gitorious.org/rekonq/mainline into ZoomSlide
Diffstat (limited to 'src/mainwindow.h')
-rw-r--r-- | src/mainwindow.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index 7083591d..35632c64 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -41,6 +41,7 @@ // Forward Declarations class QWebFrame; +class QSlider; class KAction; class KPassivePopup; @@ -72,7 +73,9 @@ public: virtual QSize sizeHint() const; virtual KActionCollection *actionCollection () const; void setWidgetsVisible(bool makeFullScreen); - + + void setZoomSliderFactor(qreal factor); + private: void setupActions(); void setupTools(); @@ -125,9 +128,10 @@ private slots: void findPrevious(); // Zoom slots - void viewTextBigger(); - void viewTextNormal(); - void viewTextSmaller(); + void zoomIn(); + void zoomNormal(); + void zoomOut(); + void setZoomFactor(int factor); // File Menu slots void openLocation(); @@ -163,6 +167,8 @@ private: KToolBar *m_mainBar; KToolBar *m_bmBar; + QSlider *m_zoomSlider; + QString m_lastSearch; KPassivePopup *m_popup; |