Merge branch 'master' into 'release/0.1.2.016'
Master See merge request SympatheticFire/linear-app-launcher!13
@ -52,10 +52,10 @@
|
|||||||
<DesignTime>True</DesignTime>
|
<DesignTime>True</DesignTime>
|
||||||
<DependentUpon>Resources16.resx</DependentUpon>
|
<DependentUpon>Resources16.resx</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="Properties\Resources20.Designer.cs">
|
<Compile Include="Properties\Resources.Designer.cs">
|
||||||
<AutoGen>True</AutoGen>
|
<AutoGen>True</AutoGen>
|
||||||
<DesignTime>True</DesignTime>
|
<DesignTime>True</DesignTime>
|
||||||
<DependentUpon>Resources20.resx</DependentUpon>
|
<DependentUpon>Resources.resx</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="RyzStudio\Drawing\Rectangoid.cs" />
|
<Compile Include="RyzStudio\Drawing\Rectangoid.cs" />
|
||||||
<Compile Include="RyzStudio\Windows\Forms\TForm.cs">
|
<Compile Include="RyzStudio\Windows\Forms\TForm.cs">
|
||||||
@ -134,9 +134,9 @@
|
|||||||
<Generator>ResXFileCodeGenerator</Generator>
|
<Generator>ResXFileCodeGenerator</Generator>
|
||||||
<LastGenOutput>Resources16.Designer.cs</LastGenOutput>
|
<LastGenOutput>Resources16.Designer.cs</LastGenOutput>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="Properties\Resources20.resx">
|
<EmbeddedResource Include="Properties\Resources.resx">
|
||||||
<Generator>ResXFileCodeGenerator</Generator>
|
<Generator>ResXFileCodeGenerator</Generator>
|
||||||
<LastGenOutput>Resources20.Designer.cs</LastGenOutput>
|
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="RyzStudio\Windows\Forms\TForm.resx">
|
<EmbeddedResource Include="RyzStudio\Windows\Forms\TForm.resx">
|
||||||
<DependentUpon>TForm.cs</DependentUpon>
|
<DependentUpon>TForm.cs</DependentUpon>
|
||||||
@ -160,27 +160,6 @@
|
|||||||
<DependentUpon>TTextBox.cs</DependentUpon>
|
<DependentUpon>TTextBox.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\20\close.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\20\close2.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\20\maximise.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\20\maximise2.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\20\maximise3.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\20\minimise.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\20\minimise2.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Resources\16\arrow_down.png" />
|
<None Include="Resources\16\arrow_down.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@ -230,19 +209,64 @@
|
|||||||
<None Include="Resources\16\plus2.png" />
|
<None Include="Resources\16\plus2.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Resources\20\close3.png" />
|
<None Include="Resources\titlebar_blank.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Resources\20\empty.png" />
|
<None Include="Resources\titlebar_blank2.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Resources\20\empty2.png" />
|
<None Include="Resources\titlebar_blank3.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Resources\20\empty3.png" />
|
<None Include="Resources\titlebar_blank4.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Resources\20\minimise3.png" />
|
<None Include="Resources\titlebar_blank5.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_close.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_close2.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_close3.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_close4.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_close5.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_maximise.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_maximise2.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_maximise3.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_maximise4.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_maximise5.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_minimise.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_minimise2.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_minimise3.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_minimise4.png" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Resources\titlebar_minimise5.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
</Project>
|
</Project>
|
@ -22,14 +22,14 @@ namespace AppLauncher.Properties {
|
|||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
internal class Resources20 {
|
internal class Resources {
|
||||||
|
|
||||||
private static global::System.Resources.ResourceManager resourceMan;
|
private static global::System.Resources.ResourceManager resourceMan;
|
||||||
|
|
||||||
private static global::System.Globalization.CultureInfo resourceCulture;
|
private static global::System.Globalization.CultureInfo resourceCulture;
|
||||||
|
|
||||||
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
||||||
internal Resources20() {
|
internal Resources() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -39,7 +39,7 @@ namespace AppLauncher.Properties {
|
|||||||
internal static global::System.Resources.ResourceManager ResourceManager {
|
internal static global::System.Resources.ResourceManager ResourceManager {
|
||||||
get {
|
get {
|
||||||
if (object.ReferenceEquals(resourceMan, null)) {
|
if (object.ReferenceEquals(resourceMan, null)) {
|
||||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppLauncher.Properties.Resources20", typeof(Resources20).Assembly);
|
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppLauncher.Properties.Resources", typeof(Resources).Assembly);
|
||||||
resourceMan = temp;
|
resourceMan = temp;
|
||||||
}
|
}
|
||||||
return resourceMan;
|
return resourceMan;
|
||||||
@ -63,9 +63,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap close {
|
internal static System.Drawing.Bitmap titlebar_blank {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("close", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_blank", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -73,9 +73,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap close2 {
|
internal static System.Drawing.Bitmap titlebar_blank2 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("close2", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_blank2", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -83,9 +83,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap close3 {
|
internal static System.Drawing.Bitmap titlebar_blank3 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("close3", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_blank3", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -93,9 +93,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap empty {
|
internal static System.Drawing.Bitmap titlebar_blank4 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("empty", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_blank4", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -103,9 +103,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap empty2 {
|
internal static System.Drawing.Bitmap titlebar_blank5 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("empty2", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_blank5", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -113,9 +113,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap empty3 {
|
internal static System.Drawing.Bitmap titlebar_close {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("empty3", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_close", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -123,9 +123,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap maximise {
|
internal static System.Drawing.Bitmap titlebar_close2 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("maximise", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_close2", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -133,9 +133,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap maximise2 {
|
internal static System.Drawing.Bitmap titlebar_close3 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("maximise2", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_close3", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -143,9 +143,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap maximise3 {
|
internal static System.Drawing.Bitmap titlebar_close4 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("maximise3", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_close4", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -153,9 +153,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap minimise {
|
internal static System.Drawing.Bitmap titlebar_close5 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("minimise", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_close5", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -163,9 +163,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap minimise2 {
|
internal static System.Drawing.Bitmap titlebar_maximise {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("minimise2", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_maximise", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -173,9 +173,89 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap minimise3 {
|
internal static System.Drawing.Bitmap titlebar_maximise2 {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("minimise3", resourceCulture);
|
object obj = ResourceManager.GetObject("titlebar_maximise2", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
|
/// </summary>
|
||||||
|
internal static System.Drawing.Bitmap titlebar_maximise3 {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("titlebar_maximise3", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
|
/// </summary>
|
||||||
|
internal static System.Drawing.Bitmap titlebar_maximise4 {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("titlebar_maximise4", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
|
/// </summary>
|
||||||
|
internal static System.Drawing.Bitmap titlebar_maximise5 {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("titlebar_maximise5", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
|
/// </summary>
|
||||||
|
internal static System.Drawing.Bitmap titlebar_minimise {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("titlebar_minimise", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
|
/// </summary>
|
||||||
|
internal static System.Drawing.Bitmap titlebar_minimise2 {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("titlebar_minimise2", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
|
/// </summary>
|
||||||
|
internal static System.Drawing.Bitmap titlebar_minimise3 {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("titlebar_minimise3", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
|
/// </summary>
|
||||||
|
internal static System.Drawing.Bitmap titlebar_minimise4 {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("titlebar_minimise4", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
|
/// </summary>
|
||||||
|
internal static System.Drawing.Bitmap titlebar_minimise5 {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("titlebar_minimise5", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -118,40 +118,64 @@
|
|||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
<data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="close2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_blank2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\close2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_blank2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="close3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_blank3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\close3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_blank3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="empty" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_blank4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_blank4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="empty2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_blank5" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\empty2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_blank5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="empty3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_close" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\empty3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="maximise" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_close2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\maximise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_close2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="maximise2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_close3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\maximise2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_close3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="maximise3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_close4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\maximise3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_close4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="minimise" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_close5" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\minimise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_close5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="minimise2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_maximise" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\minimise2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_maximise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="minimise3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="titlebar_maximise2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\20\minimise3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\titlebar_maximise2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="titlebar_maximise3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\titlebar_maximise3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="titlebar_maximise4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\titlebar_maximise4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="titlebar_maximise5" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\titlebar_maximise5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="titlebar_minimise" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\titlebar_minimise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="titlebar_minimise2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\titlebar_minimise2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="titlebar_minimise3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\titlebar_minimise3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="titlebar_minimise4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\titlebar_minimise4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="titlebar_minimise5" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\titlebar_minimise5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
Before Width: | Height: | Size: 493 B |
Before Width: | Height: | Size: 525 B |
Before Width: | Height: | Size: 514 B |
Before Width: | Height: | Size: 274 B |
Before Width: | Height: | Size: 289 B |
Before Width: | Height: | Size: 284 B |
Before Width: | Height: | Size: 303 B |
Before Width: | Height: | Size: 320 B |
Before Width: | Height: | Size: 315 B |
Before Width: | Height: | Size: 304 B |
Before Width: | Height: | Size: 320 B |
Before Width: | Height: | Size: 315 B |
BIN
FizzyLauncher.UI/Resources/titlebar_blank.png
Normal file
After Width: | Height: | Size: 255 B |
BIN
FizzyLauncher.UI/Resources/titlebar_blank2.png
Normal file
After Width: | Height: | Size: 260 B |
BIN
FizzyLauncher.UI/Resources/titlebar_blank3.png
Normal file
After Width: | Height: | Size: 259 B |
BIN
FizzyLauncher.UI/Resources/titlebar_blank4.png
Normal file
After Width: | Height: | Size: 260 B |
BIN
FizzyLauncher.UI/Resources/titlebar_blank5.png
Normal file
After Width: | Height: | Size: 261 B |
BIN
FizzyLauncher.UI/Resources/titlebar_close.png
Normal file
After Width: | Height: | Size: 429 B |
BIN
FizzyLauncher.UI/Resources/titlebar_close2.png
Normal file
After Width: | Height: | Size: 478 B |
BIN
FizzyLauncher.UI/Resources/titlebar_close3.png
Normal file
After Width: | Height: | Size: 473 B |
BIN
FizzyLauncher.UI/Resources/titlebar_close4.png
Normal file
After Width: | Height: | Size: 441 B |
BIN
FizzyLauncher.UI/Resources/titlebar_close5.png
Normal file
After Width: | Height: | Size: 478 B |
BIN
FizzyLauncher.UI/Resources/titlebar_maximise.png
Normal file
After Width: | Height: | Size: 302 B |
BIN
FizzyLauncher.UI/Resources/titlebar_maximise2.png
Normal file
After Width: | Height: | Size: 307 B |
BIN
FizzyLauncher.UI/Resources/titlebar_maximise3.png
Normal file
After Width: | Height: | Size: 308 B |
BIN
FizzyLauncher.UI/Resources/titlebar_maximise4.png
Normal file
After Width: | Height: | Size: 303 B |
BIN
FizzyLauncher.UI/Resources/titlebar_maximise5.png
Normal file
After Width: | Height: | Size: 311 B |
BIN
FizzyLauncher.UI/Resources/titlebar_minimise.png
Normal file
After Width: | Height: | Size: 303 B |
BIN
FizzyLauncher.UI/Resources/titlebar_minimise2.png
Normal file
After Width: | Height: | Size: 307 B |
BIN
FizzyLauncher.UI/Resources/titlebar_minimise3.png
Normal file
After Width: | Height: | Size: 309 B |
BIN
FizzyLauncher.UI/Resources/titlebar_minimise4.png
Normal file
After Width: | Height: | Size: 304 B |
BIN
FizzyLauncher.UI/Resources/titlebar_minimise5.png
Normal file
After Width: | Height: | Size: 313 B |
@ -1,54 +1,50 @@
|
|||||||
using RyzStudio.Windows.Forms;
|
using System;
|
||||||
using System;
|
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using Resources = AppLauncher.Properties.Resources20;
|
using Resources = AppLauncher.Properties.Resources;
|
||||||
|
|
||||||
namespace AppLauncher.Windows.Forms
|
namespace RyzStudio.Windows.Forms
|
||||||
{
|
{
|
||||||
public class TForm : Form
|
public class TForm : Form
|
||||||
{
|
{
|
||||||
protected readonly Color borderColour = Color.FromArgb(235, 234, 233);
|
protected readonly Color borderColour = Color.FromArgb(200, 200, 200);
|
||||||
protected readonly int borderWidth = 1;
|
protected readonly int borderWidth = 1;
|
||||||
|
|
||||||
protected readonly int resizeBorderWidth = 3;
|
protected readonly int resizeBorderWidth = 4;
|
||||||
|
|
||||||
protected readonly Color backColour = Color.FromArgb(255, 255, 255);
|
protected readonly Color backColour = Color.FromArgb(250, 250, 250);
|
||||||
|
|
||||||
protected readonly Color titleBackColour = Color.FromArgb(235, 234, 233);
|
protected readonly Color titleBackColour = Color.FromArgb(235, 234, 233);
|
||||||
protected readonly Color titleBorderColour = Color.FromArgb(200, 198, 196);
|
protected readonly Color titleBorderColour = Color.FromArgb(200, 198, 196);
|
||||||
protected readonly Color titleColour = Color.FromArgb(102, 102, 102);
|
protected readonly Color titleColour = Color.FromArgb(102, 102, 102);
|
||||||
protected readonly int titleBarHeight = 54;
|
protected readonly int titleBarHeight = 33;
|
||||||
|
protected readonly bool showTitleBarLine = true;
|
||||||
protected Font titleFont = null;
|
protected Font titleFont = null;
|
||||||
protected int titleFontTop = 0;
|
protected int titleFontTop = 0;
|
||||||
|
|
||||||
protected readonly int titleBarIconSize = 20;
|
protected readonly Size titleBarIconSize = new Size(48, 32);
|
||||||
protected readonly int titleBarIconMargin = 8;
|
protected readonly int titleBarIconMargin = 0;
|
||||||
|
protected readonly int titleBarIconMarginRight = 0;
|
||||||
|
|
||||||
|
protected Image appIcon = null;
|
||||||
|
protected const int appIconLeft = 12;
|
||||||
|
protected const int appIconRight = 6;
|
||||||
|
protected int appIconTop = 0;
|
||||||
|
|
||||||
protected bool isDragging = false;
|
protected bool isDragging = false;
|
||||||
protected Point startPosition = new Point();
|
protected Point startPosition = new Point();
|
||||||
protected Point startWindowSize = new Point();
|
protected Point startWindowSize = new Point();
|
||||||
|
|
||||||
|
protected bool enableMinimise { get; set; } = true;
|
||||||
|
protected bool enableMaximise { get; set; } = true;
|
||||||
|
protected bool enableClose { get; set; } = true;
|
||||||
|
protected bool closeOnMinimise { get; set; } = false;
|
||||||
|
|
||||||
protected bool isBusy = false;
|
protected bool isBusy = false;
|
||||||
|
|
||||||
protected Image appIcon = null;
|
|
||||||
protected int appIconTop = 0;
|
|
||||||
|
|
||||||
protected bool isMinimiseEnabled = true;
|
|
||||||
protected bool isMaximiseEnabled = true;
|
|
||||||
protected bool closeOnMinimise = false;
|
|
||||||
protected bool enableMinimiseMenu = true;
|
|
||||||
protected bool enableMaximiseMenu = true;
|
|
||||||
protected bool enableCloseMenu = true;
|
|
||||||
|
|
||||||
protected MouseEventHandler minimiseMenuEvent = null;
|
|
||||||
protected MouseEventHandler maximiseMenuEvent = null;
|
|
||||||
protected MouseEventHandler closeMenuEvent = null;
|
|
||||||
|
|
||||||
private IContainer components;
|
private IContainer components;
|
||||||
|
|
||||||
|
|
||||||
public TForm() : base()
|
public TForm() : base()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
@ -130,14 +126,15 @@ namespace AppLauncher.Windows.Forms
|
|||||||
area.Inflate((-1 * borderWidth), (-1 * borderWidth));
|
area.Inflate((-1 * borderWidth), (-1 * borderWidth));
|
||||||
|
|
||||||
g.FillRectangle(new SolidBrush(titleBackColour), area.X, area.Y, (area.Width + area.X), titleBarHeight);
|
g.FillRectangle(new SolidBrush(titleBackColour), area.X, area.Y, (area.Width + area.X), titleBarHeight);
|
||||||
g.DrawLine(new Pen(titleBorderColour, 1), area.X, (titleBarHeight + 1), (area.Width + area.X), (titleBarHeight + 1));
|
|
||||||
|
if (showTitleBarLine) g.DrawLine(new Pen(titleBorderColour, 1), area.X, titleBarHeight, (area.Width + area.X), titleBarHeight);
|
||||||
|
|
||||||
if (!DesignMode)
|
if (!DesignMode)
|
||||||
{
|
{
|
||||||
//g.DrawImageUnscaled(appIcon, 17, appIconTop);
|
if (appIcon != null) g.DrawImageUnscaled(appIcon, appIconLeft, appIconTop);
|
||||||
g.DrawImage(appIcon, 17, appIconTop, appIcon.Width, appIcon.Height);
|
|
||||||
|
|
||||||
TextRenderer.DrawText(g, this.Text, titleFont, new Point(58, titleFontTop), titleColour);
|
int iconPosX = borderWidth + appIconLeft + appIconRight + ((appIcon == null) ? 0 : appIcon.Width);
|
||||||
|
TextRenderer.DrawText(g, this.Text, titleFont, new Point(iconPosX, titleFontTop), titleColour);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -149,7 +146,7 @@ namespace AppLauncher.Windows.Forms
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
|
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
|
||||||
public override Color BackColor { get => base.BackColor; set => base.BackColor = value; }
|
public override Color BackColor { get => base.BackColor; set => base.BackColor = backColour; }
|
||||||
|
|
||||||
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
|
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
|
||||||
public new FormBorderStyle FormBorderStyle { get => base.FormBorderStyle; set => base.FormBorderStyle = value; }
|
public new FormBorderStyle FormBorderStyle { get => base.FormBorderStyle; set => base.FormBorderStyle = value; }
|
||||||
@ -190,7 +187,7 @@ namespace AppLauncher.Windows.Forms
|
|||||||
// AForm
|
// AForm
|
||||||
//
|
//
|
||||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
|
||||||
this.Name = "Form";
|
this.Name = "AForm";
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -235,40 +232,28 @@ namespace AppLauncher.Windows.Forms
|
|||||||
|
|
||||||
// close
|
// close
|
||||||
TImageBox closeBox = generateToolbarImageBox();
|
TImageBox closeBox = generateToolbarImageBox();
|
||||||
if (enableCloseMenu)
|
closeBox.Image = closeBox.ImageNormal = (enableClose) ? Resources.titlebar_close : Resources.titlebar_blank;
|
||||||
{
|
closeBox.ImageHover = (enableClose) ? Resources.titlebar_close3 : Resources.titlebar_blank;
|
||||||
closeBox.Image = closeBox.ImageNormal = Resources.close;
|
closeBox.ImageSelected = Resources.titlebar_close3;
|
||||||
closeBox.ImageHover = Resources.close3;
|
|
||||||
//closeBox.ImageSelected = null;
|
|
||||||
closeBox.MouseClick += delegate (object sender, MouseEventArgs e)
|
closeBox.MouseClick += delegate (object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
if (e.Button != MouseButtons.Left) return;
|
if (e.Button == MouseButtons.Left)
|
||||||
|
{
|
||||||
if (closeMenuEvent != null)
|
if (enableClose)
|
||||||
{
|
{
|
||||||
closeMenuEvent(sender, e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.Close();
|
this.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
closeBox.Left = this.DisplayRectangle.Width - closeBox.Width - (titleBarIconMarginRight + borderWidth);
|
||||||
else
|
|
||||||
{
|
|
||||||
closeBox.Image = closeBox.ImageNormal = closeBox.ImageHover = closeBox.ImageSelected = Resources.close;
|
|
||||||
}
|
|
||||||
|
|
||||||
closeBox.Left = this.DisplayRectangle.Width - closeBox.Width - 17;
|
|
||||||
|
|
||||||
this.Controls.Add(closeBox);
|
this.Controls.Add(closeBox);
|
||||||
|
|
||||||
// maximise
|
// maximise
|
||||||
TImageBox maximiseBox = generateToolbarImageBox();
|
TImageBox maximiseBox = generateToolbarImageBox();
|
||||||
if (enableMaximiseMenu)
|
maximiseBox.Image = maximiseBox.ImageNormal = (enableMaximise) ? Resources.titlebar_maximise : Resources.titlebar_blank;
|
||||||
{
|
maximiseBox.ImageHover = (enableMaximise) ? Resources.titlebar_maximise5 : Resources.titlebar_blank;
|
||||||
maximiseBox.Image = maximiseBox.ImageNormal = (isMaximiseEnabled) ? Resources.maximise : Resources.empty;
|
maximiseBox.ImageSelected = Resources.titlebar_maximise3;
|
||||||
maximiseBox.ImageHover = (isMaximiseEnabled) ? Resources.maximise2 : Resources.empty;
|
|
||||||
maximiseBox.ImageSelected = Resources.maximise3;
|
|
||||||
maximiseBox.MouseClick += delegate (object sender, MouseEventArgs e)
|
maximiseBox.MouseClick += delegate (object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
if (!(sender is TImageBox)) return;
|
if (!(sender is TImageBox)) return;
|
||||||
@ -277,25 +262,19 @@ namespace AppLauncher.Windows.Forms
|
|||||||
|
|
||||||
if (imageBox2 == null) return;
|
if (imageBox2 == null) return;
|
||||||
|
|
||||||
if (maximiseMenuEvent != null)
|
|
||||||
{
|
|
||||||
maximiseMenuEvent(sender, e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (e.Button == MouseButtons.Left)
|
if (e.Button == MouseButtons.Left)
|
||||||
{
|
{
|
||||||
if (isMaximiseEnabled)
|
if (enableMaximise)
|
||||||
{
|
{
|
||||||
if (this.WindowState == FormWindowState.Maximized)
|
if (this.WindowState == FormWindowState.Maximized)
|
||||||
{
|
{
|
||||||
this.WindowState = FormWindowState.Normal;
|
this.WindowState = FormWindowState.Normal;
|
||||||
imageBox2.Image = imageBox2.ImageNormal = Resources.maximise;
|
imageBox2.Image = imageBox2.ImageNormal = Resources.titlebar_maximise;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.WindowState = FormWindowState.Maximized;
|
this.WindowState = FormWindowState.Maximized;
|
||||||
imageBox2.Image = imageBox2.ImageNormal = Resources.maximise2;
|
imageBox2.Image = imageBox2.ImageNormal = Resources.titlebar_maximise5;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -305,44 +284,30 @@ namespace AppLauncher.Windows.Forms
|
|||||||
|
|
||||||
if (this.TopMost)
|
if (this.TopMost)
|
||||||
{
|
{
|
||||||
imageBox2.Image = imageBox2.ImageNormal = Resources.maximise3;
|
imageBox2.Image = imageBox2.ImageNormal = Resources.titlebar_maximise3;
|
||||||
imageBox2.ImageHover = (isMaximiseEnabled) ? Resources.maximise2 : Resources.maximise3;
|
imageBox2.ImageHover = (enableMaximise) ? Resources.titlebar_maximise5 : Resources.titlebar_maximise3;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
imageBox2.Image = imageBox2.ImageNormal = (isMaximiseEnabled) ? Resources.maximise : Resources.empty;
|
imageBox2.Image = imageBox2.ImageNormal = (enableMaximise) ? Resources.titlebar_maximise : Resources.titlebar_blank;
|
||||||
imageBox2.ImageHover = (isMaximiseEnabled) ? Resources.maximise2 : Resources.empty;
|
imageBox2.ImageHover = (enableMaximise) ? Resources.titlebar_maximise5 : Resources.titlebar_blank;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
maximiseBox.Image = maximiseBox.ImageNormal = maximiseBox.ImageHover = maximiseBox.ImageSelected = Resources.maximise;
|
|
||||||
}
|
|
||||||
|
|
||||||
maximiseBox.Left = closeBox.Left - maximiseBox.Width - titleBarIconMargin;
|
maximiseBox.Left = closeBox.Left - maximiseBox.Width - titleBarIconMargin;
|
||||||
|
|
||||||
this.Controls.Add(maximiseBox);
|
this.Controls.Add(maximiseBox);
|
||||||
|
|
||||||
// minimise
|
// minimise
|
||||||
TImageBox minimiseBox = generateToolbarImageBox();
|
TImageBox minimiseBox = generateToolbarImageBox();
|
||||||
if (enableMinimiseMenu)
|
minimiseBox.Image = minimiseBox.ImageNormal = (enableMinimise) ? Resources.titlebar_minimise : Resources.titlebar_blank;
|
||||||
{
|
minimiseBox.ImageHover = (enableMinimise) ? Resources.titlebar_minimise5 : Resources.titlebar_blank;
|
||||||
minimiseBox.Image = minimiseBox.ImageNormal = (isMinimiseEnabled) ? Resources.minimise : Resources.empty;
|
|
||||||
minimiseBox.ImageHover = (isMinimiseEnabled) ? Resources.minimise2 : Resources.empty;
|
|
||||||
//minimiseBox.ImageSelected = null;
|
//minimiseBox.ImageSelected = null;
|
||||||
minimiseBox.MouseClick += delegate (object sender, MouseEventArgs e)
|
minimiseBox.MouseClick += delegate (object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
if (!isMinimiseEnabled) return;
|
if (!enableMinimise) return;
|
||||||
if (e.Button != MouseButtons.Left) return;
|
if (e.Button != MouseButtons.Left) return;
|
||||||
|
|
||||||
if (minimiseMenuEvent != null)
|
|
||||||
{
|
|
||||||
minimiseMenuEvent(sender, e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (closeOnMinimise)
|
if (closeOnMinimise)
|
||||||
{
|
{
|
||||||
this.Close();
|
this.Close();
|
||||||
@ -352,12 +317,6 @@ namespace AppLauncher.Windows.Forms
|
|||||||
this.WindowState = FormWindowState.Minimized;
|
this.WindowState = FormWindowState.Minimized;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
minimiseBox.Image = minimiseBox.ImageNormal = minimiseBox.ImageHover = minimiseBox.ImageSelected = Resources.minimise;
|
|
||||||
}
|
|
||||||
|
|
||||||
minimiseBox.Left = maximiseBox.Left - minimiseBox.Width - titleBarIconMargin;
|
minimiseBox.Left = maximiseBox.Left - minimiseBox.Width - titleBarIconMargin;
|
||||||
|
|
||||||
this.Controls.Add(minimiseBox);
|
this.Controls.Add(minimiseBox);
|
||||||
@ -436,7 +395,8 @@ namespace AppLauncher.Windows.Forms
|
|||||||
protected TImageBox generateToolbarImageBox()
|
protected TImageBox generateToolbarImageBox()
|
||||||
{
|
{
|
||||||
TImageBox imageBox = new TImageBox();
|
TImageBox imageBox = new TImageBox();
|
||||||
imageBox.BackColor = Color.Transparent;
|
//imageBox.BackColor = Color.Transparent;
|
||||||
|
imageBox.BackColorHover = imageBox.BackColorSelected = Color.FromArgb(220, 220, 220);
|
||||||
imageBox.BackgroundImageLayout = ImageLayout.Center;
|
imageBox.BackgroundImageLayout = ImageLayout.Center;
|
||||||
imageBox.ErrorImage = null;
|
imageBox.ErrorImage = null;
|
||||||
//imageBox.Image = Resources.close;
|
//imageBox.Image = Resources.close;
|
||||||
@ -445,12 +405,13 @@ namespace AppLauncher.Windows.Forms
|
|||||||
imageBox.ImageSelected = null;
|
imageBox.ImageSelected = null;
|
||||||
imageBox.IsSelected = false;
|
imageBox.IsSelected = false;
|
||||||
//closeBox.Location = new System.Drawing.Point(169, 12);
|
//closeBox.Location = new System.Drawing.Point(169, 12);
|
||||||
imageBox.Size = new System.Drawing.Size(titleBarIconSize, titleBarIconSize);
|
imageBox.Size = titleBarIconSize;
|
||||||
imageBox.SizeMode = PictureBoxSizeMode.CenterImage;
|
imageBox.SizeMode = PictureBoxSizeMode.CenterImage;
|
||||||
//imageBox.MouseClick += new MouseEventHandler(closeBox_MouseClick);
|
//imageBox.MouseClick += new MouseEventHandler(closeBox_MouseClick);
|
||||||
//imageBox.Left = this.DisplayRectangle.Width - imageBox.Width - 17;
|
//imageBox.Left = this.DisplayRectangle.Width - imageBox.Width - 17;
|
||||||
imageBox.Top = (int)Math.Floor((decimal)(titleBarHeight - titleBarIconSize) / 2);
|
imageBox.Top = (int)Math.Floor((decimal) (titleBarHeight - titleBarIconSize.Height) / 2) + borderWidth;
|
||||||
imageBox.Anchor = (AnchorStyles.Top | AnchorStyles.Right);
|
imageBox.Anchor = (AnchorStyles.Top | AnchorStyles.Right);
|
||||||
|
imageBox.Padding = new Padding(0);
|
||||||
|
|
||||||
return imageBox;
|
return imageBox;
|
||||||
}
|
}
|
||||||
|
@ -21,9 +21,21 @@ namespace RyzStudio.Windows.Forms
|
|||||||
base.OnCreateControl();
|
base.OnCreateControl();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
|
||||||
|
public new Color BackColor { get => base.BackColor; set => base.BackColor = value; }
|
||||||
|
|
||||||
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
|
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
|
||||||
public new Image Image { get => base.Image; set => base.Image = value; }
|
public new Image Image { get => base.Image; set => base.Image = value; }
|
||||||
|
|
||||||
|
[Category("Appearance"), Browsable(true)]
|
||||||
|
public Color BackColorNormal { get; set; } = Color.Transparent;
|
||||||
|
|
||||||
|
[Category("Appearance"), Browsable(true)]
|
||||||
|
public Color BackColorHover { get; set; } = Color.Transparent;
|
||||||
|
|
||||||
|
[Category("Appearance"), Browsable(true)]
|
||||||
|
public Color BackColorSelected { get; set; } = Color.Transparent;
|
||||||
|
|
||||||
[Category("Appearance"), Browsable(true)]
|
[Category("Appearance"), Browsable(true)]
|
||||||
public Image ImageNormal { get; set; }
|
public Image ImageNormal { get; set; }
|
||||||
|
|
||||||
@ -33,11 +45,21 @@ namespace RyzStudio.Windows.Forms
|
|||||||
[Category("Appearance"), Browsable(true)]
|
[Category("Appearance"), Browsable(true)]
|
||||||
public Image ImageSelected { get; set; }
|
public Image ImageSelected { get; set; }
|
||||||
|
|
||||||
|
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
|
||||||
|
public Image NormalImage { get => this.ImageNormal; set => this.ImageNormal = value; }
|
||||||
|
|
||||||
|
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
|
||||||
|
public Image HoverImage { get => this.ImageHover; set => this.ImageHover = value; }
|
||||||
|
|
||||||
|
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
|
||||||
|
public Image SelectedImage { get => this.ImageSelected; set => this.ImageSelected = value; }
|
||||||
|
|
||||||
public bool IsSelected { get; set; } = false;
|
public bool IsSelected { get; set; } = false;
|
||||||
|
|
||||||
protected override void OnMouseEnter(EventArgs e)
|
protected override void OnMouseEnter(EventArgs e)
|
||||||
{
|
{
|
||||||
this.Image = this.ImageHover;
|
this.Image = this.ImageHover;
|
||||||
|
this.BackColor = this.BackColorHover;
|
||||||
|
|
||||||
base.OnMouseEnter(e);
|
base.OnMouseEnter(e);
|
||||||
}
|
}
|
||||||
@ -45,6 +67,7 @@ namespace RyzStudio.Windows.Forms
|
|||||||
protected override void OnMouseLeave(EventArgs e)
|
protected override void OnMouseLeave(EventArgs e)
|
||||||
{
|
{
|
||||||
this.Image = (this.IsSelected ? this.ImageSelected : this.ImageNormal);
|
this.Image = (this.IsSelected ? this.ImageSelected : this.ImageNormal);
|
||||||
|
this.BackColor = (this.IsSelected ? this.BackColorSelected : this.BackColorNormal);
|
||||||
|
|
||||||
base.OnMouseLeave(e);
|
base.OnMouseLeave(e);
|
||||||
}
|
}
|
||||||
@ -52,6 +75,7 @@ namespace RyzStudio.Windows.Forms
|
|||||||
protected override void OnLostFocus(EventArgs e)
|
protected override void OnLostFocus(EventArgs e)
|
||||||
{
|
{
|
||||||
this.Image = (this.IsSelected ? this.ImageSelected : this.ImageNormal);
|
this.Image = (this.IsSelected ? this.ImageSelected : this.ImageNormal);
|
||||||
|
this.BackColor = (this.IsSelected ? this.BackColorSelected : this.BackColorNormal);
|
||||||
|
|
||||||
base.OnLostFocus(e);
|
base.OnLostFocus(e);
|
||||||
}
|
}
|
||||||
|
@ -152,14 +152,12 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Resources\toggle-right-ea-16.png" />
|
<None Include="Resources\toggle-right-ea-16.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<None Include="Resources\app_icon_24.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Resources\folder_32.png" />
|
<None Include="Resources\folder_32.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="favicon.ico" />
|
<Content Include="favicon.ico" />
|
||||||
|
<None Include="Resources\app_icon.png" />
|
||||||
<None Include="Resources\app_icon_32.png" />
|
<None Include="Resources\app_icon_32.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
77
MainForm.Designer.cs
generated
@ -42,6 +42,7 @@
|
|||||||
this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator();
|
this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator();
|
||||||
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
|
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripMenuItem();
|
this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
|
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripMenuItem();
|
this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
@ -50,15 +51,16 @@
|
|||||||
this.viewHelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.viewHelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
||||||
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
|
||||||
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
|
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
|
||||||
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
|
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
|
||||||
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
|
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
|
||||||
this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
|
this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||||
this.exitToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
|
this.exitToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripMenuItem();
|
this.panel1 = new System.Windows.Forms.Panel();
|
||||||
|
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
||||||
this.contextMenuStrip1.SuspendLayout();
|
this.contextMenuStrip1.SuspendLayout();
|
||||||
this.contextMenuStrip2.SuspendLayout();
|
this.contextMenuStrip2.SuspendLayout();
|
||||||
|
this.panel1.SuspendLayout();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// contextMenuStrip1
|
// contextMenuStrip1
|
||||||
@ -69,7 +71,7 @@
|
|||||||
this.toolStripMenuItem9,
|
this.toolStripMenuItem9,
|
||||||
this.helpToolStripMenuItem});
|
this.helpToolStripMenuItem});
|
||||||
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
||||||
this.contextMenuStrip1.Size = new System.Drawing.Size(181, 114);
|
this.contextMenuStrip1.Size = new System.Drawing.Size(102, 92);
|
||||||
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
|
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
|
||||||
//
|
//
|
||||||
// toolStripMenuItem4
|
// toolStripMenuItem4
|
||||||
@ -85,7 +87,7 @@
|
|||||||
this.toolStripMenuItem10,
|
this.toolStripMenuItem10,
|
||||||
this.exitToolStripMenuItem});
|
this.exitToolStripMenuItem});
|
||||||
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
|
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
|
||||||
this.toolStripMenuItem4.Size = new System.Drawing.Size(180, 22);
|
this.toolStripMenuItem4.Size = new System.Drawing.Size(101, 22);
|
||||||
this.toolStripMenuItem4.Text = "&File";
|
this.toolStripMenuItem4.Text = "&File";
|
||||||
//
|
//
|
||||||
// toolStripMenuItem5
|
// toolStripMenuItem5
|
||||||
@ -152,9 +154,16 @@
|
|||||||
this.toolStripMenuItem11,
|
this.toolStripMenuItem11,
|
||||||
this.toolStripMenuItem1});
|
this.toolStripMenuItem1});
|
||||||
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
|
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
|
||||||
this.toolStripMenuItem3.Size = new System.Drawing.Size(180, 22);
|
this.toolStripMenuItem3.Size = new System.Drawing.Size(101, 22);
|
||||||
this.toolStripMenuItem3.Text = "&View";
|
this.toolStripMenuItem3.Text = "&View";
|
||||||
//
|
//
|
||||||
|
// toolStripMenuItem12
|
||||||
|
//
|
||||||
|
this.toolStripMenuItem12.Name = "toolStripMenuItem12";
|
||||||
|
this.toolStripMenuItem12.Size = new System.Drawing.Size(222, 22);
|
||||||
|
this.toolStripMenuItem12.Text = "Enable &Big Icons (In Folders)";
|
||||||
|
this.toolStripMenuItem12.Click += new System.EventHandler(this.toolStripMenuItem12_Click);
|
||||||
|
//
|
||||||
// toolStripMenuItem11
|
// toolStripMenuItem11
|
||||||
//
|
//
|
||||||
this.toolStripMenuItem11.Name = "toolStripMenuItem11";
|
this.toolStripMenuItem11.Name = "toolStripMenuItem11";
|
||||||
@ -174,7 +183,7 @@
|
|||||||
this.toolStripMenuItem9.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
this.toolStripMenuItem9.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
this.optionToolStripMenuItem});
|
this.optionToolStripMenuItem});
|
||||||
this.toolStripMenuItem9.Name = "toolStripMenuItem9";
|
this.toolStripMenuItem9.Name = "toolStripMenuItem9";
|
||||||
this.toolStripMenuItem9.Size = new System.Drawing.Size(180, 22);
|
this.toolStripMenuItem9.Size = new System.Drawing.Size(101, 22);
|
||||||
this.toolStripMenuItem9.Text = "&Tools";
|
this.toolStripMenuItem9.Text = "&Tools";
|
||||||
//
|
//
|
||||||
// optionToolStripMenuItem
|
// optionToolStripMenuItem
|
||||||
@ -191,7 +200,7 @@
|
|||||||
this.toolStripSeparator1,
|
this.toolStripSeparator1,
|
||||||
this.aboutToolStripMenuItem});
|
this.aboutToolStripMenuItem});
|
||||||
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
|
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
|
||||||
this.helpToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
this.helpToolStripMenuItem.Size = new System.Drawing.Size(101, 22);
|
||||||
this.helpToolStripMenuItem.Text = "&Help";
|
this.helpToolStripMenuItem.Text = "&Help";
|
||||||
//
|
//
|
||||||
// viewHelpToolStripMenuItem
|
// viewHelpToolStripMenuItem
|
||||||
@ -213,21 +222,6 @@
|
|||||||
this.aboutToolStripMenuItem.Text = "&About";
|
this.aboutToolStripMenuItem.Text = "&About";
|
||||||
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
|
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// flowLayoutPanel1
|
|
||||||
//
|
|
||||||
this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
|
||||||
| System.Windows.Forms.AnchorStyles.Left)
|
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
|
||||||
this.flowLayoutPanel1.AutoScroll = true;
|
|
||||||
this.flowLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
|
|
||||||
this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
|
|
||||||
this.flowLayoutPanel1.Location = new System.Drawing.Point(12, 58);
|
|
||||||
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
|
|
||||||
this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0);
|
|
||||||
this.flowLayoutPanel1.Size = new System.Drawing.Size(620, 340);
|
|
||||||
this.flowLayoutPanel1.TabIndex = 27;
|
|
||||||
this.flowLayoutPanel1.WrapContents = false;
|
|
||||||
//
|
|
||||||
// saveFileDialog1
|
// saveFileDialog1
|
||||||
//
|
//
|
||||||
this.saveFileDialog1.Filter = "Session files|*.jsonfig";
|
this.saveFileDialog1.Filter = "Session files|*.jsonfig";
|
||||||
@ -260,21 +254,41 @@
|
|||||||
this.exitToolStripMenuItem1.Text = "E&xit";
|
this.exitToolStripMenuItem1.Text = "E&xit";
|
||||||
this.exitToolStripMenuItem1.Click += new System.EventHandler(this.exitToolStripMenuItem1_Click);
|
this.exitToolStripMenuItem1.Click += new System.EventHandler(this.exitToolStripMenuItem1_Click);
|
||||||
//
|
//
|
||||||
// toolStripMenuItem12
|
// panel1
|
||||||
//
|
//
|
||||||
this.toolStripMenuItem12.Name = "toolStripMenuItem12";
|
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||||
this.toolStripMenuItem12.Size = new System.Drawing.Size(222, 22);
|
| System.Windows.Forms.AnchorStyles.Left)
|
||||||
this.toolStripMenuItem12.Text = "Enable &Big Icons (In Folders)";
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.toolStripMenuItem12.Click += new System.EventHandler(this.toolStripMenuItem12_Click);
|
this.panel1.AutoScroll = true;
|
||||||
|
this.panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
|
||||||
|
this.panel1.BackColor = System.Drawing.Color.Transparent;
|
||||||
|
this.panel1.Controls.Add(this.flowLayoutPanel1);
|
||||||
|
this.panel1.Location = new System.Drawing.Point(12, 34);
|
||||||
|
this.panel1.Name = "panel1";
|
||||||
|
this.panel1.Size = new System.Drawing.Size(620, 363);
|
||||||
|
this.panel1.TabIndex = 0;
|
||||||
|
//
|
||||||
|
// flowLayoutPanel1
|
||||||
|
//
|
||||||
|
this.flowLayoutPanel1.AutoSize = true;
|
||||||
|
this.flowLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
|
||||||
|
this.flowLayoutPanel1.BackColor = System.Drawing.Color.Transparent;
|
||||||
|
this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
|
||||||
|
this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
|
||||||
|
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
|
||||||
|
this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 20);
|
||||||
|
this.flowLayoutPanel1.Size = new System.Drawing.Size(0, 30);
|
||||||
|
this.flowLayoutPanel1.TabIndex = 29;
|
||||||
|
this.flowLayoutPanel1.WrapContents = false;
|
||||||
//
|
//
|
||||||
// MainForm
|
// MainForm
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(254)))), ((int)(((byte)(254)))));
|
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(250)))), ((int)(((byte)(250)))));
|
||||||
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
|
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
|
||||||
this.ClientSize = new System.Drawing.Size(633, 400);
|
this.ClientSize = new System.Drawing.Size(633, 400);
|
||||||
this.Controls.Add(this.flowLayoutPanel1);
|
this.Controls.Add(this.panel1);
|
||||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||||
this.MinimumSize = new System.Drawing.Size(420, 280);
|
this.MinimumSize = new System.Drawing.Size(420, 280);
|
||||||
this.Name = "MainForm";
|
this.Name = "MainForm";
|
||||||
@ -282,12 +296,13 @@
|
|||||||
this.TitleContextMenuStrip = this.contextMenuStrip1;
|
this.TitleContextMenuStrip = this.contextMenuStrip1;
|
||||||
this.contextMenuStrip1.ResumeLayout(false);
|
this.contextMenuStrip1.ResumeLayout(false);
|
||||||
this.contextMenuStrip2.ResumeLayout(false);
|
this.contextMenuStrip2.ResumeLayout(false);
|
||||||
|
this.panel1.ResumeLayout(false);
|
||||||
|
this.panel1.PerformLayout();
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
|
|
||||||
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
|
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
|
||||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
|
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
|
||||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
|
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
|
||||||
@ -314,6 +329,8 @@
|
|||||||
private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem1;
|
private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem1;
|
||||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem11;
|
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem11;
|
||||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem12;
|
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem12;
|
||||||
|
private System.Windows.Forms.Panel panel1;
|
||||||
|
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,8 +40,10 @@ namespace AppLauncher
|
|||||||
|
|
||||||
this.StartPosition = FormStartPosition.WindowsDefaultBounds;
|
this.StartPosition = FormStartPosition.WindowsDefaultBounds;
|
||||||
|
|
||||||
appIcon = Properties.Resources.app_icon_32;
|
appIcon = Properties.Resources.app_icon;
|
||||||
enableMaximiseMenu = false;
|
|
||||||
|
enableMaximise = false;
|
||||||
|
//enableMaximiseMenu = false;
|
||||||
closeOnMinimise = true;
|
closeOnMinimise = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -139,7 +141,8 @@ namespace AppLauncher
|
|||||||
break;
|
break;
|
||||||
case WM_QUERYENDSESSION:
|
case WM_QUERYENDSESSION:
|
||||||
requestExit = true;
|
requestExit = true;
|
||||||
this.Close();
|
//this.Close();
|
||||||
|
Application.Exit();
|
||||||
|
|
||||||
break;
|
break;
|
||||||
default: break;
|
default: break;
|
||||||
|
@ -20,11 +20,81 @@ namespace AppLauncher.Models
|
|||||||
|
|
||||||
public override string ToString() => this.Title ?? string.Empty;
|
public override string ToString() => this.Title ?? string.Empty;
|
||||||
|
|
||||||
public string CleanProcessFilename => (string.IsNullOrWhiteSpace(this.ProcessFilename) ? string.Empty : Environment.ExpandEnvironmentVariables(this.ProcessFilename));
|
public string CleanProcessFilename => (string.IsNullOrWhiteSpace(this.ProcessFilename) ? string.Empty : resolvePath(this.ProcessFilename));
|
||||||
|
|
||||||
public string CleanProcessArgument => (string.IsNullOrWhiteSpace(this.ProcessArgument) ? string.Empty : Environment.ExpandEnvironmentVariables(this.ProcessArgument));
|
public string CleanProcessArgument => (string.IsNullOrWhiteSpace(this.ProcessArgument) ? string.Empty : resolvePath(this.ProcessArgument));
|
||||||
|
|
||||||
public string CleanProcessWorkingDirectory => (string.IsNullOrWhiteSpace(this.ProcessWorkingDirectory) ? string.Empty : Environment.ExpandEnvironmentVariables(this.ProcessWorkingDirectory));
|
public string CleanProcessWorkingDirectory => (string.IsNullOrWhiteSpace(this.ProcessWorkingDirectory) ? string.Empty : resolvePath(this.ProcessWorkingDirectory));
|
||||||
|
|
||||||
|
protected string resolvePath(string value)
|
||||||
|
{
|
||||||
|
string rv = Environment.ExpandEnvironmentVariables(value);
|
||||||
|
|
||||||
|
rv = resolveFirstPath(rv);
|
||||||
|
rv = resolveLastPath(rv);
|
||||||
|
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected string resolveFirstPath(string value)
|
||||||
|
{
|
||||||
|
const string last = "%FIRST%";
|
||||||
|
if (!value.Contains(last))
|
||||||
|
{
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
string head = value.Substring(0, value.IndexOf(last));
|
||||||
|
string tail = value.Substring(value.IndexOf(last) + last.Length);
|
||||||
|
|
||||||
|
string[] dirList = new string[0];
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
dirList = System.IO.Directory.GetDirectories(head, "*", System.IO.SearchOption.TopDirectoryOnly);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// do nothing
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dirList.Length <= 0)
|
||||||
|
{
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
return dirList[0] + tail;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected string resolveLastPath(string value)
|
||||||
|
{
|
||||||
|
const string last = "%LAST%";
|
||||||
|
if (!value.Contains(last))
|
||||||
|
{
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
string head = value.Substring(0, value.IndexOf(last));
|
||||||
|
string tail = value.Substring(value.IndexOf(last) + last.Length);
|
||||||
|
|
||||||
|
string[] dirList = new string[0];
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
dirList = System.IO.Directory.GetDirectories(head, "*", System.IO.SearchOption.TopDirectoryOnly);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// do nothing
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dirList.Length <= 0)
|
||||||
|
{
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
return dirList[(dirList.Length - 1)] + tail;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
4
Properties/Resources.Designer.cs
generated
@ -63,9 +63,9 @@ namespace AppLauncher.Properties {
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static System.Drawing.Bitmap app_icon_32 {
|
internal static System.Drawing.Bitmap app_icon {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("app_icon_32", resourceCulture);
|
object obj = ResourceManager.GetObject("app_icon", resourceCulture);
|
||||||
return ((System.Drawing.Bitmap)(obj));
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -118,8 +118,8 @@
|
|||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
<data name="app_icon_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="app_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\app_icon_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\app_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="folder_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="folder_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\folder_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\folder_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |