Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

File Converter release v2.0 #379

Merged
merged 280 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
280 commits
Select commit Hold shift + click to select a range
4d8a827
Add localization for new error message.
Tichau Sep 25, 2018
28cb808
Extract settings resources from window xaml
Tichau Oct 16, 2018
d0e0004
Update readme
Tichau Oct 17, 2018
c8c54e7
Add a troubleshooting section in README
Tichau Oct 17, 2018
6bc435b
Add files via upload
chachak Nov 5, 2018
96be447
Fix issue where upgrade uri was not correct in debug mode.
Tichau Nov 9, 2018
3071be3
Fixed: Issue where upgrade download was working due to an issue with …
Tichau Nov 9, 2018
7a92810
Update resharper settings
Tichau Nov 9, 2018
ce7ad82
File Converter is now using .NET framework 4.5.2
Tichau Nov 9, 2018
8e649eb
Add MVVM Light framework to File Converter project
Tichau Nov 9, 2018
40e637a
Use services instead of putting all the logic in Application.cs
Tichau Nov 9, 2018
5c933fc
Migration to MVVM design pattern.
Tichau Dec 6, 2018
5637aa1
Replace DelegateCommand by RelayCommand from MVVC framework
Tichau Dec 6, 2018
498cc57
Fixed: Issue where estimated duration was throwing an exception in so…
Tichau Dec 6, 2018
22e16ed
Cancel upgrade when quiting the Upgrade window after quiting the appl…
Tichau Dec 7, 2018
5d7186f
Add assert in debug tools
Tichau Dec 7, 2018
f67f25d
Rework NavigationService.
Tichau Dec 7, 2018
5afffc1
Stylecop
Tichau Dec 7, 2018
a46a48e
Replace CancelConversionJobCommand by generic RelayCommand
Tichau Dec 7, 2018
c913c60
Replace OpenUrlCommand by a RelayCommand.
Tichau Dec 10, 2018
db280c8
Put upgrade helpers in upgrade service. Unify changelog display.
Tichau Dec 11, 2018
832cd04
Use async methods in upgrade service instead of events.
Tichau Dec 11, 2018
08b5230
Remove warning
Tichau Dec 11, 2018
9b7c17d
Update resharper settings
Tichau Feb 24, 2019
0bef7fa
Fixed: Issue where an exception was thrown at start when there was no…
Tichau Mar 12, 2019
11e7eb3
Migrate from .net 4.5.2 to 4.6.1 (the last version compatible with Wi…
Tichau Mar 12, 2019
ad9b40b
Rework settings service.
Tichau Mar 12, 2019
b6c0221
Added: installer debug script.
Tichau Apr 4, 2019
c58986c
Added: Messages logged from main thread are now displayed in the cons…
Tichau Apr 7, 2019
248caa4
Add possibility to register / unregister file converter shell extensi…
Tichau Apr 7, 2019
e2790b8
Remove installer dependency from sharpshell tools.
Tichau Apr 7, 2019
2282f3c
Rework installer by using fileConverter command line to register/unre…
Tichau Apr 7, 2019
aa90270
Update resharper settings.
Tichau Apr 9, 2019
f217176
Improve 32x32 File Converter icon.
Tichau Apr 9, 2019
7804066
Fixed: Issue where File Converter logo displayed in the about section…
Tichau Apr 9, 2019
a7f5416
Fixed: Issue where File Converter icon was blurry in explorer context…
Tichau Apr 10, 2019
faf8451
Update changelog.
Tichau Apr 10, 2019
b768303
Merge pull request #75 from Tichau/feature/rework-architecture
Tichau Apr 10, 2019
c744bcf
Merge pull request #62 from chachak/integration
Tichau Apr 10, 2019
1268312
Added: Italian translation (thanks to Davide)
Tichau Apr 11, 2019
af452fc
Update changelog
Tichau Apr 11, 2019
02b8428
Merge pull request #76 from Tichau/feature/localization
Tichau Apr 11, 2019
6eb052c
Annotate changelog with issues ids
Tichau Apr 12, 2019
983f9c1
Migrate svg files to new Inkscape format.
Tichau Apr 17, 2019
f4f3714
Remove deprecated 16px application icon.
Tichau Apr 17, 2019
1441bfc
Add new folder and preset icons.
Tichau Apr 17, 2019
de6c8b0
Added: Possibility to create preset folders in File Converter context…
Tichau Apr 17, 2019
2a1bf6b
Added: Icons on context menu elements.
Tichau Apr 17, 2019
6f0b625
Small typos.
Tichau Apr 17, 2019
8d67366
Update Readme and changelog
Tichau Apr 17, 2019
a5952ea
Fixed: Issue where Settings icon was blurred on high dpi devices.
Tichau Apr 17, 2019
22e5673
Update changelog
Tichau Apr 17, 2019
b87286d
Merge pull request #79 from Tichau/feature/preset-folders
Tichau Apr 17, 2019
cf212f7
Added: Support new raw image input formats: arw and raf.
Tichau Apr 17, 2019
7a91989
Merge pull request #80 from Tichau/feature/raw-images
Tichau Apr 17, 2019
bf16b25
Upgrade ImageMagick to version 7.12
Tichau Apr 27, 2019
3d36c90
Added: Support new raw image input format: cr2.
Tichau Apr 27, 2019
c8bf559
Update changelog
Tichau Apr 27, 2019
4d5a3e0
Merge pull request #83 from Tichau/feature/new-input-types
Tichau Apr 27, 2019
845ea76
Migration of classes that were implementing INotifyPropertyChanged to…
Tichau Apr 27, 2019
4ff7b51
Add notion of name and folders on conversion jobs.
Tichau Apr 30, 2019
d633697
Create ViewModel data structure for conversion presets.
Tichau May 4, 2019
3f8fc70
Add sample data to test the view.
Tichau May 4, 2019
6536acd
Add SelectedItem dependency property on TreeViews.
Tichau May 4, 2019
b9756ea
Add representation of the presets tree view with commands to edit it.
Tichau May 4, 2019
5c2ce17
Fixed: Issue where preset parent folder was not initialized correctly.
Tichau May 4, 2019
957a881
Fix typo in localization keys.
Tichau Jun 6, 2019
fc4ef1f
Fixed: Minor WPF binding issue with Mp3 preset.
Tichau Jun 6, 2019
b0f658e
Added: Possibility to move presets and folders in the tree.
Tichau Jun 10, 2019
6ad9c72
Add drag and drop for conversion preset.
Tichau Jun 27, 2019
92477c8
Move data validation on modelview data structure.
Tichau Jul 1, 2019
a919782
Update settings with data in model view before saving.
Tichau Jul 1, 2019
1cc3823
Change treeview item selection colors to improve contrast with folder…
Tichau Jul 2, 2019
212854e
Highlight in red in the treeview elements that contains errors.
Tichau Jul 2, 2019
764131e
Add 'Before' / 'After' element drag and drop for a better UX
Tichau Jul 4, 2019
eef7c9e
Simplify drag & drop implementation.
Tichau Jul 5, 2019
e02a11b
Select element after droping it.
Tichau Jul 8, 2019
cbcc0c5
Clear highlighted object after drag.
Tichau Jul 8, 2019
038bf63
Better drop selection.
Tichau Jul 8, 2019
0a46609
Update default settings with new presets (a lot more presets for scal…
Tichau Jul 8, 2019
bb5e7ee
Auto scroll tree view when drag and droping an element.
Tichau Jul 9, 2019
2cc9e93
Update changelog
Tichau Jul 9, 2019
d147804
Review
Tichau Jul 9, 2019
62110d9
Merge pull request #85 from Tichau/feature/preset-category-ui
Tichau Jul 9, 2019
bfe9381
New icons
Tichau Jul 11, 2019
6da4670
Integration of treeview manipulation icons
Tichau Jul 11, 2019
cbbb5ff
Lower opacity of icon buttons when it is disabled.
Tichau Jul 11, 2019
b79e99f
Update changelog
Tichau Jul 12, 2019
2ce2a67
Merge pull request #88 from Tichau/feature/icons
Tichau Jul 12, 2019
a318536
Support for dng files
Tichau Jul 12, 2019
f4f14d5
Update changelog
Tichau Jul 12, 2019
63a75c1
Support for nef files
Tichau Jul 12, 2019
ad0ba71
Update changelog
Tichau Jul 12, 2019
6e914e8
Cancel job button is now grayed if cancel is not possible.
Tichau Jul 12, 2019
f3d61e4
Merge pull request #89 from Tichau/feature/new-formats
Tichau Jul 12, 2019
deec7e2
Add custom command argument for ffmpeg.
Tichau Oct 25, 2018
f289e5c
Rename ConversionPresetTemplates.xaml
Tichau Jul 12, 2019
78e689a
Initialize preset for custom command.
Tichau Jul 12, 2019
70fcb74
Add boolean to activate FFMPEG custom command
Tichau Jul 15, 2019
1c43f3f
Add UI to configure FFMPEG custom command for Mkv and Mp4
Tichau Jul 15, 2019
20ea28c
Add UI to edit FFMPEGCustomCommand when the option is available.
Tichau Jul 18, 2019
c8095c4
Add new custom preset to convert video in 720p and 1080p
Tichau Jul 19, 2019
33c54dd
Update Changelog
Tichau Jul 19, 2019
7965df8
Review
Tichau Jul 19, 2019
6cb03e6
Merge pull request #90 from Tichau/feature/custom-command
Tichau Jul 19, 2019
e5a7ab5
Check that .net Frawework is installed and prompt a message if not be…
Tichau Jul 31, 2019
cb7760e
Merge pull request #92 from Tichau/feature/dotnet-installer
Tichau Jul 31, 2019
fbcc910
Handle null as a valid boolean value in BoolToVisibilityConverter.
Tichau Jul 22, 2019
d5b372b
Change selected item settings display by using style triggers. Add no…
Tichau Jul 23, 2019
e773ea4
Change the side of the input format tree to follow a preset creation …
Tichau Jul 25, 2019
d9e03e9
Put up and down button side by side
Tichau Jul 25, 2019
a217d98
Change ExitApplicationWhenConversionsFinished default value to false …
Tichau Jul 25, 2019
62c2a93
Make the diagnostics logs selectable.
Tichau Jul 25, 2019
700d327
Cleanup
Tichau Jul 25, 2019
fd9efb0
Update changelog.
Tichau Jul 31, 2019
155273a
Change default window size.
Tichau Aug 1, 2019
fec5591
Add possibility to define a default value in registry.
Tichau Aug 2, 2019
680b998
Added: Import / Export presets buttons.
Tichau Aug 2, 2019
e6fef86
Update changelog.
Tichau Aug 2, 2019
2b11ba1
Focus element after importing it
Tichau Aug 2, 2019
3871b74
Improve drag and drop UX
Tichau Aug 6, 2019
f92c9e2
Add context menu for presets operation instead the dockpanel.
Tichau Aug 6, 2019
6fc031f
Align folder name text box the same size as preset name text box
Tichau Nov 13, 2020
c7605c8
Fixed: Typo in localization keys
Tichau Nov 13, 2020
d9bfb1b
Put all colors in a specific resource file.
Tichau Nov 14, 2020
e63704b
Update SayThanks url.
Tichau Nov 14, 2020
ea5830f
Fixed: Issue where cancel button was always disabled
Tichau Nov 14, 2020
d426ce1
Add missing localisation keys
Tichau Nov 14, 2020
389d245
Replace Settings and Log button with icons
Tichau Nov 14, 2020
7be821b
Align buttons
Tichau Nov 15, 2020
5e77619
Clean code
Tichau Nov 15, 2020
57af0e5
Add custom styles to all application
Tichau Nov 16, 2020
1154e7d
Move conversion state colors in resource files
Tichau Nov 16, 2020
ae9dec0
Rework icons to improve main window visual
Tichau Nov 16, 2020
e72e109
Fixed: AddNewPreset command was not working
Tichau Nov 18, 2020
527c90d
Change donation link from itch.io to paypal
Tichau Nov 21, 2020
2eb8e2f
Change donation link on Readme
Tichau Dec 13, 2020
a290240
Rework Icon buttons style, now using generic styles
Tichau Nov 22, 2020
4503cee
Fixed: Output file name template was invalid for 1080p conversions.
Tichau Nov 22, 2020
49bf06d
Add import and export icon
Tichau Mar 6, 2021
9ff6513
Add new preset icon
Tichau Mar 6, 2021
7a48868
Reorganise resource folder
Tichau Mar 6, 2021
41d24d4
Merge pull request #131 from Tichau/feature/ux
Tichau Mar 6, 2021
d310f65
Create Resources.de.resx
nikkischnelle Jan 15, 2021
a148468
Final touchup
nikkischnelle Jan 15, 2021
8cef88a
Merge pull request #154 from Tichau/feature/nikotschierske-rebase
Tichau Mar 6, 2021
53d6869
Fixed: Issue with installer after resource folder reorganisation.
Tichau Mar 6, 2021
a686608
Include german localisation to project
Tichau Mar 6, 2021
b78a36b
Localize error message
Tichau Mar 10, 2021
0088228
Remove compatible extensions from registry
Tichau Mar 10, 2021
f4de7d1
Update preset icon in extension
Tichau Mar 10, 2021
976f839
Move file locations path helpers in extensions so it can load these f…
Tichau Mar 10, 2021
cc9e7cf
Rework extension so it uses directly the settings file on disk instea…
Tichau Mar 10, 2021
f940493
Remove code that was updating registry entries.
Tichau Mar 10, 2021
834c3ae
Update changelog
Tichau Mar 15, 2021
6725bc3
Profile settings load duration
Tichau Jun 3, 2021
7ed1fdb
Merge pull request #158 from Tichau/feature/remove-settings-from-regi…
Tichau Jun 6, 2021
a43f13d
Update and rename Resources.fr.resx to Resources.fr-FR.resx
ValentinKhmer Aug 14, 2021
4793708
Merge pull request #186 from ValentinKhmer/patch-1
Tichau Oct 5, 2021
27f3341
Create Resources.zh-CN.resx
Snoopy1866 Oct 15, 2021
e0e400a
Update README.md
papujarapy Nov 17, 2021
64ecd42
Merge pull request #210 from papujarapy/patch-1
Tichau Jan 5, 2022
cc1658f
Create Resources.tr-TR.resx
MayaC0re Apr 22, 2022
ec37754
Create Resources.hi.resx
vishveshjain Oct 20, 2022
0e500ac
Update and rename Resources.hi.resx to Resources.hi-HI.resx
vishveshjain Oct 20, 2022
8125aa7
Rename Resources.hi-HI.resx to Resources.en-IN.resx
vishveshjain Oct 20, 2022
7c71ff9
Fixed: Issue where french localization was not registered correctly.
Tichau Nov 18, 2022
75e63c9
Migrate project to .net framework 4.6.2
Tichau Nov 18, 2022
cd3ae2f
Merge pull request #296 from Tichau/feature/migrate-to-visual-studio-…
Tichau Nov 18, 2022
2525362
Merge pull request #199 from Snoopy1866/patch-1
Tichau Nov 18, 2022
c3b19b3
Merge pull request #252 from MayaC0re/integration
Tichau Nov 18, 2022
72e637b
Merge pull request #280 from vishveshjain/integration
Tichau Nov 18, 2022
18042cf
Correctly integrate new languages
Tichau Nov 18, 2022
f197da1
Credit translation in readme and changelog
Tichau Nov 18, 2022
3b42c75
Merge pull request #297 from Tichau/fix/language-integration
Tichau Nov 18, 2022
b22ee55
Update dependencies
Tichau Nov 18, 2022
3f2fffa
Create Resources.ar-EG.resx
Mahmoud0Sultan Apr 29, 2023
45ec5ea
Copy File After Converting
hsayed21 Dec 4, 2023
ae11eb1
Copy All Selected Files
hsayed21 Dec 8, 2023
c91f331
Add the bookmarks in pdf when converting from word file.
Dec 27, 2023
65d12e7
Ignore TestData folder
Tichau Jan 16, 2024
2d9f8d1
Migrate to dotnet 8
Tichau Jan 16, 2024
1a699d5
Migrate from Wix 3 to Wix 4
Tichau Jan 16, 2024
01dea5b
Replace Heat command by new Heat syntax
Tichau Jan 17, 2024
2d4ed46
Clean up wix project.
Tichau Jan 17, 2024
51b14ed
Upgrade dependencies
Tichau Jan 17, 2024
2c8fe8a
Remove deprecated dependencies
Tichau Jan 17, 2024
73918bb
Upgrade ffmpeg from version 4.0 to version 6.1.1
Tichau Jan 17, 2024
fba6ae4
Change ghostscript version from 9.21 to 10.02.1
Tichau Jan 17, 2024
dbaf442
Don't require to sign the installer in debug configuration.
Tichau Jan 18, 2024
f10ea5a
Add missing dependencies to installer.
Tichau Jan 18, 2024
4bb745d
Update README and CHANGELOG
Tichau Jan 18, 2024
5d9cd4e
Merge pull request #354 from Tichau/feature/upgrade-dependencies
Tichau Jan 19, 2024
bc2719e
Merge pull request #313 from Mahmoud0Sultan/integration
Tichau Jan 19, 2024
19ba35d
Merge pull request #352 from wangweirui/integration
Tichau Jan 19, 2024
5b45796
Fixes: Missing librairies in packaged installer resulting in crash du…
Tichau Jan 19, 2024
d8ab57e
Clean up and polish after pull requests merge.
Tichau Jan 19, 2024
c2edf67
Added: Support ts input extension (github issue #23)
Tichau Jan 19, 2024
0edc325
- Added: Possibility to use conversion date in output file path templ…
Tichau Jan 19, 2024
f50a43a
- Added: Support mpg input extension as an alias for mpeg (github iss…
Tichau Jan 19, 2024
0157fdf
- Fixed: Issue where there was a maximum number of files to convert a…
Tichau Jan 19, 2024
3659900
- Added: Support new raw image input formats: heic.
Tichau Jan 19, 2024
608ec16
- Added: Support rm input extension (github issue #101).
Tichau Jan 19, 2024
3c9235d
- Added: Support opus input extension (github issue #111).
Tichau Jan 19, 2024
7502b84
- Added: Support new image input formats: dds (github issue #113).
Tichau Jan 19, 2024
c73d444
Fixes: Issue where file 'Error' in there name were generating false n…
Tichau Jan 19, 2024
dad944d
Add: Support new image input formats: jfif (github issue #130).
Tichau Jan 19, 2024
586c73e
Fixes: spelling mistake in english localization (github issue #260)
Tichau Jan 19, 2024
d163871
Adde Support new video input formats: 3gpp (github issue #318).
Tichau Jan 19, 2024
a225ef1
Add demo gif in readme (github issue #335)
Tichau Jan 19, 2024
38246f5
Add: Support new audio input formats: m4b, opus (github issue #351).
Tichau Jan 19, 2024
0b01da7
Update issue numbers in changelog.
Tichau Jan 19, 2024
0574762
Clean changelog nomenclature.
Tichau Jan 19, 2024
d567e1a
Merge pull request #355 from Tichau/feature/issues
Tichau Jan 19, 2024
5f12aff
Merge branch 'Tichau:integration' into integration
hsayed21 Jan 20, 2024
ee553d1
changes
hsayed21 Jan 20, 2024
3eca915
Merge pull request #348 from hsayed21/integration
Tichau Jan 20, 2024
f1aa7a3
Add pull request #348 to changelog.
Tichau Jan 20, 2024
1a5ac40
Add files via upload
Sedimentary-Rock Jan 24, 2024
0e4022c
Create Resources.el-GR.resx for Greek translation.
CrisBalGreece Jan 24, 2024
f6e2084
Update FileConverter.csproj for Greek language integration
CrisBalGreece Jan 24, 2024
6b11147
Merge pull request #360 from CrisBalGreece/integration
Tichau Jan 28, 2024
988567c
Merge pull request #358 from Sedimentary-Rock/integration
Tichau Jan 28, 2024
4d23a19
Update changelog
Tichau Jan 28, 2024
0645481
Change website adress from file-converter.org to file-converter.io.
Tichau Feb 1, 2024
6ae8122
Update pt-PT translation
hugok79 Feb 14, 2024
885f861
Merge pull request #367 from hugok79/patch-1
Tichau Feb 26, 2024
9b21416
chore: update changelog.
Tichau Feb 26, 2024
6b04a7e
Change: Remove close button since it is already possible using the wi…
Tichau Jan 19, 2024
eb2d6a7
Change: Remove SayThanks button since the service does not exists any…
Tichau Jan 19, 2024
7e9750d
Change installer colors
Tichau Jan 19, 2024
bff728c
Update copyright date.
Tichau Jan 20, 2024
5fc99f0
Change: Preset selection colors
Tichau Feb 17, 2024
c7f49ec
Change: Conversion job color theme
Tichau Feb 17, 2024
1ba1594
chore: Replace design data in ConversionJobControl (since d:DesignDat…
Tichau Feb 26, 2024
ce17135
chore: remove deprecated way of doing design data
Tichau Feb 26, 2024
630187e
Fixes: Issue where cancel button was not updated correctly
Tichau Mar 4, 2024
ecf434c
Change: Application theme fit better windows 11 style
Tichau Mar 4, 2024
d7c9b30
Tech: make brush binding dynamic and reduce color count of the main t…
Tichau Mar 4, 2024
3157503
Merge pull request #372 from Tichau/feature/ux-improvements
Tichau Mar 4, 2024
17a70be
Fixes: Missing margins between conversion jobs
Tichau Mar 4, 2024
0c584d3
Doc: Update helper gif
Tichau Mar 4, 2024
db321b6
Update version number to 2.0
Tichau Mar 4, 2024
3941ae6
Update changelog
Tichau Mar 4, 2024
eba3397
Fixes: Change installer constraint from .net framework 4.6.2 to 4.8
Tichau Mar 6, 2024
4882c9b
Change: small changes in changelog and readme
Tichau Mar 6, 2024
208af67
Update issue templates
Tichau Mar 6, 2024
09d174c
Update issue templates
Tichau Mar 6, 2024
c5dacc3
Merge pull request #377 from Tichau/release/2.0
Tichau Mar 6, 2024
e6632b3
Merge branch 'master' into integration
Tichau Mar 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -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.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ bld/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
TestData/*

# NUNIT
*.VisualState.xml
Expand Down Expand Up @@ -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
24 changes: 20 additions & 4 deletions Application/FileConverter/App.config
Original file line number Diff line number Diff line change
@@ -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>
115 changes: 67 additions & 48 deletions Application/FileConverter/Application.xaml
Original file line number Diff line number Diff line change
@@ -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>
Loading