add Transfer

2019-01-28 00:31:06 +08:00
1 parent 43d1e7e4f4
commit 56aae57ccd
@@ -78,6 +78,8 @@
 	
        public static readonly string ProgressButtonDemoCtl = nameof(ProgressButtonDemoCtl);
 	
+        public static readonly string TransferDemoCtl = nameof(TransferDemoCtl);
+	
        public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl);

        public static readonly string ToggleButtonDemoCtl = nameof(ToggleButtonDemoCtl);
@@ -41,7 +41,8 @@ var controlList = new List<string>
 	"WaterfallPanelDemoCtl",
 	"CoverViewDemoCtl",
 	"CoverFlowDemoCtl",
-	"ProgressButtonDemoCtl"
+	"ProgressButtonDemoCtl",
+	"TransferDemoCtl"
 };
 var styleList = new List<string>
 {
@@ -216,6 +216,9 @@
    <Compile Include="UserControl\Controls\TimePickerDemoCtl.xaml.cs">
      <DependentUpon>TimePickerDemoCtl.xaml</DependentUpon>
    </Compile>
+    <Compile Include="UserControl\Controls\TransferDemoCtl.xaml.cs">
+      <DependentUpon>TransferDemoCtl.xaml</DependentUpon>
+    </Compile>
    <Compile Include="UserControl\Controls\WaterfallPanelDemoCtl.xaml.cs">
      <DependentUpon>WaterfallPanelDemoCtl.xaml</DependentUpon>
    </Compile>
@@ -529,6 +532,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="UserControl\Controls\TransferDemoCtl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="UserControl\Controls\WaterfallPanelDemoCtl.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@@ -711,6 +718,7 @@
      <Generator>TextTemplatingFileGenerator</Generator>
      <LastGenOutput>MessageToken.cs</LastGenOutput>
    </Content>
+    <Resource Include="Resources\Img\LeftMainContent\Transfer_16x.png" />
    <Resource Include="Resources\Img\LeftMainContent\ProgressButton_16x.png" />
    <Resource Include="Resources\Img\LeftMainContent\SortAscending_grey_16x.png" />
    <Resource Include="Resources\Img\LeftMainContent\LinearCarousel_16x.png" />
@@ -1095,6 +1095,15 @@ namespace HandyControlDemo.Properties.Langs {
            }
        }
        
+        /// <summary>
+        ///   查找类似 穿梭框 的本地化字符串。
+        /// </summary>
+        public static string Transfer {
+            get {
+                return ResourceManager.GetString("Transfer", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 树视图 的本地化字符串。
        /// </summary>
@@ -483,4 +483,7 @@
  <data name="OpenCustomMessageWindow" xml:space="preserve">
    <value>open custom message window</value>
  </data>
+  <data name="Transfer" xml:space="preserve">
+    <value>Transfer</value>
+  </data>
 </root>
@@ -483,4 +483,7 @@
  <data name="OpenCustomMessageWindow" xml:space="preserve">
    <value>点击打开自定义消息窗口</value>
  </data>
+  <data name="Transfer" xml:space="preserve">
+    <value>穿梭框</value>
+  </data>
 </root>
@@ -14,7 +14,7 @@ namespace HandyControlDemo.Service
        internal List<DemoDataModel> GetDemoDataList()
        {
            var list = new List<DemoDataModel>();
-            for (var i = 1; i <= 6; i++)
+            for (var i = 1; i <= 20; i++)
            {
                var dataList = new List<DemoDataModel>();
                for (int j = 0; j < 3; j++)
@@ -34,7 +34,7 @@ namespace HandyControlDemo.Service
                    Name = $"Name{i}",
                    Type = (DemoType)i,
                    DataList = dataList,
-                    ImgPath = $"/HandyControlDemo;component/Resources/Img/Avatar/avatar{i}.png",
+                    ImgPath = $"/HandyControlDemo;component/Resources/Img/Avatar/avatar{i % 7}.png",
                    Remark = new string(i.ToString()[0], 10)
                };
                list.Add(model);
@@ -0,0 +1,15 @@
+<UserControl x:Class="HandyControlDemo.UserControl.TransferDemoCtl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Background="{DynamicResource RegionBrush}"
+             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
+    <controls:TransitioningContentControl>
+        <controls:Transfer ItemsSource="{Binding DataList}" Margin="32" Height="300">
+            <controls:Transfer.ItemTemplate>
+                <DataTemplate>
+                    <TextBlock Text="{Binding Name}"/>
+                </DataTemplate>
+            </controls:Transfer.ItemTemplate>
+        </controls:Transfer>
+    </controls:TransitioningContentControl>
+</UserControl>
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+    public partial class TransferDemoCtl
+    {
+        public TransferDemoCtl()
+        {
+            InitializeComponent();
+        }
+    }
+}
@@ -33,7 +33,7 @@
                        <Border CornerRadius="4" Height="30" Width="30" BorderThickness="1" BorderBrush="{DynamicResource PrimaryBrush}"/>
                    </controls:StatusSwitchElement.CheckedElement>
                </ToggleButton>
-                <ListBox Name="listStyle" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single" Style="{StaticResource ListBoxTransparent}">
+                <ListBox Name="ListBoxStyle" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single" Style="{StaticResource ListBoxTransparent}">
                    <ListBoxItem Tag="{x:Static data:MessageToken.BrushDemoCtl}" Content="{x:Static langs:Lang.Brush}">
                        <controls:EdgeElement.LeftContent>
                            <Image Source="../../Resources/Img/LeftMainContent/Brush_16x.png"/>
@@ -181,7 +181,7 @@
                        <Border CornerRadius="4" Height="30" Width="30" BorderThickness="1" BorderBrush="{DynamicResource PrimaryBrush}"/>
                    </controls:StatusSwitchElement.CheckedElement>
                </ToggleButton>
-                <ListBox Name="listControl" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single"  Style="{StaticResource ListBoxTransparent}">
+                <ListBox Name="ListBoxControl" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" BorderThickness="0" SelectionMode="Single"  Style="{StaticResource ListBoxTransparent}">
                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.ProgressButtonDemoCtl}" Content="{x:Static langs:Lang.ProgressButton}">
                        <controls:EdgeElement.LeftContent>
                            <Image Source="../../Resources/Img/LeftMainContent/ProgressButton_16x.png"/>
@@ -232,6 +232,11 @@
                            <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
                        </controls:EdgeElement.LeftContent>
                    </ListBoxItem>
+                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.TransferDemoCtl}" Content="{x:Static langs:Lang.Transfer}">
+                        <controls:EdgeElement.LeftContent>
+                            <Image Source="../../Resources/Img/LeftMainContent/Transfer_16x.png"/>
+                        </controls:EdgeElement.LeftContent>
+                    </ListBoxItem>
                    <ListBoxItem Tag="{x:Static data:MessageToken.FlipClockDemoCtl}" Content="{x:Static langs:Lang.FlipClock}">
                        <controls:EdgeElement.LeftContent>
                            <Image Source="../../Resources/Img/LeftMainContent/FlipVertical_16x.png"/>
@@ -242,7 +247,7 @@
                            <Image Source="../../Resources/Img/LeftMainContent/Star.png"/>
                        </controls:EdgeElement.LeftContent>
                    </ListBoxItem>
-                    <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.ShieldDemoCtl}" Content="{x:Static langs:Lang.Shield}">
+                    <ListBoxItem Tag="{x:Static data:MessageToken.ShieldDemoCtl}" Content="{x:Static langs:Lang.Shield}">
                        <controls:EdgeElement.LeftContent>
                            <Image Source="../../Resources/Img/LeftMainContent/Shield_16x.png"/>
                        </controls:EdgeElement.LeftContent>
@@ -36,11 +36,11 @@ namespace HandyControlDemo.UserControl
        {
            if (ButtonStyleAscending.IsChecked == true)
            {
-                listStyle.Items.SortDescriptions.Add(new SortDescription("Content", ListSortDirection.Ascending));
+                ListBoxStyle.Items.SortDescriptions.Add(new SortDescription("Content", ListSortDirection.Ascending));
            }
            else
            {
-                listStyle.Items.SortDescriptions.Clear();
+                ListBoxStyle.Items.SortDescriptions.Clear();
            }
        }

@@ -48,11 +48,11 @@ namespace HandyControlDemo.UserControl
        {
            if (ButtonControlAscending.IsChecked == true)
            {
-                listControl.Items.SortDescriptions.Add(new SortDescription("Content", ListSortDirection.Ascending));
+                ListBoxControl.Items.SortDescriptions.Add(new SortDescription("Content", ListSortDirection.Ascending));
            }
            else
            {
-                listControl.Items.SortDescriptions.Clear();
+                ListBoxControl.Items.SortDescriptions.Clear();
            }
        }

@@ -60,7 +60,7 @@ namespace HandyControlDemo.UserControl
        {
            if (e.Info == null) return;

-            foreach (var listBoxItem in listStyle.Items.OfType<ListBoxItem>())
+            foreach (var listBoxItem in ListBoxStyle.Items.OfType<ListBoxItem>())
            {
                listBoxItem.Show(listBoxItem.Content.ToString().ToLower().Contains(e.Info.ToLower()));
            }
@@ -70,7 +70,7 @@ namespace HandyControlDemo.UserControl
        {
            if (e.Info == null) return;

-            foreach (var listBoxItem in listControl.Items.OfType<ListBoxItem>())
+            foreach (var listBoxItem in ListBoxControl.Items.OfType<ListBoxItem>())
            {
                listBoxItem.Show(listBoxItem.Content.ToString().ToLower().Contains(e.Info.ToLower()));
            }