4.0.0 release (desktop overlay adjustment removal, bindings tab/button change, documentation update) (#315)
* removed desktop overlay tab moved width to steamvrtab * added binding page launch button * changed binding page button location * removed binding page and associated resources * clarified functionality via text update to desktop width box * updated version string * changed string to release * updated photos * updated ivrscreenshot * updated documentation * removed old qml references * added missing actions to documentation * hid audio profiles
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 294 KiB |
@@ -1,19 +0,0 @@
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.0
|
||||
import QtQuick.Layouts 1.3
|
||||
import ovras.advsettings 1.0
|
||||
import "common"
|
||||
|
||||
MyStackViewPage {
|
||||
headerText: "Bindings Guide"
|
||||
|
||||
content: ColumnLayout {
|
||||
Image {
|
||||
source: "qrc:/bindings/bindings"
|
||||
sourceSize.width: 1120
|
||||
sourceSize.height: 659
|
||||
Layout.fillHeight: true
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -122,16 +122,6 @@ MyStackViewPage {
|
||||
}
|
||||
}
|
||||
|
||||
MyPushButton {
|
||||
id: desktopOverlayButton
|
||||
activationSoundEnabled: false
|
||||
text: "Desktop Overlay"
|
||||
Layout.fillWidth: true
|
||||
onClicked: {
|
||||
MyResources.playFocusChangedSound()
|
||||
mainView.push(desktopOverlayPage)
|
||||
}
|
||||
}
|
||||
|
||||
MyPushButton {
|
||||
id: statisticsButton
|
||||
@@ -157,8 +147,7 @@ MyStackViewPage {
|
||||
text: " Bindings"
|
||||
Layout.fillWidth: true
|
||||
onClicked: {
|
||||
MyResources.playFocusChangedSound()
|
||||
mainView.push(bindingsPage)
|
||||
SteamVRTabController.launchBindingUI()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ ColumnLayout {
|
||||
MyText {
|
||||
Layout.preferredWidth: 150
|
||||
text: "Audio Profile:"
|
||||
visible: false
|
||||
}
|
||||
|
||||
MyComboBox {
|
||||
@@ -32,6 +33,7 @@ ColumnLayout {
|
||||
Layout.preferredWidth: 250
|
||||
model: [""]
|
||||
enabled: false
|
||||
visible: false
|
||||
onCurrentIndexChanged: {
|
||||
if (currentIndex > 0) {
|
||||
audioApplyProfileButton.enabled = true
|
||||
@@ -46,6 +48,7 @@ ColumnLayout {
|
||||
MyPushButton {
|
||||
id: audioApplyProfileButton
|
||||
enabled: false
|
||||
visible: false
|
||||
Layout.preferredWidth: 150
|
||||
text: "Apply"
|
||||
onClicked: {
|
||||
@@ -66,6 +69,7 @@ ColumnLayout {
|
||||
MyPushButton {
|
||||
id: audioDeleteProfileButton
|
||||
enabled: false
|
||||
visible: false
|
||||
Layout.preferredWidth: 200
|
||||
text: "Delete Profile"
|
||||
onClicked: {
|
||||
@@ -77,6 +81,7 @@ ColumnLayout {
|
||||
}
|
||||
MyPushButton {
|
||||
enabled: false
|
||||
visible: false
|
||||
Layout.preferredWidth: 200
|
||||
text: "New Profile"
|
||||
onClicked: {
|
||||
|
||||
@@ -75,16 +75,6 @@ Rectangle {
|
||||
visible:false
|
||||
}
|
||||
|
||||
property DesktopOverlayPage desktopOverlayPage: DesktopOverlayPage {
|
||||
stackView: mainView
|
||||
visible: false
|
||||
}
|
||||
|
||||
property BindingsPage bindingsPage: BindingsPage {
|
||||
stackView: mainView
|
||||
visible: false
|
||||
}
|
||||
|
||||
StackView {
|
||||
id: mainView
|
||||
anchors.fill: parent
|
||||
|
||||
@@ -5,7 +5,7 @@ import ovras.advsettings 1.0
|
||||
import "../../common"
|
||||
|
||||
FullWidthSliderBox {
|
||||
headerMessage: "Overlay Width"
|
||||
headerMessage: "Desktop Overlay Width: (refresh dashboard to apply)"
|
||||
|
||||
lowerLimit: 0.0
|
||||
upperLimit: 32.0
|
||||
|
||||
@@ -5,6 +5,7 @@ import ovras.advsettings 1.0
|
||||
import "../common"
|
||||
import "camera"
|
||||
import "steamvrmisc"
|
||||
import "../desktop_overlay_page/desktop_size"
|
||||
|
||||
MyStackViewPage {
|
||||
width: 1200
|
||||
@@ -18,6 +19,9 @@ MyStackViewPage {
|
||||
CameraGroupBox {
|
||||
id: cameraGroupBox}
|
||||
|
||||
SteamDesktopGroupBox {
|
||||
}
|
||||
|
||||
Item { Layout.fillHeight: true; Layout.fillWidth: true}
|
||||
|
||||
RowLayout {
|
||||
|
||||
@@ -17,9 +17,6 @@
|
||||
<file alias="previous">img/audio/media_keys/outline_skip_previous_white_24dp.svg</file>
|
||||
<file alias="stop">img/audio/media_keys/outline_stop_white_24dp.svg</file>
|
||||
</qresource>
|
||||
<qresource prefix="/bindings">
|
||||
<file alias="bindings">img/bindings/bindings.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="/main_menu_icons">
|
||||
<file alias="audio_tab_icon">img/main_menu_icons/audio_tab_icon.svg</file>
|
||||
<file alias="bindings_tab_icon">img/main_menu_icons/bindings_tab_icon.svg</file>
|
||||
|
||||
@@ -350,6 +350,26 @@ bool SteamVRTabController::cameraDashboard() const
|
||||
return m_cameraDashboard;
|
||||
}
|
||||
|
||||
void SteamVRTabController::launchBindingUI()
|
||||
{
|
||||
vr::VRActionSetHandle_t actionHandle = 0;
|
||||
vr::VRInputValueHandle_t inputHandle = 0;
|
||||
|
||||
auto error2 = vr::VRInput()->GetInputSourceHandle( "/user/hand/right",
|
||||
&inputHandle );
|
||||
if ( error2 != vr::VRInputError_None )
|
||||
{
|
||||
LOG( ERROR )
|
||||
<< "failed to get input handle? is your right controller on?";
|
||||
}
|
||||
auto error = vr::VRInput()->OpenBindingUI(
|
||||
application_strings::applicationKey, actionHandle, inputHandle, false );
|
||||
if ( error != vr::VRInputError_None )
|
||||
{
|
||||
LOG( ERROR ) << "Input Error: " << error;
|
||||
}
|
||||
}
|
||||
|
||||
void SteamVRTabController::setCameraDashboard( const bool value,
|
||||
const bool notify )
|
||||
{
|
||||
|
||||
@@ -71,6 +71,8 @@ public:
|
||||
bool cameraRoom() const;
|
||||
bool cameraDashboard() const;
|
||||
|
||||
Q_INVOKABLE void launchBindingUI();
|
||||
|
||||
public slots:
|
||||
|
||||
void setPerformanceGraph( bool value, bool notify = true );
|
||||
|
||||
Reference in New Issue
Block a user