Merge branch 'release/0.1.1.005-alpha' into 'master'

Changed: to rystudio external package

See merge request SympatheticFire/random-file-runner!1
This commit is contained in:
Ray 2021-11-07 16:07:40 +00:00
commit d99f5e09ac
7 changed files with 17 additions and 58 deletions

2
.gitignore vendored
View File

@ -2,4 +2,4 @@
/bin
/obj
/*.user
/Properties/PublishProfiles/*.user
/Properties/PublishProfiles/*.user

View File

@ -61,12 +61,11 @@ namespace RandomFileRunner {
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// Looks up a localized string similar to https://www.hiimray.co.uk/software-random-file-runner.
/// </summary>
internal static System.Drawing.Bitmap loading_block {
internal static string AppHelpURL {
get {
object obj = ResourceManager.GetObject("loading_block", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
return ResourceManager.GetString("AppHelpURL", resourceCulture);
}
}
}

View File

@ -117,8 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="loading_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\loading-block.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="AppHelpURL" xml:space="preserve">
<value>https://www.hiimray.co.uk/software-random-file-runner</value>
</data>
</root>

View File

@ -116,7 +116,7 @@ namespace RandomFileRunner
{
isBusy = value;
ThreadControl.SetValue(pictureBox1, (isBusy ? AppResource.loading_block : null));
ThreadControl.SetValue(pictureBox1, (isBusy ? RyzStudio.UIResource.loading_block : null));
ThreadControl.SetEnable(textBox1, !isBusy);
//ThreadControl.SetEnable(button2, !isBusy);
button2.LabelText = (isBusy? "&Cancel" : "&Search");
@ -232,7 +232,7 @@ namespace RandomFileRunner
{
System.Diagnostics.Process.Start(new ProcessStartInfo()
{
FileName = "https://www.hiimray.co.uk/software-random-file-runner",
FileName = AppResource.AppHelpURL,
UseShellExecute = true
});
}

View File

@ -11,7 +11,7 @@
<Copyright>Ray Lam</Copyright>
<ApplicationIcon>favicon.ico</ApplicationIcon>
<NoWin32Manifest>true</NoWin32Manifest>
<Version>0.1.0.019</Version>
<Version>0.1.1.005</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@ -20,50 +20,23 @@
</PropertyGroup>
<ItemGroup>
<Compile Remove="RyzStudio\Data\**" />
<Compile Remove="RyzStudio\Net\**" />
<Compile Remove="RyzStudio\Windows\ThemedForms\PickerBox\**" />
<EmbeddedResource Remove="RyzStudio\Data\**" />
<EmbeddedResource Remove="RyzStudio\Net\**" />
<EmbeddedResource Remove="RyzStudio\Windows\ThemedForms\PickerBox\**" />
<None Remove="RyzStudio\Data\**" />
<None Remove="RyzStudio\Net\**" />
<None Remove="RyzStudio\Windows\ThemedForms\PickerBox\**" />
<Compile Remove="RyzStudio\**" />
<EmbeddedResource Remove="RyzStudio\**" />
<None Remove="RyzStudio\**" />
</ItemGroup>
<ItemGroup>
<Compile Remove="RyzStudio\IO\FileType.cs" />
<Compile Remove="RyzStudio\IO\SessionFileFormatBase.cs" />
<Compile Remove="RyzStudio\IO\SharpZipLib.cs" />
<Compile Remove="RyzStudio\IO\SmarterFileSystem.cs" />
<Compile Remove="RyzStudio\Windows\Forms\StackLayoutPanel.cs" />
<Compile Remove="RyzStudio\Windows\Forms\TCustomProgressBar.cs" />
<Compile Remove="RyzStudio\Windows\Forms\TCustomProgressBar.Designer.cs" />
<Compile Remove="RyzStudio\Windows\Forms\TFlatButton.cs" />
<Compile Remove="RyzStudio\Windows\Forms\TForm.cs" />
<Compile Remove="RyzStudio\Windows\Forms\TPanelBook.cs" />
<Compile Remove="RyzStudio\Windows\ThemedForms\TProgressBar.cs" />
<Compile Remove="RyzStudio\Windows\ThemedForms\TProgressBar.designer.cs" />
<Compile Remove="UIResource.Designer.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="RyzStudio\Windows\Forms\TCustomProgressBar.resx" />
<EmbeddedResource Remove="RyzStudio\Windows\Forms\TForm.resx" />
<EmbeddedResource Remove="RyzStudio\Windows\ThemedForms\TextBox\TFolderTextBox - Copy.resx" />
<EmbeddedResource Remove="RyzStudio\Windows\ThemedForms\TProgressBar.resx" />
<EmbeddedResource Remove="UIResource.resx" />
</ItemGroup>
<ItemGroup>
<Compile Include="RyzStudio\Windows\ThemedForms\PickerBox\TPickerBox.cs" />
<Compile Include="RyzStudio\Windows\ThemedForms\PickerBox\TPickerBox.designer.cs" />
<Compile Include="RyzStudio\Windows\ThemedForms\PickerBox\TNumericPickerBox.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="RyzStudio\Windows\ThemedForms\PickerBox\TYesNoPickerBox.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="RyzStudio\Windows\ThemedForms\PickerBox\TPickerBox.resx" />
<Reference Include="RyzStudio3">
<HintPath>References\RyzStudio3.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@ -72,14 +45,6 @@
<AutoGen>True</AutoGen>
<DependentUpon>AppResource.resx</DependentUpon>
</Compile>
<Compile Update="RyzStudio\Windows\ThemedForms\TextBox\TClearableTextBox.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="UIResource.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>UIResource.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
@ -87,10 +52,6 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>AppResource.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="UIResource.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>UIResource.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
</Project>

BIN
References/RyzStudio3.dll Normal file

Binary file not shown.