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

Zmiany #11

Merged
s434786 merged 12 commits from s434739/DINO_SCRUM:master into master 2019-01-21 20:50:33 +01:00
Conversation 0 Commits 12 Files Changed 6 +21 -21
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 811922788a - Show all commits

6
Magazyn_Client/Magazyn/MainWindow.xaml
View File

@ -1,4 +1,4 @@
<Window x:Class="Magazyn.MainWindow"
<Window x:Class="Magazyn.MainWindow"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@ -11,8 +11,8 @@
<Grid>
<ListBox x:Name="fruitList" Margin="10,35,10,0" Height="239" VerticalAlignment="Top"/>
<Button Name="sum" Content="Suma" HorizontalAlignment="Left" Margin="414,0,0,46" VerticalAlignment="Bottom" Width="74" Height="35" Background="Teal" Click="Button_Click_1"/>
<TextBlock Name="payment" HorizontalAlignment="Left" Margin="404,322,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="84"/>
<Button Name="sum" Content="Suma" Margin="0,288,24,0" Height="35" Background="Teal" Click="Button_Click_1" HorizontalAlignment="Right" Width="74" VerticalAlignment="Top"/>
<TextBlock Name="payment" Margin="0,328,24,0" TextWrapping="Wrap" HorizontalAlignment="Right" Width="74" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
<ProgressBar Name="loadingContent" HorizontalAlignment="Left" Height="10" Margin="304,294,0,0" VerticalAlignment="Top" Width="100"/>
<Label Content="Lista owoców:" FontWeight="Bold" HorizontalAlignment="Left" Margin="10,4,0,0" VerticalAlignment="Top" Width="100"/>