Skip to content

Commit

Permalink
Slight redesign of interface
Browse files Browse the repository at this point in the history
github issue #8.
  • Loading branch information
Tichau committed Oct 24, 2016
1 parent 9f241b8 commit 5c1826e
Show file tree
Hide file tree
Showing 12 changed files with 86 additions and 8 deletions.
6 changes: 6 additions & 0 deletions Application/FileConverter/FileConverter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,12 @@
<ItemGroup>
<Resource Include="Resources\FileConverterUsage.gif" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Settings-Icon.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\WebSite-Icon.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy /Y "$(SolutionDir)Middleware\ffmpeg\$(PlatformName)\ffmpeg.exe" "$(TargetDir)ffmpeg.exe"
Expand Down
9 changes: 9 additions & 0 deletions Application/FileConverter/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Application/FileConverter/Properties/Resources.en.resx
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ use maj for uppercase version</value>
<value>See change log ...</value>
</data>
<data name="Settings" xml:space="preserve">
<value>Settings</value>
<value>File Converter Settings</value>
</data>
<data name="SettingsButtonTitle" xml:space="preserve">
<value>Settings</value>
Expand Down Expand Up @@ -541,4 +541,7 @@ use maj for uppercase version</value>
<data name="ErrorMicrosoftWordIsNotAvailable" xml:space="preserve">
<value>Microsoft Word must be installed in order to convert Word documents.</value>
</data>
<data name="WebsiteButtonDescription" xml:space="preserve">
<value>Open File Converter website</value>
</data>
</root>
5 changes: 4 additions & 1 deletion Application/FileConverter/Properties/Resources.fr.resx
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ utilisez maj pour une version en majuscules</value>
<value>Voir les changements ...</value>
</data>
<data name="Settings" xml:space="preserve">
<value>Configuration</value>
<value>Configuration de File Converter</value>
</data>
<data name="SettingsButtonTitle" xml:space="preserve">
<value>Configuration</value>
Expand Down Expand Up @@ -559,4 +559,7 @@ utilisez maj pour une version en majuscules</value>
<data name="ErrorMicrosoftWordIsNotAvailable" xml:space="preserve">
<value>Microsoft Word doit être installé pour pouvoir convertir les documents Word.</value>
</data>
<data name="WebsiteButtonDescription" xml:space="preserve">
<value>Ouvrir le site web de File Converter</value>
</data>
</root>
3 changes: 3 additions & 0 deletions Application/FileConverter/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -541,4 +541,7 @@ use maj for uppercase version</value>
<data name="ErrorMicrosoftWordIsNotAvailable" xml:space="preserve">
<value>Microsoft Word must be installed in order to convert Word documents.</value>
</data>
<data name="WebsiteButtonDescription" xml:space="preserve">
<value>Open File Converter website</value>
</data>
</root>
Binary file modified Application/FileConverter/Resources/GitHub-Documentation-Icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Application/FileConverter/Resources/GitHub-Icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Application/FileConverter/Resources/GitHub-Issue-Icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 8 additions & 6 deletions Application/FileConverter/Windows/SettingsWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -736,9 +736,9 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>

<Image HorizontalAlignment="Left" Height="48" Width="48" VerticalAlignment="Top" Source="..\Resources\ApplicationIcon.png" />
<Image HorizontalAlignment="Left" Height="48" Width="48" VerticalAlignment="Top" Source="..\Resources\Settings-Icon.png" />
<Label Grid.Column="1" Content="{x:Static project:Resources.Settings}" FontSize="20" Margin="4" VerticalAlignment="Center" />
<Label Grid.Column="2" HorizontalAlignment="Right" FontStyle="Italic" FontSize="14" VerticalAlignment="Center">
<Label Grid.Column="2" HorizontalAlignment="Right" FontStyle="Italic" FontSize="14" VerticalAlignment="Center" Foreground="#FF999999">
<Label.Content>
<Binding Path="(local:Application.ApplicationVersion)" Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" />
</Label.Content>
Expand Down Expand Up @@ -987,9 +987,6 @@
<Binding Path="(local:Application.ApplicationVersion)" Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" />
</Label.Content>
</Label>
<TextBlock Margin="5" FontSize="16" HorizontalAlignment="Right" VerticalAlignment="Bottom" >
<Hyperlink Foreground="#1E6BB8" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://www.file-converter.org?from=about">www.file-converter.org</Hyperlink>
</TextBlock>
</DockPanel>
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,5,0,0">
<Button ToolTip="{x:Static project:Resources.GitHubButtonDescription}" Background="WhiteSmoke" BorderBrush="DarkGray" Padding="1" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="http://github.com/Tichau/FileConverter/?from=about">
Expand All @@ -1007,6 +1004,11 @@
<Image Source="/FileConverter;component/Resources/GitHub-Documentation-Icon.png"></Image>
</Button.Content>
</Button>
<Button ToolTip="{x:Static project:Resources.WebsiteButtonDescription}" Background="WhiteSmoke" BorderBrush="DarkGray" Padding="1" Margin="5,0,5,0" Command="{Binding OpenUrlCommand, ElementName=window, Mode=OneWay}" CommandParameter="www.file-converter.org?from=about">
<Button.Content>
<Image Source="/FileConverter;component/Resources/WebSite-Icon.png"></Image>
</Button.Content>
</Button>
</StackPanel>

<DockPanel Grid.Row="1" Grid.Column="0" Margin="0,0,5,0">
Expand All @@ -1018,7 +1020,7 @@
</TextBlock>
</DockPanel>

<Image Grid.Row="1" Grid.Column="1" Margin="0,5,0,5" Source="/FileConverter;component/Resources/ApplicationIcon.ico"></Image>
<Image Grid.Row="1" Grid.Column="1" Margin="20,20,20,20" Source="/FileConverter;component/Resources/ApplicationIcon.ico"></Image>

<StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center">
<Label Content="{x:Static project:Resources.DonateDescription}" VerticalAlignment="Center"/>
Expand Down
52 changes: 52 additions & 0 deletions Resources/Icons/SettingsIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5c1826e

Please sign in to comment.