update pr/41
This commit is contained in:
1 parent
ea7ebbff3b
commit
0ff2d2c0c5
7 files changed
+145
-162
No files matched your search
@@ -742,6 +742,7 @@
|
|||||||
<Generator>TextTemplatingFileGenerator</Generator>
|
<Generator>TextTemplatingFileGenerator</Generator>
|
||||||
<LastGenOutput>MessageToken.cs</LastGenOutput>
|
<LastGenOutput>MessageToken.cs</LastGenOutput>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Resource Include="Resources\Img\LeftMainContent\Label_16x.png" />
|
||||||
<Resource Include="Resources\Img\Chat\chat_back1.jpg" />
|
<Resource Include="Resources\Img\Chat\chat_back1.jpg" />
|
||||||
<Resource Include="Resources\Img\Chat\chat_back2.jpg" />
|
<Resource Include="Resources\Img\Chat\chat_back2.jpg" />
|
||||||
<Resource Include="Resources\Img\LeftMainContent\Bubble_16xLG.png" />
|
<Resource Include="Resources\Img\LeftMainContent\Bubble_16xLG.png" />
|
||||||
|
|||||||
+140
-140
File diff suppressed because it is too large.
Load diff
@@ -496,6 +496,6 @@
|
|||||||
<value>秒</value>
|
<value>秒</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Label" xml:space="preserve">
|
<data name="Label" xml:space="preserve">
|
||||||
<value>Label</value>
|
<value>标签</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 247 B |
@@ -161,7 +161,7 @@
|
|||||||
</ListBoxItem>
|
</ListBoxItem>
|
||||||
<ListBoxItem Tag="{x:Static data:MessageToken.LabelDemoCtl}" Content="{x:Static langs:Lang.Label}">
|
<ListBoxItem Tag="{x:Static data:MessageToken.LabelDemoCtl}" Content="{x:Static langs:Lang.Label}">
|
||||||
<controls:EdgeElement.LeftContent>
|
<controls:EdgeElement.LeftContent>
|
||||||
<Image Source="../../Resources/Img/LeftMainContent/TextBlock_16x.png"/>
|
<Image Source="../../Resources/Img/LeftMainContent/Label_16x.png"/>
|
||||||
</controls:EdgeElement.LeftContent>
|
</controls:EdgeElement.LeftContent>
|
||||||
</ListBoxItem>
|
</ListBoxItem>
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
|
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
|
||||||
Background="{DynamicResource RegionBrush}">
|
Background="{DynamicResource RegionBrush}">
|
||||||
<controls:TransitioningContentControl>
|
<controls:TransitioningContentControl>
|
||||||
<StackPanel>
|
<StackPanel Margin="32">
|
||||||
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
|
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
|
||||||
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelDanger}"/>
|
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelDanger}"/>
|
||||||
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelInfo}"/>
|
<Label HorizontalAlignment="Left" Margin="5" Content="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource LabelInfo}"/>
|
||||||
|
|||||||
@@ -1,23 +1,5 @@
|
|||||||
using System;
|
namespace HandyControlDemo.UserControl
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Data;
|
|
||||||
using System.Windows.Documents;
|
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using System.Windows.Navigation;
|
|
||||||
using System.Windows.Shapes;
|
|
||||||
|
|
||||||
namespace HandyControlDemo.UserControl
|
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for LabelDemoCtl.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class LabelDemoCtl
|
public partial class LabelDemoCtl
|
||||||
{
|
{
|
||||||
public LabelDemoCtl()
|
public LabelDemoCtl()
|
||||||
|
|||||||
Reference in new issue
Block a user