Skip to content

Commit

Permalink
Merge pull request #41 from MerlinCooper/master
Browse files Browse the repository at this point in the history
Update Branch with most recent project structure
  • Loading branch information
MerlinCooper authored Jun 22, 2020
2 parents 2827110 + b3f1d05 commit 70a5785
Show file tree
Hide file tree
Showing 169 changed files with 2,966 additions and 752 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "GitHubReleases"]
path = GitHubReleases
url = git://github.com/vipoo/GitHubReleases.git
[submodule "iRacingSDK.Net"]
path = iRacingSDK.Net
url = https://github.com/MerlinCooper/iRacingSDK.Net.git
4 changes: 0 additions & 4 deletions .nuget/packages.config

This file was deleted.

6 changes: 3 additions & 3 deletions AboutBox1.Designer.cs

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

6 changes: 3 additions & 3 deletions AboutBox1.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// This file is part of iRacingReplayOverlay.
// This file is part of iRacingReplayDirector.
//
// Copyright 2016 Dean Netherton
// https://github.com/vipoo/iRacingReplayOverlay.net
// https://github.com/vipoo/iRacingReplayDirector.net

using iRacingSDK.Support;
using System;
using System.Reflection;
using System.Windows.Forms;

namespace iRacingReplayOverlay
namespace iRacingReplayDirector
{
partial class AboutBox1 : Form
{
Expand Down
2 changes: 1 addition & 1 deletion AdvancedGeneralSettingsDlg.Designer.cs

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

2 changes: 1 addition & 1 deletion AdvancedGeneralSettingsDlg.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;

namespace iRacingReplayOverlay
namespace iRacingReplayDirector
{
public partial class AdvanceGeneralSettingsDlg : Form
{
Expand Down
28 changes: 14 additions & 14 deletions App.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="iRacingReplayOverlay.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="iRacingReplayOverlay.Main" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="iRacingReplayDirector.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="iRacingReplayDirector.Main" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>

<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
<userSettings>
<iRacingReplayOverlay.Settings>
<iRacingReplayDirector.Settings>
<setting name="WorkingFolder" serializeAs="String">
<value />
<value/>
</setting>
<setting name="videoBitRate" serializeAs="String">
<value>15</value>
Expand All @@ -21,16 +21,16 @@
<value>48000</value>
</setting>
<setting name="lastSelectedTrackName" serializeAs="String">
<value />
<value/>
</setting>
<setting name="lastVideoFile" serializeAs="String">
<value />
<value/>
</setting>
<setting name="CameraStickyPeriod" serializeAs="String">
<value>00:00:20</value>
</setting>
<setting name="PreferredDriverNames" serializeAs="String">
<value />
<value/>
</setting>
<setting name="BattleGap" serializeAs="String">
<value>00:00:01</value>
Expand Down Expand Up @@ -63,7 +63,7 @@
<value>False</value>
</setting>
<setting name="TrackingID" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ResultsFlashCardPosition" serializeAs="String">
<value>3</value>
Expand All @@ -81,16 +81,16 @@
<value>False</value>
</setting>
<setting name="MainExecPath" serializeAs="String">
<value />
<value/>
</setting>
<setting name="OverlayPluginId" serializeAs="String">
<value />
<value/>
</setting>
</iRacingReplayOverlay.Settings>
<iRacingReplayOverlay.Main>
</iRacingReplayDirector.Settings>
<iRacingReplayDirector.Main>
<setting name="WorkingFolder" serializeAs="String">
<value/>
</setting>
</iRacingReplayOverlay.Main>
</iRacingReplayDirector.Main>
</userSettings>
</configuration>
6 changes: 3 additions & 3 deletions Aws/AwsKey.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This file is part of iRacingReplayOverlay.
// This file is part of iRacingReplayDirector.
//
// Copyright 2016 Dean Netherton
// https://github.com/vipoo/iRacingReplayOverlay.net
// https://github.com/vipoo/iRacingReplayDirector.net

// To enable AWS logging, update this file with an aws key
// with permission to write to your specific log group/stream
Expand All @@ -12,7 +12,7 @@

using System;

namespace iRacingReplayOverlay
namespace iRacingReplayDirector
{
public class AwsKeys
{
Expand Down
6 changes: 3 additions & 3 deletions Aws/AwsLogListener.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This file is part of iRacingReplayOverlay.
// This file is part of iRacingReplayDirector.
//
// Copyright 2016 Dean Netherton
// https://github.com/vipoo/iRacingReplayOverlay.net
// https://github.com/vipoo/iRacingReplayDirector.net

using Amazon;
using Amazon.CloudWatchLogs;
Expand All @@ -17,7 +17,7 @@
using System.Reflection;
using System.Timers;

namespace iRacingReplayOverlay
namespace iRacingReplayDirector
{
public class AwsLogListener : TraceListener
{
Expand Down
3 changes: 2 additions & 1 deletion ConfigureGeneralSettings.Designer.cs

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

17 changes: 11 additions & 6 deletions ConfigureGeneralSettings.cs
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
// This file is part of iRacingReplayOverlay.
// This file is part of iRacingReplayDirector.
//
// Copyright 2014 Dean Netherton
// https://github.com/vipoo/iRacingReplayOverlay.net
// https://github.com/vipoo/iRacingReplayDirector.net
//
// iRacingReplayOverlay is free software: you can redistribute it and/or modify
// iRacingReplayDirector is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iRacingReplayOverlay is distributed in the hope that it will be useful,
// iRacingReplayDirector is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with iRacingReplayOverlay. If not, see <http://www.gnu.org/licenses/>.
// along with iRacingReplayDirector. If not, see <http://www.gnu.org/licenses/>.

using System;
using System.Windows.Forms;

namespace iRacingReplayOverlay
namespace iRacingReplayDirector
{
public partial class ConfigureGeneralSettings : Form
{
Expand Down Expand Up @@ -122,5 +122,10 @@ void OnFocus(object sender, EventArgs e)
if (this.ActiveControl.Tag != null)
helpText.Text = this.ActiveControl.Tag.ToString();
}

private void ConfigureGeneralSettings_Load(object sender, EventArgs e)
{

}
}
}
2 changes: 1 addition & 1 deletion ConfigurePlugins.Designer.cs

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

2 changes: 1 addition & 1 deletion ConfigurePlugins.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System.Threading;
using System.Windows.Forms;

namespace iRacingReplayOverlay
namespace iRacingReplayDirector
{
public partial class ConfigurePlugins : Form
{
Expand Down
2 changes: 1 addition & 1 deletion ConfigureTrackCameras.Designer.cs

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

12 changes: 6 additions & 6 deletions ConfigureTrackCameras.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
// This file is part of iRacingReplayOverlay.
// This file is part of iRacingReplayDirector.
//
// Copyright 2014 Dean Netherton
// https://github.com/vipoo/iRacingReplayOverlay.net
// https://github.com/vipoo/iRacingReplayDirector.net
//
// iRacingReplayOverlay is free software: you can redistribute it and/or modify
// iRacingReplayDirector is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iRacingReplayOverlay is distributed in the hope that it will be useful,
// iRacingReplayDirector is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with iRacingReplayOverlay. If not, see <http://www.gnu.org/licenses/>.
// along with iRacingReplayDirector. If not, see <http://www.gnu.org/licenses/>.

using iRacingSDK;
using iRacingSDK.Support;
Expand All @@ -25,7 +25,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;

namespace iRacingReplayOverlay
namespace iRacingReplayDirector
{
public partial class ConfigureTrackCameras : Form
{
Expand Down
10 changes: 5 additions & 5 deletions DllImports/Win32/Messages.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
// This file is part of iRacingReplayOverlay.
// This file is part of iRacingReplayDirector.
//
// Copyright 2014 Dean Netherton
// https://github.com/vipoo/iRacingReplayOverlay.net
// https://github.com/vipoo/iRacingReplayDirector.net
//
// iRacingReplayOverlay is free software: you can redistribute it and/or modify
// iRacingReplayDirector is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iRacingReplayOverlay is distributed in the hope that it will be useful,
// iRacingReplayDirector is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with iRacingReplayOverlay. If not, see <http://www.gnu.org/licenses/>.
// along with iRacingReplayDirector. If not, see <http://www.gnu.org/licenses/>.
//

using System;
Expand Down
13 changes: 7 additions & 6 deletions GeneralSettingFields.cs
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
// This file is part of iRacingReplayOverlay.
// This file is part of iRacingReplayDirector.
//
// Copyright 2014 Dean Netherton
// https://github.com/vipoo/iRacingReplayOverlay.net
// https://github.com/vipoo/iRacingReplayDirector.net
//
// iRacingReplayOverlay is free software: you can redistribute it and/or modify
// iRacingReplayDirector is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iRacingReplayOverlay is distributed in the hope that it will be useful,
// iRacingReplayDirector is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with iRacingReplayOverlay. If not, see <http://www.gnu.org/licenses/>.
// along with iRacingReplayDirector. If not, see <http://www.gnu.org/licenses/>.

using iRacingSDK.Support;
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using System.Globalization;

namespace iRacingReplayOverlay
namespace iRacingReplayDirector
{
public class GeneralSettingFields
{
Expand Down Expand Up @@ -121,6 +121,7 @@ internal void AddTimeField(string caption, string description, string setting)
AddField(caption, description, ((TimeSpan)settings[setting]).TotalSeconds.ToString(provider), tb =>
{
var newSeconds = 0.0;

if (double.TryParse(tb.Text, out newSeconds))
{
if (string.Compare(setting, "BattleGap") == 0)
Expand Down
2 changes: 1 addition & 1 deletion LogMessages.Designer.cs

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

2 changes: 1 addition & 1 deletion LogMessages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;

namespace iRacingReplayOverlay
namespace iRacingReplayDirector
{
public partial class LogMessages : Form
{
Expand Down
12 changes: 6 additions & 6 deletions Main.Designer.cs

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

Loading

0 comments on commit 70a5785

Please sign in to comment.