diff --git a/.gitignore b/.gitignore
index ad095000..4de048e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
*.bak
*.suo
*.sln.cache
+*.user
po/POTFILES
Makefile.in
Makefile
diff --git a/SparkleLib/windows/SparkleLib.csproj b/SparkleLib/windows/SparkleLib.csproj
index e1f1e575..1bc686f2 100644
--- a/SparkleLib/windows/SparkleLib.csproj
+++ b/SparkleLib/windows/SparkleLib.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -11,9 +11,11 @@
SparkleLib
- 2.0
+ 3.5
+ false
+ v3.5
publish\
true
Disk
@@ -26,10 +28,8 @@
true
0
1.0.0.%2a
- false
false
true
- v3.5
true
@@ -41,6 +41,7 @@
4
false
x86
+ AllRules.ruleset
none
@@ -49,6 +50,7 @@
prompt
4
false
+ AllRules.ruleset
@@ -117,9 +119,15 @@
+
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
False
.NET Framework 2.0 %28x86%29
@@ -135,6 +143,11 @@
.NET Framework 3.5
false
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
@@ -166,4 +179,4 @@
$(ProjectDir)transform_tt.cmd
-
+
\ No newline at end of file
diff --git a/SparkleShare/SparkleAbout.cs b/SparkleShare/SparkleAbout.cs
index c8b9a682..5f132110 100644
--- a/SparkleShare/SparkleAbout.cs
+++ b/SparkleShare/SparkleAbout.cs
@@ -53,15 +53,14 @@ namespace SparkleShare {
Title = _("About SparkleShare");
AppPaintable = true;
- // TODO: Should be able to do without referencing SparkleLib...
- //string image_path = SparkleLib.SparkleHelpers.CombineMore (SparkleLib.Defines.DATAROOTDIR,
- // "sparkleshare", "pixmaps", "about.png");
-
+ MemoryStream MemStream = new MemoryStream();
+ Icons.about.Save(MemStream, System.Drawing.Imaging.ImageFormat.Png);
+ MemStream.Seek(0, SeekOrigin.Begin);
Realize ();
- //Gdk.Pixbuf buf = new Gdk.Pixbuf (image_path);
- //Gdk.Pixmap map, map2;
- //buf.RenderPixmapAndMask (out map, out map2, 255);
- //GdkWindow.SetBackPixmap (map, false);
+ Gdk.Pixbuf buf = new Gdk.Pixbuf(MemStream);
+ Gdk.Pixmap map, map2;
+ buf.RenderPixmapAndMask (out map, out map2, 255);
+ GdkWindow.SetBackPixmap (map, false);
CreateAbout ();
diff --git a/SparkleShare/Windows/Icons.Designer.cs b/SparkleShare/Windows/Icons.Designer.cs
index cabe4017..1d3290b8 100644
--- a/SparkleShare/Windows/Icons.Designer.cs
+++ b/SparkleShare/Windows/Icons.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4211
+// Runtime Version:4.0.30319.225
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@ namespace SparkleShare {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Icons {
@@ -60,6 +60,13 @@ namespace SparkleShare {
}
}
+ internal static System.Drawing.Bitmap about {
+ get {
+ object obj = ResourceManager.GetObject("about", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap avatar_default {
get {
object obj = ResourceManager.GetObject("avatar_default", resourceCulture);
@@ -165,13 +172,6 @@ namespace SparkleShare {
}
}
- internal static System.Drawing.Bitmap folder_sparkleshare_16_mist {
- get {
- object obj = ResourceManager.GetObject("folder_sparkleshare_16_mist", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap folder_sparkleshare_22 {
get {
object obj = ResourceManager.GetObject("folder_sparkleshare_22", resourceCulture);
@@ -179,13 +179,6 @@ namespace SparkleShare {
}
}
- internal static System.Drawing.Bitmap folder_sparkleshare_22_mist {
- get {
- object obj = ResourceManager.GetObject("folder_sparkleshare_22_mist", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap folder_sparkleshare_24 {
get {
object obj = ResourceManager.GetObject("folder_sparkleshare_24", resourceCulture);
@@ -193,13 +186,6 @@ namespace SparkleShare {
}
}
- internal static System.Drawing.Bitmap folder_sparkleshare_24_mist {
- get {
- object obj = ResourceManager.GetObject("folder_sparkleshare_24_mist", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap folder_sparkleshare_256 {
get {
object obj = ResourceManager.GetObject("folder_sparkleshare_256", resourceCulture);
@@ -207,13 +193,6 @@ namespace SparkleShare {
}
}
- internal static System.Drawing.Bitmap folder_sparkleshare_256_mist {
- get {
- object obj = ResourceManager.GetObject("folder_sparkleshare_256_mist", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap folder_sparkleshare_32 {
get {
object obj = ResourceManager.GetObject("folder_sparkleshare_32", resourceCulture);
@@ -221,13 +200,6 @@ namespace SparkleShare {
}
}
- internal static System.Drawing.Bitmap folder_sparkleshare_32_mist {
- get {
- object obj = ResourceManager.GetObject("folder_sparkleshare_32_mist", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap folder_sparkleshare_48 {
get {
object obj = ResourceManager.GetObject("folder_sparkleshare_48", resourceCulture);
@@ -235,13 +207,6 @@ namespace SparkleShare {
}
}
- internal static System.Drawing.Bitmap folder_sparkleshare_48_mist {
- get {
- object obj = ResourceManager.GetObject("folder_sparkleshare_48_mist", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap idle0 {
get {
object obj = ResourceManager.GetObject("idle0", resourceCulture);
@@ -319,13 +284,6 @@ namespace SparkleShare {
}
}
- internal static System.Drawing.Bitmap process_syncing_sparkleshare_24_mist {
- get {
- object obj = ResourceManager.GetObject("process_syncing_sparkleshare_24_mist", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap process_syncing_sparkleshare_i_24 {
get {
object obj = ResourceManager.GetObject("process_syncing_sparkleshare_i_24", resourceCulture);
@@ -388,5 +346,12 @@ namespace SparkleShare {
return ((System.Drawing.Bitmap)(obj));
}
}
+
+ internal static System.Drawing.Bitmap sparkleshare_windows_status {
+ get {
+ object obj = ResourceManager.GetObject("sparkleshare_windows_status", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/SparkleShare/Windows/Icons.resx b/SparkleShare/Windows/Icons.resx
index 76390d68..283d9193 100644
--- a/SparkleShare/Windows/Icons.resx
+++ b/SparkleShare/Windows/Icons.resx
@@ -228,9 +228,15 @@
..\..\data\icons\sparkleshare-syncing-error-24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\..\data\icons\sparkleshare-windows-status.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\..\data\icons\sparkleshare.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\..\data\about.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\..\data\avatar-default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj
index 95fd656d..f2ef5299 100644
--- a/SparkleShare/Windows/SparkleShare.csproj
+++ b/SparkleShare/Windows/SparkleShare.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -11,9 +11,11 @@
SparkleShare
- 2.0
+ 3.5
+ false
+ v3.5
publish\
true
Disk
@@ -26,10 +28,8 @@
true
0
1.0.0.%2a
- false
false
true
- v3.5
true
@@ -40,6 +40,7 @@
prompt
4
x86
+ AllRules.ruleset
none
@@ -47,6 +48,7 @@
..\..\bin
prompt
4
+ AllRules.ruleset
@@ -127,6 +129,11 @@
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
False
.NET Framework 2.0 %28x86%29
@@ -142,8 +149,14 @@
.NET Framework 3.5
false
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
@@ -180,4 +193,4 @@
-
+
\ No newline at end of file
diff --git a/SparkleShare/Windows/SparkleShare.sln b/SparkleShare/Windows/SparkleShare.sln
index 83b5e5a1..129f6e96 100644
--- a/SparkleShare/Windows/SparkleShare.sln
+++ b/SparkleShare/Windows/SparkleShare.sln
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShare.csproj", "{728483AA-E34B-4441-BF2C-C8BC2901E4E0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleLib", "..\..\SparkleLib\windows\SparkleLib.csproj", "{2C914413-B31C-4362-93C7-1AE34F09112A}"