From 1b957e581100afc0f45c3333f4e6079a6349822a Mon Sep 17 00:00:00 2001 From: donovaly Date: Sun, 15 Mar 2020 21:10:54 +0100 Subject: [PATCH] [GUI] some preferences cleanup as requested and discussed in https://forum.freecadweb.org/viewtopic.php?f=27&t=43984#p376950 and following --- src/Gui/DlgSettings3DView.ui | 119 +++--- src/Gui/DlgSettingsNavigation.ui | 600 ++++++++++++++++++------------- 2 files changed, 427 insertions(+), 292 deletions(-) diff --git a/src/Gui/DlgSettings3DView.ui b/src/Gui/DlgSettings3DView.ui index cf97ba6e85..07024daf4e 100644 --- a/src/Gui/DlgSettings3DView.ui +++ b/src/Gui/DlgSettings3DView.ui @@ -7,7 +7,7 @@ 0 0 477 - 500 + 407 @@ -15,7 +15,6 @@ - true @@ -91,11 +90,11 @@ will be shown at the lower left corner in opened files Rendering - - - - - If selected, Vertex Buffer Objects (VBO) will be used. + + + + + If selected, Vertex Buffer Objects (VBO) will be used. A VBO is an OpenGL feature that provides methods for uploading vertex data (position, normal vector, color, etc.) to the graphics card. VBOs offer substantial performance gains because the data resides @@ -105,27 +104,35 @@ can be rendered directly by GPU. Note: Sometimes this feature may lead to a host of different issues ranging from graphical anomalies to GPU crash bugs. Remember to report this setting as enabled when seeking support on the FreeCAD forums - - - Use OpenGL VBO (Vertex Buffer Object) - - - UseVBO - - - View - - - - + + + Use OpenGL VBO (Vertex Buffer Object) + + + UseVBO + + + View + + + + + + Render cache - + + + + 120 + 0 + + 'Render Caching' is another way to say 'Rendering Acceleration'. There are 3 options available to achieve this: @@ -155,15 +162,21 @@ but slower response to any scene changes. - + Anti-Aliasing - + + + + 120 + 0 + + What kind of multisample anti-aliasing is used @@ -200,7 +213,7 @@ but slower response to any scene changes. - + @@ -210,22 +223,34 @@ but slower response to any scene changes. - + + + + 120 + 0 + + Size of vertices in the Sketcher workbench - + Eye to eye distance for stereo modes - + + + + 120 + 0 + + Eye-to-eye distance used for stereo projections. The specified value is a factor that will be multiplied with the @@ -254,7 +279,7 @@ bounding box size of the 3D object that is currently displayed. - + Backlight is enabled with the defined color @@ -270,7 +295,7 @@ bounding box size of the 3D object that is currently displayed. - + false @@ -293,7 +318,20 @@ bounding box size of the 3D object that is currently displayed. - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + false @@ -309,7 +347,7 @@ bounding box size of the 3D object that is currently displayed. - + false @@ -320,6 +358,12 @@ bounding box size of the 3D object that is currently displayed. 0 + + + 120 + 0 + + Intensity of the backlight @@ -350,6 +394,8 @@ bounding box size of the 3D object that is currently displayed. + + @@ -463,17 +509,6 @@ bounding box size of the 3D object that is currently displayed. QDoubleSpinBox
Gui/PrefWidgets.h
- - PrefUnitSpinBox - QWidget -
Gui/PrefWidgets.h
- 1 -
- - Gui::PrefSpinBox - QSpinBox -
Gui/PrefWidgets.h
-
diff --git a/src/Gui/DlgSettingsNavigation.ui b/src/Gui/DlgSettingsNavigation.ui index 38ed66f6cb..c22fe1590f 100644 --- a/src/Gui/DlgSettingsNavigation.ui +++ b/src/Gui/DlgSettingsNavigation.ui @@ -6,8 +6,8 @@ 0 0 - 540 - 472 + 500 + 363 @@ -58,7 +58,7 @@ Qt::Horizontal - QSizePolicy::Ignored + QSizePolicy::MinimumExpanding @@ -119,258 +119,358 @@ Navigation - - - - - 3D Navigation - - - - - - - Navigation settings set - - - -1 - - - - - - - - 0 - 0 - - - - - 84 - 0 - - - - List the mouse button configs for each chosen navigation setting. + + + + + + + Direction of zoom operations will be inverted + + + Invert zoom + + + true + + + InvertZoom + + + View + + + + + + + + 0 + 0 + + + + + 60 + 0 + + + + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. - - - Mouse... - - - - - - - Orbit style - - - - - - - Rotation orbit style. -Trackball: moving the mouse horizontally will rotate the part around the y-axis -Turntable: the part will be rotated around the z-axis. - - - 1 - - - - Turntable - + + + Mouse... + + - - - Trackball - + + + + 3D Navigation + + - - - - - - New document camera orientation - - - - - - - Camera orientation for new documents - - - - - - - New document scale - - - - - - - Sets camera zoom for new documents. -The value is the diameter of the sphere to fit on the screen. - - - mm - - - 0.000010000000000 - - - 10000000.000000000000000 - - - NewDocumentCameraScale - - - View - - - 100.000000000000000 - - - - - - - true - - - Enable animated rotations - - - Enable animation - - - false - - - UseAutoRotation - - - View - - - - - - - Zoom operations will be performed at position of mouse pointer - - - Zoom at cursor - - - true - - - ZoomAtCursor - - - View - - - - - - - Zoom step - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - How much will be zoomed. -Zoom step of '1' means a factor of 7.5 for every zoom step. - - - 0.010000000000000 - - - 1.000000000000000 - - - 0.050000000000000 - - - 0.200000000000000 - - - ZoomStep - - - View - - - - - - - Direction of zoom operations will be inverted - - - Invert zoom - - - true - - - InvertZoom - - - View - - - - - - - Prevents view tilting when pinch-zooming. + + + + New document scale + + + + + + + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. - - - Disable touchscreen tilt gesture - - - true - - - DisableTouchTilt - - - View - - - - - - - Rotations in 3D will use current cursor position as center for rotation - - - Rotate at cursor - - - false - - - DragAtCursor - - - View - - + + + Disable touchscreen tilt gesture + + + true + + + DisableTouchTilt + + + View + + + + + + + Orbit style + + + + + + + + 120 + 20 + + + + + 16777215 + 16777215 + + + + Sets camera zoom for new documents. +The value is the diameter of the sphere to fit on the screen. + + + mm + + + 0.000010000000000 + + + 10000000.000000000000000 + + + NewDocumentCameraScale + + + View + + + 100.000000000000000 + + + + + + + + + + 100 + 16777215 + + + + Zoom step + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 60 + 16777215 + + + + How much will be zoomed. +Zoom step of '1' means a factor of 7.5 for every zoom step. + + + 0.010000000000000 + + + 1.000000000000000 + + + 0.050000000000000 + + + 0.200000000000000 + + + ZoomStep + + + View + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 10 + 20 + + + + + + + + + + true + + + Enable animated rotations + + + Enable animation + + + false + + + UseAutoRotation + + + View + + + + + + + + 120 + 0 + + + + + 16777215 + 16777215 + + + + Rotation orbit style. +Trackball: moving the mouse horizontally will rotate the part around the y-axis +Turntable: the part will be rotated around the z-axis. + + + 1 + + + + Turntable + + + + + Trackball + + + + + + + + Zoom operations will be performed at position of mouse pointer + + + Zoom at cursor + + + true + + + ZoomAtCursor + + + View + + + + + + + + 120 + 0 + + + + + 16777215 + 16777215 + + + + Navigation settings set + + + -1 + + + + + + + Rotations in 3D will use current cursor position as center for rotation + + + Rotate at cursor + + + false + + + DragAtCursor + + + View + + + + + + + + 120 + 0 + + + + + 16777215 + 16777215 + + + + Camera orientation for new documents + + + + + + + New document camera orientation + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 20 + 20 + + + + +