Skip to content

Commit b2391e4

Browse files
committed
更改默认设置,添加预览图
1 parent 928d4f1 commit b2391e4

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

GitSquash.VisualStudio.Extension/GitSquash.VisualStudio.Extension/GitSquash.VisualStudio.Extension.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@
113113
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
114114
<IncludeInVSIX>true</IncludeInVSIX>
115115
</Content>
116+
<Content Include="Resources\preview.png">
117+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
118+
<IncludeInVSIX>true</IncludeInVSIX>
119+
</Content>
116120
<Content Include="Resources\SquashIcon.ico">
117121
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
118122
<IncludeInVSIX>true</IncludeInVSIX>
Loading

GitSquash.VisualStudio.Extension/GitSquash.VisualStudio.Extension/View/SquashView.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<wpf:TextBlockControl Text="分支:" Margin="6,6,3,0" />
8585
<teamExplorer:TextLink Text="{Binding CurrentBranch.FriendlyName}" Margin="3,6,3,0" Command="{Binding ChangeBranch}" />
8686
</StackPanel>
87-
<framework:SectionControl HeaderText="父提交" IsExpanded="False" Margin="0,6,0,0" IsBusy="{Binding IsBusy}" ShowProgressWhenBusy="True" >
87+
<framework:SectionControl HeaderText="父提交" IsExpanded="True" Margin="0,6,0,0" IsBusy="{Binding IsBusy}" ShowProgressWhenBusy="True" >
8888
<framework:SectionControl.Content>
8989
<Grid>
9090
<Grid.RowDefinitions>
@@ -107,7 +107,7 @@
107107

108108
</ComboBox>
109109
</StackPanel>
110-
<DataGrid Grid.Row="1" IsReadOnly="True" SelectionMode="Single" SelectedValue="{Binding SelectedCommit}" ItemsSource="{Binding BranchCommits}" AutoGenerateColumns="False" Margin="0,0,6,0">
110+
<DataGrid Grid.Row="1" IsReadOnly="True" SelectionMode="Single" SelectedValue="{Binding SelectedCommit}" ItemsSource="{Binding BranchCommits}" AutoGenerateColumns="False" Margin="0,0,6,0" Background="{x:Null}" BorderBrush="{x:Null}">
111111
<DataGrid.Columns>
112112
<DataGridTextColumn MaxWidth="50" Binding="{Binding Sha, Converter={converters:PrefixValueConverter PrefixLength=6}}" Header="ID"/>
113113
<DataGridTextColumn Binding="{Binding MessageShort}" Width="250" Header="消息" />

GitSquash.VisualStudio.Extension/GitSquash.VisualStudio.Extension/source.extension.vsixmanifest

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="GitSquash.VisualStudio.Extension.Glenn Watson.9d974827-f458-4741-b96c-f6926984b1d8" Version="1.1.0.15" Language="en-US" Publisher="Glenn Watson" />
4+
<Identity Id="GitSquash.VisualStudio.Extension.Glenn Watson.9d974827-f458-4741-b96c-f6926984b1d8" Version="1.2.0.1" Language="zh-Hans" Publisher="Glenn Watson,Colin Zeb" />
55
<DisplayName>Git Squash</DisplayName>
6-
<Description xml:space="preserve">Allows rebasing with squash in Visual Studio Team Explorer</Description>
7-
<MoreInfo>https://github.com/glennawatson/GitSquash-VIsualStudio</MoreInfo>
6+
<Description xml:space="preserve">实现在VS的团队资源管理器中执行拉取变基</Description>
7+
<MoreInfo>https://github.com/ColinZeb/GitSquash-VIsualStudio</MoreInfo>
88
<License>License.rtf</License>
99
<Icon>Resources\compress.ico</Icon>
10+
<PreviewImage>preview.png</PreviewImage>
1011
<Tags>Git Squash Rebase</Tags>
1112
</Metadata>
1213
<Installation>

0 commit comments

Comments
 (0)