Przeglądaj źródła

Zoom settings view #168

Ruben 1 rok temu
rodzic
commit
b26d1a2fd9

+ 4 - 0
src/PicView.Avalonia/PicView.Avalonia.csproj

@@ -76,6 +76,10 @@
       <DependentUpon>SlideshowSettingsView.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="Views\ZoomSettingsView.axaml.cs">
+      <DependentUpon>ZoomSettingsView.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
 
   

+ 0 - 29
src/PicView.Avalonia/Views/MouseWheelView.axaml

@@ -5,7 +5,6 @@
     x:Class="PicView.Avalonia.Views.MouseWheelView"
     x:DataType="viewModels:MainViewModel"
     xmlns="https://github.com/avaloniaui"
-    xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels"
@@ -56,34 +55,6 @@
             <ComboBoxItem Content="{CompiledBinding Forward, Mode=OneWay}" />
         </ComboBox>
 
-        <TextBlock
-            Classes="txt"
-            FontFamily="/Assets/Fonts/Roboto-Bold.ttf#Roboto"
-            FontSize="12"
-            Margin="0,10,0,10"
-            MaxWidth="300"
-            Text="{CompiledBinding AdjustTimingForZoom,
-                                   Mode=OneWay}" />
-        <customControls:CustomSlider
-            Height="30"
-            HorizontalAlignment="Center"
-            IsSnapToTickEnabled="True"
-            Margin="0,1,0,1"
-            Maximum="1.5"
-            Minimum=".1"
-            TickFrequency=".1"
-            TickPlacement="BottomRight"
-            Value="{CompiledBinding GetZoomSpeed,
-                                    Mode=OneWay}"
-            Width="300" />
-        <TextBlock
-            Classes="txt"
-            FontFamily="/Assets/Fonts/Roboto-Bold.ttf#Roboto"
-            Foreground="{StaticResource MainTextColorFaded}"
-            Margin="0,0,0,15"
-            Text="{CompiledBinding GetZoomSpeed,
-                                   Mode=OneWay}" />
-
 
 
     </StackPanel>

Plik diff jest za duży
+ 3 - 0
src/PicView.Avalonia/Views/SettingsView.axaml


+ 49 - 0
src/PicView.Avalonia/Views/ZoomSettingsView.axaml

@@ -0,0 +1,49 @@
+<UserControl
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d"
+    x:Class="PicView.Avalonia.Views.ZoomSettingsView"
+    x:DataType="viewModels:MainViewModel"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.DataContext>
+        <viewModels:MainViewModel />
+    </Design.DataContext>
+    <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+
+        <TextBlock
+            Classes="txt"
+            FontFamily="/Assets/Fonts/Roboto-Bold.ttf#Roboto"
+            FontSize="12"
+            Margin="0,10,0,10"
+            MaxWidth="300"
+            Text="{CompiledBinding AdjustTimingForZoom,
+                                   Mode=OneWay}" />
+        <customControls:CustomSlider
+            Height="30"
+            HorizontalAlignment="Center"
+            IsSnapToTickEnabled="True"
+            Margin="0,1,0,1"
+            Maximum="1.5"
+            Minimum=".1"
+            TickFrequency=".1"
+            TickPlacement="BottomRight"
+            Value="{CompiledBinding GetZoomSpeed,
+                                    Mode=OneWay}"
+            Width="300" />
+        <TextBlock
+            Classes="txt"
+            FontFamily="/Assets/Fonts/Roboto-Bold.ttf#Roboto"
+            Foreground="{StaticResource MainTextColorFaded}"
+            Margin="0,0,0,15"
+            Text="{CompiledBinding GetZoomSpeed,
+                                   Mode=OneWay}" />
+
+
+
+    </StackPanel>
+</UserControl>

+ 11 - 0
src/PicView.Avalonia/Views/ZoomSettingsView.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace PicView.Avalonia.Views;
+
+public partial class ZoomSettingsView : UserControl
+{
+    public ZoomSettingsView()
+    {
+        InitializeComponent();
+    }
+}

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików