diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/lang/nl_NL.ts | 16 | ||||
| -rw-r--r-- | gui/lang/ru_RU.ts | 16 | ||||
| -rw-r--r-- | gui/lang/stub.ts | 16 | ||||
| -rw-r--r-- | gui/lang/zh_CN.ts | 16 | ||||
| -rw-r--r-- | gui/settings-dialog.ui | 85 | ||||
| -rw-r--r-- | gui/settings.cpp | 10 |
6 files changed, 150 insertions, 9 deletions
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 <source>None</source> <translation type="unfinished">Geen</translation> </message> + <message> + <source>Centering method</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Point</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Wireless VR 360</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Roll compensated VR 360</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>process_detector</name> 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 <source>None</source> <translation>Не назначена</translation> </message> + <message> + <source>Centering method</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Point</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Wireless VR 360</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Roll compensated VR 360</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>process_detector</name> 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 <source>None</source> <translation type="unfinished"></translation> </message> + <message> + <source>Centering method</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Point</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Wireless VR 360</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Roll compensated VR 360</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>process_detector</name> 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 <source>None</source> <translation>空</translation> </message> + <message> + <source>Centering method</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Point</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Wireless VR 360</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Roll compensated VR 360</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>process_detector</name> 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 @@ <x>0</x> <y>0</y> <width>548</width> - <height>599</height> + <height>600</height> </rect> </property> <property name="windowTitle"> @@ -812,29 +812,39 @@ <enum>QFrame::Sunken</enum> </property> <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QCheckBox" name="center_at_startup"> + <item row="1" column="0"> + <widget class="QCheckBox" name="disable_translation"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="text"> - <string>Center at startup</string> + <string>Never translate the application interface</string> </property> </widget> </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="disable_translation"> + <item row="0" column="1"> + <widget class="QLabel" name="label_18"> + <property name="text"> + <string>Centering method</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QCheckBox" name="center_at_startup"> <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> + <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="text"> - <string>Never translate the application interface</string> + <string>Center at startup</string> </property> </widget> </item> @@ -848,6 +858,39 @@ </property> </widget> </item> + <item row="0" column="2"> + <widget class="QComboBox" name="cbox_centering"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> + <horstretch>4</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="currentIndex"> + <number>3</number> + </property> + <item> + <property name="text"> + <string>Disabled</string> + </property> + </item> + <item> + <property name="text"> + <string>Point</string> + </property> + </item> + <item> + <property name="text"> + <string>Wireless VR 360</string> + </property> + </item> + <item> + <property name="text"> + <string>Roll compensated VR 360</string> + </property> + </item> + </widget> + </item> </layout> </widget> </item> @@ -1569,9 +1612,15 @@ </item> <item row="0" column="2"> <widget class="QLabel" name="label_4"> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> <property name="text"> <string>X</string> </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="0" column="3"> @@ -1601,6 +1650,9 @@ <property name="text"> <string>Pitch</string> </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="1" column="2"> @@ -1608,6 +1660,9 @@ <property name="text"> <string>Y</string> </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="1" column="1"> @@ -1637,6 +1692,9 @@ <property name="text"> <string>Z</string> </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="2" column="0"> @@ -1644,6 +1702,9 @@ <property name="text"> <string>Roll</string> </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="1" column="3"> @@ -1673,6 +1734,9 @@ <property name="text"> <string>Yaw</string> </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> </widget> </item> <item row="0" column="1"> @@ -1808,6 +1872,9 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="currentIndex"> + <number>0</number> + </property> <item> <property name="text"> <string>Disabled</string> 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<void(bool)> 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, |