去掉无用UI
parent
533d7cae3e
commit
c42497d68b
|
|
@ -51,14 +51,14 @@
|
||||||
</ListBox.Template>
|
</ListBox.Template>
|
||||||
</ListBox>
|
</ListBox>
|
||||||
|
|
||||||
<StackPanel Margin="10" VerticalAlignment="Bottom">
|
<!--<StackPanel Margin="10" VerticalAlignment="Bottom">
|
||||||
<!--<ProgressBar Value="1507" Maximum="2056" Style="{DynamicResource }"/>-->
|
~1~<ProgressBar Value="1507" Maximum="2056" Style="{DynamicResource }"/>@1@
|
||||||
<h:FProgressBar Height="12" Maximum="2056" Value="850">
|
<h:FProgressBar Height="12" Maximum="2056" Value="850">
|
||||||
<!--<h:FProgressBar.Triggers>
|
~1~<h:FProgressBar.Triggers>
|
||||||
<EventTrigger RoutedEvent="Loaded">
|
<EventTrigger RoutedEvent="Loaded">
|
||||||
<BeginStoryboard Storyboard="{StaticResource S.Storyboard.ProgressBar.LoadValue}" />
|
<BeginStoryboard Storyboard="{StaticResource S.Storyboard.ProgressBar.LoadValue}" />
|
||||||
</EventTrigger>
|
</EventTrigger>
|
||||||
</h:FProgressBar.Triggers>-->
|
</h:FProgressBar.Triggers>@1@
|
||||||
</h:FProgressBar>
|
</h:FProgressBar>
|
||||||
|
|
||||||
<TextBlock Margin="0,10"
|
<TextBlock Margin="0,10"
|
||||||
|
|
@ -66,7 +66,7 @@
|
||||||
Foreground="{DynamicResource {x:Static h:BrushKeys.ForegroundTitle}}"
|
Foreground="{DynamicResource {x:Static h:BrushKeys.ForegroundTitle}}"
|
||||||
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
||||||
Text="850G/2056G" />
|
Text="850G/2056G" />
|
||||||
</StackPanel>
|
</StackPanel>-->
|
||||||
<!-- 中间内容 -->
|
<!-- 中间内容 -->
|
||||||
<Grid Grid.Column="1" Margin="0">
|
<Grid Grid.Column="1" Margin="0">
|
||||||
<h:LinkActionFrame LinkAction="{Binding SelectLink, Mode=TwoWay}" />
|
<h:LinkActionFrame LinkAction="{Binding SelectLink, Mode=TwoWay}" />
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,22 @@
|
||||||
<UserControl x:Class="HeBianGu.App.Disk.UpLoadControl"
|
<UserControl x:Class="HeBianGu.App.Disk.UpLoadControl"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:h="https://github.com/HeBianGu"
|
xmlns:h="https://github.com/HeBianGu"
|
||||||
xmlns:local="clr-namespace:HeBianGu.App.Disk"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
d:DesignHeight="450"
|
||||||
xmlns:system="clr-namespace:System;assembly=mscorlib"
|
d:DesignWidth="800"
|
||||||
d:DesignHeight="450"
|
mc:Ignorable="d">
|
||||||
d:DesignWidth="800"
|
|
||||||
mc:Ignorable="d">
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<DockPanel Margin="0,0,10,0">
|
<DockPanel Margin="0,0,10,0">
|
||||||
<h:Row DockPanel.Dock="Top" Style="{DynamicResource {x:Static h:Row.Column10Key}}">
|
<h:Row DockPanel.Dock="Top" Style="{DynamicResource {x:Static h:Row.Column10Key}}">
|
||||||
<TextBlock Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}" Text="上传总进度" />
|
<TextBlock Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}" Text="上传总进度" />
|
||||||
<h:FProgressBar Grid.Column="1"
|
<h:FProgressBar Grid.Column="1"
|
||||||
Grid.ColumnSpan="6"
|
Grid.ColumnSpan="6"
|
||||||
Height="15"
|
Height="15"
|
||||||
CornerRadius="2"
|
CornerRadius="2"
|
||||||
Maximum="100"
|
Maximum="100"
|
||||||
Value="{Binding Progress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
|
Value="{Binding Progress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
|
||||||
<!--<h:FProgressBar.Triggers>
|
<!--<h:FProgressBar.Triggers>
|
||||||
<EventTrigger RoutedEvent="Loaded">
|
<EventTrigger RoutedEvent="Loaded">
|
||||||
<BeginStoryboard>
|
<BeginStoryboard>
|
||||||
|
|
@ -40,37 +38,40 @@
|
||||||
<Button Grid.Column="9" Content="全部取消" Style="{DynamicResource {x:Static h:ButtonKeys.BorderBrushTransparent}}" />-->
|
<Button Grid.Column="9" Content="全部取消" Style="{DynamicResource {x:Static h:ButtonKeys.BorderBrushTransparent}}" />-->
|
||||||
</h:Row>
|
</h:Row>
|
||||||
|
|
||||||
<Grid Height="60" DockPanel.Dock="Top" TextBlock.Foreground="{DynamicResource {x:Static h:BrushKeys.Orange}}">
|
<!--
|
||||||
|
<Grid Height="60" DockPanel.Dock="Top"
|
||||||
|
TextBlock.Foreground="{DynamicResource {x:Static h:BrushKeys.Orange}}">
|
||||||
|
|
||||||
<Border Background="{DynamicResource {x:Static h:BrushKeys.Orange}}" Opacity="0.2" />
|
<Border Background="{DynamicResource {x:Static h:BrushKeys.Orange}}" Opacity="0.2" />
|
||||||
|
|
||||||
<!--<TextBlock Margin="10,0"
|
<TextBlock Margin="10,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
FontSize="20"
|
FontSize="20"
|
||||||
Style="{DynamicResource {x:Static h:TextBlockKeys.Icon}}"
|
Style="{DynamicResource {x:Static h:TextBlockKeys.Icon}}"
|
||||||
Text="" />-->
|
Text="" />
|
||||||
|
|
||||||
<!--<TextBlock Margin="40,0,10,0"
|
<TextBlock Margin="40,0,10,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontStyle="Oblique"
|
FontStyle="Oblique"
|
||||||
Text="开通超级会员,立即尊享急速下载特权!" />
|
Text="开通超级会员,立即尊享急速下载特权!" />
|
||||||
|
|
||||||
<Button Height="30"
|
<Button Height="30"
|
||||||
Margin="300,0,10,0"
|
Margin="300,0,10,0"
|
||||||
Padding="15,0"
|
Padding="15,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
h:Cattach.CornerRadius="15"
|
h:Cattach.CornerRadius="15"
|
||||||
Background="{DynamicResource {x:Static h:BrushKeys.Orange}}"
|
Background="{DynamicResource {x:Static h:BrushKeys.Orange}}"
|
||||||
Content="免费试用"
|
Content="免费试用"
|
||||||
Foreground="{DynamicResource {x:Static h:BrushKeys.ForegroundWhite}}"
|
Foreground="{DynamicResource {x:Static h:BrushKeys.ForegroundWhite}}"
|
||||||
Style="{DynamicResource {x:Static h:ButtonKeys.Transparent}}" />-->
|
Style="{DynamicResource {x:Static h:ButtonKeys.Transparent}}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
|
-->
|
||||||
|
|
||||||
<ListBox h:Cattach.ItemHeight="Auto" Style="{DynamicResource {x:Static h:ListBoxKeys.Single}}"
|
<ListBox h:Cattach.ItemHeight="Auto" Style="{DynamicResource {x:Static h:ListBoxKeys.Single}}"
|
||||||
ItemsSource="{Binding UpLoadItems}">
|
ItemsSource="{Binding UpLoadItems}">
|
||||||
<ListBox.ItemTemplate>
|
<ListBox.ItemTemplate>
|
||||||
<DataTemplate >
|
<DataTemplate>
|
||||||
<Grid Height="50" Margin="10">
|
<Grid Height="50" Margin="10">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
|
|
@ -85,47 +86,48 @@
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<TextBlock Grid.RowSpan="2"
|
<TextBlock Grid.RowSpan="2"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontSize="30"
|
FontSize="30"
|
||||||
Style="{DynamicResource {x:Static h:TextBlockKeys.Icon}}"
|
Style="{DynamicResource {x:Static h:TextBlockKeys.Icon}}"
|
||||||
Text="" />
|
Text="" />
|
||||||
|
|
||||||
<TextBlock Grid.Row="0"
|
<TextBlock Grid.Row="0"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
||||||
Text="{Binding Value}" />
|
Text="{Binding Value}" />
|
||||||
<TextBlock Grid.Row="1"
|
<TextBlock Grid.Row="1"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
||||||
Text="{Binding Value1}" />
|
Text="{Binding Value1}" />
|
||||||
|
|
||||||
<TextBlock Grid.Row="0"
|
<TextBlock Grid.Row="0"
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
||||||
Text="{Binding Value2}" />
|
Text="{Binding Value2}" />
|
||||||
|
|
||||||
<TextBlock Grid.Row="0"
|
<TextBlock Grid.Row="0"
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
||||||
Text="{Binding Value3}" />
|
Text="{Binding Value3}" />
|
||||||
|
|
||||||
<h:FProgressBar Grid.Column="3"
|
<h:FProgressBar Grid.Column="3"
|
||||||
Height="15"
|
Height="15"
|
||||||
CornerRadius="2"
|
CornerRadius="2"
|
||||||
Maximum="100"
|
Maximum="100"
|
||||||
Value="{Binding Int1}">
|
Value="{Binding Int1}">
|
||||||
<h:FProgressBar.Triggers>
|
<h:FProgressBar.Triggers>
|
||||||
<EventTrigger RoutedEvent="Loaded">
|
<EventTrigger RoutedEvent="Loaded">
|
||||||
<BeginStoryboard>
|
<BeginStoryboard>
|
||||||
<Storyboard Timeline.DesiredFrameRate="{x:Static h:StoryboardSetting.DesiredFrameRate}">
|
<Storyboard
|
||||||
|
Timeline.DesiredFrameRate="{x:Static h:StoryboardSetting.DesiredFrameRate}">
|
||||||
<DoubleAnimation Storyboard.TargetProperty="Value"
|
<DoubleAnimation Storyboard.TargetProperty="Value"
|
||||||
From="0"
|
From="0"
|
||||||
To="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Value}"
|
To="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Value}"
|
||||||
Duration="00:00:01" />
|
Duration="00:00:01" />
|
||||||
</Storyboard>
|
</Storyboard>
|
||||||
</BeginStoryboard>
|
</BeginStoryboard>
|
||||||
</EventTrigger>
|
</EventTrigger>
|
||||||
|
|
@ -133,11 +135,11 @@
|
||||||
</h:FProgressBar>
|
</h:FProgressBar>
|
||||||
|
|
||||||
<TextBlock Grid.Row="1"
|
<TextBlock Grid.Row="1"
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Margin="-3,0"
|
Margin="-3,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
Style="{DynamicResource {x:Static h:TextBlockKeys.Default}}"
|
||||||
Text="{Binding Value3}" />
|
Text="{Binding Value3}" />
|
||||||
|
|
||||||
<!--<StackPanel Grid.RowSpan="2"
|
<!--<StackPanel Grid.RowSpan="2"
|
||||||
Grid.Column="4"
|
Grid.Column="4"
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,16 @@
|
||||||
/*{
|
{
|
||||||
"Minio": {
|
"Minio": {
|
||||||
"Endpoint": "123.132.248.154:9107",
|
"Endpoint": "123.132.248.154:9107",
|
||||||
"AccessKey": "oZNgo25pNXnKFV9oKGh4",
|
"AccessKey": "oZNgo25pNXnKFV9oKGh4",
|
||||||
"SecretKey": "66GYn0x1XAEInSa9wdCutzvUWKfhH1EhqxPJ6a9u",
|
"SecretKey": "66GYn0x1XAEInSa9wdCutzvUWKfhH1EhqxPJ6a9u",
|
||||||
"BucketName": "demo"
|
"BucketName": "demo"
|
||||||
}
|
}
|
||||||
}*/
|
}
|
||||||
{
|
/*{
|
||||||
"Minio": {
|
"Minio": {
|
||||||
"Endpoint": "192.168.10.163:9016",
|
"Endpoint": "192.168.10.163:9016",
|
||||||
"AccessKey": "I2c35jD6ayApaneyQZyC",
|
"AccessKey": "I2c35jD6ayApaneyQZyC",
|
||||||
"SecretKey": "XHlrNeCHK0xf8y2Fo0K5OKyDeaI2ItfEsFbzQPFk",
|
"SecretKey": "XHlrNeCHK0xf8y2Fo0K5OKyDeaI2ItfEsFbzQPFk",
|
||||||
"BucketName": "demo"
|
"BucketName": "demo"
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue