From 402c4e1694385811811701c55f935bd14a5f42aa Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Fri, 12 Aug 2022 09:16:12 -0700
Subject: [PATCH] ui: move zoom scrolling option to preferences

---
 .../tabs/preferencesbehaviortab.cpp           |  5 +++++
 .../handmovableview/handmovableview.cpp       | 18 ++--------------
 app/widget/handmovableview/handmovableview.h  | 21 -------------------
 app/widget/keyframeview/keyframeview.cpp      |  4 ----
 app/widget/nodeview/nodeview.cpp              |  4 ----
 app/widget/timelinewidget/timelinewidget.cpp  | 10 ---------
 app/widget/timelinewidget/timelinewidget.h    |  2 --
 7 files changed, 7 insertions(+), 57 deletions(-)

diff --git a/app/dialog/preferences/tabs/preferencesbehaviortab.cpp b/app/dialog/preferences/tabs/preferencesbehaviortab.cpp
index a081260fe..df9917a84 100644
--- a/app/dialog/preferences/tabs/preferencesbehaviortab.cpp
+++ b/app/dialog/preferences/tabs/preferencesbehaviortab.cpp
@@ -44,6 +44,11 @@ PreferencesBehaviorTab::PreferencesBehaviorTab()
   AddItem(tr("Enable slider ladder"),
           QStringLiteral("UseSliderLadders"),
           general_group);
+  AddItem(tr("Scrolling zooms by default"),
+          QStringLiteral("ScrollZooms"),
+          tr("By default, scrolling will move the view around, and holding Ctrl/Cmd will make it zoom instead. "
+             "Enabling this will switch those, scrolling will zoom by default, and holding Ctrl/Cmd will move the view instead."),
+          general_group);
 
   QTreeWidgetItem* audio_group = AddParent(tr("Audio"));
   AddItem(tr("Enable audio scrubbing"),
diff --git a/app/widget/handmovableview/handmovableview.cpp b/app/widget/handmovableview/handmovableview.cpp
index 5ff36be0a..a44858ad8 100644
--- a/app/widget/handmovableview/handmovableview.cpp
+++ b/app/widget/handmovableview/handmovableview.cpp
@@ -31,8 +31,7 @@ namespace olive {
 
 HandMovableView::HandMovableView(QWidget* parent) :
   super(parent),
-  dragging_hand_(false),
-  scroll_zooms_by_default_(OLIVE_CONFIG("ScrollZooms").toBool())
+  dragging_hand_(false)
 {
   connect(Core::instance(), &Core::ToolChanged, this, &HandMovableView::ApplicationToolChanged);
 }
@@ -149,7 +148,7 @@ const HandMovableView::DragMode &HandMovableView::GetDefaultDragMode() const
 
 bool HandMovableView::WheelEventIsAZoomEvent(QWheelEvent *event) const
 {
-  return (static_cast<bool>(event->modifiers() & Qt::ControlModifier) == !scroll_zooms_by_default_);
+  return (static_cast<bool>(event->modifiers() & Qt::ControlModifier) == !OLIVE_CONFIG("ScrollZooms").toBool());
 }
 
 void HandMovableView::wheelEvent(QWheelEvent *event)
@@ -179,17 +178,4 @@ void HandMovableView::ZoomIntoCursorPosition(QWheelEvent *event, double multipli
   Q_UNUSED(cursor_pos)
 }
 
-QAction *HandMovableView::AddSetScrollZoomsByDefaultActionToMenu(QMenu *m, bool autoconnect)
-{
-  QAction* ctrl_zoom = m->addAction(tr("Scroll Zooms By Default"));
-  ctrl_zoom->setCheckable(true);
-  ctrl_zoom->setChecked(GetScrollZoomsByDefault());
-
-  if (autoconnect) {
-    connect(ctrl_zoom, &QAction::triggered, this, &HandMovableView::SetScrollZoomsByDefault);
-  }
-
-  return ctrl_zoom;
-}
-
 }
diff --git a/app/widget/handmovableview/handmovableview.h b/app/widget/handmovableview/handmovableview.h
index c1f9220e8..e8c01599b 100644
--- a/app/widget/handmovableview/handmovableview.h
+++ b/app/widget/handmovableview/handmovableview.h
@@ -34,19 +34,6 @@ class HandMovableView : public QGraphicsView
 public:
   HandMovableView(QWidget* parent = nullptr);
 
-  bool GetScrollZoomsByDefault() const
-  {
-    return scroll_zooms_by_default_;
-  }
-
-  QAction* AddSetScrollZoomsByDefaultActionToMenu(QMenu* menu, bool autoconnect = true);
-
-public slots:
-  void SetScrollZoomsByDefault(bool e)
-  {
-    scroll_zooms_by_default_ = e;
-  }
-
 protected:
   virtual void ToolChangedEvent(Tool::Item tool){Q_UNUSED(tool)}
 
@@ -69,14 +56,6 @@ private:
 
   DragMode default_drag_mode_;
 
-  /**
-   * @brief Whether scrolling should perform a scroll or a zoom
-   *
-   * If TRUE, scrolling will ZOOM and Ctrl+Scroll with SCROLL.
-   * If FALSE (default), scrolling will SCROLL and Ctrl+Scroll will ZOOM.
-   */
-  bool scroll_zooms_by_default_;
-
   QPointF transformed_pos_;
 
 private slots:
diff --git a/app/widget/keyframeview/keyframeview.cpp b/app/widget/keyframeview/keyframeview.cpp
index 688e5d7f8..9fead0fe1 100644
--- a/app/widget/keyframeview/keyframeview.cpp
+++ b/app/widget/keyframeview/keyframeview.cpp
@@ -569,10 +569,6 @@ void KeyframeView::ShowContextMenu()
 
   m.addSeparator();
 
-  AddSetScrollZoomsByDefaultActionToMenu(&m);
-
-  m.addSeparator();
-
   ContextMenuEvent(m);
 
   if (!GetSelectedKeyframes().empty()) {
diff --git a/app/widget/nodeview/nodeview.cpp b/app/widget/nodeview/nodeview.cpp
index e757e6031..cf1610b02 100644
--- a/app/widget/nodeview/nodeview.cpp
+++ b/app/widget/nodeview/nodeview.cpp
@@ -814,10 +814,6 @@ void NodeView::ShowContextMenu(const QPoint &pos)
 
     m.addSeparator();
 
-    AddSetScrollZoomsByDefaultActionToMenu(&m);
-
-    m.addSeparator();
-
     Menu* direction_menu = new Menu(tr("Direction"), &m);
     m.addMenu(direction_menu);
 
diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index 00aa7e40e..49dda39bb 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -1128,9 +1128,6 @@ void TimelineWidget::ShowContextMenu()
     show_waveforms->setChecked(views_.first()->view()->GetShowWaveforms());
     connect(show_waveforms, &QAction::triggered, this, &TimelineWidget::SetViewWaveformsEnabled);
 
-    QAction* scroll_zoom = views_.first()->view()->AddSetScrollZoomsByDefaultActionToMenu(&menu);
-    connect(scroll_zoom, &QAction::triggered, this, &TimelineWidget::SetScrollZoomsByDefaultOnAllViews);
-
     menu.addSeparator();
 
     QAction* properties_action = menu.addAction(tr("Properties"));
@@ -1220,13 +1217,6 @@ void TimelineWidget::TrackIndexChanged(int old, int now)
   }
 }
 
-void TimelineWidget::SetScrollZoomsByDefaultOnAllViews(bool e)
-{
-  foreach (TimelineAndTrackView* tview, views_) {
-    tview->view()->SetScrollZoomsByDefault(e);
-  }
-}
-
 void TimelineWidget::SignalBlockSelectionChange()
 {
   signal_block_change_timer_->stop();
diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h
index 870d7065b..5123e6006 100644
--- a/app/widget/timelinewidget/timelinewidget.h
+++ b/app/widget/timelinewidget/timelinewidget.h
@@ -426,8 +426,6 @@ private slots:
 
   void TrackIndexChanged(int old, int now);
 
-  void SetScrollZoomsByDefaultOnAllViews(bool e);
-
   void SignalBlockSelectionChange();
 
   void RevealInFootageViewer();