Skip to content

Commit 7f805fc

Browse files
committed
ux: use BranchOrTagNameTextBox to edit git-flow new topic branch name
Signed-off-by: leo <longshuang@msn.cn>
1 parent 163e4d8 commit 7f805fc

4 files changed

Lines changed: 24 additions & 13 deletions

File tree

src/Resources/Locales/en_US.axaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,9 @@
444444
<x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">Feature:</x:String>
445445
<x:String x:Key="Text.GitFlow.FeaturePrefix" xml:space="preserve">Feature Prefix:</x:String>
446446
<x:String x:Key="Text.GitFlow.Finish" xml:space="preserve">Finish ${0}$</x:String>
447-
<x:String x:Key="Text.GitFlow.FinishFeature" xml:space="preserve">FLOW - Finish Feature</x:String>
448-
<x:String x:Key="Text.GitFlow.FinishHotfix" xml:space="preserve">FLOW - Finish Hotfix</x:String>
449-
<x:String x:Key="Text.GitFlow.FinishRelease" xml:space="preserve">FLOW - Finish Release</x:String>
447+
<x:String x:Key="Text.GitFlow.FinishFeature" xml:space="preserve">Finish Feature</x:String>
448+
<x:String x:Key="Text.GitFlow.FinishHotfix" xml:space="preserve">Finish Hotfix</x:String>
449+
<x:String x:Key="Text.GitFlow.FinishRelease" xml:space="preserve">Finish Release</x:String>
450450
<x:String x:Key="Text.GitFlow.FinishTarget" xml:space="preserve">Target:</x:String>
451451
<x:String x:Key="Text.GitFlow.FinishWithSquash" xml:space="preserve">Squash during merge</x:String>
452452
<x:String x:Key="Text.GitFlow.Hotfix" xml:space="preserve">Hotfix:</x:String>
@@ -457,12 +457,13 @@
457457
<x:String x:Key="Text.GitFlow.Release" xml:space="preserve">Release:</x:String>
458458
<x:String x:Key="Text.GitFlow.ReleasePrefix" xml:space="preserve">Release Prefix:</x:String>
459459
<x:String x:Key="Text.GitFlow.StartFeature" xml:space="preserve">Start Feature...</x:String>
460-
<x:String x:Key="Text.GitFlow.StartFeatureTitle" xml:space="preserve">FLOW - Start Feature</x:String>
460+
<x:String x:Key="Text.GitFlow.StartFeatureTitle" xml:space="preserve">Start Feature</x:String>
461461
<x:String x:Key="Text.GitFlow.StartHotfix" xml:space="preserve">Start Hotfix...</x:String>
462-
<x:String x:Key="Text.GitFlow.StartHotfixTitle" xml:space="preserve">FLOW - Start Hotfix</x:String>
462+
<x:String x:Key="Text.GitFlow.StartHotfixTitle" xml:space="preserve">Start Hotfix</x:String>
463463
<x:String x:Key="Text.GitFlow.StartPlaceholder" xml:space="preserve">Enter name</x:String>
464464
<x:String x:Key="Text.GitFlow.StartRelease" xml:space="preserve">Start Release...</x:String>
465-
<x:String x:Key="Text.GitFlow.StartReleaseTitle" xml:space="preserve">FLOW - Start Release</x:String>
465+
<x:String x:Key="Text.GitFlow.StartReleaseTitle" xml:space="preserve">Start Release</x:String>
466+
<x:String x:Key="Text.GitFlow.StartTarget" xml:space="preserve">New Branch:</x:String>
466467
<x:String x:Key="Text.GitFlow.TagPrefix" xml:space="preserve">Version Tag Prefix:</x:String>
467468
<x:String x:Key="Text.GitLFS" xml:space="preserve">Git LFS</x:String>
468469
<x:String x:Key="Text.GitLFS.AddTrackPattern" xml:space="preserve">Add Track Pattern...</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@
467467
<x:String x:Key="Text.GitFlow.StartPlaceholder" xml:space="preserve">输入分支名</x:String>
468468
<x:String x:Key="Text.GitFlow.StartRelease" xml:space="preserve">开始版本分支...</x:String>
469469
<x:String x:Key="Text.GitFlow.StartReleaseTitle" xml:space="preserve">开始版本分支</x:String>
470+
<x:String x:Key="Text.GitFlow.StartTarget" xml:space="preserve">新分支名 :</x:String>
470471
<x:String x:Key="Text.GitFlow.TagPrefix" xml:space="preserve">版本标签前缀 :</x:String>
471472
<x:String x:Key="Text.GitLFS" xml:space="preserve">Git LFS</x:String>
472473
<x:String x:Key="Text.GitLFS.AddTrackPattern" xml:space="preserve">添加追踪文件规则...</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@
467467
<x:String x:Key="Text.GitFlow.StartPlaceholder" xml:space="preserve">輸入分支名稱</x:String>
468468
<x:String x:Key="Text.GitFlow.StartRelease" xml:space="preserve">開始發行分支...</x:String>
469469
<x:String x:Key="Text.GitFlow.StartReleaseTitle" xml:space="preserve">開始發行分支</x:String>
470+
<x:String x:Key="Text.GitFlow.StartTarget" xml:space="preserve">分支名稱 :</x:String>
470471
<x:String x:Key="Text.GitFlow.TagPrefix" xml:space="preserve">版本標籤前置詞:</x:String>
471472
<x:String x:Key="Text.GitLFS" xml:space="preserve">Git LFS</x:String>
472473
<x:String x:Key="Text.GitLFS.AddTrackPattern" xml:space="preserve">加入追蹤檔案規則...</x:String>

src/Views/GitFlowStart.axaml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:m="using:SourceGit.Models"
66
xmlns:vm="using:SourceGit.ViewModels"
7+
xmlns:v="using:SourceGit.Views"
78
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
89
x:Class="SourceGit.Views.GitFlowStart"
910
x:DataType="vm:GitFlowStart">
@@ -31,13 +32,20 @@
3132
<TextBlock Grid.Column="0"
3233
HorizontalAlignment="Right" VerticalAlignment="Center"
3334
Margin="0,0,8,0"
34-
Text="{Binding Prefix}"/>
35-
<TextBox Grid.Column="1"
36-
Height="26"
37-
VerticalAlignment="Center"
38-
CornerRadius="3"
39-
PlaceholderText="{DynamicResource Text.GitFlow.StartPlaceholder}"
40-
Text="{Binding Name, Mode=TwoWay}"/>
35+
Text="{DynamicResource Text.GitFlow.StartTarget}"/>
36+
<v:BranchOrTagNameTextBox Grid.Column="1"
37+
Height="26"
38+
VerticalAlignment="Center"
39+
CornerRadius="3"
40+
PlaceholderText="{DynamicResource Text.GitFlow.StartPlaceholder}"
41+
Text="{Binding Name, Mode=TwoWay}"
42+
ClipToBounds="True">
43+
<v:BranchOrTagNameTextBox.InnerLeftContent>
44+
<Border Height="25" Padding="6,0" BorderThickness="0,0,1,0" BorderBrush="{DynamicResource Brush.Border1}">
45+
<TextBlock Text="{Binding Prefix, Mode=OneWay}"/>
46+
</Border>
47+
</v:BranchOrTagNameTextBox.InnerLeftContent>
48+
</v:BranchOrTagNameTextBox>
4149
</Grid>
4250
</StackPanel>
4351
</UserControl>

0 commit comments

Comments
 (0)