diff --git a/libs/flake/tools/KoZoomToolWidget.cpp b/libs/flake/tools/KoZoomToolWidget.cpp index b818316b29..43822fdf96 100644 --- a/libs/flake/tools/KoZoomToolWidget.cpp +++ b/libs/flake/tools/KoZoomToolWidget.cpp @@ -1,89 +1,48 @@ /* This file is part of the KDE project * Copyright (C) 2008 Martin Pfeiffer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public License * along with this library; see the file COPYING.LIB. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ #include "KoZoomToolWidget.h" #include #include #include #include "KoZoomTool.h" KoZoomToolWidget::KoZoomToolWidget(KoZoomTool* tool, QWidget* parent) - : QWidget(parent), m_tool(tool) + : QWidget(parent) + , m_tool(tool) { setupUi(this); - m_dirtyThumbnail = true; - birdEyeLabel->installEventFilter(this); - birdEyeLabel->hide(); //remove this when coding on the birdEyeLabel zoomInButton->setIcon(koIcon("zoom-in")); zoomOutButton->setIcon(koIcon("zoom-out")); connect(zoomInButton, SIGNAL(toggled(bool)), this, SLOT(changeZoomMode())); connect(zoomOutButton, SIGNAL(toggled(bool)), this, SLOT(changeZoomMode())); zoomInButton->click(); } KoZoomToolWidget::~KoZoomToolWidget() { } -void KoZoomToolWidget::paintBirdEye() -{ - QPainter p; - if (m_dirtyThumbnail) { - m_thumbnail = QPixmap(birdEyeLabel->size()); -// m_thumbnail.fill(birdEyeLabel->palette().dark().color()); - p.begin(&m_thumbnail); - // TODO fill in code to paint a thumbnail of the current document - p.end(); - m_dirtyThumbnail = false; - } - - p.begin(birdEyeLabel); - p.drawPixmap(0, 0, m_thumbnail); -// p.drawRect(m_birdEyeRect); - p.end(); -} - -bool KoZoomToolWidget::eventFilter(QObject* object, QEvent* event) -{ - if (object == birdEyeLabel) { - if (event->type() == QEvent::Paint) { - paintBirdEye(); - return true; - } else if (event->type() == QEvent::MouseMove) { - QMouseEvent *mouseEvent = static_cast(event); - if (mouseEvent->buttons() | Qt::LeftButton) { - // m_tool->canvasController()->pan - // TODO implement panning - } - return true; - } else if (event->type() == QEvent::Resize) { - m_dirtyThumbnail = true; - } else - return false; - } - return QWidget::eventFilter(object, event); -} - void KoZoomToolWidget::changeZoomMode() { m_tool->setZoomInMode(zoomInButton->isChecked()); } diff --git a/libs/flake/tools/KoZoomToolWidget.h b/libs/flake/tools/KoZoomToolWidget.h index aff3e89019..41a5fe4feb 100644 --- a/libs/flake/tools/KoZoomToolWidget.h +++ b/libs/flake/tools/KoZoomToolWidget.h @@ -1,50 +1,41 @@ /* This file is part of the KDE project * Copyright (C) 2008 Martin Pfeiffer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library 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 * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public License * along with this library; see the file COPYING.LIB. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ #ifndef KOZOOMTOOLWIDGET_H #define KOZOOMTOOLWIDGET_H #include #include #include "ui_KoZoomToolWidget.h" class KoZoomTool; class KoZoomToolWidget : public QWidget, Ui::ZoomToolWidget { Q_OBJECT public: explicit KoZoomToolWidget(KoZoomTool* tool, QWidget *parent = 0); ~KoZoomToolWidget() override; -protected: - bool eventFilter(QObject *object, QEvent *event) override; - private Q_SLOTS: void changeZoomMode(); - private: - void paintBirdEye(); - - bool m_dirtyThumbnail; - QRect m_birdEyeRect; - QPixmap m_thumbnail; KoZoomTool *m_tool; }; #endif diff --git a/libs/flake/tools/KoZoomToolWidget.ui b/libs/flake/tools/KoZoomToolWidget.ui index f8d6fde19a..873553084a 100644 --- a/libs/flake/tools/KoZoomToolWidget.ui +++ b/libs/flake/tools/KoZoomToolWidget.ui @@ -1,58 +1,51 @@ ZoomToolWidget 0 0 212 261 Qt::NoFocus - Zoom In + &Zoom In - - - - Qt::NoFocus - - - Zoom Out - - - - - - - - - - - + Qt::Vertical 20 0 + + + + Qt::NoFocus + + + Zoo&m Out + + +