Commit 69a1b4b4 authored by Manu's avatar Manu
Browse files

Fix vocabulary file error & add screenshots

parent 5e48593e
......@@ -48,6 +48,13 @@
<Compile Include="VocableCart.cs" />
<Compile Include="Vocabulary.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Microsoft.DependencyValidation.Analyzers.0.9.0\analyzers\dotnet\cs\Microsoft.DependencyValidation.Analyzers.resources.dll" />
<Analyzer Include="..\packages\Microsoft.DependencyValidation.Analyzers.0.9.0\analyzers\dotnet\Microsoft.DependencyValidation.Analyzers.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
......
......@@ -52,6 +52,12 @@ namespace VocLearner.BusinessLogic
{
Directory.CreateDirectory(directoryPath);
}
if (!File.Exists(filePath))
{
File.Create(filePath);
}
using (StreamReader fileReader = new StreamReader(filePath))
{
while (!fileReader.EndOfStream)
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.DependencyValidation.Analyzers" version="0.9.0" targetFramework="net451" />
</packages>
\ No newline at end of file
......@@ -15,16 +15,16 @@
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Background="{Binding Path=MenuColor}">
<Button Margin="5" Padding="5,0,5,0" Click="StartVocableTrainingButton_Click">Start vocable training</Button>
<Button Margin="5" Padding="5,0,5,0" Click="SaveVocabularyButton_Click">Save vocabulary</Button>
<Label>BackgroundColor</Label>
<TextBox Margin="5" Text="{Binding Path=BackgroundColor}"></TextBox>
<Label>MenuColor</Label>
<TextBox Margin="5" Text="{Binding Path=MenuColor}"></TextBox>
<Button Margin="5" Padding="10,5,10,5" Click="StartVocableTrainingButton_Click">Start vocable training</Button>
<Button Margin="5" Padding="10,5,10,5" Click="SaveVocabularyButton_Click">Save vocabulary</Button>
<Label VerticalAlignment="Center">BackgroundColor</Label>
<TextBox Margin="5" TextAlignment="Center" Text="{Binding Path=BackgroundColor}"></TextBox>
<Label VerticalAlignment="Center">MenuColor</Label>
<TextBox Margin="5" TextAlignment="Center" Text="{Binding Path=MenuColor}"></TextBox>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal" Background="{Binding Path=MenuColor}">
<Button Margin="5" Padding="5,0,5,0" Click="BackToVocabularyButton_Click">Back</Button>
<Button Margin="5" Padding="10,5,10,5" Click="BackToVocabularyButton_Click">Back</Button>
</StackPanel>
<Grid Grid.Column="0" Grid.Row="1">
......@@ -40,17 +40,17 @@
<ListView.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBox Text="{Binding Path=Text}" Margin="5" Padding="5,0,5,0"></TextBox>
<TextBox Text="{Binding Path=Translation}" Margin="5" Padding="5,0,5,0"></TextBox>
<TextBox Text="{Binding Path=Comment}" Margin="5" Padding="5,0,5,0"></TextBox>
<TextBox Text="{Binding Path=Text}" Margin="5" Padding="5"></TextBox>
<TextBox Text="{Binding Path=Translation}" Margin="5" Padding="5"></TextBox>
<TextBox Text="{Binding Path=Comment}" Margin="5" Padding="5"></TextBox>
</StackPanel>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
<StackPanel Orientation="Horizontal" Grid.Row="1" Background="{Binding Path=MenuColor}">
<Button Margin="5" Padding="5,0,5,0" Click="AddVocableButton_Click">Add</Button>
<Button Margin="5" Padding="5,0,5,0" Click="DeleteVocableButton_Click">Delete</Button>
<Button Margin="5" Padding="10,5,10,5" Click="AddVocableButton_Click">Add</Button>
<Button Margin="5" Padding="10,5,10,5" Click="DeleteVocableButton_Click">Delete</Button>
</StackPanel>
</Grid>
......@@ -65,16 +65,16 @@
<ListView.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<Label Content="{Binding Path=Text}"></Label>
<TextBox Background="{Binding Path=Color}" Text="{Binding Path=Answer}" MinWidth="100"></TextBox>
<TextBox Background="{Binding Path=Color2}" Text="{Binding Path=Answer2}" MinWidth="100"></TextBox>
<Label Content="{Binding Path=Text}" Margin="5" Padding="5"></Label>
<TextBox Background="{Binding Path=Color}" Text="{Binding Path=Answer}" MinWidth="100" Margin="5" Padding="5"></TextBox>
<TextBox Background="{Binding Path=Color2}" Text="{Binding Path=Answer2}" MinWidth="100" Margin="5" Padding="5"></TextBox>
</StackPanel>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
<StackPanel Orientation="Horizontal" Grid.Row="1" Background="{Binding Path=MenuColor}">
<Button Margin="5" Padding="5,0,5,0" Click="UselessButton_Click" Visibility="{Binding Path=UselessButtonVisibility}">Away with you, mr. button!</Button>
<Button Margin="5" Padding="10,5,10,5" Click="UselessButton_Click" Visibility="{Binding Path=UselessButtonVisibility}">Away with you, mr. button!</Button>
</StackPanel>
</Grid>
......
......@@ -36,7 +36,7 @@ namespace VocLearner.WPFUI
vocabulary.Load();
vocabulary.Page1Width = "1*";
vocabulary.Page2Width = "0";
vocabulary.MenuColor = "DarkGreen";
vocabulary.MenuColor = "white";
vocabulary.BackgroundColor = "lightblue";
vocabulary.UselessButtonVisibility = "Visible";
......
......@@ -70,7 +70,7 @@
<GenerateManifests>true</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
<SignManifests>false</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
......@@ -123,6 +123,7 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
......@@ -159,6 +160,10 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Microsoft.DependencyValidation.Analyzers.0.9.0\analyzers\dotnet\cs\Microsoft.DependencyValidation.Analyzers.resources.dll" />
<Analyzer Include="..\packages\Microsoft.DependencyValidation.Analyzers.0.9.0\analyzers\dotnet\Microsoft.DependencyValidation.Analyzers.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.DependencyValidation.Analyzers" version="0.9.0" targetFramework="net451" />
</packages>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment