Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dashboard and settings minor rehearsal #1893

Merged
merged 21 commits into from
Nov 14, 2023
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2ad2b0e
Disable adapt to framerate by default. Remove dynamic oculus foveatio…
Meister1593 Nov 7, 2023
999d3fb
Add 'Donate to ALVR button' in About tab.
Meister1593 Nov 7, 2023
8898201
Add Hand Gestures Setup Page. Change SoftwareRequirements tab for lin…
Meister1593 Nov 7, 2023
01082ba
Default sharpening to 0.5
Meister1593 Nov 7, 2023
48e5916
Remove commented code. Remove unnecessary import.
Meister1593 Nov 7, 2023
2828d40
Reformat code. Remove commented code. Remove unnecessary import.
Meister1593 Nov 7, 2023
1c07f84
Update hand tracking controller bindings
Meister1593 Nov 7, 2023
6a69cea
Updated distrobox guide
Meister1593 Nov 7, 2023
6a9e8ef
Fix table on hand tracking bindings wiki
Meister1593 Nov 7, 2023
f2502df
Rename label to Only Touch
Meister1593 Nov 7, 2023
8484b39
Set only touch to be true by default. Added note about disabling/enab…
Meister1593 Nov 7, 2023
2d99a37
Restore adapt to framerate toggle to be true by default
Meister1593 Nov 13, 2023
e9058bd
Added automatic audio script download/placement for alvr
Meister1593 Nov 13, 2023
13ca11f
Added platform-specific cfg's for linux code
Meister1593 Nov 13, 2023
bb7d62d
Fixed link after testing
Meister1593 Nov 13, 2023
4812efc
Remove reqwest and use ureq instead. Add more platform cfgs in setup …
Meister1593 Nov 14, 2023
2f7d699
Re-added OpenUrl for windows
Meister1593 Nov 14, 2023
d4be60e
Added specific cfg checks for windows to prevent compile errors on macos
Meister1593 Nov 14, 2023
666baf1
Moved platform specific import to function. Changed windows platform …
Meister1593 Nov 14, 2023
3bcf787
Fix incorrect OpenUrl import for windows
Meister1593 Nov 14, 2023
2c9e6cd
Remove whitespaces
Meister1593 Nov 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions alvr/dashboard/src/dashboard/components/setup_wizard.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::dashboard::basic_components;
use alvr_common::{error, warn};
use alvr_packets::{FirewallRulesAction, PathValuePair, ServerRequest};
#[cfg(not(target_os = "linux"))]
#[cfg(target_os = "win64")]
Meister1593 marked this conversation as resolved.
Show resolved Hide resolved
use eframe::OpenUrl;
use eframe::{
egui::{Button, Label, Layout, RichText, Ui},
Expand Down Expand Up @@ -129,14 +129,16 @@ Make sure you have at least one output audio device.",
page_content(
ui,
"Software requirements",
if cfg!(not(target_os = "linux")) {
if cfg!(target_os = "win64") {
r"To stream the headset microphone on Windows you need to install VB-Cable or Voicemeeter."
} else {
} else if cfg!(target_os = "linux") {
r"To stream the headset microphone on Linux, you might be required to use pipewire and On connect/On disconnect script.
Script is not 100% stable and might cause some instability issues with pipewire, but it should work."
} else {
r"N/A"
},
|ui| {
#[cfg(not(target_os = "linux"))]
#[cfg(target_os = "win64")]
if ui.button("Download VB-Cable").clicked() {
ui.ctx()
.open_url(OpenUrl::same_tab("https://vb-audio.com/Cable/"));
Expand Down