Browse Source

Code cleaning

Ruben 4 years ago
parent
commit
4f372fb0cb

+ 3 - 0
.editorconfig

@@ -2,3 +2,6 @@
 
 
 # CS8604: Possible null reference argument.
 # CS8604: Possible null reference argument.
 dotnet_diagnostic.CS8604.severity = silent
 dotnet_diagnostic.CS8604.severity = silent
+
+# Default severity for analyzer diagnostics with category 'Style'
+dotnet_analyzer_diagnostic.category-Style.severity = none

+ 1 - 1
PicView/FileHandling/WebFunctions.cs

@@ -77,7 +77,7 @@ namespace PicView.FileHandling
                 fileName = fileName.Substring(0, index);
                 fileName = fileName.Substring(0, index);
             }
             }
 
 
-            using (var client = new WebFunctions.HttpClientDownloadWithProgress(url, tempPath + fileName))
+            using (var client = new HttpClientDownloadWithProgress(url, tempPath + fileName))
             {
             {
                 if (displayProgress)
                 if (displayProgress)
                 {
                 {

+ 0 - 63
PicView/PicView.csproj

@@ -115,9 +115,6 @@
     <Resource Include="Editing\ShaderEffects\PsEffects\MonochromeEffect.ps">
     <Resource Include="Editing\ShaderEffects\PsEffects\MonochromeEffect.ps">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\MultiInput_ColorChannelsEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
     <Resource Include="Editing\ShaderEffects\PsEffects\OldMovieEffect.ps">
     <Resource Include="Editing\ShaderEffects\PsEffects\OldMovieEffect.ps">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     </Resource>
@@ -130,87 +127,27 @@
     <Resource Include="Editing\ShaderEffects\PsEffects\PixelateEffect.ps">
     <Resource Include="Editing\ShaderEffects\PsEffects\PixelateEffect.ps">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\PixelateOutTransitionEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\RadGradientEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\ReflectionEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
     <Resource Include="Editing\ShaderEffects\PsEffects\RippleEffect.ps">
     <Resource Include="Editing\ShaderEffects\PsEffects\RippleEffect.ps">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\SharpenEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
     <Resource Include="Editing\ShaderEffects\PsEffects\SketchGraniteEffect.ps">
     <Resource Include="Editing\ShaderEffects\PsEffects\SketchGraniteEffect.ps">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     </Resource>
     <Resource Include="Editing\ShaderEffects\PsEffects\SketchPencilStrokeEffect.ps">
     <Resource Include="Editing\ShaderEffects\PsEffects\SketchPencilStrokeEffect.ps">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\SplinterEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\StarGeneratorEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
     <Resource Include="Editing\ShaderEffects\PsEffects\SwirlEffect.ps">
     <Resource Include="Editing\ShaderEffects\PsEffects\SwirlEffect.ps">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     </Resource>
     <Resource Include="Editing\ShaderEffects\PsEffects\TelescopicBlurPS3Effect.ps">
     <Resource Include="Editing\ShaderEffects\PsEffects\TelescopicBlurPS3Effect.ps">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\TilerEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
     <Resource Include="Editing\ShaderEffects\PsEffects\ToneMappingEffect.ps">
     <Resource Include="Editing\ShaderEffects\PsEffects\ToneMappingEffect.ps">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\ToonShaderEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\Transition_BandedSwirlEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\Transition_BlindsEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\Transition_BloodEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\Transition_CircleRevealEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\Transition_CircleStretchEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\Transition_CircularBlurEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\Transition_CloudRevealEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\Transition_CrumbleEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
     <Resource Include="Editing\ShaderEffects\PsEffects\Transition_RippleEffect.ps">
     <Resource Include="Editing\ShaderEffects\PsEffects\Transition_RippleEffect.ps">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\Transition_WaterEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\TransparentAlternatingPixelsEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\TransparentAlternatingPixelsMultipliedEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Editing\ShaderEffects\PsEffects\TransparentAlternatingScanlinesEffect.ps">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
     <Resource Include="Editing\ShaderEffects\PsEffects\UnderwaterEffect.ps">
     <Resource Include="Editing\ShaderEffects\PsEffects\UnderwaterEffect.ps">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     </Resource>

+ 0 - 8
PicView/UILogic/UC.cs

@@ -214,14 +214,6 @@ namespace PicView.UILogic
             }
             }
         }
         }
 
 
-        /// <summary>
-        /// Closes usercontrol menus
-        /// </summary>
-        internal static void Close_UserControls(object sender, RoutedEventArgs e)
-        {
-            Close_UserControls();
-        }
-
         /// <summary>
         /// <summary>
         /// Toggles whether open menu is open or not
         /// Toggles whether open menu is open or not
         /// </summary>
         /// </summary>

+ 0 - 1
PicView/Views/UserControls/Menus/FileMenu.xaml

@@ -84,7 +84,6 @@
                     Canvas.Top="59"
                     Canvas.Top="59"
                     Width="120"
                     Width="120"
                     Height="50"
                     Height="50"
-                    Background="{StaticResource BackgroundColorBrushAlt}"
                     Style="{StaticResource ButtonBorder}">
                     Style="{StaticResource ButtonBorder}">
                     <Button
                     <Button
                         x:Name="Open"
                         x:Name="Open"