From c5a652e9ad60f1ab0ee586d578daa0be79359b28 Mon Sep 17 00:00:00 2001 From: GO63-samara Date: Sat, 31 Jul 2021 02:38:25 +0400 Subject: Adding a choice of centering method --- gui/lang/nl_NL.ts | 16 ++++++++++ gui/lang/ru_RU.ts | 16 ++++++++++ gui/lang/stub.ts | 16 ++++++++++ gui/lang/zh_CN.ts | 16 ++++++++++ gui/settings-dialog.ui | 85 ++++++++++++++++++++++++++++++++++++++++++++------ gui/settings.cpp | 10 ++++++ 6 files changed, 150 insertions(+), 9 deletions(-) (limited to 'gui') diff --git a/gui/lang/nl_NL.ts b/gui/lang/nl_NL.ts index 60b84189..59d46b82 100644 --- a/gui/lang/nl_NL.ts +++ b/gui/lang/nl_NL.ts @@ -360,6 +360,22 @@ Press "clear calibration" to remove any calibration data pertaining to None Geen + + Centering method + + + + Point + + + + Wireless VR 360 + + + + Roll compensated VR 360 + + process_detector diff --git a/gui/lang/ru_RU.ts b/gui/lang/ru_RU.ts index d40b4775..8f3c360a 100644 --- a/gui/lang/ru_RU.ts +++ b/gui/lang/ru_RU.ts @@ -363,6 +363,22 @@ Press "clear calibration" to remove any calibration data pertaining to None Не назначена + + Centering method + + + + Point + + + + Wireless VR 360 + + + + Roll compensated VR 360 + + process_detector diff --git a/gui/lang/stub.ts b/gui/lang/stub.ts index b383a0d8..9dd07851 100644 --- a/gui/lang/stub.ts +++ b/gui/lang/stub.ts @@ -360,6 +360,22 @@ Press "clear calibration" to remove any calibration data pertaining to None + + Centering method + + + + Point + + + + Wireless VR 360 + + + + Roll compensated VR 360 + + process_detector diff --git a/gui/lang/zh_CN.ts b/gui/lang/zh_CN.ts index fa2d512c..a88251ce 100644 --- a/gui/lang/zh_CN.ts +++ b/gui/lang/zh_CN.ts @@ -361,6 +361,22 @@ Press "clear calibration" to remove any calibration data pertaining to None 空 + + Centering method + + + + Point + + + + Wireless VR 360 + + + + Roll compensated VR 360 + + process_detector diff --git a/gui/settings-dialog.ui b/gui/settings-dialog.ui index 6333692a..93374b06 100644 --- a/gui/settings-dialog.ui +++ b/gui/settings-dialog.ui @@ -7,7 +7,7 @@ 0 0 548 - 599 + 600 @@ -812,29 +812,39 @@ QFrame::Sunken - - + + - + 0 0 - Center at startup + Never translate the application interface - - + + + + Centering method + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + - + 0 0 - Never translate the application interface + Center at startup @@ -848,6 +858,39 @@ + + + + + 4 + 0 + + + + 3 + + + + Disabled + + + + + Point + + + + + Wireless VR 360 + + + + + Roll compensated VR 360 + + + + @@ -1569,9 +1612,15 @@ + + Qt::LeftToRight + X + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -1601,6 +1650,9 @@ Pitch + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -1608,6 +1660,9 @@ Y + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -1637,6 +1692,9 @@ Z + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -1644,6 +1702,9 @@ Roll + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -1673,6 +1734,9 @@ Yaw + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -1808,6 +1872,9 @@ 0 + + 0 + Disabled diff --git a/gui/settings.cpp b/gui/settings.cpp index 3851f0c2..cef93d19 100644 --- a/gui/settings.cpp +++ b/gui/settings.cpp @@ -59,6 +59,16 @@ options_dialog::options_dialog(std::function pause_keybindings) : tie_setting(main.center_at_startup, ui.center_at_startup); + const centering_state centering_modes[] = { + center_disabled, + center_point, + center_vr360, + center_roll_compensated, + }; + for (unsigned k = 0; k < 4; k++) + ui.cbox_centering->setItemData(k, int(centering_modes[k])); + tie_setting(main.centering_mode, ui.cbox_centering); + const reltrans_state reltrans_modes[] = { reltrans_disabled, reltrans_enabled, -- cgit v1.2.3