Skip to content

Commit 7bf24e0

Browse files
masatomixmasatomix
committed
Merge branch 'release/0.1.23'
2 parents 080da82 + c4ab651 commit 7bf24e0

6 files changed

Lines changed: 170 additions & 1 deletion

File tree

‎Utils/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
3333
// 以下のように '*' を使用します:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.1.7.0")]
35+
[assembly: AssemblyVersion("0.1.23.0")]
3636
[assembly: AssemblyFileVersion("1.0.0.0")]

‎Utils/StringUtils/ConvertCRLF.cs‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Activities;
6+
using System.ComponentModel;
7+
using System.Text.RegularExpressions;
8+
9+
namespace Utils.StringUtils
10+
{
11+
12+
[Designer(typeof(ConvertCRLFDesigner))]
13+
public sealed class ConvertCRLF : CodeActivity
14+
{
15+
[Category("Input")]
16+
[RequiredArgument]
17+
[Description("処理したい文字データを指定します")]
18+
public InArgument<String> Target { get; set; }
19+
20+
21+
[Category("セットする改行コード")]
22+
[DefaultValue(false)]
23+
public Boolean CR { get; set; }
24+
25+
26+
[Category("セットする改行コード")]
27+
[DefaultValue(false)]
28+
public Boolean LF { get; set; }
29+
30+
31+
[Category("Output")]
32+
public OutArgument<String> Result { get; set; }
33+
34+
protected override void Execute(CodeActivityContext context)
35+
{
36+
var target = context.GetValue(this.Target);
37+
38+
var trimData = target;
39+
40+
// まず、LFだけにしてしまう
41+
trimData = trimData.Replace("\r\n", "\n");
42+
trimData = trimData.Replace("\r", "\n");
43+
44+
if (CR)
45+
{
46+
trimData = trimData.Replace("\n", "\r\n");
47+
}
48+
else
49+
{
50+
// CRはすでに除去済みなのでなにもしない
51+
}
52+
53+
if (LF)
54+
{
55+
// LFはすでに付与済みなのでなにもしない
56+
}
57+
else
58+
{
59+
trimData = trimData.Replace("\n", "");
60+
}
61+
62+
Result.Set(context, trimData);
63+
}
64+
}
65+
66+
67+
}

‎Utils/StringUtils/ConvertCRLFDesigner.xaml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<sap:ActivityDesigner x:Class="Utils.StringUtils.ConvertCRLFDesigner"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:s="clr-namespace:System;assembly=mscorlib"
5+
xmlns:sap="clr-namespace:System.Activities.Presentation;assembly=System.Activities.Presentation"
6+
xmlns:sapv="clr-namespace:System.Activities.Presentation.View;assembly=System.Activities.Presentation"
7+
xmlns:sapc="clr-namespace:System.Activities.Presentation.Converters;assembly=System.Activities.Presentation" >
8+
9+
<sap:ActivityDesigner.Resources>
10+
<sapc:ArgumentToExpressionConverter x:Key="ArgumentToExpressionConverter" />
11+
<DataTemplate x:Key="Collapsed">
12+
</DataTemplate>
13+
<DataTemplate x:Key="Expanded">
14+
<Grid>
15+
<Grid.ColumnDefinitions>
16+
<ColumnDefinition Width="3*"/>
17+
<ColumnDefinition Width="7*"/>
18+
</Grid.ColumnDefinitions>
19+
<Grid.RowDefinitions>
20+
<RowDefinition Height="*"/>
21+
</Grid.RowDefinitions>
22+
23+
<Label Content="Target" />
24+
<sapv:ExpressionTextBox
25+
Expression="{Binding ModelItem.Target,
26+
ConverterParameter=In,
27+
Converter={StaticResource ArgumentToExpressionConverter},
28+
Mode=TwoWay}"
29+
ExpressionType="{x:Type s:String}"
30+
HintText="Enter a string" OwnerActivity="{Binding ModelItem}"
31+
MaxLines="1" Grid.Column="1" />
32+
</Grid>
33+
34+
</DataTemplate>
35+
<Style x:Key="ExpandOrCollapsedStyle" TargetType="{x:Type ContentPresenter}">
36+
<Setter Property="ContentTemplate" Value="{DynamicResource Collapsed}"/>
37+
<Style.Triggers>
38+
<DataTrigger Binding="{Binding Path=ShowExpanded}" Value="true">
39+
<Setter Property="ContentTemplate" Value="{DynamicResource Expanded}"/>
40+
</DataTrigger>
41+
</Style.Triggers>
42+
</Style>
43+
</sap:ActivityDesigner.Resources>
44+
<sap:ActivityDesigner.Icon>
45+
<DrawingBrush>
46+
<DrawingBrush.Drawing>
47+
<DrawingGroup>
48+
<DrawingGroup.Children>
49+
<DrawingGroup>
50+
<DrawingGroup.Transform>
51+
<MatrixTransform Matrix="1,0,0,1,0,0"/>
52+
</DrawingGroup.Transform>
53+
<DrawingGroup.Children>
54+
<ImageDrawing ImageSource="../images/page_add.png" Rect="0,0,16,16"/>
55+
</DrawingGroup.Children>
56+
</DrawingGroup>
57+
</DrawingGroup.Children>
58+
</DrawingGroup>
59+
</DrawingBrush.Drawing>
60+
</DrawingBrush>
61+
</sap:ActivityDesigner.Icon>
62+
<Grid>
63+
<ContentPresenter Style="{DynamicResource ExpandOrCollapsedStyle}" Content="{Binding}" />
64+
</Grid>
65+
</sap:ActivityDesigner>

‎Utils/StringUtils/ConvertCRLFDesigner.xaml.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Windows;
6+
using System.Windows.Controls;
7+
using System.Windows.Data;
8+
using System.Windows.Documents;
9+
using System.Windows.Input;
10+
using System.Windows.Media;
11+
using System.Windows.Media.Imaging;
12+
using System.Windows.Navigation;
13+
using System.Windows.Shapes;
14+
15+
namespace Utils.StringUtils
16+
{
17+
// ConvertCRLFDesigner.xaml の相互作用ロジック
18+
public partial class ConvertCRLFDesigner
19+
{
20+
public ConvertCRLFDesigner()
21+
{
22+
InitializeComponent();
23+
}
24+
25+
}
26+
}

‎Utils/Utils.csproj‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,17 @@
6969
<DependentUpon>Base64DecodeDesigner.xaml</DependentUpon>
7070
</Compile>
7171
<Compile Include="StringUtils\Base64Encode.cs" />
72+
<Compile Include="StringUtils\ConvertCRLFDesigner.xaml.cs">
73+
<DependentUpon>ConvertCRLFDesigner.xaml</DependentUpon>
74+
</Compile>
7275
<Compile Include="StringUtils\Base64EncodeFromFileDesigner.xaml.cs">
7376
<DependentUpon>Base64EncodeFromFileDesigner.xaml</DependentUpon>
7477
</Compile>
7578
<Compile Include="StringUtils\Base64EncodeDesigner.xaml.cs">
7679
<DependentUpon>Base64EncodeDesigner.xaml</DependentUpon>
7780
</Compile>
7881
<Compile Include="StringUtils\Base64EncodeFromFile.cs" />
82+
<Compile Include="StringUtils\ConvertCRLF.cs" />
7983
</ItemGroup>
8084
<ItemGroup>
8185
<Page Include="Controls\FilePathControl.xaml">
@@ -98,6 +102,10 @@
98102
<SubType>Designer</SubType>
99103
<Generator>MSBuild:Compile</Generator>
100104
</Page>
105+
<Page Include="StringUtils\ConvertCRLFDesigner.xaml">
106+
<Generator>MSBuild:Compile</Generator>
107+
<SubType>Designer</SubType>
108+
</Page>
101109
<Page Include="StringUtils\Base64EncodeFromFileDesigner.xaml">
102110
<Generator>MSBuild:Compile</Generator>
103111
<SubType>Designer</SubType>
@@ -123,5 +131,8 @@
123131
<Resource Include="images\text_horizontalrule.png" />
124132
<Resource Include="images\text_padding_bottom.png" />
125133
</ItemGroup>
134+
<ItemGroup>
135+
<Resource Include="images\page_add.png" />
136+
</ItemGroup>
126137
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
127138
</Project>

‎Utils/images/page_add.png‎

739 Bytes
Loading

0 commit comments

Comments
 (0)