diff --git a/Application/FileConverter/Controls/ConversionJobControl.xaml b/Application/FileConverter/Controls/ConversionJobControl.xaml index ccff855..7a18468 100644 --- a/Application/FileConverter/Controls/ConversionJobControl.xaml +++ b/Application/FileConverter/Controls/ConversionJobControl.xaml @@ -11,7 +11,7 @@ - + diff --git a/Application/FileConverter/Resources/CancelIcon.png b/Application/FileConverter/Resources/CancelIcon.png index 1f3948d..869f269 100644 Binary files a/Application/FileConverter/Resources/CancelIcon.png and b/Application/FileConverter/Resources/CancelIcon.png differ diff --git a/Application/FileConverter/Resources/FailIcon.png b/Application/FileConverter/Resources/FailIcon.png index 6f9b86f..cd1cede 100644 Binary files a/Application/FileConverter/Resources/FailIcon.png and b/Application/FileConverter/Resources/FailIcon.png differ diff --git a/Application/FileConverter/Resources/SuccessIcon.png b/Application/FileConverter/Resources/SuccessIcon.png index 00ce2bf..ae1adf9 100644 Binary files a/Application/FileConverter/Resources/SuccessIcon.png and b/Application/FileConverter/Resources/SuccessIcon.png differ diff --git a/Application/FileConverter/Views/MainWindow.xaml b/Application/FileConverter/Views/MainWindow.xaml index cf0e0e8..3f8e6d7 100644 --- a/Application/FileConverter/Views/MainWindow.xaml +++ b/Application/FileConverter/Views/MainWindow.xaml @@ -31,15 +31,15 @@ - + - - + + diff --git a/Resources/CancelIcon.png b/Resources/CancelIcon.png index 1f3948d..869f269 100644 Binary files a/Resources/CancelIcon.png and b/Resources/CancelIcon.png differ diff --git a/Resources/FailIcon.png b/Resources/FailIcon.png index 6f9b86f..cd1cede 100644 Binary files a/Resources/FailIcon.png and b/Resources/FailIcon.png differ diff --git a/Resources/Icons/CancelIcon.svg b/Resources/Icons/CancelIcon.svg index bfb5668..fb748e9 100644 --- a/Resources/Icons/CancelIcon.svg +++ b/Resources/Icons/CancelIcon.svg @@ -1,6 +1,4 @@ - - + inkscape:export-filename="D:\Users\adrie\Documents\GitHub\FileConverter\Resources\CancelIcon.png" + inkscape:export-xdpi="36" + inkscape:export-ydpi="36"> + inkscape:window-width="2498" + inkscape:window-height="1417" + inkscape:window-x="54" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:document-rotation="0" /> @@ -48,7 +47,7 @@ image/svg+xml - + @@ -62,5 +61,10 @@ d="M 128,803.1122 A 121.25,121.25 0 0 0 6.75,924.3622 121.25,121.25 0 0 0 128,1045.6122 121.25,121.25 0 0 0 249.25,924.3622 121.25,121.25 0 0 0 128,803.1122 Z m 0,20.20833 A 101.04167,101.04167 0 0 1 229.04167,924.3622 101.04167,101.04167 0 0 1 211.66526,980.96132 L 57.714866,851.77797 A 101.04167,101.04167 0 0 1 128,823.32053 Z M 44.334737,867.76308 198.28513,996.9464 A 101.04167,101.04167 0 0 1 128,1025.4039 101.04167,101.04167 0 0 1 26.958333,924.3622 101.04167,101.04167 0 0 1 44.334737,867.76308 Z" id="path3338" inkscape:connector-curvature="0" /> + diff --git a/Resources/Icons/FailIcon.svg b/Resources/Icons/FailIcon.svg index 13e93bb..46cc9cd 100644 --- a/Resources/Icons/FailIcon.svg +++ b/Resources/Icons/FailIcon.svg @@ -1,6 +1,4 @@ - - + inkscape:export-filename="D:\Users\adrie\Documents\GitHub\FileConverter\Resources\FailIcon.png" + inkscape:export-xdpi="36" + inkscape:export-ydpi="36"> + inkscape:window-width="2498" + inkscape:window-height="1417" + inkscape:window-x="54" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:document-rotation="0" /> @@ -48,7 +47,7 @@ image/svg+xml - + @@ -70,20 +69,27 @@ y="2.625" style="fill:#f44336;fill-opacity:1" />! ! + ! + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'MS UI Gothic';-inkscape-font-specification:'MS UI Gothic';fill:#ff5252;fill-opacity:1">! + + diff --git a/Resources/Icons/SuccessIcon.svg b/Resources/Icons/SuccessIcon.svg index f7ad6d9..6ad2fae 100644 --- a/Resources/Icons/SuccessIcon.svg +++ b/Resources/Icons/SuccessIcon.svg @@ -1,6 +1,4 @@ - - + inkscape:export-filename="D:\Users\adrie\Documents\GitHub\FileConverter\Resources\SuccessIcon.png" + inkscape:export-xdpi="36" + inkscape:export-ydpi="36"> + inkscape:window-width="2498" + inkscape:window-height="1417" + inkscape:window-x="54" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:document-rotation="0" /> @@ -48,7 +47,7 @@ image/svg+xml - + @@ -58,10 +57,13 @@ id="layer1" transform="translate(0,-796.3622)"> + style="fill:#4caf50;fill-opacity:1;stroke-width:0.276214;stroke:none;stroke-opacity:1" + d="M 115.8966,247.76844 C 92.037607,245.16548 70.961645,236.48202 52.148824,221.50384 47.337244,217.67301 37.925702,208.26325 34.105231,203.46365 19.550222,185.17844 10.990369,164.82705 8.0734325,141.57202 7.4781319,136.82604 7.2387715,123.31805 7.6608429,118.28808 9.8590632,92.091114 20.178789,67.831797 37.502076,48.138163 57.112929,25.843955 83.579096,11.928435 113.88256,7.9784326 c 4.87576,-0.6355469 22.25024,-0.7269001 26.93083,-0.1415995 32.84719,4.1074939 61.01507,19.6162769 81.10718,44.6563059 13.2052,16.457149 21.61191,35.580766 25.08122,57.054871 0.98421,6.09203 1.25259,9.93152 1.25583,17.96606 0.004,10.34474 -0.65298,16.80146 -2.65369,26.07324 -6.49176,30.08454 -24.9727,57.11772 -50.79079,74.29472 -15.541,10.33956 -30.92258,16.29885 -49.58034,19.20891 -6.89914,1.07606 -22.40133,1.43408 -29.3362,0.6775 z m 21.87844,-18.91485 c 21.77463,-2.16331 42.99826,-11.6755 58.69538,-26.3066 17.96191,-16.74207 28.60783,-37.33845 32.08803,-62.07982 0.70687,-5.02526 0.71024,-19.87564 0.006,-25.13544 -3.02879,-22.611882 -12.51499,-42.358311 -28.00427,-58.293559 -16.05005,-16.51217 -36.5209,-26.75833 -59.88459,-29.973686 -4.38557,-0.603551 -16.9196,-0.849562 -21.61932,-0.424332 -24.237811,2.19303 -46.415441,12.599295 -63.465697,29.779595 -22.094016,22.26253 -32.649624,53.836832 -28.419543,85.009532 4.308413,31.74995 23.266565,59.50743 51.32295,75.14424 12.757976,7.11047 27.36342,11.44907 42.24138,12.54797 3.91126,0.28889 12.85026,0.14835 17.03999,-0.2679 z" + id="path843" + transform="translate(0,796.3622)" /> + diff --git a/Resources/SuccessIcon.png b/Resources/SuccessIcon.png index 00ce2bf..ae1adf9 100644 Binary files a/Resources/SuccessIcon.png and b/Resources/SuccessIcon.png differ