diff --git a/Installer/Installer.vdproj b/Installer/Installer.vdproj
index 21223c0..a038fed 100644
--- a/Installer/Installer.vdproj
+++ b/Installer/Installer.vdproj
@@ -21,7 +21,7 @@
}
"Entry"
{
- "MsmKey" = "8:_319FB8AF11673FA1DE35F32F28006014"
+ "MsmKey" = "8:_348F38381A436B17ED9D498F7B85293B"
"OwnerKey" = "8:_DF30C536B54F4789A5D9483F1711C32F"
"MsmSig" = "8:_UNDEFINED"
}
@@ -34,19 +34,19 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_06453D777CDCC5417ED9D2B4550F24E9"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_DF30C536B54F4789A5D9483F1711C32F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_319FB8AF11673FA1DE35F32F28006014"
+ "OwnerKey" = "8:_348F38381A436B17ED9D498F7B85293B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_UNDEFINED"
+ "OwnerKey" = "8:_06453D777CDCC5417ED9D2B4550F24E9"
"MsmSig" = "8:_UNDEFINED"
}
}
@@ -67,6 +67,14 @@
"PrivateKeyFile" = "8:"
"TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2"
+ "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+ {
+ "Enabled" = "11:TRUE"
+ "PromptEnabled" = "11:TRUE"
+ "PrerequisitesLocation" = "2:1"
+ "Url" = "8:"
+ "ComponentsUrl" = "8:"
+ }
}
"Release"
{
@@ -83,6 +91,14 @@
"PrivateKeyFile" = "8:"
"TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2"
+ "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
+ {
+ "Enabled" = "11:TRUE"
+ "PromptEnabled" = "11:TRUE"
+ "PrerequisitesLocation" = "2:1"
+ "Url" = "8:"
+ "ComponentsUrl" = "8:"
+ }
}
}
"Deployable"
@@ -143,14 +159,14 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_319FB8AF11673FA1DE35F32F28006014"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_348F38381A436B17ED9D498F7B85293B"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_319FB8AF11673FA1DE35F32F28006014"
+ "_348F38381A436B17ED9D498F7B85293B"
{
"Name" = "8:Newtonsoft.Json.dll"
"Attributes" = "3:512"
@@ -230,15 +246,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Fizzy Launcher"
- "ProductCode" = "8:{7A71598F-054E-4C67-B36B-7748F9980545}"
- "PackageCode" = "8:{C8B03E34-EB01-4DC4-A305-9BF6414006A2}"
+ "ProductCode" = "8:{7CAF68BE-7E5A-4EE3-96E3-D39781DD3330}"
+ "PackageCode" = "8:{AB19C030-EFEA-4954-8571-065CE113F0B5}"
"UpgradeCode" = "8:{7D53FD1D-34E0-4146-817B-8794A9178FCE}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:0.1.1.107"
+ "ProductVersion" = "8:0.1.1.108"
"Manufacturer" = "8:Hi, I'm Ray"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://www.hiimray.co.uk/software-fizzy-launcher"
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 11696d9..0be6320 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.1.1.107")]
+[assembly: AssemblyFileVersion("0.1.1.108")]
diff --git a/Resources/raw/app_icon_24.png b/Resources/raw/app_icon_24.png
deleted file mode 100644
index 2d9b51f..0000000
Binary files a/Resources/raw/app_icon_24.png and /dev/null differ
diff --git a/Resources/raw/icon-set.svg b/Resources/raw/icon-set.svg
index d5f2e3a..d7d223a 100644
--- a/Resources/raw/icon-set.svg
+++ b/Resources/raw/icon-set.svg
@@ -8,57 +8,57 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- sodipodi:docname="icon-set.svg"
- inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
- id="svg8"
- version="1.1"
- viewBox="0 0 210 297"
+ width="210mm"
height="297mm"
- width="210mm">
+ viewBox="0 0 210 297"
+ version="1.1"
+ id="svg8"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ sodipodi:docname="icon-set.svg">
+ stop-opacity="0.5"
+ stop-color="#ffffff" />
+ stop-opacity="0.25"
+ stop-color="#ffffff" />
+ id="linearGradient859"
+ x1="174.3136"
+ x2="284.79895"
+ xlink:href="#linearGradient856"
+ y1="129.67796"
+ y2="147.37285" />
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4.1750023"
+ inkscape:cx="315.07811"
+ inkscape:cy="427.8732"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ inkscape:document-rotation="0"
+ showgrid="false"
+ inkscape:window-width="1920"
+ inkscape:window-height="1017"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1" />
@@ -72,501 +72,532 @@
+ id="layer1">
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\RyzStudio\Windows\Forms\Resources\edit.png"
+ inkscape:export-xdpi="96.300003"
+ inkscape:export-ydpi="96.300003">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ style="fill:#66609e;fill-opacity:1;stroke:#66609e;stroke-opacity:1" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ transform="translate(-0.28397375,10.623964)"
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\RyzStudio\Windows\Forms\Resources\edit2.png"
+ inkscape:export-xdpi="96.300003"
+ inkscape:export-ydpi="96.300003">
+ transform="matrix(0.18713591,0,0,0.18713591,97.496016,76.71581)">
+ r="10"
+ cy="12"
+ cx="12" />
+ transform="matrix(0.08592684,0,0,0.08592684,98.715721,77.925124)">
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+ transform="matrix(0.4024192,0,0,0.4024192,47.691701,86.479192)"
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\Resources\app_icon_24.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
-
+
-
+
-
+
+ inkscape:export-xdpi="120"
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\Resources\rect1168.png"
+ id="rect1174"
+ height="5.5141511"
+ width="5.5141511"
+ y="11.45283"
+ x="2.7877357" />
+ transform="matrix(0.32940665,0,0,0.32940665,85.708522,93.493015)"
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\Resources\toggle-left-ea-16.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ ry="3.6404958"
+ rx="3.6404958"
+ height="7.2809916"
+ width="11.441558"
+ y="4.520071"
+ x="0.52007085" />
+ r="1.5602125"
+ cy="8.1605663"
+ cx="4.1605668" />
+ transform="matrix(0.33075013,0,0,0.33075013,91.462156,93.398154)"
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\Resources\toggle-right-ea-16.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ ry="3.618644"
+ rx="3.618644"
+ height="7.237288"
+ width="11.372882"
+ y="4.5169492"
+ x="0.51694918" />
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\Resources\toggle-right-ea-16.png"
+ style="stroke:#636977;stroke-width:1.0339;stroke-opacity:1"
+ id="circle5917"
+ r="1.5508475"
+ cy="8.1355934"
+ cx="8.2711868" />
+ transform="matrix(0.34189664,0,0,0.34189664,58.53086,85.862008)"
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\Resources\folder_32.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\Resources\folder-ea-32.png"
+ style="stroke:#636977;stroke-opacity:1"
+ id="path4528"
+ d="m 22,19 a 2,2 0 0 1 -2,2 H 4 A 2,2 0 0 1 2,19 V 5 A 2,2 0 0 1 4,3 h 5 l 2,3 h 9 a 2,2 0 0 1 2,2 z" />
+
+
+
+
+
+ id="rect1955-1" />
+ id="line1957-7" />
+ id="line1959-0" />
-
-
-
-
-
+
+
+
+
+
+ style="stroke:#e43d5b;stroke-opacity:1" />
+ style="stroke:#e43d5b;stroke-opacity:1" />
+ style="stroke:#e43d5b;stroke-opacity:1" />
-
-
-
-
-
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ rx="0.52916664"
+ height="4.7624998"
+ width="4.7624998"
+ y="100.26458"
+ x="50.264584"
+ style="fill:none;stroke:#9c9eab;stroke-width:0.529167;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+ x2="53.704166"
+ y1="103.70419"
+ x1="51.587502"
+ style="fill:none;stroke:#9c9eab;stroke-width:0.529167;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\RyzStudio\Windows\Forms\Resources\maximise_20.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ id="g2088"
+ style="stroke:#9c9eab;stroke-opacity:1">
+ rx="0.52916664"
+ height="4.7624998"
+ width="4.7624998"
+ y="100.23583"
+ x="57.506439"
+ style="fill:none;stroke:#9c9eab;stroke-width:0.529167;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+ x2="60.946022"
+ y1="101.55878"
+ x1="58.829357"
+ style="fill:none;stroke:#9c9eab;stroke-width:0.529167;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+ transform="translate(0.28551938,6.8433626)"
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\RyzStudio\Windows\Forms\Resources\minimise2_20.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ y="100.26458"
+ width="4.7624998"
+ height="4.7624998"
+ rx="0.52916664"
+ ry="0.52916664"
+ id="rect2046-8" />
+ y1="103.70419"
+ x2="53.704166"
+ y2="103.70419"
+ id="line2048-0" />
+ transform="translate(0.28551938,6.8433626)"
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\RyzStudio\Windows\Forms\Resources\maximise2_20.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ style="stroke:#ffa800;stroke-opacity:1"
+ id="g2088-0">
+ y="100.23583"
+ width="4.7624998"
+ height="4.7624998"
+ rx="0.52916664"
+ ry="0.52916664"
+ id="rect2046-3-0" />
+ y1="101.55878"
+ x2="60.946022"
+ y2="101.55878"
+ id="line2048-3-5" />
+ inkscape:export-xdpi="150"
+ id="path852"
+ d="m 115.92909,151.32554 -10.13759,3.10677 -7.82051,-7.03087 2.31709,-10.13756 10.1376,-3.10677 7.82051,7.03082 z"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#545b6b;stroke-width:1.33802;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+
+
+
+
+ transform="translate(-33.270941,-1.3308419)"
+ id="g2186-8">
-
-
-
-
-
-
+ inkscape:export-filename="L:\L\xData (95785206A)\2020\projects\linear-app-launcher\graphics\2\icon16.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ d="M 88.59595,152.12833 72.74081,156.9873 60.509578,145.99106 64.133499,130.13597 79.98864,125.277 92.21988,136.27316 Z"
+ id="path852-6"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96"
+ inkscape:export-filename="L:\L\xData (95785206A)\2020\projects\linear-app-launcher\graphics\2\icon128.png" />
+ id="g2186-8-3"
+ transform="matrix(2.6757045,0,0,2.6757045,-174.08721,-180.02964)">
-
+
-
+
-
+
+ width="2.2190003"
+ height="2.2190003"
+ id="rect1174-6-1-8"
+ inkscape:export-filename="L:\gitlab-hiimray\linear-app-launcher\Resources\rect1168.png"
+ inkscape:export-xdpi="120"
+ inkscape:export-ydpi="120"
+ style="fill:none;fill-opacity:1;stroke:#00b7d1;stroke-width:0.633999;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
diff --git a/RyzStudio/Windows/Forms/Resources/close2_16.png b/RyzStudio/Windows/Forms/Resources/close2_16.png
index f962292..c02cdf0 100644
Binary files a/RyzStudio/Windows/Forms/Resources/close2_16.png and b/RyzStudio/Windows/Forms/Resources/close2_16.png differ
diff --git a/RyzStudio/Windows/Forms/Resources/close2_20.png b/RyzStudio/Windows/Forms/Resources/close2_20.png
index a564cda..14e88b0 100644
Binary files a/RyzStudio/Windows/Forms/Resources/close2_20.png and b/RyzStudio/Windows/Forms/Resources/close2_20.png differ
diff --git a/RyzStudio/Windows/Forms/Resources/close_16.png b/RyzStudio/Windows/Forms/Resources/close_16.png
index 2fa28b0..25fc632 100644
Binary files a/RyzStudio/Windows/Forms/Resources/close_16.png and b/RyzStudio/Windows/Forms/Resources/close_16.png differ
diff --git a/RyzStudio/Windows/ThemedForms/TButton.cs b/RyzStudio/Windows/ThemedForms/TButton.cs
index 51d84f4..7bd7916 100644
--- a/RyzStudio/Windows/ThemedForms/TButton.cs
+++ b/RyzStudio/Windows/ThemedForms/TButton.cs
@@ -30,8 +30,8 @@
label1.ImageAlign = ContentAlignment.MiddleCenter;
this.StyleDefault = new ButtonStyle() { BackColour = Color.White, PenColour = Color.Black, ForeImage = this.DefaultImage };
- this.StyleDown = new ButtonStyle() { BackColour = Color.FromArgb(179, 179, 179), PenColour = Color.Black, ForeImage = this.DownImage };
- this.StyleOver = new ButtonStyle() { BackColour = Color.FromArgb(51, 51, 51), PenColour = Color.White, ForeImage = this.OverImage };
+ this.StyleDown = new ButtonStyle() { BackColour = Color.FromArgb(0, 183, 209), PenColour = Color.Black, ForeImage = this.DownImage };
+ this.StyleOver = new ButtonStyle() { BackColour = Color.FromArgb(108, 101, 196), PenColour = Color.White, ForeImage = this.OverImage };
this.StyleSelected = new ButtonStyle() { BackColour = Color.FromArgb(51, 51, 51), PenColour = Color.White, ForeImage = this.OverImage };
label1.Click += delegate { this.OnClick(null); };
diff --git a/RyzStudio/Windows/ThemedForms/TDialogForm.cs b/RyzStudio/Windows/ThemedForms/TDialogForm.cs
index fef0327..f6d451e 100644
--- a/RyzStudio/Windows/ThemedForms/TDialogForm.cs
+++ b/RyzStudio/Windows/ThemedForms/TDialogForm.cs
@@ -9,7 +9,8 @@
public partial class TDialogForm : System.Windows.Forms.Form
{
- protected readonly Color borderColour = Color.FromArgb(232, 231, 236);
+ //protected readonly Color borderColour = Color.FromArgb(232, 231, 236);
+ protected readonly Color borderColour = Color.FromArgb(77, 84, 100);
protected readonly int borderWidth = 1;
protected readonly Color titleBarColour = Color.FromArgb(152, 175, 206);
protected readonly Color titleBarForeColour = Color.White;
@@ -82,6 +83,7 @@
// border
g.DrawRectangle(new Pen(borderColour, borderWidth), area);
+ g.DrawLine(new Pen(borderColour, 1), this.DisplayRectangle.X, (titleBarHeight + 1), this.DisplayRectangle.Width, (titleBarHeight + 1));
area.Inflate((-1 * borderWidth), (-1 * borderWidth));
diff --git a/Windows/Forms/Tile/TTilePanel.cs b/Windows/Forms/Tile/TTilePanel.cs
index eb4f75a..8136700 100644
--- a/Windows/Forms/Tile/TTilePanel.cs
+++ b/Windows/Forms/Tile/TTilePanel.cs
@@ -297,8 +297,6 @@ namespace AppLauncher.Windows.Forms
return (item as MainForm);
}
}
-
- return null;
}
private void toolItem_Click(object sender, EventArgs e)