From 95a1b3ec59ec4e38bccd39c2278fcf2ad0c090f6 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 11 Mar 2012 13:17:53 +0000 Subject: [PATCH] window: Move to .NET 4.0 --- .gitignore | 1 + SparkleLib/windows/SparkleLib.Git.csproj | 2 +- SparkleLib/windows/SparkleLib.csproj | 2 +- SparkleShare/SparkleBubblesController.cs | 5 ----- SparkleShare/SparkleControllerBase.cs | 4 ---- SparkleShare/Windows/SparkleAbout.cs | 1 + SparkleShare/Windows/SparkleSetup.cs | 3 +-- SparkleShare/Windows/SparkleShare.csproj | 4 ++-- SparkleShare/Windows/SparkleShare.sln | 4 ++-- .../SparkleShareInviteOpener/SparkleShareInviteOpener.csproj | 2 +- SparkleShare/Windows/build.cmd | 2 +- 11 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 28b243f5..60b9e37e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *~ +*.swp .DS_Store *.exe *.exe.mdb diff --git a/SparkleLib/windows/SparkleLib.Git.csproj b/SparkleLib/windows/SparkleLib.Git.csproj index 0d91bf63..00d9dac2 100644 --- a/SparkleLib/windows/SparkleLib.Git.csproj +++ b/SparkleLib/windows/SparkleLib.Git.csproj @@ -1,5 +1,5 @@ - + Debug AnyCPU diff --git a/SparkleLib/windows/SparkleLib.csproj b/SparkleLib/windows/SparkleLib.csproj index 528142c3..1c6c38e3 100644 --- a/SparkleLib/windows/SparkleLib.csproj +++ b/SparkleLib/windows/SparkleLib.csproj @@ -1,5 +1,5 @@ - + Debug AnyCPU diff --git a/SparkleShare/SparkleBubblesController.cs b/SparkleShare/SparkleBubblesController.cs index 2b1b7cff..e0000863 100755 --- a/SparkleShare/SparkleBubblesController.cs +++ b/SparkleShare/SparkleBubblesController.cs @@ -36,11 +36,6 @@ namespace SparkleShare { ShowBubble (change_set.User.Name, FormatMessage (change_set), Program.Controller.GetAvatar (change_set.User.Email, 36)); }; - - Program.Controller.NoteNotificationRaised += delegate (SparkleUser user, string folder_name) { - ShowBubble (user.Name, "added a note to '" + folder_name + "'", - Program.Controller.GetAvatar (user.Email, 36)); - }; } diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs index dc6053ac..6f1bac60 100644 --- a/SparkleShare/SparkleControllerBase.cs +++ b/SparkleShare/SparkleControllerBase.cs @@ -82,10 +82,6 @@ namespace SparkleShare { public event AlertNotificationRaisedEventHandler AlertNotificationRaised; public delegate void AlertNotificationRaisedEventHandler (string title, string message); - public event NoteNotificationRaisedEventHandler NoteNotificationRaised; - public delegate void NoteNotificationRaisedEventHandler (SparkleUser user, string folder_name); - - public bool FirstRun { get { diff --git a/SparkleShare/Windows/SparkleAbout.cs b/SparkleShare/Windows/SparkleAbout.cs index c9ae38a8..fd61edae 100644 --- a/SparkleShare/Windows/SparkleAbout.cs +++ b/SparkleShare/Windows/SparkleAbout.cs @@ -21,6 +21,7 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Media; using System.Windows.Media.Imaging; +using System.Xaml; namespace SparkleShare { diff --git a/SparkleShare/Windows/SparkleSetup.cs b/SparkleShare/Windows/SparkleSetup.cs index a7ac915d..fa43abf1 100644 --- a/SparkleShare/Windows/SparkleSetup.cs +++ b/SparkleShare/Windows/SparkleSetup.cs @@ -24,7 +24,6 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Data; using System.Windows.Documents; -using System.Windows.Forms.Integration; using System.Windows.Markup; using System.Windows.Media; using System.Windows.Media.Imaging; @@ -458,7 +457,7 @@ namespace SparkleShare { Buttons.Add (finish_button); Buttons.Add (cancel_button); - + Controller.UpdateProgressBarEvent += delegate (double percentage) { Dispatcher.Invoke ((Action) delegate { diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj index 98b2122a..d1196264 100644 --- a/SparkleShare/Windows/SparkleShare.csproj +++ b/SparkleShare/Windows/SparkleShare.csproj @@ -1,5 +1,5 @@ - + Debug AnyCPU @@ -15,7 +15,6 @@ false - v3.5 publish\ true Disk @@ -70,6 +69,7 @@ ..\..\bin\Gettext.Cs.dll + diff --git a/SparkleShare/Windows/SparkleShare.sln b/SparkleShare/Windows/SparkleShare.sln index 388751ff..58518999 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}" diff --git a/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj b/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj index 582fdcf5..1671f1cc 100644 --- a/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj +++ b/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj @@ -1,5 +1,5 @@ - + Debug AnyCPU diff --git a/SparkleShare/Windows/build.cmd b/SparkleShare/Windows/build.cmd index 53ab216b..5a76c44a 100644 --- a/SparkleShare/Windows/build.cmd +++ b/SparkleShare/Windows/build.cmd @@ -3,7 +3,7 @@ call %~dp0\..\..\data\plugins\build.cmd set WinDirNet=%WinDir%\Microsoft.NET\Framework -set msbuild="%WinDirNet%\v3.5\msbuild.exe" +set msbuild="%WinDirNet%\v4.0\msbuild.exe" if not exist %msbuild% set msbuild="%WinDirNet%\v4.0.30319\msbuild.exe" set wixBinDir=%WIX%\bin