From 389d2457d182e404d8895670cdaaa4e4ee3e046c Mon Sep 17 00:00:00 2001 From: Adrien Allard Date: Sat, 14 Nov 2020 17:20:21 +0100 Subject: [PATCH] Replace Settings and Log button with icons --- .../FileConverter/FileConverter.csproj | 3 + .../Properties/Resources.Designer.cs | 8 +- .../Properties/Resources.en.resx | 4 +- .../Properties/Resources.es-ES.resx | 4 +- .../Properties/Resources.fr.resx | 4 +- .../Properties/Resources.it-IT.resx | 4 +- .../Properties/Resources.pt-BR.resx | 4 +- .../Properties/Resources.pt.resx | 4 +- .../FileConverter/Properties/Resources.resx | 4 +- .../FileConverter/Resources/LogIcon.png | Bin 0 -> 1097 bytes .../Views/DiagnosticsWindow.xaml | 13 +- .../FileConverter/Views/MainWindow.xaml | 18 +- Resources/Icons/LogIcon.svg | 189 ++++++++++++++++++ Resources/LogIcon.png | Bin 0 -> 1097 bytes 14 files changed, 232 insertions(+), 27 deletions(-) create mode 100644 Application/FileConverter/Resources/LogIcon.png create mode 100644 Resources/Icons/LogIcon.svg create mode 100644 Resources/LogIcon.png diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj index d5903f9..69fcdbb 100644 --- a/Application/FileConverter/FileConverter.csproj +++ b/Application/FileConverter/FileConverter.csproj @@ -418,6 +418,9 @@ + + + copy /Y "$(SolutionDir)Middleware\ffmpeg\$(PlatformName)\ffmpeg.exe" "$(TargetDir)ffmpeg.exe" diff --git a/Application/FileConverter/Properties/Resources.Designer.cs b/Application/FileConverter/Properties/Resources.Designer.cs index 51db265..d357b63 100644 --- a/Application/FileConverter/Properties/Resources.Designer.cs +++ b/Application/FileConverter/Properties/Resources.Designer.cs @@ -360,9 +360,9 @@ namespace FileConverter.Properties { /// /// Looks up a localized string similar to Logs. /// - public static string DiagnosticsButtonTitle { + public static string DiagnosticsButtonTooltip { get { - return ResourceManager.GetString("DiagnosticsButtonTitle", resourceCulture); + return ResourceManager.GetString("DiagnosticsButtonTooltip", resourceCulture); } } @@ -1150,9 +1150,9 @@ namespace FileConverter.Properties { /// /// Looks up a localized string similar to Settings. /// - public static string SettingsButtonTitle { + public static string SettingsButtonTooltip { get { - return ResourceManager.GetString("SettingsButtonTitle", resourceCulture); + return ResourceManager.GetString("SettingsButtonTooltip", resourceCulture); } } diff --git a/Application/FileConverter/Properties/Resources.en.resx b/Application/FileConverter/Properties/Resources.en.resx index 62fef2d..2c35246 100644 --- a/Application/FileConverter/Properties/Resources.en.resx +++ b/Application/FileConverter/Properties/Resources.en.resx @@ -159,7 +159,7 @@ Logs - + Logs @@ -310,7 +310,7 @@ use maj for uppercase version File Converter Settings - + Settings diff --git a/Application/FileConverter/Properties/Resources.es-ES.resx b/Application/FileConverter/Properties/Resources.es-ES.resx index 8b9a824..c37383e 100644 --- a/Application/FileConverter/Properties/Resources.es-ES.resx +++ b/Application/FileConverter/Properties/Resources.es-ES.resx @@ -159,7 +159,7 @@ Registros - + Registros @@ -313,7 +313,7 @@ Use May para versión en mayúsculas Configuración - + Configuración diff --git a/Application/FileConverter/Properties/Resources.fr.resx b/Application/FileConverter/Properties/Resources.fr.resx index b5bab6d..4a172d5 100644 --- a/Application/FileConverter/Properties/Resources.fr.resx +++ b/Application/FileConverter/Properties/Resources.fr.resx @@ -161,7 +161,7 @@ Historique d'activité - + Historique d'activité @@ -321,7 +321,7 @@ utilisez maj pour une version en majuscules Configuration de File Converter - + Configuration diff --git a/Application/FileConverter/Properties/Resources.it-IT.resx b/Application/FileConverter/Properties/Resources.it-IT.resx index 0c5d87d..a74c6f5 100644 --- a/Application/FileConverter/Properties/Resources.it-IT.resx +++ b/Application/FileConverter/Properties/Resources.it-IT.resx @@ -173,7 +173,7 @@ Log Logs - + Log Logs @@ -389,7 +389,7 @@ use maj for uppercase version Impostazioni Settings - + Impostazioni Settings diff --git a/Application/FileConverter/Properties/Resources.pt-BR.resx b/Application/FileConverter/Properties/Resources.pt-BR.resx index 7f31f7c..8ac4866 100644 --- a/Application/FileConverter/Properties/Resources.pt-BR.resx +++ b/Application/FileConverter/Properties/Resources.pt-BR.resx @@ -159,7 +159,7 @@ Logs - + Logs @@ -313,7 +313,7 @@ Use maj para a versão em maiúsculas Configurações - + Configurações diff --git a/Application/FileConverter/Properties/Resources.pt.resx b/Application/FileConverter/Properties/Resources.pt.resx index fdf37c1..48fbb8f 100644 --- a/Application/FileConverter/Properties/Resources.pt.resx +++ b/Application/FileConverter/Properties/Resources.pt.resx @@ -159,7 +159,7 @@ Logs - + Logs @@ -313,7 +313,7 @@ Use maj para a versão em maiúsculas Definições - + Definições diff --git a/Application/FileConverter/Properties/Resources.resx b/Application/FileConverter/Properties/Resources.resx index 651787e..f02d00e 100644 --- a/Application/FileConverter/Properties/Resources.resx +++ b/Application/FileConverter/Properties/Resources.resx @@ -159,7 +159,7 @@ Logs - + Logs @@ -313,7 +313,7 @@ use maj for uppercase version Settings - + Settings diff --git a/Application/FileConverter/Resources/LogIcon.png b/Application/FileConverter/Resources/LogIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..65187ddc5222027e25ad6cf5b28514481e047d44 GIT binary patch literal 1097 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9GW4Is?Ozi*QbP*AeO zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_tJ9o-U3d6?5LsIoll_D$zc_ zIDc85_g1k#F+bRU1a7r{yC^D3c54U6E&&!n7Dqv@X*1duo;ml3eOq1Q1HUC9bNi!2 z#kumLqIIG~xy*uZ^_Gg2EuQ&AMtr5Yv61=FJ1>8`J^%jZ-X8Pk{~k1&KUbOFAmGHI z*a9XZbX&aM*S-6ke)7<*NlWz|tU@#Y1}X+AKVNpKZh3V}`1U%}Gnck5bY@g+neLgH z^D}SNrY{+S4H5VJBEOjyTsQDeKddUG-O6I2%y`bD!C2@)4~s=`rZm?XX6b49OXY(& zc5AP**IL8fx&8Dk$v+ke)2$|SFy7z;2^?S>J+`oc}&(p7OFnDoB>Ky;>Ep8Ja zMnFsp-M;Yuyx(eOO#C9HPn7vg`^3NYoz%`Omoq!hDiD-Z_1${f_ATNJ(v5C`saqQM zHTeB@J8^GQKkJeS48e?2jvxnpQ`SgrU-&y9@cGLh_UmRef9T0w(cO~r&v@S6hMQH~ z8B@P4pY^=)Z(8M?iyTF6OmikOq`$Fe-u8ayTphcJD~fU{t18#5I6gaE@U#1w;)6$< zBOd#nj=sgs@zG4^>mt9K`Uf_;hTmbxoL{Ne;KJm?n!#cTbo!0{1v+(J=JNWlHh#D} zsV>*IyX<-9>xctdmL0yP&l`4L`gbsPzvEB-2mj4Ynm|^n9FY8dzTso1^^0Y)uCj+1 z)1>Z;ecg8Q>yx?eXNwt+Oqfyok{4uc#~m*YeZ8uuA{WF1vg7^F#F?LGt$*KyWN%bi zM_GAw;PaoIOaGec{(EDSD$5Get*AnvV^#8 z)r{H`Ie#+(^Jd5R->W@iBkthSdGlEIwCyDodK&kf64L*-{xH5Ee!;q9Z_+$&1w;t* z*`G=`ZrQRmzI=cDrTpSq8^0_m)miX8b&laTre&|w8#gcgd-!bS16yQk`TEuTa+H?* zTihP`qhaN-iHr7auQc8Ir|@&kh2Lf+%Mz>D3U9C$8n=jdSrrMr;NH>nx+8Oa1**}mzMg)dKZSJlF@BG3J2GmljqvJ$)S+vuD`HRF7f^Ni2Ee(!C*@f$f_ zfq~3f0F2_DXKr5zdHepOduyxy;RE~q*E_f}KD@biho;QlFQM>!C6KiB av$)OGCqaB&?7hHZfWgz%&t;ucLK6VjtnLy3 literal 0 HcmV?d00001 diff --git a/Application/FileConverter/Views/DiagnosticsWindow.xaml b/Application/FileConverter/Views/DiagnosticsWindow.xaml index db0d73f..c6aad8b 100644 --- a/Application/FileConverter/Views/DiagnosticsWindow.xaml +++ b/Application/FileConverter/Views/DiagnosticsWindow.xaml @@ -21,10 +21,19 @@ - + -