upload v1.2.1.4

yaronzz · May 6, 2021 · 79d2f00 · 79d2f00
1 parent 195c2c0
commit 79d2f00
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 22 deletions.
diff --git a/TIDALDL-UI-PRO/.vs/TIDALDL-UI/v16/.suo b/TIDALDL-UI-PRO/.vs/TIDALDL-UI/v16/.suo
diff --git a/TIDALDL-UI-PRO/Pages/DownloadView.xaml b/TIDALDL-UI-PRO/Pages/DownloadView.xaml
@@ -28,19 +28,19 @@
         <ListBox Grid.Row="1" Margin="15" BorderThickness="0" Background="{x:Null}">
             <ListBoxItem Margin="0,0,0,5" IsSelected="{Binding VisibilityDownload}" Style="{StaticResource MyListBoxItemTransparent}">
                 <StackPanel Orientation="Horizontal">
-                    <Path Fill="{DynamicResource InfoBrush}" Width="18" Data="{StaticResource StartGeometry}"></Path>
+                    <Path Fill="{DynamicResource InfoBrush}" Width="18" Data="{StaticResource StartGeometry}" Stretch="Uniform"></Path>
                     <TextBlock Margin="6,0,0,0" Text="{DynamicResource strDownload}"/>
                 </StackPanel>
             </ListBoxItem>
             <ListBoxItem Margin="0,0,0,5" IsSelected="{Binding VisibilityComplete}" Style="{StaticResource MyListBoxItemTransparent}">
                 <StackPanel Orientation="Horizontal">
-                    <Path Fill="{DynamicResource SuccessBrush}" Width="18" Data="{StaticResource SuccessGeometry}"></Path>
+                    <Path Fill="{DynamicResource SuccessBrush}" Width="18" Data="{StaticResource SuccessGeometry}" Stretch="Uniform"></Path>
                     <TextBlock Margin="6,0,0,0" Text="{DynamicResource strComplete}"/>
                 </StackPanel>
             </ListBoxItem>
             <ListBoxItem Margin="0,0,0,5" IsSelected="{Binding VisibilityError}" Style="{StaticResource MyListBoxItemTransparent}">
                 <StackPanel Orientation="Horizontal">
-                    <Path Fill="{DynamicResource DangerBrush}" Width="18" Data="{StaticResource ErrorGeometry}"></Path>
+                    <Path Fill="{DynamicResource DangerBrush}" Width="18" Data="{StaticResource ErrorGeometry}" Stretch="Uniform"></Path>
                     <TextBlock Margin="6,0,0,0" Text="{DynamicResource strError}"/>
                 </StackPanel>
             </ListBoxItem>

diff --git a/TIDALDL-UI-PRO/Pages/LoginView.xaml b/TIDALDL-UI-PRO/Pages/LoginView.xaml
@@ -24,7 +24,7 @@
         <!--Image-->
         <Grid Background="Black" Grid.RowSpan="2">
             <!--<Image Source="pack://application:,,,/resource/tidal.jpg" Margin="5" />-->
-            <Path Width="150" Fill="White" Data="{StaticResource LogoGeometry}"></Path>
+            <Path Fill="White" Data="{StaticResource LogoGeometry}" Margin="61,0,67,0" Stretch="Uniform"/>
         </Grid>
 
         <!--Close button-->
@@ -44,7 +44,7 @@
                 <Button Content="Login" IsDefault="True" Command="{s:Action Login}" IsEnabled="{Binding BtnLoginEnable}"  Style="{StaticResource ButtonPrimary}" HorizontalAlignment="Stretch" Margin="0,20,0,0"/>
             </StackPanel>
         </Grid>-->
-        
+
         <TabControl Margin="30,62,29.6,65" Grid.Column="1" VerticalAlignment="Center" Height="250">
             <TabItem Header="{DynamicResource strLOGIN}" FontWeight="ExtraBold">
                 <Grid Margin="0 16 0 0" >

diff --git a/TIDALDL-UI-PRO/Pages/MainView.xaml b/TIDALDL-UI-PRO/Pages/MainView.xaml
@@ -29,23 +29,23 @@
         <Grid Grid.RowSpan="2" Background="Black">
             <StackPanel >
                 <Button Margin="0,45,0,15" Background="Black" BorderThickness="0" Height="60" hc:BackgroundSwitchElement.MouseHoverBackground="Gray" Padding="0">
-                    <Path Fill="White" Width="30" Data="{StaticResource LogoGeometry}"></Path>
+                    <Path Fill="White" Width="30" Data="{StaticResource LogoGeometry}" Stretch="Uniform"></Path>
                 </Button>
 
                 <Button Command="{s:Action ShowSearch}" Background="Black" BorderThickness="0" Height="60" hc:BackgroundSwitchElement.MouseHoverBackground="Gray" Padding="0" HorizontalAlignment="Stretch">
-                    <Path Fill="LightGray" Width="26" Data="{StaticResource SearchGeometry}"></Path>
+                    <Path Fill="LightGray" Width="26" Data="{StaticResource SearchGeometry}" Stretch="Uniform"></Path>
                 </Button>
                 <Button Command="{s:Action ShowDownload}" Background="Black" BorderThickness="0" Height="60" hc:BackgroundSwitchElement.MouseHoverBackground="Gray" Padding="0">
-                    <Path Fill="LightGray" Width="26" Data="{StaticResource SDownloadGeometry}"></Path>
+                    <Path Fill="LightGray" Width="26" Data="{StaticResource SDownloadGeometry}" Stretch="Uniform"></Path>
                 </Button>
             </StackPanel>
 
             <StackPanel Height="130" VerticalAlignment="Bottom">
                 <Button Command="{s:Action ShowSettings}" Background="Black" BorderThickness="0" Height="60"  hc:BackgroundSwitchElement.MouseHoverBackground="Gray" Padding="0">
-                    <Path Fill="LightGray" Width="26" Data="{StaticResource SettingsGeometry}"></Path>
+                    <Path Fill="LightGray" Width="26" Data="{StaticResource SettingsGeometry}" Stretch="Uniform"></Path>
                 </Button>
                 <Button Command="{s:Action ShowAbout}" Background="Black" BorderThickness="0" Height="60" hc:BackgroundSwitchElement.MouseHoverBackground="Gray" Padding="0">
-                    <Path Fill="LightGray" Width="26" Data="{StaticResource AboutGeometry}"></Path>
+                    <Path Fill="LightGray" Width="26" Data="{StaticResource AboutGeometry}" Stretch="Uniform"></Path>
                 </Button>
             </StackPanel>
         </Grid>
@@ -66,13 +66,13 @@
         <!--Windows button-->
         <StackPanel Background="{DynamicResource RegionBrush}" MouseLeftButtonDown="{s:Action WindowMove}" Orientation="Horizontal" FlowDirection="RightToLeft" Grid.Column="1" Margin="0" HorizontalAlignment="Right">
             <Button Command="{s:Action WindowClose}" Height="32" Width="32" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource MyButtonClose}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed" Padding="0" Grid.Column="1">
-                <Path Fill="LightGray" Width="12" Data="{StaticResource CloseGeometry}"></Path>
+                <Path Fill="LightGray" Width="12" Data="{StaticResource CloseGeometry}" Stretch="Uniform"></Path>
             </Button>
             <Button Command="{s:Action WindowMax}" Height="32" Width="32" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource MyButtonDefault}" hc:BackgroundSwitchElement.MouseHoverBackground="{DynamicResource DarkDefaultBrush}" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed" Padding="5" Grid.Column="1">
-                <Path Fill="LightGray" Width="12" Data="{StaticResource WindowMaxGeometry}"></Path>
+                <Path Fill="LightGray" Width="12" Data="{StaticResource WindowMaxGeometry}" Stretch="Uniform"></Path>
             </Button>
             <Button Command="{s:Action WindowMin}" Height="32" Width="32" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource MyButtonDefault}" hc:BackgroundSwitchElement.MouseHoverBackground="{DynamicResource DarkDefaultBrush}" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed" Padding="5" Grid.Column="1">
-                <Path Fill="LightGray" Width="12" Data="{StaticResource WindowMinGeometry}"></Path>
+                <Path Fill="LightGray" Width="12" Data="{StaticResource WindowMinGeometry}" Stretch="Uniform"></Path>
             </Button>
         </StackPanel>
 

diff --git a/TIDALDL-UI-PRO/Pages/MessageView.xaml b/TIDALDL-UI-PRO/Pages/MessageView.xaml
@@ -13,7 +13,7 @@
         <StackPanel Margin="32" VerticalAlignment="Center">
 
             <StackPanel Orientation="Horizontal">
-                <Path x:Name="CtlIcon" Width="32" Fill="GreenYellow" Data="{StaticResource InfoGeometry}" Margin="10,0"></Path>
+                <Path x:Name="CtlIcon" Width="32" Fill="GreenYellow" Data="{StaticResource InfoGeometry}" Margin="10,0" Stretch="Uniform"></Path>
                 <TextBlock x:Name="CtlMsg" Text="This is a example msg." Margin="0,0,0,5" VerticalAlignment="Center"></TextBlock>
             </StackPanel>
 

diff --git a/TIDALDL-UI-PRO/Pages/SearchView.xaml b/TIDALDL-UI-PRO/Pages/SearchView.xaml
@@ -190,9 +190,9 @@
             </DataGrid>
 
             <DockPanel Grid.Row="2">
-                <Path Fill="Gray" Width="18" Margin="10,0,10,0" Data="{StaticResource LogoGeometry}"/>
+                <Path Fill="Gray" Width="18" Margin="10,0,10,0" Data="{StaticResource LogoGeometry}" Stretch="Uniform"/>
                 <ComboBox Width="100" VerticalAlignment="Center" SelectedValue="{Binding QualityValue}" ItemsSource="{Binding ComboxTrackQuality}" SelectionChanged="{s:Action ChangeQuality}"/>
-                <Path Fill="Gray" Width="18" Margin="10,0,10,0" Data="{StaticResource VideoGeometry}"/>
+                <Path Fill="Gray" Width="18" Margin="10,0,10,0" Data="{StaticResource VideoGeometry}" Stretch="Uniform"/>
                 <ComboBox Width="100" VerticalAlignment="Center" SelectedValue="{Binding ResolutionValue}" ItemsSource="{Binding ComboxVideoResolution}" SelectionChanged="{s:Action ChangeResolution}"/>
                 <Button Command="{s:Action Download}" Content="{DynamicResource strDownload}" DockPanel.Dock="Right" Style="{StaticResource ButtonPrimary}" HorizontalAlignment="Right" Margin="0,0,10,0" Padding="15,6"></Button>
             </DockPanel>

diff --git a/TIDALDL-UI-PRO/Pages/ShellView.xaml b/TIDALDL-UI-PRO/Pages/ShellView.xaml
@@ -0,0 +1,15 @@
+<Window x:Class="TIDALDL_UI.Pages.ShellView"
+        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"
+        xmlns:local="clr-namespace:TIDALDL_UI.Pages"
+        xmlns:s="https://github.com/canton7/Stylet"
+        mc:Ignorable="d"
+        d:DataContext="{d:DesignInstance local:ShellViewModel}"
+        Title="Stylet Start Project"
+        Width="350" Height="200">
+    <TextBlock FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center">
+        Hello Stylet!
+    </TextBlock>
+</Window>
diff --git a/TIDALDL-UI-PRO/Pages/ShellView.xaml.cs b/TIDALDL-UI-PRO/Pages/ShellView.xaml.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Windows;
+
+namespace TIDALDL_UI.Pages
+{
+    /// <summary>
+    /// Interaction logic for ShellView.xaml
+    /// </summary>
+    public partial class ShellView : Window
+    {
+        public ShellView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/TIDALDL-UI-PRO/Pages/ShellViewModel.cs b/TIDALDL-UI-PRO/Pages/ShellViewModel.cs
@@ -0,0 +1,9 @@
+using System;
+using Stylet;
+
+namespace TIDALDL_UI.Pages
+{
+    public class ShellViewModel : Screen
+    {
+    }
+}
diff --git a/TIDALDL-UI-PRO/Pages/TaskView.xaml b/TIDALDL-UI-PRO/Pages/TaskView.xaml
@@ -28,16 +28,16 @@
 
                 <Button Margin="5" Command="{s:Action ChangeExpand}" BorderThickness="0" DockPanel.Dock="Right" HorizontalAlignment="Right" hc:IconElement.Geometry="{StaticResource UpDownGeometry}" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}"/>
                 <Button Margin="1" Command="{s:Action OpenFolder}" BorderThickness="0" DockPanel.Dock="Right" HorizontalAlignment="Right" Padding="5">
-                    <Path Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource OpenFolderGeometry}"/>
+                    <Path Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource OpenFolderGeometry}" Stretch="Uniform"/>
                 </Button>
                 <Button Margin="1" Command="{s:Action Delete}" BorderThickness="0" DockPanel.Dock="Right" HorizontalAlignment="Right" Padding="5">
-                    <Path Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource RemoveGeometry}"/>
+                    <Path Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource RemoveGeometry}" Stretch="Uniform"/>
                 </Button>
                 <Button Margin="1" Command="{s:Action RetryOrCancel}" BorderThickness="0" DockPanel.Dock="Right" HorizontalAlignment="Right" Padding="5" Visibility="{Binding IsCancel, Converter={StaticResource ConverterUnBoolToVisibility}}">
-                    <Path Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource CancelGeometry}"/>
+                    <Path Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource CancelGeometry}" Stretch="Uniform"/>
                 </Button>
                 <Button Margin="1" Command="{s:Action RetryOrCancel}" BorderThickness="0" DockPanel.Dock="Right" HorizontalAlignment="Right" Padding="5" Visibility="{Binding IsCancel, Converter={StaticResource ConverterBoolToVisibility}}">
-                    <Path Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource RetryGeometry}"/>
+                    <Path Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource RetryGeometry}" Stretch="Uniform"/>
                 </Button>
             </DockPanel>
 

diff --git a/TIDALDL-UI-PRO/Properties/AssemblyInfo.cs b/TIDALDL-UI-PRO/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.3")]
-[assembly: AssemblyFileVersion("1.2.1.3")]
+[assembly: AssemblyVersion("1.2.1.4")]
+[assembly: AssemblyFileVersion("1.2.1.4")]
diff --git a/TIDALDL-UI-PRO/UPDATE_LOG.md b/TIDALDL-UI-PRO/UPDATE_LOG.md
@@ -1,3 +1,4 @@
+#### v1.2.1.4
 - [x] Fix: download video
 - [x] Fix: search