dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-30 08:34:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

style<Preference>: new layout for Preference window

Browse source
This commit is contained in:
leo 2021-08-05 16:37:29 +08:00
parent eeeeafbf0a
commit 6f5cfe078e
4 changed files with 28 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/Views/Preference.xaml
View file

@ -69,12 +69,11 @@
<RowDefinition Height="36"/>
<RowDefinition Height="28"/>
<RowDefinition Height="28"/>
<RowDefinition Height="28"/>
<RowDefinition Height="6"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="132"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
@ -90,7 +89,7 @@
Grid.Row="1" Grid.Column="0"
Text="{DynamicResource Text.Preference.Locale}"
HorizontalAlignment="Right"
Margin="0,0,6,0"/>
Margin="0,0,8,0"/>
<ComboBox
Grid.Row="1" Grid.Column="1"
Height="24"
@ -105,7 +104,7 @@
Grid.Row="2" Grid.Column="0"
Text="{DynamicResource Text.Preference.AvatarServer}"
HorizontalAlignment="Right"
Margin="0,0,6,0"/>
Margin="0,0,8,0"/>
<ComboBox
Grid.Row="2" Grid.Column="1"
Height="24"
@ -144,7 +143,7 @@
Grid.Row="8" Grid.Column="0"
Text="{DynamicResource Text.Preference.Git.Path}"
HorizontalAlignment="Right"
Margin="0,0,6,0"/>
Margin="0,0,8,0"/>
<Grid Grid.Row="8" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
@ -171,7 +170,7 @@
Grid.Row="9" Grid.Column="0"
Text="{DynamicResource Text.Preference.Git.Dir}"
HorizontalAlignment="Right"
Margin="0,0,6,0"/>
Margin="0,0,8,0"/>
<Grid Grid.Row="9" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
@ -198,7 +197,7 @@
Grid.Row="10" Grid.Column="0"
Text="{DynamicResource Text.Preference.Git.User}"
HorizontalAlignment="Right"
Margin="0,0,6,0"/>
Margin="0,0,8,0"/>
<controls:TextEdit
Grid.Row="10" Grid.Column="1"
Height="24"
@ -210,7 +209,7 @@
Grid.Row="11" Grid.Column="0"
Text="{DynamicResource Text.Preference.Git.Email}"
HorizontalAlignment="Right"
Margin="0,0,6,0"/>
Margin="0,0,8,0"/>
<controls:TextEdit
Grid.Row="11" Grid.Column="1"
Height="24"
@ -222,7 +221,7 @@
Grid.Row="12" Grid.Column="0"
Text="{DynamicResource Text.Preference.Git.CRLF}"
HorizontalAlignment="Right"
Margin="0,0,6,0"/>
Margin="0,0,8,0"/>
<ComboBox
Grid.Row="12" Grid.Column="1"
Height="24"
@ -251,7 +250,7 @@
Grid.Row="15" Grid.Column="0"
Text="{DynamicResource Text.Preference.Merger.Type}"
HorizontalAlignment="Right"
Margin="0,0,6,0"/>
Margin="0,0,8,0"/>
<ComboBox
Grid.Row="15" Grid.Column="1"
Height="24"
@ -266,7 +265,7 @@
Grid.Row="16" Grid.Column="0"
Text="{DynamicResource Text.Preference.Merger.Path}"
HorizontalAlignment="Right"
Margin="0,0,6,0"/>
Margin="0,0,8,0"/>
<Grid Grid.Row="16" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
@ -287,18 +286,6 @@
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
Icon="{StaticResource Icon.Folder.Open}"/>
</Grid>
<!-- Merge Tool Command -->
<TextBlock
Grid.Row="17" Grid.Column="0"
Text="{DynamicResource Text.Preference.Merger.Cmd}"
HorizontalAlignment="Right"
Margin="0,0,6,0"/>
<TextBlock
Grid.Row="17" Grid.Column="1"
x:Name="txtMergeCmd"
Text="{Binding ElementName=me, Path=MergeCmd}"
Foreground="{DynamicResource Brush.FG2}"/>
</Grid>
</Grid>
</controls:Window>

7
src/Views/Preference.xaml.cs
View file

@ -13,7 +13,6 @@ namespace SourceGit.Views {
public string User { get; set; }
public string Email { get; set; }
public string CRLF { get; set; }
public string MergeCmd { get; set; }
public Preference() {
if (Models.Preference.Instance.IsReady) {
@ -27,9 +26,6 @@ namespace SourceGit.Views {
CRLF = "false";
}
var merger = Models.MergeTool.Supported.Find(x => x.Type == Models.Preference.Instance.MergeTool.Type);
if (merger != null) MergeCmd = merger.Cmd;
InitializeComponent();
}
@ -84,9 +80,6 @@ namespace SourceGit.Views {
var tool = Models.MergeTool.Supported.Find(x => x.Type == type);
if (tool == null) return;
MergeCmd = tool.Cmd;
txtMergeCmd?.GetBindingExpression(TextBlock.TextProperty).UpdateTarget();
if (IsLoaded) {
Models.Preference.Instance.MergeTool.Path = tool.Finder();
txtMergeExec?.GetBindingExpression(TextBox.TextProperty).UpdateTarget();