From b5289fdcb7a2f7fc352a039dd298cdffd5fe1237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20LEMELE?= Date: Tue, 14 Mar 2017 17:47:39 +0100 Subject: [PATCH] Change Namespace to SparkleShare.Windows --- SparkleShare/Windows/SparkleShare.Windows.csproj | 6 +++--- SparkleShare/Windows/UserInterface/Note.xaml | 2 +- SparkleShare/Windows/UserInterface/UserInterfaceHelpers.cs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SparkleShare/Windows/SparkleShare.Windows.csproj b/SparkleShare/Windows/SparkleShare.Windows.csproj index 843eef96..7e557d3e 100644 --- a/SparkleShare/Windows/SparkleShare.Windows.csproj +++ b/SparkleShare/Windows/SparkleShare.Windows.csproj @@ -6,9 +6,9 @@ 8.0.30703 {728483AA-E34B-4441-BF2C-C8BC2901E4E0} WinExe - SparkleShare + SparkleShare.Windows 2.0 - SparkleShare + SparkleShare.Windows 3.5 @@ -298,4 +298,4 @@ Sparkles.Git - + \ No newline at end of file diff --git a/SparkleShare/Windows/UserInterface/Note.xaml b/SparkleShare/Windows/UserInterface/Note.xaml index 76ffd742..2d39a248 100644 --- a/SparkleShare/Windows/UserInterface/Note.xaml +++ b/SparkleShare/Windows/UserInterface/Note.xaml @@ -26,7 +26,7 @@ - + diff --git a/SparkleShare/Windows/UserInterface/UserInterfaceHelpers.cs b/SparkleShare/Windows/UserInterface/UserInterfaceHelpers.cs index 901ab8e2..be1f891b 100644 --- a/SparkleShare/Windows/UserInterface/UserInterfaceHelpers.cs +++ b/SparkleShare/Windows/UserInterface/UserInterfaceHelpers.cs @@ -42,7 +42,7 @@ namespace SparkleShare { public static BitmapFrame GetImageSource (string name, string type) { Assembly assembly = Assembly.GetExecutingAssembly(); - Stream image_stream = assembly.GetManifestResourceStream("SparkleShare.Images." + name + "." + type); + Stream image_stream = assembly.GetManifestResourceStream("SparkleShare.Windows.Images." + name + "." + type); return BitmapFrame.Create(image_stream); } @@ -60,7 +60,7 @@ namespace SparkleShare { public static Drawing.Bitmap GetBitmap (string name) { Assembly assembly = Assembly.GetExecutingAssembly (); - Stream image_stream = assembly.GetManifestResourceStream ("SparkleShare.Images." + name + ".png"); + Stream image_stream = assembly.GetManifestResourceStream ("SparkleShare.Windows.Images." + name + ".png"); return (Drawing.Bitmap) Drawing.Bitmap.FromStream (image_stream); } @@ -69,7 +69,7 @@ namespace SparkleShare { { Assembly assembly = Assembly.GetExecutingAssembly (); StreamReader html_reader = new StreamReader ( - assembly.GetManifestResourceStream ("SparkleShare.HTML." + name)); + assembly.GetManifestResourceStream ("SparkleShare.Windows.HTML." + name)); return html_reader.ReadToEnd (); }