Skip to content

Commit

Permalink
2.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@TuTAH1
TuTAH1 committed Oct 8, 2024
1 parent 0df17d9 commit d9beaed
Show file tree
Hide file tree
Showing 29 changed files with 977 additions and 393 deletions.
42 changes: 42 additions & 0 deletions App.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="SteamVR_OculusDash_Switcher.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<userSettings>
<SteamVR_OculusDash_Switcher.Properties.Settings>
<setting name="OneClickMode" serializeAs="String">
<value>True</value>
</setting>
<setting name="SteamVRDisablingMethod" serializeAs="String">
<value>-1</value>
</setting>
<setting name="Language" serializeAs="String">
<value />
</setting>
<setting name="RealismLevel" serializeAs="String">
<value>1</value>
</setting>
<setting name="SteamVR_Location" serializeAs="String">
<value />
</setting>
<setting name="Oculus_Location" serializeAs="String">
<value />
</setting>
<setting name="KillSteamVR_Enabled" serializeAs="String">
<value>True</value>
</setting>
<setting name="KillOculusDash" serializeAs="String">
<value>True</value>
</setting>
<setting name="BlackMode" serializeAs="String">
<value>False</value>
</setting>
<setting name="Current_SteamVRDisablingMethod" serializeAs="String">
<value>None</value>
</setting>
</SteamVR_OculusDash_Switcher.Properties.Settings>
</userSettings>
</configuration>
4 changes: 2 additions & 2 deletions Forms/ControlsTipsForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
using System.Windows.Forms;
using SteamVR_OculusDash_Switcher.Properties.Localization;
using Titanium;
using static Titanium.Forms;
using static SteamVR_OculusDash_Switcher.Program;
using static Titanium.Forms;

namespace SteamVR_OculusDash_Switcher.Forms
{
public partial class ControlsTipsForm : Form
public partial class ControlsTipsForm : Form
{
public ControlsTipsForm()
{
Expand Down
18 changes: 6 additions & 12 deletions Forms/SettingsForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.Drawing;
using System.Globalization;
using System.IO;
using System.Media;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
Expand All @@ -17,7 +16,7 @@

namespace SteamVR_OculusDash_Switcher
{
public partial class SettingsForm : Form
public partial class SettingsForm : Form
{
public SettingsForm()
{
Expand Down Expand Up @@ -144,24 +143,19 @@ private void btnApply_Click(object sender, EventArgs e)
{
Thread.CurrentThread.CurrentUICulture = ((Language)comboLanguage.SelectedItem).Culture;
restartControlBecouseStupidWinformsCantDoSuchBasicThingAsClearCombobox = true;

ErrorTaskDialog.InitializeDictionary(
LocalizationStrings.ErrorTaskDialog__OpenMicrosoftDocs,
LocalizationStrings.ErrorTaskDialog__Copy_to_Clipboard,
LocalizationStrings.ErrorTaskDialog__Open_Inner_Exception,
LocalizationStrings.Button__Close);
}

if (comboSteamVRDisableMethod.SelectedItem!= null && Settings.Default.SteamVRDisablingMethod != (SteamVRMethod)comboSteamVRDisableMethod.SelectedItem)
if (comboSteamVRDisableMethod.SelectedItem!= null && Settings.Default.SteamVRDisablingMethod != (SteamVRMethod)comboSteamVRDisableMethod.SelectedItem) //: if method changed
{
if (_SteamVr.IsBroken)

/*if (_SteamVr.IsBroken)
{
if (MessageBox.Show("SteamVR needs to be restored before changing method. Do it now?", "Do you realy read this captions?", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
_SteamVr.Restore();
else
comboSteamVRDisableMethod.SelectedItem = _SteamVr.Method;
}
Settings.Default.SteamVRDisablingMethod = _SteamVr.Method = (SteamVRMethod)comboSteamVRDisableMethod.SelectedItem;
}*/
Settings.Default.SteamVRDisablingMethod = _SteamVr.Method = (SteamVRMethod)comboSteamVRDisableMethod.SelectedItem; //: set new method
}

Settings.Default.KillOculusDash = cbKillOculus.Checked;
Expand Down
53 changes: 53 additions & 0 deletions Libs/ErrorTaskDialog.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
using System;
using System.Threading;
using System.Windows.Forms;
using TaskDialogButton = Ookii.Dialogs.WinForms.TaskDialogButton;
using Localization = Titanium.ErrorTaskDialog_Localisation;

namespace Titanium
{

public static class ErrorTaskDialog
{
public static void ShowMessageBox(this Exception Error, string Title = null)
{
if (Error == null) return;


Ookii.Dialogs.WinForms.TaskDialog taskDialog = new();
taskDialog.WindowTitle = Title ?? Localization.Title_Error;
taskDialog.Content = Error.Message;
//if(Error.Data.Count!=0) taskDialog.CollapsedControlText = Error.Data.ToDictionary().ToStringT();
if (Error.HelpLink != null) taskDialog.Footer = $"<a href=\"{Error.HelpLink}\">{"d"}</a>";
//extract "close" localisation from resource

TaskDialogButton closeBtn = new(Localization.Close),
copyBtn = new(Localization.Copy_to_Clipboard),
innerExceptionBtn = new(Localization.Open_Inner_Exception),
callStack = new(Localization.Open_Callstack);
innerExceptionBtn.Enabled = Error.InnerException != null;
taskDialog.Buttons.Add(closeBtn);
taskDialog.Buttons.Add(copyBtn);
taskDialog.Buttons.Add(callStack);
taskDialog.Buttons.Add(innerExceptionBtn);

var button = taskDialog.ShowDialog();
if (button == closeBtn) taskDialog.Dispose();
if (button == copyBtn)
{
Thread thread = new(() => Clipboard.SetText(Error.Message));
thread.SetApartmentState(ApartmentState.STA);
thread.Start();
thread.Join();
Error.ShowMessageBox();
}

if (button == callStack)
{
MessageBox.Show(Error.StackTrace);
}
if (button == innerExceptionBtn)
Error.InnerException.ShowMessageBox();
}
}
}
117 changes: 117 additions & 0 deletions Libs/ErrorTaskDialog_Localisation.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

119 changes: 119 additions & 0 deletions Libs/ErrorTaskDialog_Localisation.resx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 1.3
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">1.3</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1">this is my long string</data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
[base64 mime encoded serialized .NET Framework object]
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
[base64 mime encoded string representing a byte array form of the .NET Framework object]
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->

<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>1.3</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Close" xml:space="preserve">
<value>Close</value>
</data>
<data name="Copy_to_Clipboard" xml:space="preserve">
<value>Copy to Clipboard</value>
</data>
<data name="OpenMicrosoftDocs" xml:space="preserve">
<value>Open Microsoft documentation</value>
</data>
<data name="Open_Callstack" xml:space="preserve">
<value>Open call stack</value>
</data>
<data name="Open_Inner_Exception" xml:space="preserve">
<value>Open inner exception</value>
</data>
<data name="Title_Error" xml:space="preserve">
<value>Error</value>
</data>
</root>
Loading

0 comments on commit d9beaed

Please sign in to comment.