Maya moves the camera with Alt and any button (left orbits, middle pans, right zooms), middle drag also pans. HFSS pans with Alt+left drag and zooms with Shift+Alt+left; its Ctrl+left orbit is the drag from empty space every preset already has, so a Ctrl+click on geometry still adds to the selection. The help texts are in the catalog for every locale that has the other presets' help. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
92fc868aa9
commit
8f8df03358
3 files changed
+110
-2
No files matched your search
@@ -0,0 +1,58 @@
|
||||
{
|
||||
"ar": {
|
||||
"nav.hfss.help": "Alt مع السحب بالزر الأيسر يُزيح العرض، وShift+Alt مع الأيسر يكبّره، وCtrl مع السحب بالأيسر من مساحة فارغة يدوّره",
|
||||
"nav.maya.help": "Alt مع السحب بالزر الأيسر يدوّر العرض، وAlt مع الأوسط يُزيحه، وAlt مع الأيمن يكبّره؛ والسحب بالزر الأوسط يُزيح أيضًا"
|
||||
},
|
||||
"da": {
|
||||
"nav.hfss.help": "Alt+træk med venstre museknap panorerer, Shift+Alt+venstre zoomer, Ctrl+træk med venstre fra et tomt område roterer visningen",
|
||||
"nav.maya.help": "Alt+træk med venstre museknap roterer visningen, Alt+midterste panorerer, Alt+højre zoomer; træk med midterste museknap panorerer også"
|
||||
},
|
||||
"de": {
|
||||
"nav.hfss.help": "Alt+Linksziehen verschiebt, Umschalt+Alt+Linksziehen zoomt, Strg+Linksziehen auf leerer Fläche dreht",
|
||||
"nav.maya.help": "Alt+Linksziehen dreht, Alt+Mitte verschiebt, Alt+Rechtsziehen zoomt; mittleres Ziehen verschiebt ebenfalls"
|
||||
},
|
||||
"en": {
|
||||
"nav.hfss.help": "Alt+left drag pans, Shift+Alt+left zooms, Ctrl+left drag on empty space orbits",
|
||||
"nav.maya.help": "Alt+left drag orbits, Alt+middle pans, Alt+right zooms; middle drag also pans"
|
||||
},
|
||||
"fr": {
|
||||
"nav.hfss.help": "Alt+glisser gauche fait un panoramique, Maj+Alt+gauche zoome, Ctrl+glisser gauche sur un espace vide fait orbiter",
|
||||
"nav.maya.help": "Alt+glisser gauche fait orbiter, Alt+milieu fait un panoramique, Alt+droit zoome ; glisser avec le milieu fait aussi un panoramique"
|
||||
},
|
||||
"he": {
|
||||
"nav.hfss.help": "Alt וגרירה שמאלית מזיזים, Shift+Alt וגרירה שמאלית מבצעים זום, Ctrl וגרירה שמאלית משטח ריק מסובבים",
|
||||
"nav.maya.help": "Alt וגרירה שמאלית מסובבים, Alt וגרירה אמצעית מזיזים, Alt וגרירה ימנית מבצעים זום; גם גרירה אמצעית מזיזה"
|
||||
},
|
||||
"ja": {
|
||||
"nav.hfss.help": "Alt+左ドラッグでパン、Shift+Alt+左ドラッグでズーム、何もない所からの Ctrl+左ドラッグで回転。",
|
||||
"nav.maya.help": "Alt+左ドラッグで回転、Alt+中ドラッグでパン、Alt+右ドラッグでズーム。中ドラッグでもパン。"
|
||||
},
|
||||
"ko": {
|
||||
"nav.hfss.help": "Alt+왼쪽 드래그는 이동, Shift+Alt+왼쪽 드래그는 확대/축소, 빈 공간에서 Ctrl+왼쪽 드래그는 회전입니다",
|
||||
"nav.maya.help": "Alt+왼쪽 드래그는 회전, Alt+가운데 드래그는 이동, Alt+오른쪽 드래그는 확대/축소입니다. 가운데 드래그로도 이동합니다"
|
||||
},
|
||||
"nb": {
|
||||
"nav.hfss.help": "Alt+venstredrag panorerer, Shift+Alt+venstredrag zoomer, Ctrl+venstredrag fra tomt område roterer",
|
||||
"nav.maya.help": "Alt+venstredrag roterer, Alt+midtdrag panorerer, Alt+høyredrag zoomer; midtdrag panorerer også"
|
||||
},
|
||||
"pt-BR": {
|
||||
"nav.hfss.help": "Alt+arrastar com o esquerdo desloca, Shift+Alt+esquerdo aplica zoom, Ctrl+arrastar com o esquerdo em área vazia orbita",
|
||||
"nav.maya.help": "Alt+arrastar com o esquerdo orbita, Alt+meio desloca, Alt+direito aplica zoom; arrastar com o meio também desloca"
|
||||
},
|
||||
"tr": {
|
||||
"nav.hfss.help": "Alt+sol sürükleme kaydırır, Shift+Alt+sol yakınlaştırır, boş alanda Ctrl+sol sürükleme döndürür",
|
||||
"nav.maya.help": "Alt+sol sürükleme döndürür, Alt+orta kaydırır, Alt+sağ yakınlaştırır; orta sürükleme ayrıca kaydırır"
|
||||
},
|
||||
"uk": {
|
||||
"nav.hfss.help": "Alt+ліва панорамує, Shift+Alt+ліва масштабує, Ctrl+ліва з порожнього місця обертає",
|
||||
"nav.maya.help": "Alt+ліва обертає, Alt+середня панорамує, Alt+права масштабує; середня також панорамує"
|
||||
},
|
||||
"vi": {
|
||||
"nav.hfss.help": "Alt+kéo chuột trái để trượt, Shift+Alt+chuột trái để thu phóng, Ctrl+kéo chuột trái từ vùng trống để xoay",
|
||||
"nav.maya.help": "Alt+kéo chuột trái để xoay, Alt+chuột giữa để trượt, Alt+chuột phải để thu phóng; kéo chuột giữa cũng trượt"
|
||||
},
|
||||
"zh": {
|
||||
"nav.hfss.help": "Alt+左键拖动平移,Shift+Alt+左键拖动缩放,在空白处 Ctrl+左键拖动旋转",
|
||||
"nav.maya.help": "Alt+左键拖动旋转,Alt+中键拖动平移,Alt+右键拖动缩放;中键拖动也可平移"
|
||||
}
|
||||
}
|
||||
@@ -56,6 +56,7 @@ impl NavKeys {
|
||||
const NONE: NavKeys = NavKeys { shift: false, ctrl: false, alt: false };
|
||||
const SHIFT: NavKeys = NavKeys { shift: true, ctrl: false, alt: false };
|
||||
const CTRL: NavKeys = NavKeys { shift: false, ctrl: true, alt: false };
|
||||
const ALT: NavKeys = NavKeys { shift: false, ctrl: false, alt: true };
|
||||
const SHIFT_ALT: NavKeys = NavKeys { shift: true, ctrl: false, alt: true };
|
||||
|
||||
/// All of these keys are held (Ctrl is Cmd on macOS).
|
||||
@@ -99,7 +100,7 @@ use NavButton::{Left, Middle, Right};
|
||||
use NavMode::{Orbit, Pan, Zoom};
|
||||
|
||||
/// The mouse mappings. The first is the default.
|
||||
pub const NAV_PRESETS: [NavPreset; 8] = [
|
||||
pub const NAV_PRESETS: [NavPreset; 10] = [
|
||||
NavPreset {
|
||||
id: "fusion",
|
||||
label: "Fusion",
|
||||
@@ -145,6 +146,18 @@ pub const NAV_PRESETS: [NavPreset; 8] = [
|
||||
bind(Right, NavKeys::NONE, Orbit),
|
||||
],
|
||||
},
|
||||
NavPreset {
|
||||
id: "maya",
|
||||
label: "Maya",
|
||||
help: "Alt+left drag orbits, Alt+middle pans, Alt+right zooms; middle drag also pans",
|
||||
reverse_zoom: false,
|
||||
bindings: &[
|
||||
bind(Left, NavKeys::ALT, Orbit),
|
||||
bind(Middle, NavKeys::ALT, Pan),
|
||||
bind(Right, NavKeys::ALT, Zoom),
|
||||
bind(Middle, NavKeys::NONE, Pan),
|
||||
],
|
||||
},
|
||||
NavPreset {
|
||||
id: "blender",
|
||||
label: "Blender",
|
||||
@@ -172,6 +185,15 @@ pub const NAV_PRESETS: [NavPreset; 8] = [
|
||||
bind(Middle, NavKeys::NONE, Pan),
|
||||
],
|
||||
},
|
||||
NavPreset {
|
||||
id: "hfss",
|
||||
label: "HFSS",
|
||||
help: "Alt+left drag pans, Shift+Alt+left zooms, Ctrl+left drag on empty space orbits",
|
||||
reverse_zoom: false,
|
||||
// Ctrl+left orbit is the drag from empty space every preset has: as a binding it would
|
||||
// also take a Ctrl+click on geometry, which adds to the selection.
|
||||
bindings: &[bind(Left, NavKeys::SHIFT_ALT, Zoom), bind(Left, NavKeys::ALT, Pan)],
|
||||
},
|
||||
NavPreset {
|
||||
id: TOUCHPAD_NAV,
|
||||
label: "Touchpad",
|
||||
@@ -5409,6 +5431,34 @@ mod tests {
|
||||
assert_eq!(format_length(25.4, "in", 3), "1.000 in");
|
||||
}
|
||||
|
||||
/// #6474, #2742: Maya moves the camera with Alt and any button, HFSS with Alt or Shift+Alt and
|
||||
/// the left button. A plain left drag still selects, and HFSS leaves Ctrl+left to the drag
|
||||
/// from empty space every preset has, so a Ctrl+click on geometry still adds to the selection.
|
||||
#[test]
|
||||
fn maya_and_hfss_presets_navigate_with_alt() {
|
||||
let mut app = SolveApp::new(solidcraft_engine::Session::default(), Default::default());
|
||||
let none = Modifiers::default();
|
||||
let alt = Modifiers { alt: true, ..Default::default() };
|
||||
let shift_alt = Modifiers { shift: true, alt: true, ..Default::default() };
|
||||
let ctrl = Modifiers { ctrl: true, ..Default::default() };
|
||||
set(&mut app, &json!({"nav": "maya"})).unwrap();
|
||||
assert_eq!(nav_mode(&app, NavButton::Left, alt), Some(NavMode::Orbit));
|
||||
assert_eq!(nav_mode(&app, NavButton::Middle, alt), Some(NavMode::Pan));
|
||||
assert_eq!(nav_mode(&app, NavButton::Right, alt), Some(NavMode::Zoom));
|
||||
assert_eq!(nav_mode(&app, NavButton::Middle, none), Some(NavMode::Pan));
|
||||
assert_eq!(nav_mode(&app, NavButton::Left, none), None, "a plain left drag selects");
|
||||
assert_eq!(nav_mode(&app, NavButton::Right, none), None, "a plain right click opens the context menu");
|
||||
set(&mut app, &json!({"nav": "hfss"})).unwrap();
|
||||
assert_eq!(nav_mode(&app, NavButton::Left, alt), Some(NavMode::Pan));
|
||||
assert_eq!(nav_mode(&app, NavButton::Left, shift_alt), Some(NavMode::Zoom));
|
||||
assert_eq!(nav_mode(&app, NavButton::Left, none), None);
|
||||
assert_eq!(nav_mode(&app, NavButton::Left, ctrl), None);
|
||||
assert_eq!(zoom_sign(&app), 1.0);
|
||||
let mut other = SolveApp::new(solidcraft_engine::Session::default(), Default::default());
|
||||
other.load_prefs(&app.prefs());
|
||||
assert_eq!(other.preferences.nav, "hfss");
|
||||
}
|
||||
|
||||
/// The dialog: changes apply at once, Cancel puts back what was there when it opened, Apply
|
||||
/// keeps them, Restore Defaults resets one page, and the shortcuts menus open its page.
|
||||
#[test]
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
Esc or a click elsewhere closes the list. Clicking again on the same spot, with nothing changed
|
||||
in between, selects the next thing in that list. The
|
||||
wheel zooms at the cursor, the middle button pans and right-drag orbits freely (the mouse
|
||||
preset in Preferences switches to SolidWorks, Inventor, Alias, Blender, Tinkercad, OpenSCAD or Touchpad style). On a
|
||||
preset in Preferences switches to SolidWorks, Inventor, Alias, Maya, Blender, Tinkercad, OpenSCAD, HFSS or Touchpad style). On a
|
||||
trackpad, pinch zooms and two-finger scroll pans (Navigation › Two-finger scroll pans;
|
||||
off: scroll zooms like the wheel); mouse wheels zoom and the thumb wheel pans sideways.
|
||||
With the **Fusion** preset and two-finger pan enabled, hold **Shift** while scrolling with
|
||||
|
||||
Reference in new issue
Block a user