Merge branch 'develop' into steam-beta

Author: Raphiiko

CHANGELOG.md

@@ -10,10 +10,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - GPU acceleration for SteamVR overlays (Community contribution by [BenjaminZehowlt](https://github.com/BenjaminZehowlt))
+- VR Headset device & battery level to the device list
+- Sleep mode toggle and sleep preparation to system tray menu
 
 ### Changed
 
 - Added continuous scanning for lighthouses to replace manual scanning. 
+- Migrated to Tauri v2, and upgraded various dependencies.
+- Localized system tray menu
 
 ### Fixed
 

src-ui/app/components/device-list/device-edit-modal/device-edit-modal.component.ts

@@ -98,7 +98,10 @@ export class DeviceEditModalComponent
         return this.lighthouseDevice?.deviceName;
       }
       case 'OPENVR': {
-        if (this.ovrDevice?.handleType) {
+        if (
+          ['Controller', 'GenericTracker'].includes(this.ovrDevice?.class ?? '') &&
+          this.ovrDevice?.handleType
+        ) {
           return this.translate.instant(
             'comp.device-list.deviceRole.' + this.ovrDevice!.handleType
           );

src-ui/app/components/device-list/device-list-item/device-list-item.component.html

@@ -6,13 +6,9 @@
       </div>
       <div class="header-bar-info" (click)="editDevice()">
         <div class="device-name" translate>{{ deviceName }}</div>
-        <div class="device-serial" *ngIf="!deviceNickname && deviceRole"
-          >{{ 'comp.device-list.deviceRole.' + deviceRole | translate }}
+        <div class="device-subtitle" [class.nickname]="deviceHasNickname">
+          {{ deviceSubtitle ?? '' | translate }}
         </div>
-        <div class="device-serial" *ngIf="!deviceNickname && !deviceRole"
-          >{{ deviceIdentifier }}
-        </div>
-        <div class="device-nickname" *ngIf="deviceNickname">{{ deviceNickname }}</div>
       </div>
       <div class="header-bar-spacer"></div>
       <div class="header-bar-action" *ngIf="!isDeviceIgnored">

src-ui/app/components/device-list/device-list-item/device-list-item.component.scss

@@ -32,18 +32,17 @@
     // .device-name {
     // }
 
-    .device-serial {
+    .device-subtitle {
       color: var(--color-text-4);
-    }
-
-    .device-nickname {
-      width: 100%;
-      overflow: hidden;
-      color: var(--color-text-4);
-      font-weight: 700;
-      white-space: nowrap;
-      min-height: 0;
-      text-overflow: ellipsis;
+      &.nickname {
+        width: 100%;
+        overflow: hidden;
+        color: var(--color-text-4);
+        font-weight: 700;
+        white-space: nowrap;
+        min-height: 0;
+        text-overflow: ellipsis;
+      }
     }
 
     &:hover {

src-ui/app/components/device-list/device-list-item/device-list-item.component.ts

@@ -48,9 +48,6 @@ export class DeviceListItemComponent implements OnInit {
     this._lighthouseDevice = undefined;
     this._ovrDevice = device;
     this.deviceName = device.modelNumber;
-    this.deviceIdentifier = device.serialNumber;
-    this.deviceRole = device.handleType;
-    this.deviceNickname = this.openvr.getDeviceNickname(device);
     this.showBattery = Boolean(device.providesBatteryStatus || device.isCharging);
     this.isCharging = this.showBattery && device.isCharging;
     this.batteryPercentage = this.showBattery ? device.battery * 100 : 0;
@@ -65,6 +62,13 @@ export class DeviceListItemComponent implements OnInit {
     this.cssId = this.sanitizeIdentifierForCSS(device.serialNumber);
     this.powerButtonAnchorId = '--anchor-device-pwr-btn-' + this.cssId;
     this.showLHStatePopover = false;
+
+    const nickname = this.openvr.getDeviceNickname(device);
+    this.deviceHasNickname = Boolean(nickname);
+    if (nickname) this.deviceSubtitle = nickname;
+    else if (device.handleType && ['Controller', 'GenericTracker'].includes(device.class))
+      this.deviceSubtitle = 'comp.device-list.deviceRole.' + device.handleType;
+    else this.deviceSubtitle = device.serialNumber;
   }
 
   @Input() set lighthouseDevice(device: LighthouseDevice | undefined) {
@@ -73,9 +77,9 @@ export class DeviceListItemComponent implements OnInit {
     this._lighthouseDevice = device;
     this._ovrDevice = undefined;
     this.deviceName = 'comp.device-list.deviceName.' + device.deviceType;
-    this.deviceIdentifier = device.deviceName;
-    this.deviceRole = undefined;
-    this.deviceNickname = this.lighthouse.getDeviceNickname(device);
+    const nickname = this.lighthouse.getDeviceNickname(device);
+    this.deviceSubtitle = nickname ?? device.deviceName;
+    this.deviceHasNickname = Boolean(nickname);
     this.showBattery = false;
     this.isCharging = false;
     this.batteryPercentage = 100;
@@ -127,9 +131,8 @@ export class DeviceListItemComponent implements OnInit {
 
   mode?: 'lighthouse' | 'openvr';
   deviceName = '';
-  deviceIdentifier = '';
-  deviceRole: string | undefined = undefined;
-  deviceNickname: string | null = null;
+  deviceSubtitle: string | null = null;
+  deviceHasNickname = false;
   showBattery = false;
   isCharging = false;
   batteryPercentage = 100;

src-ui/app/components/device-list/device-list.component.ts

@@ -92,8 +92,8 @@ export class DeviceListComponent implements OnInit {
 
   processOpenVRDevices(devices: OVRDevice[]) {
     // Filter out non-controller and non-tracker devices
-    devices = devices.filter(
-      (device) => device.class === 'Controller' || device.class === 'GenericTracker'
+    devices = devices.filter((device) =>
+      ['HMD', 'Controller', 'GenericTracker'].includes(device.class)
     );
     // Add missing device categories
     uniq(devices.map((device) => device.class))
@@ -151,10 +151,11 @@ export class DeviceListComponent implements OnInit {
         return 'controller';
       case 'GenericTracker':
         return 'tracker';
+      case 'HMD':
+        return 'hmd';
       case 'TrackingReference':
       case 'DisplayRedirect':
       case 'Invalid':
-      case 'HMD':
       default:
         return undefined;
     }
@@ -223,7 +224,7 @@ export class DeviceListComponent implements OnInit {
   }
 
   sortDeviceCategories() {
-    const sortKeys = ['OpenVR-Controller', 'OpenVR-GenericTracker', 'Lighthouse'];
+    const sortKeys = ['OpenVR-HMD', 'OpenVR-Controller', 'OpenVR-GenericTracker', 'Lighthouse'];
     const getKey = (category: DisplayCategory) => {
       switch (category.type) {
         case 'OpenVR':
@@ -238,6 +239,8 @@ export class DeviceListComponent implements OnInit {
 
   getCategoryLabelForOpenVRDeviceClass(deviceClass: OVRDeviceClass): string {
     switch (deviceClass) {
+      case 'HMD':
+        return 'comp.device-list.category.HMD';
       case 'Controller':
         return 'comp.device-list.category.Controller';
       case 'GenericTracker':

src-ui/app/services/system-tray.service.ts

@@ -17,6 +17,7 @@ import { SleepService } from './sleep.service';
 import { TranslateService } from '@ngx-translate/core';
 import { error } from '@tauri-apps/plugin-log';
 import { invoke } from '@tauri-apps/api/core';
+import { SleepPreparationService } from './sleep-preparation.service';
 
 const CLOSE_TO_SYSTEM_TRAY_COMMAND = 'set_close_to_system_tray';
 
@@ -29,6 +30,7 @@ export class SystemTrayService {
   constructor(
     private readonly appSettingsService: AppSettingsService,
     private readonly sleepService: SleepService,
+    private readonly sleepPreparationService: SleepPreparationService,
     private readonly translateService: TranslateService
   ) {}
 
@@ -41,6 +43,8 @@ export class SystemTrayService {
     this._tray.next(tray);
     combineLatest([
       this.sleepService.mode,
+      this.sleepPreparationService.sleepPreparationAvailable,
+      this.sleepPreparationService.sleepPreparationTimedOut,
       this.translateService.onLangChange.pipe(startWith(this.translateService.currentLang)),
     ])
       .pipe(debounceTime(50))
@@ -85,6 +89,15 @@ export class SystemTrayService {
             }
           },
         },
+        {
+          text: this.translateService.instant('systemTray.prepareForSleep'),
+          enabled:
+            (await firstValueFrom(this.sleepPreparationService.sleepPreparationAvailable)) &&
+            !(await firstValueFrom(this.sleepPreparationService.sleepPreparationTimedOut)),
+          action: async () => {
+            await this.sleepPreparationService.prepareForSleep();
+          },
+        },
         {
           item: 'Separator',
         },

src-ui/assets/i18n/en.json

@@ -1,7 +1,8 @@
 {
   "systemTray": {
     "sleepMode": "Sleep Mode",
-    "quit": "Quit OyasumiVR"
+    "quit": "Quit OyasumiVR",
+    "prepareForSleep": "Prepare for sleep"
   },
   "about": {
     "author": {
@@ -355,6 +356,7 @@
     },
     "device-list": {
       "category": {
+        "HMD": "Headset",
         "Controller": "Controllers",
         "GenericTracker": "Trackers",
         "Lighthouse": "Base Stations",