Replace Settings and Log button with icons

This commit is contained in:
Adrien Allard committed 2020-11-14 17:20:21 +01:00
1 parent d426ce1237
commit 389d2457d1
14 files changed
+232 -27

No files matched your search

@@ -418,6 +418,9 @@
<ItemGroup>
<Resource Include="Resources\DeleteIcon.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\LogIcon.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy /Y "$(SolutionDir)Middleware\ffmpeg\$(PlatformName)\ffmpeg.exe" "$(TargetDir)ffmpeg.exe"
+4 -4
View File
@@ -360,9 +360,9 @@ namespace FileConverter.Properties {
/// <summary>
/// Looks up a localized string similar to Logs.
/// </summary>
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 {
/// <summary>
/// Looks up a localized string similar to Settings.
/// </summary>
public static string SettingsButtonTitle {
public static string SettingsButtonTooltip {
get {
return ResourceManager.GetString("SettingsButtonTitle", resourceCulture);
return ResourceManager.GetString("SettingsButtonTooltip", resourceCulture);
}
}
@@ -159,7 +159,7 @@
<data name="Diagnostics" xml:space="preserve">
<value>Logs</value>
</data>
<data name="DiagnosticsButtonTitle" xml:space="preserve">
<data name="DiagnosticsButtonTooltip" xml:space="preserve">
<value>Logs</value>
</data>
<data name="DocumentationButtonDescription" xml:space="preserve">
@@ -310,7 +310,7 @@ use maj for uppercase version</value>
<data name="Settings" xml:space="preserve">
<value>File Converter Settings</value>
</data>
<data name="SettingsButtonTitle" xml:space="preserve">
<data name="SettingsButtonTooltip" xml:space="preserve">
<value>Settings</value>
</data>
<data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
@@ -159,7 +159,7 @@
<data name="Diagnostics" xml:space="preserve">
<value>Registros</value>
</data>
<data name="DiagnosticsButtonTitle" xml:space="preserve">
<data name="DiagnosticsButtonTooltip" xml:space="preserve">
<value>Registros</value>
</data>
<data name="DocumentationButtonDescription" xml:space="preserve">
@@ -313,7 +313,7 @@ Use May para versión en mayúsculas</value>
<data name="Settings" xml:space="preserve">
<value>Configuración</value>
</data>
<data name="SettingsButtonTitle" xml:space="preserve">
<data name="SettingsButtonTooltip" xml:space="preserve">
<value>Configuración</value>
</data>
<data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
@@ -161,7 +161,7 @@
<data name="Diagnostics" xml:space="preserve">
<value>Historique d'activité</value>
</data>
<data name="DiagnosticsButtonTitle" xml:space="preserve">
<data name="DiagnosticsButtonTooltip" xml:space="preserve">
<value>Historique d'activité</value>
</data>
<data name="DocumentationButtonDescription" xml:space="preserve">
@@ -321,7 +321,7 @@ utilisez maj pour une version en majuscules</value>
<data name="Settings" xml:space="preserve">
<value>Configuration de File Converter</value>
</data>
<data name="SettingsButtonTitle" xml:space="preserve">
<data name="SettingsButtonTooltip" xml:space="preserve">
<value>Configuration</value>
</data>
<data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
@@ -173,7 +173,7 @@
<value>Log</value>
<comment>Logs</comment>
</data>
<data name="DiagnosticsButtonTitle" xml:space="preserve">
<data name="DiagnosticsButtonTooltip" xml:space="preserve">
<value>Log</value>
<comment>Logs</comment>
</data>
@@ -389,7 +389,7 @@ use maj for uppercase version</comment>
<value>Impostazioni</value>
<comment>Settings</comment>
</data>
<data name="SettingsButtonTitle" xml:space="preserve">
<data name="SettingsButtonTooltip" xml:space="preserve">
<value>Impostazioni</value>
<comment>Settings</comment>
</data>
@@ -159,7 +159,7 @@
<data name="Diagnostics" xml:space="preserve">
<value>Logs</value>
</data>
<data name="DiagnosticsButtonTitle" xml:space="preserve">
<data name="DiagnosticsButtonTooltip" xml:space="preserve">
<value>Logs</value>
</data>
<data name="DocumentationButtonDescription" xml:space="preserve">
@@ -313,7 +313,7 @@ Use maj para a versão em maiúsculas</value>
<data name="Settings" xml:space="preserve">
<value>Configurações</value>
</data>
<data name="SettingsButtonTitle" xml:space="preserve">
<data name="SettingsButtonTooltip" xml:space="preserve">
<value>Configurações</value>
</data>
<data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
@@ -159,7 +159,7 @@
<data name="Diagnostics" xml:space="preserve">
<value>Logs</value>
</data>
<data name="DiagnosticsButtonTitle" xml:space="preserve">
<data name="DiagnosticsButtonTooltip" xml:space="preserve">
<value>Logs</value>
</data>
<data name="DocumentationButtonDescription" xml:space="preserve">
@@ -313,7 +313,7 @@ Use maj para a versão em maiúsculas</value>
<data name="Settings" xml:space="preserve">
<value>Definições</value>
</data>
<data name="SettingsButtonTitle" xml:space="preserve">
<data name="SettingsButtonTooltip" xml:space="preserve">
<value>Definições</value>
</data>
<data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
@@ -159,7 +159,7 @@
<data name="Diagnostics" xml:space="preserve">
<value>Logs</value>
</data>
<data name="DiagnosticsButtonTitle" xml:space="preserve">
<data name="DiagnosticsButtonTooltip" xml:space="preserve">
<value>Logs</value>
</data>
<data name="DocumentationButtonDescription" xml:space="preserve">
@@ -313,7 +313,7 @@ use maj for uppercase version</value>
<data name="Settings" xml:space="preserve">
<value>Settings</value>
</data>
<data name="SettingsButtonTitle" xml:space="preserve">
<data name="SettingsButtonTooltip" xml:space="preserve">
<value>Settings</value>
</data>
<data name="TwoSeventyDegreesRotationTitle" xml:space="preserve">
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

@@ -21,10 +21,19 @@
</Window.Title>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="30" />
<RowDefinition Height="60" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Content="{x:Static project:Resources.Diagnostics}" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold" />
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="60" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Image Grid.Column="0" Height="48" Width="48" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/LogIcon.png" />
<Label Grid.Column="1" Content="{x:Static project:Resources.Diagnostics}" VerticalAlignment="Center" FontSize="18" FontWeight="Bold" />
</Grid>
<TabControl Grid.Row="1" Margin="5" ItemsSource="{Binding Path=(diagnostics:Debug.Data), Mode=OneWay}">
<TabControl.ItemTemplate>
@@ -31,23 +31,27 @@
<Grid Margin="10">
<Grid.RowDefinitions>
<RowDefinition Height="35" />
<RowDefinition Height="60" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="120" />
<ColumnDefinition Width="120" />
<ColumnDefinition Width="60" />
<ColumnDefinition Width="60" />
</Grid.ColumnDefinitions>
<DockPanel Grid.Column="0">
<Label Content="{x:Static project:Resources.ConversionQueueTitle}" VerticalAlignment="Top" Height="30" FontSize="16" FontWeight="Bold"/>
<Label Content="{Binding InformationMessage}" VerticalAlignment="Top" Height="30" FontSize="13.333" HorizontalAlignment="Right"/>
<Label Content="{x:Static project:Resources.ConversionQueueTitle}" VerticalAlignment="Center" FontSize="18" FontWeight="Bold"/>
<Label Content="{Binding InformationMessage}" VerticalAlignment="Center" FontSize="13.333" HorizontalAlignment="Right"/>
</DockPanel>
<Button Grid.Column="1" Content="{x:Static project:Resources.DiagnosticsButtonTitle}" Margin="3,3" Command="{Binding ShowDiagnosticsCommand}"/>
<Button Grid.Column="2" Content="{x:Static project:Resources.SettingsButtonTitle}" Margin="3,3" Command="{Binding ShowSettingsCommand}"/>
<Button Grid.Column="1" Margin="3,3" Command="{Binding ShowDiagnosticsCommand}" ToolTip="{x:Static project:Resources.DiagnosticsButtonTooltip}">
<Image HorizontalAlignment="Left" Height="48" Width="48" VerticalAlignment="Top" Source="/Resources/LogIcon.png" />
</Button>
<Button Grid.Column="2" Margin="3,3" Command="{Binding ShowSettingsCommand}" ToolTip="{x:Static project:Resources.SettingsButtonTooltip}">
<Image HorizontalAlignment="Left" Height="48" Width="48" VerticalAlignment="Top" Source="/Resources/SettingsIcon.ico" />
</Button>
</Grid>
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" CanContentScroll="True">
+189
View File
@@ -0,0 +1,189 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="50mm"
height="50mm"
viewBox="0 0 50 50"
version="1.1"
id="svg3760"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
sodipodi:docname="LogIcon.svg"
inkscape:export-filename="D:\Users\adrie\Documents\GitHub\FileConverter\Resources\LogIcon.png"
inkscape:export-xdpi="48.77"
inkscape:export-ydpi="48.77">
<defs
id="defs3754" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="4.3748757"
inkscape:cx="85.122902"
inkscape:cy="67.683432"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="2498"
inkscape:window-height="1417"
inkscape:window-x="54"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:document-rotation="0" />
<metadata
id="metadata3757">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-247)">
<rect
id="rect3762"
width="3.96875"
height="36.88842"
x="7.8778019"
y="253.62828"
style="fill:#0171bb;fill-opacity:1;stroke-width:0.120997" />
<rect
id="rect3762-9"
width="3.96875"
height="35.383747"
x="38.488541"
y="253.65729"
style="fill:#0171bb;fill-opacity:1;stroke-width:0.118503" />
<rect
id="rect3762-93"
width="3.96875"
height="34.548386"
x="253.61607"
y="-42.444916"
style="fill:#0171bb;fill-opacity:1;stroke-width:0.117097"
transform="rotate(90)" />
<rect
id="rect3762-93-7"
width="3.96875"
height="34.577518"
x="286.58069"
y="-42.456921"
style="fill:#0171bb;fill-opacity:1;stroke-width:0.117146"
transform="rotate(90)" />
<g
id="g232"
transform="translate(-0.11779088,-0.12019703)">
<rect
id="rect3762-93-70"
width="1.984375"
height="16.243387"
x="261.49573"
y="-35.530304"
style="fill:#004b82;fill-opacity:1;stroke-width:0.056774"
transform="rotate(90)" />
<rect
id="rect3762-93-70-0"
width="1.984375"
height="1.9707552"
x="261.44177"
y="-16.984608"
style="fill:#004b82;fill-opacity:1;stroke-width:0.0197755"
transform="rotate(90)" />
</g>
<g
id="g236"
transform="translate(-0.06206197,-0.2562312)">
<rect
id="rect3762-93-70-8"
width="1.984375"
height="16.243387"
x="266.31354"
y="-35.474575"
style="fill:#004b82;fill-opacity:1;stroke-width:0.056774"
transform="rotate(90)" />
<rect
id="rect3762-93-70-0-3"
width="1.984375"
height="1.9707552"
x="266.25958"
y="-16.928879"
style="fill:#004b82;fill-opacity:1;stroke-width:0.0197755"
transform="rotate(90)" />
</g>
<g
id="g246"
transform="translate(-0.28862447,-0.47390316)">
<rect
id="rect3762-93-70-4"
width="1.984375"
height="16.243387"
x="271.21298"
y="-35.701138"
style="fill:#004b82;fill-opacity:1;stroke-width:0.056774"
transform="rotate(90)" />
<rect
id="rect3762-93-70-0-7"
width="1.984375"
height="1.9707552"
x="271.15903"
y="-17.155441"
style="fill:#004b82;fill-opacity:1;stroke-width:0.0197755"
transform="rotate(90)" />
</g>
<g
id="g250"
transform="translate(-0.27479237,-0.20701256)">
<rect
id="rect3762-93-70-6"
width="1.984375"
height="16.243387"
x="275.62787"
y="-35.687309"
style="fill:#004b82;fill-opacity:1;stroke-width:0.056774"
transform="rotate(90)" />
<rect
id="rect3762-93-70-0-1"
width="1.984375"
height="1.9707552"
x="275.57391"
y="-17.141605"
style="fill:#004b82;fill-opacity:1;stroke-width:0.0197755"
transform="rotate(90)" />
</g>
<g
id="g254"
transform="translate(-0.07933778)">
<rect
id="rect3762-93-70-05"
width="1.984375"
height="16.243387"
x="280.10263"
y="-35.491856"
style="fill:#004b82;fill-opacity:1;stroke-width:0.056774"
transform="rotate(90)" />
<rect
id="rect3762-93-70-0-8"
width="1.984375"
height="1.9707552"
x="280.04868"
y="-16.94615"
style="fill:#004b82;fill-opacity:1;stroke-width:0.0197755"
transform="rotate(90)" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB