From 6da4670f84dbbd932ea3b03e6821126df1501c83 Mon Sep 17 00:00:00 2001 From: Adrien Allard Date: Thu, 11 Jul 2019 19:21:26 +0200 Subject: [PATCH] Integration of treeview manipulation icons --- .../FileConverter/FileConverter.csproj | 12 ++++++++ .../FileConverter/Resources/DeleteIcon.ico | Bin 0 -> 17542 bytes .../FileConverter/Resources/DownIcon.ico | Bin 0 -> 17542 bytes .../FileConverter/Resources/PresetIcon.ico | Bin 0 -> 17542 bytes .../FileConverter/Resources/UpIcon.ico | Bin 0 -> 17542 bytes .../FileConverter/Views/SettingsWindow.xaml | 28 +++++++++++------- 6 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 Application/FileConverter/Resources/DeleteIcon.ico create mode 100644 Application/FileConverter/Resources/DownIcon.ico create mode 100644 Application/FileConverter/Resources/PresetIcon.ico create mode 100644 Application/FileConverter/Resources/UpIcon.ico diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj index 01038e7..35da5d2 100644 --- a/Application/FileConverter/FileConverter.csproj +++ b/Application/FileConverter/FileConverter.csproj @@ -402,6 +402,18 @@ + + + + + + + + + + + + copy /Y "$(SolutionDir)Middleware\ffmpeg\$(PlatformName)\ffmpeg.exe" "$(TargetDir)ffmpeg.exe" diff --git a/Application/FileConverter/Resources/DeleteIcon.ico b/Application/FileConverter/Resources/DeleteIcon.ico new file mode 100644 index 0000000000000000000000000000000000000000..dbc7c3ac53ec0c1738c2ce8d78a42ae23daa4e85 GIT binary patch literal 17542 zcmeHOy>1gh5Z-_bKnNmeQXxwYiWMh5OIA=ir=kJM^eK6ZQ1TYEREWo*aDllK9dxMx zr2+v0j-6Z z6E}k?#rJxzAAyg-gE{E13_5yIyCkn_d?_a~>jyZJXGQ{Ieh?9yob zV~u55u1Ptm9b%;XCPwnRNIUE^dTUa8`#IaMpq3-ON2M#Afvv6So@07J8X?9d^YL+c zNy6gn5G&;vjhCoh}sA6x(H z@64Z&H%9;C{+8zR^uL6O?aP2~KF`?W;bD0huQg;2Sho6x!*@6L_TJvM-87%g2Xug8 z!l^AejAj^tDx0}DDdw{E4#TM`=;C(@E zo#&%#F3zvl%Rd2@Zvi3ernLZ;Z+?mqDu?FZ*?~SN2GwYO&rL_k9-1G=+qm$tV_$Ag zb6`Je1KG!peYrW!f&Hj0#-1>OHS+) zlFJs0v0dgij1ZkmPV6%p71y!6D)YK?_R*+pg>dW=3pwhzbioMmsmtwZ+ur{BnE-UI z@iF`;2Qe@c#^M=(a|(DkJJR=`a|-=$*6B(NBnA=#|0)BaXJ_>L&B!5VYOY+yJo_?r z({Y|NF_-$!&kbkZ@1eQl$^Pex(i#@Qy;*+~pTXv4{>$Lo$5&tM`srDss~vJleEQm5 zbI0=Ytxxjj>Z|RBozH4mY%38qeivN>B5L%1zbD;fB^r1qB@xv4ri+|YV) zJokP#_DS=23{?Nm@9aI*1)VobXQaiT?)?V3^5O908rPQ>rH7hmoprKw7P#1TOwTCm pYK~!())ga1lNj}%+v0efca89Vlzk1$U;DgkPH~BW#K8Z_z;6@ZQs)2w literal 0 HcmV?d00001 diff --git a/Application/FileConverter/Resources/DownIcon.ico b/Application/FileConverter/Resources/DownIcon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c9cec61b73390b65a2b3e2fe1384472ff9d3d8e6 GIT binary patch literal 17542 zcmeHOJ8u&~5dKVp!b8I82n}|F1YIgxQ>6(3grEz80!0Xg0HUJd3?w2yAPoft6_5fU zAw&pGBwBt0xP#ISU@4B58Q(45IJb9u=Q}^hY_ytv&V2LjW$$i12NW=l$w`nb(udf~k-cnn+?AKq@xUFJ<;3ix&sI8Ae?i!}J{BqSwdz?;MT>Lr{>IITT= za}k%H%tCQas)Of#zF$zBlj<<%Ce;x(*HuT<+&CRBbK`WRStFSPD78DcJfK+t8YQ4! z1Zoq&))-JN>>j7*@jgRa6KMNs?^nX9Fc8H6T{mwoUm5MQbJTy^310~c^L=6+D(rt6kd_yNchm|Rxqs;G(l7shP-B+>0U z))j-RzBJ=pF(lawWvnnD3#~^)(!fNZ& zxJ@|-A8hzs+D+`b+z%gC9^yFLalvRCvq|w~+^2DyvL8O!aHVNCvFmc4KBU2Do5OK_ z+^2DyG7leYII?IrvFmb{K4gK>rsLz1eI2rhr?A=0vi-vyyARJ7a4_v!WQj3O*ZW1g z56Z)Vq&~#i%cK9@?Fb(n%04LV>Cy*`AuXDf?w>L_@p>7yyUgtr48>&*h+_GZf}&V*U=+(52S<_I0>)TYX;oR0pwGPMTQ5o# W`sSWxiN3iHWQ`?#f3Mo9|MD-LE&qA| literal 0 HcmV?d00001 diff --git a/Application/FileConverter/Resources/PresetIcon.ico b/Application/FileConverter/Resources/PresetIcon.ico new file mode 100644 index 0000000000000000000000000000000000000000..e1f4f12e73eeec2504314265093015e6dd4e58d5 GIT binary patch literal 17542 zcmeHMF>Vw=5Nu0M92hxtgf6i}=*R()BP5HI2bheMfZPx{;U7eNfWPn+nD)AGySP4D z+p{~^*DI}NYOcGgx2|_??@r`E4&~%T+PIMqhazu8$XQd*CX1i9B2Lb z`c7PjI4_Eo|K>{Ge|h_GUs+AeqkJ6q-1t4O_`0K*{VD#(&jjVqV?VgB_QfB)&bf!Z zr|g{h^tHJs_Rn4X8k0G-UXTCNYdPlYnS(uk=9=qMlt1GW-V3g|@ZS#TbJ(Vxm+jQ= zje6YZ7r;8UI>7sH7H<{Vv6$84{2fwTU*h~Mh6wI=U~kOoaXxfPfBI~KAKu9RWifQv zf5wQ*>Ty1JS&uQ|I6sTQ%X*9vm(}BZ@Uk9b#BqKWgO~LfBQC4Q`QT+e#)#wmECw&@ zF-BZgkMqIHdW;dr`B@BJ)?)#;2x_dV7yizkBO~ zFREX0%Q~RHQ|Nz1*X{iCJ4O4?x{h*SDF^sjVJ+P2de*9!b*lc!0rq7rZ2iaQn2vTm zGGD7+*0Hr!{k#AFWAA$4@_%xmhnI6W_QC(ieLcs!9yt;JtN!KorSkv(-+!wAtN*>d zw(j4$f4$y_tXKb3|3v!4i>dyp{_%PvvR?gD{S)aEFQ!-jSe{XH?>XOFA62KP>(%M4 zdpx7oy*j;huTC33YHn+@HQ04;ZsSMIZEdy&yY9_x{HVFD&DLPopUS-IANx-A^561| YnrECGRkPLI=lV0(Ub*E!IndXE-|%c|qyPW_ literal 0 HcmV?d00001 diff --git a/Application/FileConverter/Resources/UpIcon.ico b/Application/FileConverter/Resources/UpIcon.ico new file mode 100644 index 0000000000000000000000000000000000000000..5448080f427521bd31852e6ce2c6c2f4ef087dc0 GIT binary patch literal 17542 zcmeHOy>8S%5FSI2_>oXLLW8bBf-V(xsx%>h5OhJLh$4hS08!Cklpk>qKtn-61zdrU z5F#9}kY~tSqzjmt^9>mmdvEu=>)S(P$r|t9H{X1=_SUmLfDC3}b{5cf;K2;QA^^6GOU*zekTfcg1h`7*%4C4eh92AdF}tVaV2I8Kl73iLPN_K&Ao;c{** zK|yEt7F?A~Trld!GL8*n)L0va>)0v`-?0*7+_8+2FT;wdGqt4mII6;^ ztNZ@M9h?2sVVU)P{B3mQ&Dd;Btg7<3*e*VrV%vPYyPpl#0`#14za~~{6NkzU&3?s&4PsF;OjdihjD#};Ly}}6Aqz#@8=iK5)Yr}A(U^9pREgr zSiW62#P(gs;r&`xY!7qD#DV+8w0tjm>*#yj*B?#EFb4pxIVU(?{j?5WBWAm zKi+|fXH;L`9i(|pYFbtWQ~_1MSpmvZ&|c9ho`3QbxM!`0DxeCe0;+&2pbDr0s(>n> z3WQOhz;94Ehm(TkJPO$tOYqYrmqfYA)VOag!Y>!@@-9vyhR+YnZ&Ri2d@b`^lBeyu z%^1FHSh(kK!p76q)VCNW68`P#&9qdZOw%vahrxYqgb zi9zniG5b#|`>@2F z*6^wDwDF)Ax;OvkPW)|SQfuSqoNa3ST=+~QcR44y#F%0q{C~^T{{!^d3Y?=eMSYc% TDxeCe0;+&2pbDr0)2zU6sz+T( literal 0 HcmV?d00001 diff --git a/Application/FileConverter/Views/SettingsWindow.xaml b/Application/FileConverter/Views/SettingsWindow.xaml index a053ac5..5b6552e 100644 --- a/Application/FileConverter/Views/SettingsWindow.xaml +++ b/Application/FileConverter/Views/SettingsWindow.xaml @@ -131,23 +131,31 @@ - + - + +