Merge pull request #214 from PixiEditor/websiteLinks

Updated Doc links and added website link to hello there window

PixiEditor/PixiEditor.csproj

@@ -128,7 +128,14 @@
     <None Remove="Images\PixiBotLogo.png" />
     <None Remove="Images\PixiEditorLogo.png" />
     <None Remove="Images\PixiParserLogo.png" />
+    <None Remove="Images\Placeholder.png" />
     <None Remove="Images\SelectImage.png" />
+    <None Remove="Images\SocialMedia\DiscordIcon.png" />
+    <None Remove="Images\SocialMedia\DonateIcon.png" />
+    <None Remove="Images\SocialMedia\GitHubIcon.png" />
+    <None Remove="Images\SocialMedia\RedditIcon.png" />
+    <None Remove="Images\SocialMedia\WebsiteIcon.png" />
+    <None Remove="Images\SocialMedia\YouTubeIcon.png" />
     <None Remove="Images\Tools\BrightnessImage.png" />
     <None Remove="Images\Tools\CircleImage.png" />
     <None Remove="Images\Tools\ColorPickerImage.png" />
@@ -186,6 +193,13 @@
     <Resource Include="Images\PixiBotLogo.png" />
     <Resource Include="Images\PixiEditorLogo.png" />
     <Resource Include="Images\PixiParserLogo.png" />
+    <Resource Include="Images\Placeholder.png" />
+    <Resource Include="Images\SocialMedia\DiscordIcon.png" />
+    <Resource Include="Images\SocialMedia\DonateIcon.png" />
+    <Resource Include="Images\SocialMedia\GitHubIcon.png" />
+    <Resource Include="Images\SocialMedia\RedditIcon.png" />
+    <Resource Include="Images\SocialMedia\WebsiteIcon.png" />
+    <Resource Include="Images\SocialMedia\YouTubeIcon.png" />
     <Resource Include="Images\Tools\BrightnessImage.png" />
     <Resource Include="Images\Tools\CircleImage.png" />
     <Resource Include="Images\Tools\ColorPickerImage.png" />

PixiEditor/Views/Dialogs/HelloTherePopup.xaml

@@ -17,10 +17,34 @@
         </Style>
 
         <Style TargetType="Button" BasedOn="{StaticResource DarkRoundButton}" x:Key="SocialMediaButton">
-            <Setter Property="Width" Value="150"/>
+            <Setter Property="Width" Value="50"/>
             <Setter Property="Margin" Value="5,8,5,0"/>
             <Setter Property="FontSize" Value="18"/>
-            <Setter Property="Height" Value="28"/>
+            <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>
 
@@ -217,67 +241,24 @@
                 </StackPanel>
 
                 <uc:AlignableWrapPanel Grid.Row="3" HorizontalContentAlignment="Center" HorizontalAlignment="Center" Margin="0,5,0,15">
+                    <Button Command="{Binding OpenHyperlinkCommand}" 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="Discord">
-                        <Button.Style>
-                            <Style TargetType="Button" BasedOn="{StaticResource SocialMediaButton}">
-                                <Style.Triggers>
-                                    <Trigger Property="IsMouseOver" Value="True">
-                                        <Setter Property="Background" Value="#7289DA"/>
-                                    </Trigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Button.Style>
-                    </Button>
+                            Style="{StaticResource SocialMediaButton}" Tag="#7289DA" ToolTip="Discord"
+                            Content="../../Images/SocialMedia/DiscordIcon.png"/>
                     <Button Command="{Binding OpenHyperlinkCommand}" CommandParameter="https://reddit.com/r/PixiEditor"
-                            Content="r/PixiEditor">
-                        <Button.Style>
-                            <Style TargetType="Button" BasedOn="{StaticResource SocialMediaButton}">
-                                <Style.Triggers>
-                                    <Trigger Property="IsMouseOver" Value="True">
-                                        <Setter Property="Background" Value="#FF4500"/>
-                                    </Trigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Button.Style>
-                    </Button>
+                            Style="{StaticResource SocialMediaButton}" Tag="#FF4500" ToolTip="Reddit"
+                            Content="../../Images/SocialMedia/RedditIcon.png"/>
                     <Button Command="{Binding OpenHyperlinkCommand}" CommandParameter="https://github.com/PixiEditor/PixiEditor"
-                            Content="GitHub">
-                        <Button.Style>
-                            <Style TargetType="Button" BasedOn="{StaticResource SocialMediaButton}">
-                                <Style.Triggers>
-                                    <Trigger Property="IsMouseOver" Value="True">
-                                        <Setter Property="Background" Value="White"/>
-                                        <Setter Property="Foreground" Value="Black"/>
-                                    </Trigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Button.Style>
-                    </Button>
+                            Style="{StaticResource SocialMediaButton}" Tag="Black" ToolTip="GitHub"
+                            Content="../../Images/SocialMedia/GithubIcon.png"/>
                     <Button Command="{Binding OpenHyperlinkCommand}" CommandParameter="https://www.youtube.com/channel/UCT5XvyvX1q5PAIaXfWmpsMQ"
-                            Content="YouTube">
-                        <Button.Style>
-                            <Style TargetType="Button" BasedOn="{StaticResource SocialMediaButton}">
-                                <Style.Triggers>
-                                    <Trigger Property="IsMouseOver" Value="True">
-                                        <Setter Property="Background" Value="#FF0000"/>
-                                    </Trigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Button.Style>
-                    </Button>
+                            Style="{StaticResource SocialMediaButton}" Tag="#FF0000" ToolTip="YouTube"
+                            Content="../../Images/SocialMedia/YouTubeIcon.png"/>
                     <Button Command="{Binding OpenHyperlinkCommand}" CommandParameter="https://opencollective.com/pixieditor"
-                            Content="Donate" ToolTip="And subscribe to PixiEditor's OnlyFans please">
-                        <Button.Style>
-                            <Style TargetType="Button" BasedOn="{StaticResource SocialMediaButton}">
-                                <Style.Triggers>
-                                    <Trigger Property="IsMouseOver" Value="True">
-                                        <Setter Property="Background" Value="#DB61A2"/>
-                                    </Trigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Button.Style>
-                    </Button>
+                            Style="{StaticResource SocialMediaButton}" Tag="#d4af37" ToolTip="Donate"
+                            Content="../../Images/SocialMedia/DonateIcon.png"/>
                 </uc:AlignableWrapPanel>
             </Grid>
         </ScrollViewer>

PixiEditor/Views/Dialogs/HelloTherePopup.xaml.cs

@@ -60,13 +60,18 @@ namespace PixiEditor.Views.Dialogs
 
             if (RecentlyOpenedEmpty)
             {
+                Width = 400;
+                Height = 500;
+            }
+            else if (RecentlyOpened.Count < 4)
+            {
+                Width = 445;
                 Height = 500;
-                Width = 520;
             }
             else if (RecentlyOpened.Count < 7)
             {
-                Height = 676;
-                Width = 545;
+                Width = 475;
+                Height = 670;
             }
         }
 

PixiEditor/Views/MainWindow.xaml

@@ -137,7 +137,9 @@
                 </MenuItem>
                 <MenuItem Header="_Help">
                     <MenuItem Header="_Documentation" Command="{Binding MiscSubViewModel.OpenHyperlinkCommand}"
-                              CommandParameter="https://github.com/PixiEditor/PixiEditor/wiki"/>
+                              CommandParameter="https://pixieditor.net/docs/introduction"/>
+                    <MenuItem Header="_Website" Command="{Binding MiscSubViewModel.OpenHyperlinkCommand}"
+                              CommandParameter="https://pixieditor.net"/>
                     <MenuItem Header="_Repository" Command="{Binding MiscSubViewModel.OpenHyperlinkCommand}"
                               CommandParameter="https://github.com/PixiEditor/PixiEditor"/>
                     <MenuItem Header="_Shortcuts" Command="{Binding MiscSubViewModel.OpenShortcutWindowCommand}"/>
@@ -145,7 +147,7 @@
                     <MenuItem Header="_License" Command="{Binding MiscSubViewModel.OpenHyperlinkCommand}"
                               CommandParameter="https://github.com/PixiEditor/PixiEditor/blob/master/LICENSE"/>
                     <MenuItem Header="_Third Party Licenses" Command="{Binding MiscSubViewModel.OpenHyperlinkCommand}"
-                              CommandParameter="https://github.com/PixiEditor/PixiEditor/wiki/Third-party-licenses"/>
+                              CommandParameter="https://pixieditor.net/docs/Third-party-licenses"/>
                 </MenuItem>
                 <MenuItem Header="_Debug" Visibility="{Binding IsDebug, Converter={StaticResource BoolToVisibilityConverter}}">
                     <MenuItem Header="_Open Local App Data" Command="{Binding DebugSubViewModel.OpenFolderCommand}"