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.

Sign up for GitHub

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

Jump to bottom

UPDATES!! #8

Closed
wants to merge 8 commits into from
Closed

UPDATES!! #8

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
acae5d1
Updates
AKASGaming Jun 15, 2022
746d17d
Update GeneralSettings.xaml
AKASGaming Jun 15, 2022
f12c63d
Tooltips + Clear Button
AKASGaming Jun 15, 2022
d577fb5
Create README.md
AKASGaming Jun 17, 2022
2073bbd
Update README.md
AKASGaming Jun 17, 2022
7e9bf52
More Updates
AKASGaming Jun 19, 2022
253b0cd
Merge branch 'master' of https://github.com/AKASGaming/DigitalHomeCin…
AKASGaming Jun 19, 2022
4919ae7
Update README.md
AKASGaming Jun 22, 2022
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
103 changes: 75 additions & 28 deletions DigitalHomeCinemaControl/DigitalHomeCinemaControl.csproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion DigitalHomeCinemaControl/Properties/Resources.Designer.cs
View file
Open in desktop

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

11 changes: 11 additions & 0 deletions DigitalHomeCinemaControl/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
24 changes: 15 additions & 9 deletions DigitalHomeCinemaControl/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="HtmlAgilityPack" version="1.11.20" targetFramework="net45" />
<package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="2.9.6" targetFramework="net45" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" version="2.9.6" targetFramework="net45" developmentDependency="true" />
<package id="Microsoft.CodeQuality.Analyzers" version="2.9.6" targetFramework="net45" developmentDependency="true" />
<package id="Microsoft.NetCore.Analyzers" version="2.9.6" targetFramework="net45" developmentDependency="true" />
<package id="Microsoft.NetFramework.Analyzers" version="2.9.6" targetFramework="net45" developmentDependency="true" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="System.Net.Http" version="4.3.0" targetFramework="net45" />
<package id="TMDbLib" version="1.4.0" targetFramework="net45" />
<package id="HtmlAgilityPack" version="1.11.43" targetFramework="net48" />
<package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="3.3.2" targetFramework="net48" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" version="3.3.2" targetFramework="net48" developmentDependency="true" />
<package id="Microsoft.CodeQuality.Analyzers" version="3.3.2" targetFramework="net48" developmentDependency="true" />
<package id="Microsoft.NetCore.Analyzers" version="3.3.2" targetFramework="net48" developmentDependency="true" />
<package id="Microsoft.NetFramework.Analyzers" version="3.3.2" targetFramework="net48" developmentDependency="true" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
<package id="System.IO" version="4.3.0" targetFramework="net48" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
<package id="System.Runtime" version="4.3.1" targetFramework="net48" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net48" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net48" />
<package id="TMDbLib" version="1.9.2" targetFramework="net48" />
</packages>
28 changes: 16 additions & 12 deletions DigitalHomeCinemaManager/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<?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" >
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="DigitalHomeCinemaManager.Properties.DeviceSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="DigitalHomeCinemaManager.Properties.Settings" 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" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<userSettings>
<DigitalHomeCinemaManager.Properties.DeviceSettings>
Expand Down Expand Up @@ -49,20 +49,17 @@
</setting>
<setting name="Display_CustomGamma" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
</value>
</setting>
<setting name="Display_CustomColorSpace" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
</value>
</setting>
<setting name="Display_CustomColorTemp" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
</value>
</setting>
<setting name="Processor_Host" serializeAs="String">
Expand All @@ -82,8 +79,7 @@
</setting>
<setting name="InputSwitch_CustomInputs" serializeAs="Xml">
<value>
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
</value>
</setting>
</DigitalHomeCinemaManager.Properties.DeviceSettings>
Expand Down Expand Up @@ -117,4 +113,12 @@
</setting>
</DigitalHomeCinemaManager.Properties.Settings>
</userSettings>
</configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
16 changes: 16 additions & 0 deletions DigitalHomeCinemaManager/Controls/Settings/GeneralSettings.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,22 @@
<Image Source="/DigitalHomeCinemaManager;component/Resources/Icons/baseline_more_horiz_black_36dp.png" />
</Button>
</StackPanel>
<Separator Height="19"/>
<Label x:Name="label" Content="These do nothing&#xD;&#xA;Feel free to implement yourself" HorizontalAlignment="Center" FontSize="36" Height="103" Foreground="#FFAF3030"/>
<StackPanel Orientation="Horizontal" Margin="0,34,0,0">
<TextBlock Text="Randomize Prerolls" Margin="0,0,0,0" Width="110" VerticalAlignment="Top" Foreground="#FF7E7E7E"/>
<CheckBox x:Name="RandPreroll" IsChecked="True" Click="checkBox_SelectionChanged"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,9,0,0">
<TextBlock Text="Preroll Count" Margin="0,0,0,0" Width="108" VerticalAlignment="Center" Foreground="#FF7E7E7E" HorizontalAlignment="Left"/>
<ComboBox x:Name="comboBox" Width="120" SelectionChanged="comboBox_SelectionChanged">
<ComboBoxItem Content="1"/>
<ComboBoxItem Content="2"/>
<ComboBoxItem Content="3"/>
<ComboBoxItem Content="4"/>
<ComboBoxItem Content="5" IsSelected="True"/>
</ComboBox>
</StackPanel>
</StackPanel>
</Grid>
</local:SettingsControl>
77 changes: 43 additions & 34 deletions DigitalHomeCinemaManager/Controls/Settings/GeneralSettings.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ namespace DigitalHomeCinemaManager.Controls.Settings
using System;
using System.IO;
using System.Windows;
using System.Windows.Forms;
using Microsoft.Win32;

/// <summary>
Expand Down Expand Up @@ -49,62 +50,61 @@ public override void SaveChanges()

private void ButtonMediaClick(object sender, RoutedEventArgs e)
{
var dialog = new SaveFileDialog() {
Title = "Select Media Path",
Filter = "Directory|*.this.directory",
FileName = "select",
var dialog = new FolderBrowserDialog()
{
ShowNewFolderButton = false
};
if (Directory.Exists(this.MediaPath.Text)) {
dialog.InitialDirectory = this.MediaPath.Text;
dialog.SelectedPath = this.MediaPath.Text;
} else {
dialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyVideos);
dialog.RootFolder = dialog.RootFolder;
}
if (dialog.ShowDialog() == true) {
string path = dialog.FileName;
path = path.Replace("\\select.this.directory", "");
path = path.Replace(".this.directory", "");
if (dialog.ShowDialog() == DialogResult.OK) {
string path = dialog.SelectedPath;
this.MediaPath.Text = path;
OnItemChanged();
}
}

private void ButtonPrerollClick(object sender, RoutedEventArgs e)
{
var dialog = new SaveFileDialog() {
Title = "Select Preroll Path",
Filter = "Directory|*.this.directory",
FileName = "select",
var dialog = new FolderBrowserDialog()
{
ShowNewFolderButton = false
};
if (Directory.Exists(this.PrerollPath.Text)) {
dialog.InitialDirectory = this.PrerollPath.Text;
} else {
dialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyVideos);
if (Directory.Exists(this.PrerollPath.Text))
{
dialog.SelectedPath = this.PrerollPath.Text;
}
else
{
dialog.RootFolder = dialog.RootFolder;
}
if (dialog.ShowDialog() == true) {
string path = dialog.FileName;
path = path.Replace("\\select.this.directory", "");
path = path.Replace(".this.directory", "");
if (dialog.ShowDialog() == DialogResult.OK)
{
string path = dialog.SelectedPath;
this.PrerollPath.Text = path;
OnItemChanged();
}
}

private void ButtonTrailerClick(object sender, RoutedEventArgs e)
{
var dialog = new SaveFileDialog() {
Title = "Select Trailer Path",
Filter = "Directory|*.this.directory",
FileName = "select",
var dialog = new FolderBrowserDialog()
{
ShowNewFolderButton = false
};
if (Directory.Exists(this.TrailerPath.Text)) {
dialog.InitialDirectory = this.TrailerPath.Text;
} else {
dialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyVideos);
if (Directory.Exists(this.TrailerPath.Text))
{
dialog.SelectedPath = this.TrailerPath.Text;
}
if (dialog.ShowDialog() == true) {
string path = dialog.FileName;
path = path.Replace("\\select.this.directory", "");
path = path.Replace(".this.directory", "");
else
{
dialog.RootFolder = dialog.RootFolder;
}
if (dialog.ShowDialog() == DialogResult.OK)
{
string path = dialog.SelectedPath;
this.TrailerPath.Text = path;
OnItemChanged();
}
Expand All @@ -127,6 +127,15 @@ private void TrailerPathTextChanged(object sender, System.Windows.Controls.TextC

#endregion

private void checkBox_SelectionChanged(object sender, RoutedEventArgs e)
{
OnItemChanged();
}

private void comboBox_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
{
OnItemChanged();
}
}

}