Skip to content

Commit

Permalink
Last touch before deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
cwelt committed Oct 10, 2020
1 parent 89fd999 commit 0b2d6ac
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 5 deletions.
41 changes: 41 additions & 0 deletions DesktopClient/DesktopClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,22 @@
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -32,6 +48,18 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>1D12B9AF880D217C3944F5C4C1EE1765795E9AF2</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>DesktopClient_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -67,6 +95,7 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="DesktopClient_TemporaryKey.pfx" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand Down Expand Up @@ -98,5 +127,17 @@
<Name>CompositionService</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
2 changes: 1 addition & 1 deletion DesktopClient/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ private void btnCompose_Click(object sender, EventArgs e)

var composition = new CompositionContext(_chordsFilePath, _midiFilePath, melodyTrackIndex: MelodyTrackIndex.TrackNumber1);
var newMelody = composition.Compose(musicalInstrument: _musicalInstrument);

composition.MidiOutputFile.SaveFile();
composition.MidiOutputFile.PlayAsync();
var res = MessageBox.Show("Want to pause?", "Playing", MessageBoxButtons.YesNoCancel);
if (res == DialogResult.Yes)
Expand Down
2 changes: 1 addition & 1 deletion WebApplication/Views/Home/About.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<p>
<!-- OpenU Logo-->
<img src="\Content\images\openUlogo.jpg"
<img src="https://github.com/cwelt/Soloist/raw/master/WebApplication/Content/images/openUlogo.jpg"
style="float:left;width:200px;height:200px;padding:2px; padding-right:8px">

This application is my final project <br /> for my B.Sc. in Computer Science
Expand Down
2 changes: 1 addition & 1 deletion WebApplication/Views/Home/Contact.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<!-- Guitar solo video of arik einstien: take me in under your wings -->
<video width="320" height="240" controls>
<source src="\Content\media\solo-video-arik.mp4" type="video/mp4">
<source src="https://github.com/cwelt/Soloist/raw/master/WebApplication/Content/media/solo-video-arik.mp4" type="video/mp4">
Your browser does not support the video tag.
</video>

Expand Down
4 changes: 2 additions & 2 deletions WebApplication/Views/Home/Documentation.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<hr />
</div>

<!-- OpenU Logo-->
<img src="\Content\images\design-mix.png"
<!-- Design mix image-->
<img src="https://github.com/cwelt/Soloist/raw/master/WebApplication/Content/images/design-mix.png"
style="float:none;width:400px;height:450px; padding-right:8px">

0 comments on commit 0b2d6ac

Please sign in to comment.