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