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:
commit
d99f5e09ac
2
.gitignore
vendored
2
.gitignore
vendored
@ -2,4 +2,4 @@
|
|||||||
/bin
|
/bin
|
||||||
/obj
|
/obj
|
||||||
/*.user
|
/*.user
|
||||||
/Properties/PublishProfiles/*.user
|
/Properties/PublishProfiles/*.user
|
7
AppResource.Designer.cs
generated
7
AppResource.Designer.cs
generated
@ -61,12 +61,11 @@ namespace RandomFileRunner {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <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>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap loading_block {
|
internal static string AppHelpURL {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("loading_block", resourceCulture);
|
return ResourceManager.GetString("AppHelpURL", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -117,8 +117,7 @@
|
|||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
<data name="AppHelpURL" xml:space="preserve">
|
||||||
<data name="loading_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<value>https://www.hiimray.co.uk/software-random-file-runner</value>
|
||||||
<value>Resources\loading-block.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
@ -116,7 +116,7 @@ namespace RandomFileRunner
|
|||||||
{
|
{
|
||||||
isBusy = value;
|
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(textBox1, !isBusy);
|
||||||
//ThreadControl.SetEnable(button2, !isBusy);
|
//ThreadControl.SetEnable(button2, !isBusy);
|
||||||
button2.LabelText = (isBusy? "&Cancel" : "&Search");
|
button2.LabelText = (isBusy? "&Cancel" : "&Search");
|
||||||
@ -232,7 +232,7 @@ namespace RandomFileRunner
|
|||||||
{
|
{
|
||||||
System.Diagnostics.Process.Start(new ProcessStartInfo()
|
System.Diagnostics.Process.Start(new ProcessStartInfo()
|
||||||
{
|
{
|
||||||
FileName = "https://www.hiimray.co.uk/software-random-file-runner",
|
FileName = AppResource.AppHelpURL,
|
||||||
UseShellExecute = true
|
UseShellExecute = true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
<Copyright>Ray Lam</Copyright>
|
<Copyright>Ray Lam</Copyright>
|
||||||
<ApplicationIcon>favicon.ico</ApplicationIcon>
|
<ApplicationIcon>favicon.ico</ApplicationIcon>
|
||||||
<NoWin32Manifest>true</NoWin32Manifest>
|
<NoWin32Manifest>true</NoWin32Manifest>
|
||||||
<Version>0.1.0.019</Version>
|
<Version>0.1.1.005</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||||
@ -20,50 +20,23 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Remove="RyzStudio\Data\**" />
|
<Compile Remove="RyzStudio\**" />
|
||||||
<Compile Remove="RyzStudio\Net\**" />
|
<EmbeddedResource Remove="RyzStudio\**" />
|
||||||
<Compile Remove="RyzStudio\Windows\ThemedForms\PickerBox\**" />
|
<None Remove="RyzStudio\**" />
|
||||||
<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\**" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Remove="RyzStudio\IO\FileType.cs" />
|
<Compile Remove="UIResource.Designer.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" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Remove="RyzStudio\Windows\Forms\TCustomProgressBar.resx" />
|
<EmbeddedResource Remove="UIResource.resx" />
|
||||||
<EmbeddedResource Remove="RyzStudio\Windows\Forms\TForm.resx" />
|
|
||||||
<EmbeddedResource Remove="RyzStudio\Windows\ThemedForms\TextBox\TFolderTextBox - Copy.resx" />
|
|
||||||
<EmbeddedResource Remove="RyzStudio\Windows\ThemedForms\TProgressBar.resx" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="RyzStudio\Windows\ThemedForms\PickerBox\TPickerBox.cs" />
|
<Reference Include="RyzStudio3">
|
||||||
<Compile Include="RyzStudio\Windows\ThemedForms\PickerBox\TPickerBox.designer.cs" />
|
<HintPath>References\RyzStudio3.dll</HintPath>
|
||||||
<Compile Include="RyzStudio\Windows\ThemedForms\PickerBox\TNumericPickerBox.cs">
|
</Reference>
|
||||||
<SubType>UserControl</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="RyzStudio\Windows\ThemedForms\PickerBox\TYesNoPickerBox.cs" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<EmbeddedResource Include="RyzStudio\Windows\ThemedForms\PickerBox\TPickerBox.resx" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@ -72,14 +45,6 @@
|
|||||||
<AutoGen>True</AutoGen>
|
<AutoGen>True</AutoGen>
|
||||||
<DependentUpon>AppResource.resx</DependentUpon>
|
<DependentUpon>AppResource.resx</DependentUpon>
|
||||||
</Compile>
|
</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>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@ -87,10 +52,6 @@
|
|||||||
<Generator>ResXFileCodeGenerator</Generator>
|
<Generator>ResXFileCodeGenerator</Generator>
|
||||||
<LastGenOutput>AppResource.Designer.cs</LastGenOutput>
|
<LastGenOutput>AppResource.Designer.cs</LastGenOutput>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Update="UIResource.resx">
|
|
||||||
<Generator>ResXFileCodeGenerator</Generator>
|
|
||||||
<LastGenOutput>UIResource.Designer.cs</LastGenOutput>
|
|
||||||
</EmbeddedResource>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
BIN
References/RyzStudio3.dll
Normal file
BIN
References/RyzStudio3.dll
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user