Merge pull request #249 from AlexKiryanov/AlexKiryanov-branch

Add views menu in view menu bar

src/app/GUI/canvaswindow.h

@@ -155,6 +155,8 @@ public:
 
     void fitCanvasToSize();
     void resetTransormation();
+    void zoomInView();
+    void zoomOutView();
 };
 
 #endif // CANVASWINDOW_H

src/app/GUI/canvaswindowevents.cpp

@@ -70,6 +70,22 @@ void CanvasWindow::fitCanvasToSize() {
     mViewTransform.scale(minScale, minScale);
 }
 
+void CanvasWindow::zoomInView() {
+    if(!mCurrentCanvas) return;
+    const auto canvasSize = mCurrentCanvas->getCanvasSize();
+    mViewTransform.translate(canvasSize.width()*0.5, canvasSize.height()*0.5);
+    mViewTransform.scale(1.1, 1.1);
+    mViewTransform.translate(-canvasSize.width()*0.5, -canvasSize.height()*0.5);
+}
+
+void CanvasWindow::zoomOutView() {
+    if(!mCurrentCanvas) return;
+    const auto canvasSize = mCurrentCanvas->getCanvasSize();
+    mViewTransform.translate(canvasSize.width()*0.5, canvasSize.height()*0.5);
+    mViewTransform.scale(0.9, 0.9);
+    mViewTransform.translate(-canvasSize.width()*0.5, -canvasSize.height()*0.5);
+}
+
 #include <QEvent>
 
 bool CanvasWindow::event(QEvent *e) {

src/app/GUI/mainwindow.cpp

@@ -606,6 +606,53 @@ void MainWindow::setupMenuBar() {
 
     mViewMenu = mMenuBar->addMenu(tr("View", "MenuBar"));
 
+    const auto ViewTransformMenu = mViewMenu->addMenu(
+                tr("Views","MenuBar_View"));
+
+    mZoomInMenu = ViewTransformMenu->addAction(
+                tr("Zoom In", "MenuBar_Views"));
+    mZoomInMenu->setShortcut(Qt::Key_Plus);
+    connect(mZoomInMenu, &QAction::triggered,
+            this, [](){
+        const auto target = KeyFocusTarget::KFT_getCurrentTarget();
+        const auto cwTarget = dynamic_cast<CanvasWindow*>(target);
+        if (!cwTarget) return;
+        cwTarget->zoomInView();
+    });
+
+    mZoomOutMenu = ViewTransformMenu->addAction(
+                tr("Zoom Out", "MenuBar_Views"));
+    mZoomOutMenu->setShortcut(Qt::Key_Minus);
+    connect(mZoomOutMenu, &QAction::triggered,
+            this, [](){
+        const auto target = KeyFocusTarget::KFT_getCurrentTarget();
+        const auto cwTarget = dynamic_cast<CanvasWindow*>(target);
+        if (!cwTarget) return;
+        cwTarget->zoomOutView();
+    });
+
+    mFitViewMenu = ViewTransformMenu->addAction(
+                tr("Fit to Canvas", "MenuBar_Views"));
+    mFitViewMenu->setShortcut(Qt::Key_0);
+    connect(mFitViewMenu, &QAction::triggered,
+            this, [](){
+        const auto target = KeyFocusTarget::KFT_getCurrentTarget();
+        const auto cwTarget = dynamic_cast<CanvasWindow*>(target);
+        if (!cwTarget) return;
+        cwTarget->fitCanvasToSize();
+    });
+
+    mResetZoomMenu = ViewTransformMenu->addAction(
+                tr("Reset Zoom", "MenuBar_Views"));
+    mResetZoomMenu->setShortcut(Qt::Key_1);
+    connect(mResetZoomMenu, &QAction::triggered,
+            this, [](){
+        const auto target = KeyFocusTarget::KFT_getCurrentTarget();
+        const auto cwTarget = dynamic_cast<CanvasWindow*>(target);
+        if (!cwTarget) return;
+        cwTarget->resetTransormation();
+    });
+
     const auto filteringMenu = mViewMenu->addMenu(
                 tr("Filtering", "MenuBar_View"));
 

src/app/GUI/mainwindow.h

@@ -282,6 +282,11 @@ private:
 //
     ActionButton *mActionNewEmptyPaintFrame;
     QAction *mActionNewEmptyPaintFrameAct;
+//
+    QAction *mResetZoomMenu;
+    QAction *mZoomInMenu;
+    QAction *mZoomOutMenu;
+    QAction *mFitViewMenu;
 //
     QAction *mNoneQuality;
     QAction *mLowQuality;