Proposed polished UX
This commit is contained in:
Родитель
a9158cc9d1
Коммит
ea4b68e96d
|
@ -26,7 +26,10 @@
|
|||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock>Contoso Expenses is an application of Contoso Corp.</TextBlock>
|
||||
<WebBrowser Grid.Row="1" Source="https://contosocorpwebsite.azurewebsites.net/" />
|
||||
<TextBlock HorizontalAlignment="Center" FontSize="14" FontWeight="Bold" Margin="10">
|
||||
Contoso Expenses is 'modern application of yesterday tomorow' from Contoso Corp.
|
||||
</TextBlock>
|
||||
<WebBrowser Grid.Row="1"
|
||||
Source="https://contosocorpwebsite.azurewebsites.net/" />
|
||||
</Grid>
|
||||
</Window>
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:ContosoExpenses"
|
||||
mc:Ignorable="d"
|
||||
Title="Add new expense" Height="450" Width="800">
|
||||
Title="Add new expense" Height="450" Width="800"
|
||||
Background="{StaticResource AddNewExpenseBackground}">
|
||||
|
||||
<Grid Margin="12">
|
||||
<Grid.RowDefinitions>
|
||||
|
@ -41,8 +42,8 @@
|
|||
<TextBox x:Name="txtCity" FontSize="16" Margin="5, 0, 0, 0" Width="400" Grid.Row="5" Grid.Column="1" />
|
||||
|
||||
<TextBlock Text="Date:" FontSize="16" FontWeight="Bold" Grid.Row="6" Grid.Column="0" />
|
||||
<DatePicker x:Name="txtDate" Grid.Row="6" Grid.Column="1" Width="400" />
|
||||
<DatePicker x:Name="txtDate" Grid.Row="6" Grid.Column="1" Margin="5, 0, 0, 0" Width="400" />
|
||||
|
||||
<Button Content="Save" Grid.Row="7" Grid.Column="0" Click="OnSaveExpense" Margin="5, 12, 0, 0" HorizontalAlignment="Left" />
|
||||
<Button Content="Save" Grid.Row="7" Grid.Column="0" Click="OnSaveExpense" Margin="5, 12, 0, 0" HorizontalAlignment="Left" Width="180" />
|
||||
</Grid>
|
||||
</Window>
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
StartupUri="MainWindow.xaml">
|
||||
<Application.Resources>
|
||||
<SolidColorBrush x:Key="SemiTransparentBackground"
|
||||
Color="Black"
|
||||
Opacity=".3" />
|
||||
Color="#0073CF"
|
||||
Opacity=".6" />
|
||||
|
||||
<ImageBrush x:Key="MainBackground"
|
||||
ImageSource="ExpensesBackground.jpg"
|
||||
Stretch="UniformToFill"/>
|
||||
ImageSource="Images\ExpensesBackground.jpg"
|
||||
Stretch="UniformToFill" />
|
||||
|
||||
<Style x:Key="DataGridHeaderStyle" TargetType="DataGridColumnHeader">
|
||||
<Setter Property="Foreground" Value="Black" />
|
||||
|
@ -19,5 +19,16 @@
|
|||
<Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
|
||||
<Setter Property="Cursor" Value="Hand" />
|
||||
</Style>
|
||||
|
||||
<ImageBrush x:Key="ExpensesListBackground"
|
||||
ImageSource="Images\ExpensesListBackground.png"
|
||||
Stretch="Fill" />
|
||||
|
||||
|
||||
<ImageBrush x:Key="AddNewExpenseBackground"
|
||||
ImageSource="Images\AddNewExpense.png"
|
||||
Stretch="UniformToFill" />
|
||||
|
||||
|
||||
</Application.Resources>
|
||||
</Application>
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ApplicationIcon>contoso.ico</ApplicationIcon>
|
||||
<ApplicationIcon>Images\contoso.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Bogus, Version=25.0.3.0, Culture=neutral, PublicKeyToken=fa1bb3f3f218129a, processorArchitecture=MSIL">
|
||||
|
@ -142,10 +142,16 @@
|
|||
<None Include="App.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="contoso.ico" />
|
||||
<Resource Include="Images\contoso.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="ExpensesBackground.jpg">
|
||||
<Content Include="Images\AddNewExpense.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Images\ExpensesBackground.jpg">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Images\ExpensesListBackground.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
|
|
@ -7,7 +7,9 @@
|
|||
mc:Ignorable="d"
|
||||
Loaded="Window_Loaded"
|
||||
Activated="Window_Activated"
|
||||
Title="Expenses List" Height="450" Width="800">
|
||||
Title="Expenses List" Height="450" Width="800"
|
||||
Background="{StaticResource ExpensesListBackground}">
|
||||
|
||||
<Grid Margin="12">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
|
@ -41,7 +43,13 @@
|
|||
IsReadOnly="True"
|
||||
Grid.Row="4"
|
||||
Margin="0, 12, 0, 0"
|
||||
SelectionMode="Single">
|
||||
SelectionMode="Single"
|
||||
Background="{StaticResource SemiTransparentBackground}"
|
||||
RowBackground="{StaticResource SemiTransparentBackground}"
|
||||
ColumnHeaderStyle="{StaticResource DataGridHeaderStyle}"
|
||||
Foreground="White"
|
||||
FontSize="14"
|
||||
RowStyle="{StaticResource DataGridRowStyle}">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Date" Binding="{Binding Path=Date}" />
|
||||
<DataGridTextColumn Header="Type" Binding="{Binding Path=Type}" />
|
||||
|
@ -51,6 +59,7 @@
|
|||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
|
||||
<Button Content="Add new expense" Click="OnAddNewExpense" Grid.Row="5" HorizontalAlignment="Left" Width="200" />
|
||||
|
||||
<Button Content="Add new expense" Click="OnAddNewExpense" Grid.Row="5" HorizontalAlignment="Left" Margin="0, 12, 0, 0" Width="180" />
|
||||
</Grid>
|
||||
</Window>
|
||||
|
|
Двоичные данные
Lab/Exercise1/01-Start/ContosoExpenses/ContosoExpenses/Images/AddNewExpense.png
Normal file
Двоичные данные
Lab/Exercise1/01-Start/ContosoExpenses/ContosoExpenses/Images/AddNewExpense.png
Normal file
Двоичный файл не отображается.
После Ширина: | Высота: | Размер: 3.2 KiB |
До Ширина: | Высота: | Размер: 320 KiB После Ширина: | Высота: | Размер: 320 KiB |
Двоичные данные
Lab/Exercise1/01-Start/ContosoExpenses/ContosoExpenses/Images/ExpensesListBackground.png
Normal file
Двоичные данные
Lab/Exercise1/01-Start/ContosoExpenses/ContosoExpenses/Images/ExpensesListBackground.png
Normal file
Двоичный файл не отображается.
После Ширина: | Высота: | Размер: 65 KiB |
До Ширина: | Высота: | Размер: 133 KiB После Ширина: | Высота: | Размер: 133 KiB |
|
@ -16,7 +16,7 @@
|
|||
</Grid.RowDefinitions>
|
||||
|
||||
<Menu IsMainMenu="True" Grid.Row="0">
|
||||
<MenuItem Header="_About" Click="OnOpenAbout" />
|
||||
<MenuItem Header="_About" FontSize="12" Click="OnOpenAbout" />
|
||||
</Menu>
|
||||
|
||||
<DataGrid x:Name="CustomersGrid" SelectionChanged="OnSelectedEmployee" Grid.Row="1" AutoGenerateColumns="False"
|
||||
|
@ -26,6 +26,7 @@
|
|||
RowBackground="{StaticResource SemiTransparentBackground}"
|
||||
ColumnHeaderStyle="{StaticResource DataGridHeaderStyle}"
|
||||
Foreground="White"
|
||||
FontSize="14"
|
||||
RowStyle="{StaticResource DataGridRowStyle}">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Employee Id" Binding="{Binding Path=EmployeeId}" />
|
||||
|
|
|
@ -12,7 +12,7 @@ using System.Windows;
|
|||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("XamlIslandDemo")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2018")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2019")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче