Change Namespace to SparkleShare.Windows

This commit is contained in:
Kévin LEMELE 2017-03-14 17:47:39 +01:00
parent 1dc2a2fcf3
commit b5289fdcb7
3 changed files with 7 additions and 7 deletions

View file

@ -6,9 +6,9 @@
<ProductVersion>8.0.30703</ProductVersion>
<ProjectGuid>{728483AA-E34B-4441-BF2C-C8BC2901E4E0}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AssemblyName>SparkleShare</AssemblyName>
<AssemblyName>SparkleShare.Windows</AssemblyName>
<SchemaVersion>2.0</SchemaVersion>
<RootNamespace>SparkleShare</RootNamespace>
<RootNamespace>SparkleShare.Windows</RootNamespace>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
@ -298,4 +298,4 @@
<Name>Sparkles.Git</Name>
</ProjectReference>
</ItemGroup>
</Project>
</Project>

View file

@ -26,7 +26,7 @@
</StackPanel>
<TextBox x:Name="balloon_text_field" Grid.Row="1" Grid.ColumnSpan="2" Width="438" Height="72" BorderBrush="{x:Null}" BorderThickness="0" Padding="8,12,8,8" TextWrapping="Wrap" AcceptsReturn="True" Text="Anything to add?" >
<TextBox.Background>
<ImageBrush ImageSource="pack://application:,,,/SparkleShare;component/Images/text-balloon.png" Stretch="Uniform"></ImageBrush>
<ImageBrush ImageSource="pack://application:,,,/SparkleShare.Windows;component/Images/text-balloon.png" Stretch="Uniform"></ImageBrush>
</TextBox.Background>
</TextBox>
<StackPanel Grid.Column="1" Grid.Row="2" VerticalAlignment="Bottom" HorizontalAlignment="Right" Orientation="Horizontal">

View file

@ -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 ();
}