diff --git a/Readme.md b/Readme.md index ee1dfd9..546d735 100644 --- a/Readme.md +++ b/Readme.md @@ -1,5 +1,5 @@ -![language](https://img.shields.io/badge/Language-C%2B%2B11-green.svg) ![dependencies](https://img.shields.io/badge/Dependencies-OpenVR%2C%20Qt5-green.svg) ![license_gpl3](https://img.shields.io/badge/License-GPL%203.0-green.svg) +![language](https://img.shields.io/badge/Language-C%2B%2B11%2C%20QML-green.svg) ![dependencies](https://img.shields.io/badge/Dependencies-OpenVR%2C%20Qt5-green.svg) ![license_gpl3](https://img.shields.io/badge/License-GPL%203.0-green.svg) # OpenVR Advanced Settings Overlay @@ -19,6 +19,7 @@ Adds an overlay to the OpenVR dashboard that allows access to advanced settings. - Mute/unmute and set volume of audio mirror device. - Mute/unmute and set volume of microphone device. - Implements push-to-talk and allows to configure push-to-talk profiles. +- Desktop mode shows a window on the desktop instead of a vr overlay. # Usage @@ -28,7 +29,7 @@ To install for the first time simply start AdvancedSettings.exe once while Steam To upgrade an existing installation first stop SteamVR, then either override the old files or delete the old files (very important, otherwise SteamVR will always start the old version). At last start SteamVR and run AdvancedSettings.exe once (only when you don't have overridden the old files). -When you have installed SteamVR to a different path than the default one, "Restart SteamVR" will not work. To resolve the issue go to the application directory, open the file restartvrserver.bat and change the path to wherever you have SteamVR installed. +Executing startdesktopmode.bat shows a window on the desktop instead of a vr overlay. Desktop mode can be used alongside an already running vr overlay instance. # Documentation @@ -114,6 +115,8 @@ Allows you to fix the height of your floor. Just place one controller on your fl - Application autostart can also be configured in the SteamVR menu (SteamVR->Settings->Applications->"Advanced Settings"). +- You can modify the shutdown wait time when restarting SteamVR by opening restartvrserver.bat and changing the number behind "timeout /t" (unit is seconds). + # Known Bugs - None yet. diff --git a/bin/windeployqt.bat b/bin/windeployqt.bat index 692ce1e..195ea2d 100644 --- a/bin/windeployqt.bat +++ b/bin/windeployqt.bat @@ -1,7 +1,7 @@ cd win64 -windeployqt.exe --dir qtdata --libdir . --plugindir qtdata/plugins --no-system-d3d-compiler --no-opengl-sw --debug --qmldir res/qml AdvancedSettings.exe +windeployqt.exe --dir qtdata --libdir . --plugindir qtdata/plugins --no-system-d3d-compiler --no-opengl-sw --release --qmldir res/qml AdvancedSettings.exe @REM Debug: @REM windeployqt.exe --dir qtdata --libdir . --plugindir qtdata/plugins --no-system-d3d-compiler --compiler-runtime --no-opengl-sw --debug --qmldir res/qml AdvancedSettings.exe diff --git a/src/logging.h b/src/logging.h index 0cf28c2..6c50c49 100644 --- a/src/logging.h +++ b/src/logging.h @@ -1,7 +1,16 @@ #pragma once // easylogging includes -#define ELPP_THREAD_SAFE -#define ELPP_QT_LOGGING -#define ELPP_NO_DEFAULT_LOG_FILE -#include +#ifndef _DEBUG + #define _DEBUG + #define ELPP_THREAD_SAFE + #define ELPP_QT_LOGGING + #define ELPP_NO_DEFAULT_LOG_FILE + #include + #undef _DEBUG +#else + #define ELPP_THREAD_SAFE + #define ELPP_QT_LOGGING + #define ELPP_NO_DEFAULT_LOG_FILE + #include +#endif diff --git a/src/main.cpp b/src/main.cpp index 622c7e0..da989e6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -52,9 +52,11 @@ int main(int argc, char *argv[]) { // Configure logger START_EASYLOGGINGPP(argc, argv); el::Loggers::addFlag(el::LoggingFlag::DisableApplicationAbortOnFatalLog); - if (QFile::exists(logConfigFileName)) { - el::Configurations conf(logConfigFileName); + auto logconfigfile = QFileInfo(logConfigFileName).absoluteFilePath(); + if (QFile::exists(logconfigfile)) { + el::Configurations conf(logconfigfile.toStdString()); el::Loggers::reconfigureAllLoggers(conf); + LOG(INFO) << "Log Config: " << QDir::toNativeSeparators(logconfigfile).toStdString(); } else { el::Configurations conf; conf.parseFromText(logConfigDefault);