About Window

src/PixiEditor/PixiEditor.csproj

@@ -261,6 +261,7 @@
 		<Resource Include="Images\Processing.gif" />
 		<Resource Include="Images\Replace.png" />
 		<Resource Include="Images\Search.png" />
+		<Resource Include="Images\SocialMedia\Avatars\flabbet.png" />
 		<Resource Include="Images\SocialMedia\DiscordIcon.png" />
 		<Resource Include="Images\SocialMedia\DonateIcon.png" />
 		<Resource Include="Images\SocialMedia\GitHubIcon.png" />
@@ -338,7 +339,10 @@
 		<None Remove="Images\TemplateLogos\Aseprite-Hover.png" />
 		<Resource Include="Images\TemplateLogos\Aseprite-Hover.png" />
 		<None Remove="Images\SocialMedia\flabbet.png" />
-		<Resource Include="Images\SocialMedia\flabbet.png" />
+		<None Remove="Images\SocialMedia\Avatars\Equbuxu.png" />
+		<Resource Include="Images\SocialMedia\Avatars\Equbuxu.png" />
+		<None Remove="Images\SocialMedia\Avatars\CPK.png" />
+		<Resource Include="Images\SocialMedia\Avatars\CPK.png" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Include="..\LICENSE">

src/PixiEditor/Styles/ThemeStyle.xaml

@@ -232,6 +232,7 @@
     <Style x:Key="HyperlinkTextButton" TargetType="{x:Type Button}">
         <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="Foreground" Value="White"/>
+        <Setter Property="Cursor" Value="Hand"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -241,10 +242,10 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="TextBlock.TextDecorations" Value="Underline"/>
+                            <Setter Property="Foreground" Value="Gray"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="False">
-                            <Setter Property="TextBlock.TextDecorations" Value="{x:Null}"/>
+                            <Setter Property="Foreground" Value="White"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -273,6 +274,37 @@
             </Setter.Value>
         </Setter>
     </Style>
+    
+    <Style TargetType="Button" BasedOn="{StaticResource DarkRoundButton}" x:Key="SocialMediaButton">
+        <Setter Property="Width" Value="50"/>
+        <Setter Property="Margin" Value="5,8,5,0"/>
+        <Setter Property="FontSize" Value="18"/>
+        <Setter Property="Height" Value="50"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{Binding Tag, RelativeSource={RelativeSource Self}}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                    <Border
+                        x:Name="Border"
+                        Background="{TemplateBinding Background}"
+                        Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" 
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        CornerRadius="5">
+                        <ContentControl>
+                            <Image Margin="8" Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}"
+                                   RenderOptions.BitmapScalingMode="Fant"/>
+                        </ContentControl>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
     <Style TargetType="Button" x:Key="ToolSettingsGlyphButton"
            BasedOn="{StaticResource BaseDarkButton}">

src/PixiEditor/ViewModels/SubViewModels/Main/MiscViewModel.cs

@@ -13,6 +13,7 @@ internal class MiscViewModel : SubViewModel<ViewModelMain>
     {
     }
 
+    [Command.Basic("PixiEditor.Links.OpenHyperlink", "Open Hyperlink", "Open a hyperlink")]
     [Command.Basic("PixiEditor.Links.OpenDocumentation", "https://pixieditor.net/docs/introduction", "Documentation", "Open Documentation")]
     [Command.Basic("PixiEditor.Links.OpenWebsite", "https://pixieditor.net", "Website", "Open Website")]
     [Command.Basic("PixiEditor.Links.OpenRepository", "https://github.com/PixiEditor/PixiEditor", "Repository", "Open Repository")]

src/PixiEditor/Views/Dialogs/AboutPopup.xaml

@@ -6,9 +6,11 @@
         xmlns:local="clr-namespace:PixiEditor.Views.Dialogs"
         xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:behaviours="clr-namespace:PixiEditor.Helpers.Behaviours"
+        xmlns:cmds="clr-namespace:PixiEditor.Models.Commands.XAML"
+        xmlns:userControls="clr-namespace:PixiEditor.Views.UserControls"
         mc:Ignorable="d" WindowStyle="None"
         Title="About" WindowStartupLocation="CenterScreen"
-        Height="300" Width="400" Name="aboutPopup">
+        Height="490" Width="400" Name="aboutPopup" MinWidth="100" MinHeight="100">
     <Window.CommandBindings>
         <CommandBinding Command="{x:Static SystemCommands.CloseWindowCommand}" CanExecute="CommandBinding_CanExecute"
                         Executed="CommandBinding_Executed_Close" />
@@ -25,7 +27,7 @@
         </b:Interaction.Behaviors>
 
         <local:DialogTitleBar DockPanel.Dock="Top"
-                             TitleText="{Binding ElementName=popup, Path=Title}" 
+                             TitleText="{Binding ElementName=aboutPopup, Path=Title}" 
                              CloseCommand="{x:Static SystemCommands.CloseWindowCommand}"/>
         <StackPanel DataContext="{Binding ElementName=aboutPopup}" Orientation="Vertical" DockPanel.Dock="Bottom" Margin="10">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top">
@@ -33,33 +35,66 @@
                 <TextBlock FontSize="40" FontWeight="SemiBold" Foreground="White" VerticalAlignment="Center" Margin="10,0,0,0">PixiEditor</TextBlock>
             </StackPanel>
             <TextBlock Foreground="White" HorizontalAlignment="Center" FontSize="20" FontWeight="Medium" Text="{Binding VersionText}"/>
-            <Label Content="Project Maintainers" Style="{StaticResource Header2}" Margin="10 5"/>
+            <Label Content="Project Maintainers" Style="{StaticResource Header2}" Margin="10 20 0 5"/>
             <StackPanel Orientation="Horizontal" Margin="20 0">
                 <Ellipse Width="32" Height="32">
                     <Ellipse.Fill>
-                        <ImageBrush ImageSource="/Images/SocialMedia/flabbet.png"/>
+                        <ImageBrush ImageSource="/Images/SocialMedia/Avatars/flabbet.png"/>
                     </Ellipse.Fill>
                 </Ellipse>
-                <TextBlock Text="Krzysztof Krysiński (flabbet)" Foreground="White" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="16">
-                </TextBlock>
+                <Button Content="Krzysztof Krysiński (flabbet)" VerticalAlignment="Center" Style="{StaticResource HyperlinkTextButton}"
+                        Margin="10 0 0 0" FontSize="14"
+                        Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://github.com/flabbet"/>
             </StackPanel>
-            <StackPanel Orientation="Horizontal" Margin="20 0">
+            <StackPanel Orientation="Horizontal" Margin="20 5">
                 <Ellipse Width="32" Height="32">
                     <Ellipse.Fill>
-                        <ImageBrush ImageSource="/Images/SocialMedia/flabbet.png"/>
+                        <ImageBrush ImageSource="/Images/SocialMedia/Avatars/Equbuxu.png"/>
                     </Ellipse.Fill>
                 </Ellipse>
-                <TextBlock Text="Egor Mozgovoy (Equbuxu)" Foreground="White" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="16">
-                </TextBlock>
+                <Button Content="Egor Mozgovoy (Equbuxu)" Style="{StaticResource HyperlinkTextButton}" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="14"
+                        Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://github.com/equbuxu"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="20 0">
                 <Ellipse Width="32" Height="32">
                     <Ellipse.Fill>
-                        <ImageBrush ImageSource="/Images/SocialMedia/flabbet.png"/>
+                        <ImageBrush ImageSource="/Images/SocialMedia/Avatars/CPK.png"/>
                     </Ellipse.Fill>
                 </Ellipse>
-                <Button Style="{StaticResource HyperlinkTextButton}" Content="Philip Kreuz (CPK)" Foreground="White" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="16"/>
+                <Button Style="{StaticResource HyperlinkTextButton}" Content="Philip Kreuz (CPK)" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="14"
+                        Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://github.com/CPKreuz"/>
             </StackPanel>
+            
+            <Button Style="{StaticResource HyperlinkTextButton}" Content="And other awesome contributors" VerticalAlignment="Center" Margin="20 10 0 0" FontSize="14"
+                    Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://github.com/PixiEditor/PixiEditor/graphs/contributors"/>
+            
+            <Button Style="{StaticResource HyperlinkTextButton}" Content="License" VerticalAlignment="Center" Margin="10 20 0 0" FontSize="14"
+                    Command="{cmds:Command PixiEditor.Links.OpenLicense}"/>
+            <Button Style="{StaticResource HyperlinkTextButton}" Content="Third Party Licenses" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="14"
+                    Command="{cmds:Command PixiEditor.Links.OpenOtherLicenses}"/>
+            <Button Style="{StaticResource HyperlinkTextButton}" Content="Documentation" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="14"
+                    Command="{cmds:Command PixiEditor.Links.OpenDocumentation}"/>
+            
+            <userControls:AlignableWrapPanel DockPanel.Dock="Bottom" HorizontalContentAlignment="Center" HorizontalAlignment="Center" Margin="0,20,0,15">
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://pixieditor.net"
+                            Style="{StaticResource SocialMediaButton}" Tag="#e3002d" ToolTip="Website"
+                            Content="/Images/SocialMedia/WebsiteIcon.png"/>
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://discord.gg/tzkQFDkqQS"
+                            Style="{StaticResource SocialMediaButton}" Tag="#7289DA" ToolTip="Discord"
+                            Content="/Images/SocialMedia/DiscordIcon.png"/>
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://reddit.com/r/PixiEditor"
+                            Style="{StaticResource SocialMediaButton}" Tag="#FF4500" ToolTip="Reddit"
+                            Content="/Images/SocialMedia/RedditIcon.png"/>
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://github.com/PixiEditor/PixiEditor"
+                            Style="{StaticResource SocialMediaButton}" Tag="Black" ToolTip="GitHub"
+                            Content="/Images/SocialMedia/GithubIcon.png"/>
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://www.youtube.com/channel/UCT5XvyvX1q5PAIaXfWmpsMQ" 
+                            Style="{StaticResource SocialMediaButton}" Tag="#FF0000" ToolTip="YouTube"
+                            Content="/Images/SocialMedia/YouTubeIcon.png"/>
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://opencollective.com/pixieditor"
+                            Style="{StaticResource SocialMediaButton}" Tag="#d4af37" ToolTip="Donate"
+                            Content="/Images/SocialMedia/DonateIcon.png"/>
+                </userControls:AlignableWrapPanel>
         </StackPanel>
     </DockPanel>
 </Window>

src/PixiEditor/Views/Dialogs/AboutPopup.xaml.cs

@@ -12,6 +12,8 @@ public partial class AboutPopup : Window
         InitializeComponent();
     }
     
+    
+    
     private void CommandBinding_CanExecute(object sender, CanExecuteRoutedEventArgs e)
     {
         e.CanExecute = true;

src/PixiEditor/Views/Dialogs/HelloTherePopup.xaml

@@ -7,6 +7,7 @@
         xmlns:dataHolders="clr-namespace:PixiEditor.Models.DataHolders" xmlns:converters="clr-namespace:PixiEditor.Helpers.Converters"
         xmlns:sys="clr-namespace:System;assembly=System.Runtime"
         xmlns:uc="clr-namespace:PixiEditor.Views.UserControls"
+        xmlns:cmds="clr-namespace:PixiEditor.Models.Commands.XAML"
         xmlns:local="clr-namespace:PixiEditor.Views.Dialogs"
         mc:Ignorable="d" ShowInTaskbar="False"
         Title="Hello there!" Height="662" Width="632" MinHeight="500" MinWidth="500"
@@ -18,37 +19,6 @@
             <Setter Property="Foreground" Value="White"/>
             <Setter Property="FontSize" Value="16"/>
         </Style>
-
-        <Style TargetType="Button" BasedOn="{StaticResource DarkRoundButton}" x:Key="SocialMediaButton">
-            <Setter Property="Width" Value="50"/>
-            <Setter Property="Margin" Value="5,8,5,0"/>
-            <Setter Property="FontSize" Value="18"/>
-            <Setter Property="Height" Value="50"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="{Binding Tag, RelativeSource={RelativeSource Self}}"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                        <Border
-                            x:Name="Border"
-                            Background="{TemplateBinding Background}"
-                            Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" 
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            CornerRadius="5">
-                            <ContentControl>
-                                <Image Margin="8" Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}"
-                                       RenderOptions.BitmapScalingMode="Fant"/>
-                            </ContentControl>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
     </Window.Resources>
 
     <WindowChrome.WindowChrome>
@@ -251,24 +221,24 @@
                 </StackPanel>
 
                 <uc:AlignableWrapPanel Grid.Row="3" HorizontalContentAlignment="Center" HorizontalAlignment="Center" Margin="0,5,0,15">
-                    <Button Command="{Binding OpenHyperlinkCommand}" CommandParameter="https://pixieditor.net"
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://pixieditor.net"
                             Style="{StaticResource SocialMediaButton}" Tag="#e3002d" ToolTip="Website"
-                            Content="../../Images/SocialMedia/WebsiteIcon.png"/>
-                    <Button Command="{Binding OpenHyperlinkCommand}" CommandParameter="https://discord.gg/tzkQFDkqQS"
+                            Content="/Images/SocialMedia/WebsiteIcon.png"/>
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://discord.gg/tzkQFDkqQS"
                             Style="{StaticResource SocialMediaButton}" Tag="#7289DA" ToolTip="Discord"
-                            Content="../../Images/SocialMedia/DiscordIcon.png"/>
-                    <Button Command="{Binding OpenHyperlinkCommand}" CommandParameter="https://reddit.com/r/PixiEditor"
+                            Content="/Images/SocialMedia/DiscordIcon.png"/>
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://reddit.com/r/PixiEditor"
                             Style="{StaticResource SocialMediaButton}" Tag="#FF4500" ToolTip="Reddit"
-                            Content="../../Images/SocialMedia/RedditIcon.png"/>
-                    <Button Command="{Binding OpenHyperlinkCommand}" CommandParameter="https://github.com/PixiEditor/PixiEditor"
+                            Content="/Images/SocialMedia/RedditIcon.png"/>
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://github.com/PixiEditor/PixiEditor"
                             Style="{StaticResource SocialMediaButton}" Tag="Black" ToolTip="GitHub"
-                            Content="../../Images/SocialMedia/GithubIcon.png"/>
-                    <Button Command="{Binding OpenHyperlinkCommand}" CommandParameter="https://www.youtube.com/channel/UCT5XvyvX1q5PAIaXfWmpsMQ"
+                            Content="/Images/SocialMedia/GithubIcon.png"/>
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://www.youtube.com/channel/UCT5XvyvX1q5PAIaXfWmpsMQ"
                             Style="{StaticResource SocialMediaButton}" Tag="#FF0000" ToolTip="YouTube"
-                            Content="../../Images/SocialMedia/YouTubeIcon.png"/>
-                    <Button Command="{Binding OpenHyperlinkCommand}" CommandParameter="https://opencollective.com/pixieditor"
+                            Content="/Images/SocialMedia/YouTubeIcon.png"/>
+                    <Button Command="{cmds:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}" CommandParameter="https://opencollective.com/pixieditor"
                             Style="{StaticResource SocialMediaButton}" Tag="#d4af37" ToolTip="Donate"
-                            Content="../../Images/SocialMedia/DonateIcon.png"/>
+                            Content="/Images/SocialMedia/DonateIcon.png"/>
                 </uc:AlignableWrapPanel>
             </Grid>
         </ScrollViewer>

src/PixiEditor/Views/Dialogs/HelloTherePopup.xaml.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Windows;
 using System.Windows.Input;
 using PixiEditor.Helpers;
+using PixiEditor.Models.Commands;
 using PixiEditor.Models.DataHolders;
 using PixiEditor.ViewModels.SubViewModels.Main;
 
@@ -34,8 +35,6 @@ internal partial class HelloTherePopup : Window
 
     public RelayCommand OpenRecentCommand { get; set; }
 
-    public RelayCommand OpenHyperlinkCommand { get => null; }
-
     public RelayCommand OpenInExplorerCommand { get; set; }
 
     public bool IsClosing { get; private set; }