Skip to content
This repository has been archived by the owner on Jan 23, 2025. It is now read-only.

Commit

Permalink
Merge pull request #27 from Azure/DecRelease2
Browse files Browse the repository at this point in the history
December update
  • Loading branch information
xpouyat committed Dec 12, 2014
2 parents 5abdf62 + 1a34045 commit 7ccfe91
Show file tree
Hide file tree
Showing 79 changed files with 4,942 additions and 2,192 deletions.
34 changes: 28 additions & 6 deletions AMSExplorer/AMSExplorer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,17 @@
<Compile Include="AMSLogin.Designer.cs">
<DependentUpon>AMSLogin.cs</DependentUpon>
</Compile>
<Compile Include="Bitmaps.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Bitmaps.resx</DependentUpon>
</Compile>
<Compile Include="MetadataInformation.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MetadataInformation.Designer.cs">
<DependentUpon>MetadataInformation.cs</DependentUpon>
</Compile>
<Compile Include="ChangeEncodingRU.cs">
<SubType>Form</SubType>
</Compile>
Expand All @@ -171,11 +182,6 @@
<Compile Include="BatchUploadFrame1.Designer.cs">
<DependentUpon>BatchUploadFrame1.cs</DependentUpon>
</Compile>
<Compile Include="Bitmaps.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Bitmaps.resx</DependentUpon>
</Compile>
<Compile Include="DeleteProgram.cs">
<SubType>Form</SubType>
</Compile>
Expand All @@ -188,6 +194,15 @@
<Compile Include="AttachStorage.Designer.cs">
<DependentUpon>AttachStorage.cs</DependentUpon>
</Compile>
<Compile Include="ListViewTemplates.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ProcessFromJobTemplate.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ProcessFromJobTemplate.Designer.cs">
<DependentUpon>ProcessFromJobTemplate.cs</DependentUpon>
</Compile>
<Compile Include="ManagementREST.cs" />
<Compile Include="PlayReadyLicense.cs">
<SubType>Form</SubType>
Expand Down Expand Up @@ -367,6 +382,9 @@
<EmbeddedResource Include="AMSLogin.resx">
<DependentUpon>AMSLogin.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MetadataInformation.resx">
<DependentUpon>MetadataInformation.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ChangeEncodingRU.resx">
<DependentUpon>ChangeEncodingRU.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -378,6 +396,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Bitmaps.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>Bitmaps.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="DeleteProgram.resx">
Expand All @@ -386,6 +405,9 @@
<EmbeddedResource Include="AttachStorage.resx">
<DependentUpon>AttachStorage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ProcessFromJobTemplate.resx">
<DependentUpon>ProcessFromJobTemplate.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="PlayReadyLicense.resx">
<DependentUpon>PlayReadyLicense.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -472,7 +494,7 @@
<Content Include="BitmapsPNG\8-12-2014-13-20-04.png" />
<Content Include="BitmapsPNG\Azure Explorer.png" />
<Content Include="BitmapsPNG\Azure Explorer_ico.ico" />
<Content Include="BitmapsPNG\Imagine.PNG" />
<None Include="BitmapsPNG\AzureMedia_Full-Color-64-opaque.png" />
<Content Include="BitmapsPNG\modeltaskxenio1.png" />
<Content Include="BitmapsPNG\modeltaskxenio2.png" />
<Content Include="BitmapsPNG\modetaskjob1.png" />
Expand Down
82 changes: 62 additions & 20 deletions AMSExplorer/AMSLogin.Designer.cs

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

5 changes: 5 additions & 0 deletions AMSExplorer/AMSLogin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -320,5 +320,10 @@ private void accountmgtlink_LinkClicked(object sender, LinkLabelLinkClickedEvent
{
Process.Start(e.Link.LinkData as string);
}

private void AMSLogin_Shown(object sender, EventArgs e)
{
Program.CheckAMSEVersion();
}
}
}
28 changes: 14 additions & 14 deletions AMSExplorer/AboutBox.Designer.cs

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

Loading

0 comments on commit 7ccfe91

Please sign in to comment.