Updates

Ruben2776 · Oct 8, 2018 · be520d4 · be520d4
1 parent 2ead3ca
commit be520d4
Show file tree

Hide file tree

Showing 12 changed files with 322 additions and 416 deletions.
diff --git a/PicView/App.config b/PicView/App.config
@@ -6,7 +6,7 @@
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
     <userSettings>
         <PicView.Properties.Settings>

diff --git a/PicView/MainWindow.xaml.cs b/PicView/MainWindow.xaml.cs
diff --git a/PicView/PicVIew.csproj b/PicView/PicVIew.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PicView</RootNamespace>
     <AssemblyName>PicView</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -53,7 +53,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>x64</PlatformTarget>
     <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>
     </DefineConstants>
@@ -63,6 +63,7 @@
     <DocumentationFile>
     </DocumentationFile>
     <FileAlignment>1024</FileAlignment>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>PicView.App</StartupObject>
@@ -89,9 +90,8 @@
     <ApplicationIcon>lib\img\Brainleaf-Dark-Blog-Reflex.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Magick.NET-Q16-HDRI-x64, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
-      <HintPath>..\packages\Magick.NET-Q16-HDRI-x64.7.0.5.500\lib\net40-client\Magick.NET-Q16-HDRI-x64.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Magick.NET-Q16-HDRI-x64, Version=7.8.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
+      <HintPath>..\packages\Magick.NET-Q16-HDRI-x64.7.8.0\lib\net40\Magick.NET-Q16-HDRI-x64.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Microsoft.WindowsAPICodePack.Shell">
@@ -111,8 +111,8 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="XamlAnimatedGif, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\XamlAnimatedGif.1.1.6\lib\net45\XamlAnimatedGif.dll</HintPath>
+    <Reference Include="XamlAnimatedGif, Version=1.1.10.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\XamlAnimatedGif.1.1.10\lib\net45\XamlAnimatedGif.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -403,12 +403,12 @@
     </FileAssociation>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Magick.NET-Q16-HDRI-x64.7.0.5.500\build\net40-client\Magick.NET-Q16-HDRI-x64.targets" Condition="Exists('..\packages\Magick.NET-Q16-HDRI-x64.7.0.5.500\build\net40-client\Magick.NET-Q16-HDRI-x64.targets')" />
+  <Import Project="..\packages\Magick.NET-Q16-HDRI-x64.7.8.0\build\net40\Magick.NET-Q16-HDRI-x64.targets" Condition="Exists('..\packages\Magick.NET-Q16-HDRI-x64.7.8.0\build\net40\Magick.NET-Q16-HDRI-x64.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Magick.NET-Q16-HDRI-x64.7.0.5.500\build\net40-client\Magick.NET-Q16-HDRI-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Magick.NET-Q16-HDRI-x64.7.0.5.500\build\net40-client\Magick.NET-Q16-HDRI-x64.targets'))" />
+    <Error Condition="!Exists('..\packages\Magick.NET-Q16-HDRI-x64.7.8.0\build\net40\Magick.NET-Q16-HDRI-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Magick.NET-Q16-HDRI-x64.7.8.0\build\net40\Magick.NET-Q16-HDRI-x64.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/PicView/Properties/AssemblyInfo.cs b/PicView/Properties/AssemblyInfo.cs
@@ -52,6 +52,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.7.5.0")]
+[assembly: AssemblyFileVersion("0.8.0.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/PicView/Properties/Resources.Designer.cs b/PicView/Properties/Resources.Designer.cs
diff --git a/PicView/Properties/Settings.Designer.cs b/PicView/Properties/Settings.Designer.cs
diff --git a/PicView/dcraw.exe b/PicView/dcraw.exe
diff --git a/PicView/lib/ImageManager.cs b/PicView/lib/ImageManager.cs
@@ -30,7 +30,6 @@ internal static BitmapSource RenderToBitmapSource(string file, string extension)
                 var mrs = new MagickReadSettings()
                 {
                     Density = new Density(300, 300),
-                    CompressionMethod = CompressionMethod.NoCompression
                 };
 
                 if (extension.ToLower() == ".svg")
@@ -281,7 +280,6 @@ internal static bool TrySaveImage(int rotate, bool flipped, string path, string
                         var mrs = new MagickReadSettings()
                         {
                             Density = new Density(300, 300),
-                            CompressionMethod = CompressionMethod.NoCompression
                         };
                         SaveImage.Quality = 100;
 

diff --git a/PicView/lib/Windows/About.xaml b/PicView/lib/Windows/About.xaml
@@ -239,21 +239,15 @@
                         </TextBlock>
                     </StackPanel>
 
-                    <StackPanel Margin="0,55,0,0">
+                    <StackPanel Margin="0,70,0,0">
                         <TextBlock
                             Margin="0,2"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Bottom"
                             FontFamily="/PicView;component/lib/fonts/#Aller"
                             FontSize="12"
                             Text="Made by Ruben Hyldgaard Negendahl" />
-                        <TextBlock
-                            Margin="0,2"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Bottom"
-                            FontFamily="/PicView;component/lib/fonts/#Aller"
-                            FontSize="12"
-                            Text="Special thanks to Mathias Nielsen" />
+
                         <Label
                             x:Name="appVersion"
                             Margin="0,2"

diff --git a/PicView/lib/Windows/FakeWindow.xaml b/PicView/lib/Windows/FakeWindow.xaml
@@ -2,16 +2,15 @@
     x:Class="PicView.Windows.FakeWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="FakeWindow"
     AllowsTransparency="True"
     Background="#72000000"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     Topmost="False"
     WindowStartupLocation="CenterScreen"
-    WindowStyle="None">
+    WindowStyle="None"
+    Width="{DynamicResource {x:Static SystemParameters.MaximizedPrimaryScreenWidthKey}}" Height="{DynamicResource {x:Static SystemParameters.MaximizedPrimaryScreenHeightKey}}">
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="0" UseAeroCaptionButtons="False" />
     </WindowChrome.WindowChrome>

diff --git a/PicView/lib/Windows/FakeWindow.xaml.cs b/PicView/lib/Windows/FakeWindow.xaml.cs
@@ -1,6 +1,9 @@
 using System;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
+using static PicView.lib.Variables;
 
 namespace PicView.Windows
 {
@@ -25,11 +28,14 @@ private void MainWindow_StateChanged(object sender, EventArgs e)
                 case WindowState.Normal:
                     Show();
                     break;
+
                 case WindowState.Minimized:
                     Hide();
                     break;
+
                 case WindowState.Maximized:
                     break;
+
                 default:
                     break;
             }
@@ -39,5 +45,27 @@ private void FakeWindow_MouseLeftButtonDown(object sender, MouseButtonEventArgs
         {
             Application.Current.MainWindow.Focus();
         }
+
+        public void AddGallery()
+        {
+            if (grid.Children.Contains(picGallery))
+            {
+                return;
+            }
+
+            picGallery.Width = 250;
+            picGallery.Height = SystemParameters.WorkArea.Height;
+            picGallery.HorizontalAlignment = HorizontalAlignment.Right;
+            picGallery.Visibility = Visibility.Visible;
+            picGallery.Opacity = 1;
+            picGallery.Scroller.HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled;
+            picGallery.Scroller.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
+            //picGallery.Scroller.Margin = new Thickness(1, 1, 0, 0);
+            picGallery.Container.Orientation = Orientation.Vertical;
+            picGallery.x2.Visibility = Visibility.Collapsed;
+            picGallery.Scroller.Margin = new Thickness(0);
+            picGallery.Background = new SolidColorBrush(Colors.Transparent);
+            grid.Children.Add(picGallery);
+        }
     }
-}
+}
diff --git a/PicView/packages.config b/PicView/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Magick.NET-Q16-HDRI-x64" version="7.0.5.500" targetFramework="net461" />
-  <package id="XamlAnimatedGif" version="1.1.6" targetFramework="net46" />
+  <package id="Magick.NET-Q16-HDRI-x64" version="7.8.0" targetFramework="net472" />
+  <package id="XamlAnimatedGif" version="1.1.10" targetFramework="net461" />
 </packages>