diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index a1519e8..dabbe01 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -39,5 +39,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.17.21")]
-[assembly: AssemblyFileVersion("1.0.17.21")]
+[assembly: AssemblyVersion("1.0.17.22")]
+[assembly: AssemblyFileVersion("1.0.17.22")]
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 85dd61c..6f32f28 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -240,36 +240,16 @@ namespace SystemTrayMenu.Properties {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap NotSelected {
- get {
- object obj = ResourceManager.GetObject("NotSelected", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
///
- public static System.Drawing.Icon search2 {
+ public static System.Drawing.Icon search {
get {
- object obj = ResourceManager.GetObject("search2", resourceCulture);
+ object obj = ResourceManager.GetObject("search", resourceCulture);
return ((System.Drawing.Icon)(obj));
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap Selected {
- get {
- object obj = ResourceManager.GetObject("Selected", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
///
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index d7eccec..93663a8 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -119,72 +119,66 @@
- ..\Resources\L080.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L080.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L020.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L020.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L070.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\resources\Selected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\NotSelected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L070.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L140.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L140.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L160.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L160.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L100.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L100.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L060.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L060.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L180.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L180.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\White50Percentage.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L150.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L150.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L120.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L120.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L170.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L170.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\SystemTrayMenu.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L090.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L090.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L040.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L040.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L010.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L010.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L030.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L030.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L050.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L050.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L130.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L130.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\L110.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\LoadingIcon\L110.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\search1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\search.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
index 4acdb40..fca2f07 100644
--- a/Properties/Settings.Designer.cs
+++ b/Properties/Settings.Designer.cs
@@ -206,7 +206,7 @@ namespace SystemTrayMenu.Properties
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("200")]
+ [global::System.Configuration.DefaultSettingValueAttribute("100")]
public int TimeUntilOpens
{
get
diff --git a/Resources/L010.ico b/Resources/LoadingIcon/L010.ico
similarity index 100%
rename from Resources/L010.ico
rename to Resources/LoadingIcon/L010.ico
diff --git a/Resources/L020.ico b/Resources/LoadingIcon/L020.ico
similarity index 100%
rename from Resources/L020.ico
rename to Resources/LoadingIcon/L020.ico
diff --git a/Resources/L030.ico b/Resources/LoadingIcon/L030.ico
similarity index 100%
rename from Resources/L030.ico
rename to Resources/LoadingIcon/L030.ico
diff --git a/Resources/L040.ico b/Resources/LoadingIcon/L040.ico
similarity index 100%
rename from Resources/L040.ico
rename to Resources/LoadingIcon/L040.ico
diff --git a/Resources/L050.ico b/Resources/LoadingIcon/L050.ico
similarity index 100%
rename from Resources/L050.ico
rename to Resources/LoadingIcon/L050.ico
diff --git a/Resources/L060.ico b/Resources/LoadingIcon/L060.ico
similarity index 100%
rename from Resources/L060.ico
rename to Resources/LoadingIcon/L060.ico
diff --git a/Resources/L070.ico b/Resources/LoadingIcon/L070.ico
similarity index 100%
rename from Resources/L070.ico
rename to Resources/LoadingIcon/L070.ico
diff --git a/Resources/L080.ico b/Resources/LoadingIcon/L080.ico
similarity index 100%
rename from Resources/L080.ico
rename to Resources/LoadingIcon/L080.ico
diff --git a/Resources/L090.ico b/Resources/LoadingIcon/L090.ico
similarity index 100%
rename from Resources/L090.ico
rename to Resources/LoadingIcon/L090.ico
diff --git a/Resources/L100.ico b/Resources/LoadingIcon/L100.ico
similarity index 100%
rename from Resources/L100.ico
rename to Resources/LoadingIcon/L100.ico
diff --git a/Resources/L110.ico b/Resources/LoadingIcon/L110.ico
similarity index 100%
rename from Resources/L110.ico
rename to Resources/LoadingIcon/L110.ico
diff --git a/Resources/L120.ico b/Resources/LoadingIcon/L120.ico
similarity index 100%
rename from Resources/L120.ico
rename to Resources/LoadingIcon/L120.ico
diff --git a/Resources/L130.ico b/Resources/LoadingIcon/L130.ico
similarity index 100%
rename from Resources/L130.ico
rename to Resources/LoadingIcon/L130.ico
diff --git a/Resources/L140.ico b/Resources/LoadingIcon/L140.ico
similarity index 100%
rename from Resources/L140.ico
rename to Resources/LoadingIcon/L140.ico
diff --git a/Resources/L150.ico b/Resources/LoadingIcon/L150.ico
similarity index 100%
rename from Resources/L150.ico
rename to Resources/LoadingIcon/L150.ico
diff --git a/Resources/L160.ico b/Resources/LoadingIcon/L160.ico
similarity index 100%
rename from Resources/L160.ico
rename to Resources/LoadingIcon/L160.ico
diff --git a/Resources/L170.ico b/Resources/LoadingIcon/L170.ico
similarity index 100%
rename from Resources/L170.ico
rename to Resources/LoadingIcon/L170.ico
diff --git a/Resources/L180.ico b/Resources/LoadingIcon/L180.ico
similarity index 100%
rename from Resources/L180.ico
rename to Resources/LoadingIcon/L180.ico
diff --git a/Resources/NotSelected.png b/Resources/NotSelected.png
deleted file mode 100644
index 9eb07d2..0000000
Binary files a/Resources/NotSelected.png and /dev/null differ
diff --git a/Resources/Selected.png b/Resources/Selected.png
deleted file mode 100644
index a1ae604..0000000
Binary files a/Resources/Selected.png and /dev/null differ
diff --git a/Resources/icon.png b/Resources/SystemTrayMenu.png
similarity index 100%
rename from Resources/icon.png
rename to Resources/SystemTrayMenu.png
diff --git a/Resources/search1.ico b/Resources/search.ico
similarity index 100%
rename from Resources/search1.ico
rename to Resources/search.ico
diff --git a/SystemTrayMenu.csproj b/SystemTrayMenu.csproj
index 62448d8..2aa4c7c 100644
--- a/SystemTrayMenu.csproj
+++ b/SystemTrayMenu.csproj
@@ -191,10 +191,6 @@
True
-
- True
-
-
diff --git a/UserInterface/Menu.cs b/UserInterface/Menu.cs
index deea082..8ec0b61 100644
--- a/UserInterface/Menu.cs
+++ b/UserInterface/Menu.cs
@@ -73,7 +73,7 @@ namespace SystemTrayMenu.UserInterface
void PictureBoxSearch_Paint(object sender, PaintEventArgs e)
{
e.Graphics.DrawIcon(
- Properties.Resources.search2,
+ Properties.Resources.search,
new Rectangle(0, 0, pictureBoxSearch.Width, pictureBoxSearch.Height));
}
diff --git a/UserInterface/SettingsForm.cs b/UserInterface/SettingsForm.cs
index 581c00c..a5e3873 100644
--- a/UserInterface/SettingsForm.cs
+++ b/UserInterface/SettingsForm.cs
@@ -336,7 +336,7 @@ namespace SystemTrayMenu.UserInterface
numericUpDownMenuWidth.Value = 300;
checkBoxStayOpenWhenFocusLost.Checked = true;
numericUpDownTimeUntilClose.Value = 1000;
- numericUpDownTimeUntilOpens.Value = 200;
+ numericUpDownTimeUntilOpens.Value = 100;
}
private void ButtonCancel_Click(object sender, EventArgs e)