Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 69789f64 authored by Markus QUARITSCH's avatar Markus QUARITSCH
Browse files

adding application and window icon,

surround relaycommand execute with try-catch
newly added job entries are selected by default
change filename of joblist to avoid conflicts with legacy gui
parent ee43b90a
No related branches found
No related tags found
No related merge requests found
......@@ -10,7 +10,7 @@
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:views="clr-namespace:VECTO3GUI.Views"
mc:Ignorable="d"
Title="{Binding Version}" Height="515.36" Width="972.48" WindowStartupLocation="CenterScreen"
Title="{Binding Version}" Icon="Resources/Icon2.ico" Height="515.36" Width="972.48" WindowStartupLocation="CenterScreen"
d:DataContext="{d:DesignInstance Type=impl:MainWindowViewModel, IsDesignTimeCreatable=False}">
<Grid>
......
......@@ -17,7 +17,7 @@ namespace VECTO3GUI.Model
public class JobListModel
{
private const string ConfigFolderName = "Config";
private const string JobListFileName = "JobList.txt";
private const string JobListFileName = "JobList.json";
private string _jobListFilePath = Path.Combine(".", ConfigFolderName, JobListFileName);
......
VECTO3GUI/Resources/Icon2.ico

4.19 KiB

using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Input;
namespace VECTO3GUI.Util
......@@ -72,7 +73,11 @@ namespace VECTO3GUI.Util
public void Execute(object parameter)
{
_execute((T)parameter);
try {
_execute((T)parameter);
} catch (Exception e) {
MessageBox.Show(e.Message, "Exception", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
#endregion
......
......@@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VECTO3GUI</RootNamespace>
<AssemblyName>VECTO3GUI</AssemblyName>
<AssemblyName>VECTO3</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
......@@ -34,6 +34,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\Icon2.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.2.0\lib\net45\Castle.Core.dll</HintPath>
......@@ -632,6 +635,9 @@
<ItemGroup>
<Resource Include="Resources\AirdragLoadTestFile.xml" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icon2.ico" />
</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.
......
......@@ -335,11 +335,13 @@ namespace VECTO3GUI.ViewModel.Impl
{
var jobEntry = SerializeHelper.DeserializeToObject<JobEntry>(filePath.First());
jobEntry.JobEntryFilePath = filePath.First();
jobEntry.Selected = true;
_jobs.Add(jobEntry);
}
else if(IsXmlFile(filePath.First()))
{
var jobEntry = GetAdditionalJobEntry(filePath.First());
jobEntry.Selected = true;
_jobs.Add(jobEntry);
}
}
......
......@@ -11,7 +11,7 @@
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:helper="clr-namespace:VECTO3GUI.Helper"
mc:Ignorable="d"
Title="{Binding WindowTitle}" Height="450" Width="800" WindowStartupLocation="CenterScreen" TitleCharacterCasing="Normal"
Title="{Binding WindowTitle}" Icon="../Resources/Icon2.ico" Height="450" Width="800" WindowStartupLocation="CenterScreen" TitleCharacterCasing="Normal"
d:DataContext="{d:DesignInstance Type=impl:OutputWindowViewModel, IsDesignTimeCreatable=False}">
<mah:MetroWindow.TitleTemplate>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment