s434786/DINO_SCRUM
1
0
Fork 6
Code Issues Pull Requests 2 Releases Wiki Activity

task 77 #33

Open
s434742 wants to merge 3 commits from s434742/DINO_SCRUM:master into master
pull from: s434742/DINO_SCRUM:master
merge into: s434786:master
Conversation 0 Commits 3 Files Changed 8 +15 -19
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5d68386fc1 - Show all commits

8
Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
View File

@ -19,14 +19,10 @@
<Grid> <Grid>
<TextBlock x:Name="fruitName" HorizontalAlignment="Left" Margin="60,125,0,0" TextWrapping="Wrap" Text="fruitName" Width="76" Height="16" VerticalAlignment="Top" TextAlignment="Center"/> <TextBlock x:Name="fruitName" HorizontalAlignment="Left" Margin="60,125,0,0" TextWrapping="Wrap" Text="fruitName" Width="76" Height="16" VerticalAlignment="Top" TextAlignment="Center"/>
<TextBlock x:Name="messageBox" HorizontalAlignment="Left" Margin="24,74,0,0" TextWrapping="Wrap" Text="messageBox" VerticalAlignment="Top" Width="290" Height="39" TextAlignment="Center" FontWeight="Bold"/> <TextBlock x:Name="messageBox" HorizontalAlignment="Left" Margin="28,80,0,0" TextWrapping="Wrap" Text="messageBox" VerticalAlignment="Top" Width="290" Height="39" TextAlignment="Center" FontWeight="Bold"/>
<TextBox x:Name="amountToChange" Margin="0,109,65,0" TextWrapping="Wrap" Text="" RenderTransformOrigin="1.456,0.316" Height="32" VerticalAlignment="Top" HorizontalAlignment="Right" Width="89" TextAlignment="Center"/> <TextBox x:Name="amountToChange" Margin="0,109,65,0" TextWrapping="Wrap" Text="" RenderTransformOrigin="1.456,0.316" Height="32" VerticalAlignment="Top" HorizontalAlignment="Right" Width="89" TextAlignment="Center"/>
<Button x:Name="saveButton" Content="Zastosuj" Margin="0,0,66,10" VerticalAlignment="Bottom" Click="saveButton_Click" Width="90" HorizontalAlignment="Right"/> <Button x:Name="saveButton" Content="Zastosuj" Margin="0,0,66,10" VerticalAlignment="Bottom" Click="saveButton_Click" Width="90" HorizontalAlignment="Right"/>
<Button x:Name="cancelButton" Content="Anuluj" Margin="60,0,0,10" VerticalAlignment="Bottom" Click="cancelButton_Click" Width="90" HorizontalAlignment="Left" /> <Button x:Name="cancelButton" Content="Anuluj" Margin="60,0,0,10" VerticalAlignment="Bottom" Click="cancelButton_Click" Width="90" HorizontalAlignment="Left" />
<Ellipse HorizontalAlignment="Left" Width="60" Height="60" Margin="134,10,0,155.333"> <Image x:Name="fruitImage" HorizontalAlignment="Left" Height="64" Margin="140,5,0,0" VerticalAlignment="Top" Width="64"/>
<Ellipse.Fill>
<ImageBrush x:Name="fruitImage"/>
</Ellipse.Fill>
</Ellipse>
</Grid> </Grid>
</Window> </Window>

2
Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
View File

@ -50,7 +50,7 @@ namespace Magazyn.Windows
try try
{ {
fruitImage.ImageSource = fruit.ImageSource; fruitImage.Source = fruit.ImageSource;
} }
catch (Exception ex) catch (Exception ex)
{ {

22
Magazyn_Client/Magazyn/Windows/InfoWindow.xaml
View File

@ -17,16 +17,16 @@
mc:Ignorable="d" mc:Ignorable="d"
Title="Informacje o: " WindowStartupLocation="CenterOwner" Height="250" Width="340" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown"> Title="Informacje o: " WindowStartupLocation="CenterOwner" Height="250" Width="340" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
<Grid> <Grid>
<TextBlock x:Name="fruitName" Margin="37,70,48.333,0" TextWrapping="Wrap" Text="fruitName" Height="16" VerticalAlignment="Top" FontWeight="Bold"/> <Grid.RowDefinitions>
<TextBlock x:Name="fruitPrice" Margin="37,91,49.333,0" TextWrapping="Wrap" Text="fruitPrice" Height="16" VerticalAlignment="Top" FontWeight="Bold"/> <RowDefinition Height="47*"/>
<TextBlock x:Name="fruitQuantity" Margin="37,112,49.333,0" TextWrapping="Wrap" Text="fruitQuantity" Height="16" VerticalAlignment="Top" FontWeight="Bold"/> <RowDefinition Height="175*"/>
<TextBlock x:Name="fruitQuantityMax" Margin="37,133,49.333,0" TextWrapping="Wrap" Text="fruitQuantityMax" Height="16" VerticalAlignment="Top" FontWeight="Bold"/> </Grid.RowDefinitions>
<TextBlock x:Name="fruitValue" Margin="37,154,50.333,0" TextWrapping="Wrap" Text="fruitValue" Height="16" VerticalAlignment="Top" FontWeight="Bold"/> <TextBlock x:Name="fruitName" Margin="37,28.667,50.667,0" TextWrapping="Wrap" Text="fruitName" Height="16" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
<Button x:Name="okButton" Content="Ok" Margin="0,0,9,10" VerticalAlignment="Bottom" Click="okButton_Click" Width="75" HorizontalAlignment="Right"/> <TextBlock x:Name="fruitPrice" Margin="38,49.178,49.667,0" TextWrapping="Wrap" Text="fruitPrice" Height="16" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
<Ellipse HorizontalAlignment="Left" Width="60" Height="60" Margin="134,10,0,155.333"> <TextBlock x:Name="fruitQuantity" Margin="37,70.178,49.667,0" TextWrapping="Wrap" Text="fruitQuantity" Height="16" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
<Ellipse.Fill> <TextBlock x:Name="fruitQuantityMax" Margin="37,91.178,49.667,0" TextWrapping="Wrap" Text="fruitQuantityMax" Height="16" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
<ImageBrush x:Name="fruitImage"/> <TextBlock x:Name="fruitValue" Margin="37,112.178,49.667,0" TextWrapping="Wrap" Text="fruitValue" Height="16" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
</Ellipse.Fill> <Button x:Name="okButton" Content="Ok" Margin="0,0,8.667,10" VerticalAlignment="Bottom" Click="okButton_Click" Width="75" HorizontalAlignment="Right" Grid.Row="1"/>
</Ellipse> <Image x:Name="fruitImage" HorizontalAlignment="Left" Height="64" Margin="140,5,0,0" VerticalAlignment="Top" Width="64" Grid.RowSpan="2"/>
</Grid> </Grid>
</Window> </Window>

2
Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs
View File

@ -37,7 +37,7 @@ namespace Magazyn.Windows
try try
{ {
fruitImage.ImageSource = fruit.ImageSource; fruitImage.Source = fruit.ImageSource;
} }
catch (Exception ex) catch (Exception ex)
{ {