From b9584f2c9a7d1ec60b56199728ab8d25ee864e30 Mon Sep 17 00:00:00 2001 From: jriegel Date: Thu, 20 Dec 2012 19:49:17 +0100 Subject: [PATCH] setting defaults for zoom invert and zoom step for Werners fix of #894 - inverse is now default - 0.2 is zoom step default expecting lots of flaming :) --- src/Gui/CADNavigationStyle.cpp | 2 +- src/Gui/DlgSettings3DView.ui | 7 +++++-- src/Gui/NavigationStyle.cpp | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Gui/CADNavigationStyle.cpp b/src/Gui/CADNavigationStyle.cpp index b6e49d632..f2a8e0cc8 100644 --- a/src/Gui/CADNavigationStyle.cpp +++ b/src/Gui/CADNavigationStyle.cpp @@ -71,7 +71,7 @@ const char* CADNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::DRAGGING: return QT_TR_NOOP("Press left and middle mouse button"); case NavigationStyle::ZOOMING: - return QT_TR_NOOP("Scroll middle mouse button"); + return QT_TR_NOOP("Scroll middle mouse button or middle and cklicking left"); default: return "No description"; } diff --git a/src/Gui/DlgSettings3DView.ui b/src/Gui/DlgSettings3DView.ui index cd289df1e..6c1fbaa26 100644 --- a/src/Gui/DlgSettings3DView.ui +++ b/src/Gui/DlgSettings3DView.ui @@ -176,7 +176,7 @@ 0.050000000000000 - 0.050000000000000 + 0.200000000000000 ZoomStep @@ -190,7 +190,10 @@ - + + true + + Invert zoom diff --git a/src/Gui/NavigationStyle.cpp b/src/Gui/NavigationStyle.cpp index e801e1490..836b6f7bf 100644 --- a/src/Gui/NavigationStyle.cpp +++ b/src/Gui/NavigationStyle.cpp @@ -226,11 +226,11 @@ void NavigationStyle::initialize() this->shiftdown = FALSE; this->altdown = FALSE; this->invertZoom = App::GetApplication().GetParameterGroupByPath - ("User parameter:BaseApp/Preferences/View")->GetBool("InvertZoom",false); + ("User parameter:BaseApp/Preferences/View")->GetBool("InvertZoom",true); this->zoomAtCursor = App::GetApplication().GetParameterGroupByPath ("User parameter:BaseApp/Preferences/View")->GetBool("ZoomAtCursor",false); this->zoomStep = App::GetApplication().GetParameterGroupByPath - ("User parameter:BaseApp/Preferences/View")->GetFloat("ZoomStep",0.05f); + ("User parameter:BaseApp/Preferences/View")->GetFloat("ZoomStep",0.2f); } void NavigationStyle::finalize()