Merge pull request #379 from Tichau/integration

File Converter release v2.0
Tichau · Mar 6, 2024 · 044ea6d · 044ea6d
2 parents 64aa175 + e6632b3
commit 044ea6d
Show file tree

Hide file tree

Showing 212 changed files with 16,805 additions and 4,889 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots and Logs**
+If applicable, add the following informations to help explain your problem.
+- Registry.xml
+- Settings.user.xml
+- The Diagnostics folder of the session that encountered the issue.
+- A screenshot (if possible)
+
+You will find the xml files and diagnostics folder in `%localappdata%\FileConverter`.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows 11 64bits]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ bld/
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
+TestData/*
 
 # NUNIT
 *.VisualState.xml
@@ -195,6 +196,3 @@ FakesAssemblies/
 
 # Ignore the installer signing commands file
 Installer/Installer.sign
-
-# Ignore the installer languages file because it is automatically generated
-Installer/Languages.wxs
diff --git a/Application/FileConverter/App.config b/Application/FileConverter/App.config
@@ -1,11 +1,27 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <probing privatePath="Languages"/>
+            <probing privatePath="Languages" />
+            <dependentAssembly>
+                <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+            </dependentAssembly>
         </assemblyBinding>
     </runtime>
-</configuration>
+</configuration>
diff --git a/Application/FileConverter/Application.xaml b/Application/FileConverter/Application.xaml
@@ -1,57 +1,76 @@
 <Application x:Class="FileConverter.Application"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:xaml="clr-namespace:Markdown.Xaml;assembly=Markdown.Xaml"
              xmlns:valueConverters="clr-namespace:FileConverter.ValueConverters"
              xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic"
-             StartupUri="Windows/MainWindow.xaml" ShutdownMode="OnMainWindowClose">
+             xmlns:viewModels="clr-namespace:FileConverter.ViewModels"
+             xmlns:services="clr-namespace:FileConverter.Services"
+             ShutdownMode="OnLastWindowClose">
     <Application.Resources>
-        <!-- Converters -->
-        <valueConverters:ApplicationVersionToApplicationName x:Key="ApplicationVersionToApplicationName"/>
-        <generic:BoolToVisibility x:Key="BoolToVisibility"/>
-
-        <generic:ValueConverterGroup x:Key="InvBoolToVisibility">
-            <generic:BoolInverterConverter/>
-            <generic:BoolToVisibility/>
-        </generic:ValueConverterGroup>
-
-        <!-- Markdown style -->
-        <Style TargetType="FlowDocument" x:Key="DocumentStyle">
-            <Setter Property="FontFamily" Value="Segoe UI" />
-            <Setter Property="TextAlignment" Value="Left" />
-            <Setter Property="Foreground" Value="#786C71" />
-            <Setter Property="Background" Value="White" />
-            <Setter Property="LineHeight" Value="9"/>
-            <Setter Property="FontSize" Value="13" />
-        </Style>
-
-        <Style x:Key="PageHeader" TargetType="Paragraph">
-            <Setter Property="FontSize" Value="24" />
-            <Setter Property="Foreground" Value="#1E6BB8" />
-        </Style>
-
-        <Style x:Key="SubHeader"
-               TargetType="Paragraph">
-            <Setter Property="FontSize"
-                    Value="20" />
-            <Setter Property="Foreground"
-                    Value="#DF3900" />
-        </Style>
-
-        <Style x:Key="SubHeaderSecondary"
-               TargetType="Paragraph">
-            <Setter Property="FontSize"
-                    Value="20" />
-            <Setter Property="Foreground"
-                    Value="#DF3900" />
-        </Style>
-
-        <xaml:Markdown x:Key="Markdown"
-                        DocumentStyle="{StaticResource DocumentStyle}"
-                        Heading1Style="{StaticResource PageHeader}"
-                        Heading2Style="{StaticResource SubHeader}"
-                        Heading3Style="{StaticResource SubHeaderSecondary}"/>
-
-        <xaml:TextToFlowDocumentConverter x:Key="TextToFlowDocumentConverter" Markdown="{StaticResource Markdown}"/>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Views/Resources/Colors.xaml"/>
+                <ResourceDictionary Source="Views/Resources/CustomStyles.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+
+            <!--Global View Model Locator-->
+            <viewModels:ViewModelLocator x:Key="Locator" />
+            <services:UpgradeService x:Key="Upgrade" />
+
+            <!-- Markdown style -->
+            <xaml:Markdown x:Key="Markdown">
+                <xaml:Markdown.DocumentStyle>
+                    <Style TargetType="FlowDocument">
+                        <Setter Property="FontFamily" Value="Segoe UI" />
+                        <Setter Property="TextAlignment" Value="Left" />
+                        <Setter Property="Foreground" Value="{DynamicResource Markdown_ForegroundBrush}" />
+                        <Setter Property="Background" Value="{DynamicResource Markdown_BackgroundBrush}" />
+                        <Setter Property="LineHeight" Value="9"/>
+                        <Setter Property="FontSize" Value="13" />
+                    </Style>
+                </xaml:Markdown.DocumentStyle>
+
+                <xaml:Markdown.Heading1Style>
+                    <Style TargetType="Paragraph">
+                        <Setter Property="FontSize" Value="24" />
+                        <Setter Property="Foreground" Value="{DynamicResource Markdown_Heading1ForegroundBrush}" />
+                    </Style>
+                </xaml:Markdown.Heading1Style>
+
+                <xaml:Markdown.Heading2Style>
+                    <Style TargetType="Paragraph">
+                        <Setter Property="FontSize" Value="20" />
+                        <Setter Property="Foreground" Value="{DynamicResource Markdown_Heading2ForegroundBrush}" />
+                    </Style>
+                </xaml:Markdown.Heading2Style>
+
+                <xaml:Markdown.Heading3Style>
+                    <Style TargetType="Paragraph">
+                        <Setter Property="FontSize" Value="20" />
+                        <Setter Property="Foreground" Value="{DynamicResource Markdown_Heading3ForegroundBrush}" />
+                    </Style>
+                </xaml:Markdown.Heading3Style>
+            </xaml:Markdown>
+
+            <!-- Converters -->
+            <valueConverters:ApplicationVersionToApplicationName x:Key="ApplicationVersionToApplicationName"/>
+            <generic:BoolToVisibility x:Key="BoolToVisibility"/>
+
+            <generic:ValueConverterGroup x:Key="EnumEqualsToVisibility">
+                <generic:ValueToString/>
+                <generic:EqualsConverter/>
+                <generic:BoolToVisibility/>
+            </generic:ValueConverterGroup>
+
+            <valueConverters:ConversionStateToBrush x:Key="ConversionStateToBrush" />
+            <valueConverters:ConversionJobToEstimatedRemainingDuration x:Key="ConversionJobToEstimatedRemainingDuration" />
+
+            <generic:ValueConverterGroup x:Key="ChangelogToMarkdown">
+                <valueConverters:ChangelogConverter/>
+                <xaml:TextToFlowDocumentConverter Markdown="{StaticResource Markdown}"/>
+            </generic:ValueConverterGroup>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>