mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-12-24 20:57:19 -08:00
feature<Welcome>: 欢迎界面增加最近使用记录和收藏/标签列表。支持拖拽,收藏支持自定义目录
This commit is contained in:
parent
b6532c063d
commit
f26c777577
4 changed files with 416 additions and 216 deletions
|
@ -298,8 +298,8 @@
|
|||
<sys:String x:Key="Text.Welcome.Title">SourceGit</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.OpenOrInit">Open Local Repository</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.Clone">Clone Remote Repository</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.Repositories">REPOSITORIES</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.DragDrop">DRAG-DROP YOUR FOLDER</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.Bookmarks">Bookmarks</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.Histories">Histories</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.NewFolder">Add Folder</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.NewSubFolder">Add Sub-Folder</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.Rename">Rename</sys:String>
|
||||
|
|
|
@ -297,8 +297,8 @@
|
|||
<sys:String x:Key="Text.Welcome.Title">欢迎使用本软件</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.OpenOrInit">打开本地仓库</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.Clone">克隆远程仓库</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.Repositories">仓库列表</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.DragDrop">支持拖放操作</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.Bookmarks">收藏/书签</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.Histories">最近使用</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.NewFolder">新建分组</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.NewSubFolder">新建子分组</sys:String>
|
||||
<sys:String x:Key="Text.Welcome.Rename">重命名</sys:String>
|
||||
|
|
|
@ -7,8 +7,7 @@
|
|||
xmlns:widgets="clr-namespace:SourceGit.Views.Widgets"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="800" d:DesignWidth="800">
|
||||
<Grid Background="Transparent" AllowDrop="True" DragEnter="OnPageDragEnter" DragLeave="OnPageDragLeave" Drop="OnPageDrop">
|
||||
<Grid Width="420">
|
||||
<Grid Background="Transparent" AllowDrop="True" Drop="OnPageDrop" MouseMove="OnPageMouseMove" MouseDown="OnPageMouseDown">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
|
@ -55,35 +54,84 @@
|
|||
</StackPanel>
|
||||
</Button>
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
|
||||
<!-- Horizontal line -->
|
||||
<Rectangle Height="1" Margin="0,36,0,8" Fill="{DynamicResource Brush.Border1}"/>
|
||||
<Grid Grid.Row="1" Margin="80,80">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="32"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<!-- Labels -->
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<!-- History -->
|
||||
<TextBlock
|
||||
Grid.Row="0"
|
||||
Grid.Column="0"
|
||||
Text="{DynamicResource Text.Welcome.Histories}"
|
||||
FontSize="13pt" FontWeight="ExtraBold"
|
||||
HorizontalAlignment="Center"
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
<!-- History Tree -->
|
||||
<controls:Tree
|
||||
Grid.Row="1"
|
||||
Grid.Column="0"
|
||||
x:Name="treeHistory"
|
||||
Margin="0,4"
|
||||
TextElement.FontSize="14"
|
||||
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Auto"
|
||||
ContextMenuOpening="OnTreeContextMenuOpening">
|
||||
<controls:Tree.ItemContainerStyle>
|
||||
<Style TargetType="{x:Type controls:TreeItem}" BasedOn="{StaticResource Style.TreeItem}">
|
||||
<EventSetter Event="MouseDoubleClick" Handler="OnTreeNodeDoubleClick"/>
|
||||
</Style>
|
||||
</controls:Tree.ItemContainerStyle>
|
||||
|
||||
<controls:Tree.ItemTemplate>
|
||||
<HierarchicalDataTemplate ItemsSource="{Binding Children}">
|
||||
<Border Height="32">
|
||||
<Grid IsHitTestVisible="False">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="22"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock
|
||||
<controls:Bookmark
|
||||
Grid.Column="0"
|
||||
Text="{DynamicResource Text.Welcome.Repositories}"
|
||||
FontSize="13pt" FontWeight="ExtraBold"
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
Margin="2,0,0,0"
|
||||
x:Name="BookmarkIcon"
|
||||
Width="16" Height="16"
|
||||
Color="{Binding Bookmark}"
|
||||
IsNewPage="False"/>
|
||||
|
||||
<TextBlock
|
||||
Grid.Column="2"
|
||||
Text="{DynamicResource Text.Welcome.DragDrop}"
|
||||
FontSize="10pt"
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
</Grid>
|
||||
<StackPanel Grid.Column="1" x:Name="ContentsHistory" Orientation="Horizontal">
|
||||
<TextBlock Margin="8,0" Text="{Binding Name}"/>
|
||||
<TextBlock x:Name="Path" Text="{Binding Id}" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
</HierarchicalDataTemplate>
|
||||
</controls:Tree.ItemTemplate>
|
||||
</controls:Tree>
|
||||
|
||||
<!-- Bookmark -->
|
||||
<TextBlock
|
||||
Grid.Row="0"
|
||||
Grid.Column="1"
|
||||
Text="{DynamicResource Text.Welcome.Bookmarks}"
|
||||
FontSize="13pt" FontWeight="ExtraBold"
|
||||
HorizontalAlignment="Center"
|
||||
Foreground="{DynamicResource Brush.FG2}"/>
|
||||
|
||||
<!-- Drop Area -->
|
||||
<Rectangle
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
x:Name="dropArea"
|
||||
Margin="0,2"
|
||||
Stroke="{DynamicResource Brush.Border1}"
|
||||
|
@ -95,16 +143,18 @@
|
|||
<!-- Tree -->
|
||||
<controls:Tree
|
||||
Grid.Row="1"
|
||||
x:Name="tree"
|
||||
Margin="2,4"
|
||||
Grid.Column="1"
|
||||
x:Name="treeBookmarks"
|
||||
Margin="0,4"
|
||||
AllowDrop="True"
|
||||
TextElement.FontSize="14"
|
||||
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Auto"
|
||||
ContextMenuOpening="OnTreeContextMenuOpening"
|
||||
MouseMove="OnTreeMouseMove"
|
||||
DragOver="OnTreeDragOver"
|
||||
Drop="OnTreeDrop">
|
||||
DragEnter="OnTreeBookmarksDragEnter"
|
||||
DragLeave="OnTreeBookmarksDragLeave"
|
||||
DragOver="OnTreeBookmarksDragOver"
|
||||
Drop="OnTreeBookmarksDrop">
|
||||
<controls:Tree.ItemContainerStyle>
|
||||
<Style TargetType="{x:Type controls:TreeItem}" BasedOn="{StaticResource Style.TreeItem}">
|
||||
<Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
|
||||
|
@ -135,14 +185,14 @@
|
|||
Color="{Binding Bookmark}"
|
||||
IsNewPage="False"/>
|
||||
|
||||
<StackPanel Grid.Column="1" x:Name="Contents" Orientation="Horizontal">
|
||||
<StackPanel Grid.Column="1" x:Name="ContentsBookmark" Orientation="Horizontal">
|
||||
<TextBlock Margin="8,0" Text="{Binding Name}"/>
|
||||
<TextBlock x:Name="Path" Text="{Binding Id}" Foreground="{DynamicResource Brush.FG2}"/>
|
||||
</StackPanel>
|
||||
|
||||
<controls:TextEdit
|
||||
Grid.Column="1"
|
||||
x:Name="Editor"
|
||||
x:Name="EditorBookmarks"
|
||||
Height="20"
|
||||
Margin="4,0,0,0"
|
||||
Text="{Binding Name}"
|
||||
|
@ -170,13 +220,14 @@
|
|||
<Setter TargetName="Icon" Property="Data" Value="{StaticResource Icon.Folder.Open}"/>
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding IsEditing}" Value="True">
|
||||
<Setter TargetName="Editor" Property="Visibility" Value="Visible"/>
|
||||
<Setter TargetName="Contents" Property="Visibility" Value="Collapsed"/>
|
||||
<Setter TargetName="EditorBookmarks" Property="Visibility" Value="Visible"/>
|
||||
<Setter TargetName="ContentsBookmark" Property="Visibility" Value="Collapsed"/>
|
||||
</DataTrigger>
|
||||
</HierarchicalDataTemplate.Triggers>
|
||||
</HierarchicalDataTemplate>
|
||||
</controls:Tree.ItemTemplate>
|
||||
</controls:Tree>
|
||||
|
||||
</Grid>
|
||||
|
||||
<!-- Popup -->
|
||||
|
|
|
@ -19,8 +19,14 @@ namespace SourceGit.Views.Widgets {
|
|||
/// 树节点数据
|
||||
/// </summary>
|
||||
public class Node : Controls.BindableBase {
|
||||
public string Id { get; set; }
|
||||
public string ParentId { get; set; }
|
||||
public string Id {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
public string ParentId {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
private string name;
|
||||
public string Name {
|
||||
|
@ -28,7 +34,10 @@ namespace SourceGit.Views.Widgets {
|
|||
set => SetProperty(ref name, value);
|
||||
}
|
||||
|
||||
public bool IsGroup { get; set; }
|
||||
public bool IsGroup {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
private bool isEditing = false;
|
||||
public bool IsEditing {
|
||||
|
@ -36,7 +45,10 @@ namespace SourceGit.Views.Widgets {
|
|||
set => SetProperty(ref isEditing, value);
|
||||
}
|
||||
|
||||
public bool IsExpanded { get; set; }
|
||||
public bool IsExpanded {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
private int bookmark = 0;
|
||||
public int Bookmark {
|
||||
|
@ -44,7 +56,10 @@ namespace SourceGit.Views.Widgets {
|
|||
set => SetProperty(ref bookmark, value);
|
||||
}
|
||||
|
||||
public List<Node> Children { get; set; }
|
||||
public List<Node> Children {
|
||||
get;
|
||||
set;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -52,6 +67,8 @@ namespace SourceGit.Views.Widgets {
|
|||
/// </summary>
|
||||
public event Action<Node> OnNodeEdited;
|
||||
|
||||
private bool clearBookmark = false;
|
||||
|
||||
public Welcome() {
|
||||
InitializeComponent();
|
||||
UpdateTree();
|
||||
|
@ -74,15 +91,21 @@ namespace SourceGit.Views.Widgets {
|
|||
#region FUNC_EVENTS
|
||||
private void OnOpenClicked(object sender, RoutedEventArgs e) {
|
||||
var dialog = new Controls.FolderDialog();
|
||||
if (dialog.ShowDialog() == true) CheckAndOpen(dialog.SelectedPath);
|
||||
|
||||
if (dialog.ShowDialog() == true) {
|
||||
CheckAndOpen(dialog.SelectedPath);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnCloneClicked(object sender, RoutedEventArgs e) {
|
||||
if (MakeSureReady()) new Popups.Clone().Show();
|
||||
if (MakeSureReady()) {
|
||||
new Popups.Clone().Show();
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTreeNodeStatusChange(object sender, RoutedEventArgs e) {
|
||||
var node = (sender as Controls.TreeItem).DataContext as Node;
|
||||
|
||||
if (node != null) {
|
||||
var group = Models.Preference.Instance.FindGroup(node.Id);
|
||||
group.IsExpanded = node.IsExpanded;
|
||||
|
@ -92,6 +115,7 @@ namespace SourceGit.Views.Widgets {
|
|||
|
||||
private void OnTreeNodeDoubleClick(object sender, MouseButtonEventArgs e) {
|
||||
var node = (sender as Controls.TreeItem).DataContext as Node;
|
||||
|
||||
if (node != null && !node.IsGroup) {
|
||||
CheckAndOpen(node.Id);
|
||||
e.Handled = true;
|
||||
|
@ -99,7 +123,8 @@ namespace SourceGit.Views.Widgets {
|
|||
}
|
||||
|
||||
private void OnTreeContextMenuOpening(object sender, ContextMenuEventArgs e) {
|
||||
var item = tree.FindItem(e.OriginalSource as DependencyObject);
|
||||
var item = treeHistory.FindItem(e.OriginalSource as DependencyObject);
|
||||
|
||||
if (item == null) {
|
||||
var addFolder = new MenuItem();
|
||||
addFolder.Header = App.Text("Welcome.NewFolder");
|
||||
|
@ -108,16 +133,20 @@ namespace SourceGit.Views.Widgets {
|
|||
UpdateTree(group.Id);
|
||||
ev.Handled = true;
|
||||
};
|
||||
|
||||
var menu = new ContextMenu();
|
||||
menu.Items.Add(addFolder);
|
||||
menu.IsOpen = true;
|
||||
e.Handled = true;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
var node = item.DataContext as Node;
|
||||
if (node == null) return;
|
||||
|
||||
if (node == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
var menu = new ContextMenu();
|
||||
|
||||
if (!node.IsGroup) {
|
||||
var open = new MenuItem();
|
||||
open.Header = App.Text("RepoCM.Open");
|
||||
|
@ -125,56 +154,56 @@ namespace SourceGit.Views.Widgets {
|
|||
CheckAndOpen(node.Id);
|
||||
ev.Handled = true;
|
||||
};
|
||||
|
||||
var explore = new MenuItem();
|
||||
explore.Header = App.Text("RepoCM.Explore");
|
||||
explore.Click += (o, ev) => {
|
||||
Process.Start("explorer", node.Id);
|
||||
ev.Handled = true;
|
||||
};
|
||||
|
||||
var iconBookmark = FindResource("Icon.Bookmark") as Geometry;
|
||||
var bookmark = new MenuItem();
|
||||
bookmark.Header = App.Text("RepoCM.Bookmark");
|
||||
|
||||
for (int i = 0; i < Controls.Bookmark.COLORS.Length; i++) {
|
||||
var icon = new System.Windows.Shapes.Path();
|
||||
icon.Data = iconBookmark;
|
||||
icon.Fill = Controls.Bookmark.COLORS[i];
|
||||
icon.Width = 8;
|
||||
|
||||
var mark = new MenuItem();
|
||||
mark.Icon = icon;
|
||||
mark.Header = $"{i}";
|
||||
|
||||
var refIdx = i;
|
||||
mark.Click += (o, ev) => {
|
||||
var repo = Models.Preference.Instance.FindRepository(node.Id);
|
||||
|
||||
if (repo != null) {
|
||||
repo.Bookmark = refIdx;
|
||||
node.Bookmark = refIdx;
|
||||
OnNodeEdited?.Invoke(node);
|
||||
UpdateTree();
|
||||
}
|
||||
|
||||
ev.Handled = true;
|
||||
};
|
||||
|
||||
bookmark.Items.Add(mark);
|
||||
}
|
||||
|
||||
menu.Items.Add(open);
|
||||
menu.Items.Add(explore);
|
||||
menu.Items.Add(bookmark);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
var addSubFolder = new MenuItem();
|
||||
addSubFolder.Header = App.Text("Welcome.NewSubFolder");
|
||||
addSubFolder.Click += (o, ev) => {
|
||||
var parent = Models.Preference.Instance.FindGroup(node.Id);
|
||||
if (parent != null) parent.IsExpanded = true;
|
||||
|
||||
if (parent != null) {
|
||||
parent.IsExpanded = true;
|
||||
}
|
||||
|
||||
var group = Models.Preference.Instance.AddGroup("New Group", node.Id);
|
||||
UpdateTree(group.Id);
|
||||
ev.Handled = true;
|
||||
};
|
||||
|
||||
menu.Items.Add(addSubFolder);
|
||||
}
|
||||
|
||||
|
@ -184,14 +213,12 @@ namespace SourceGit.Views.Widgets {
|
|||
UpdateTree(node.Id);
|
||||
ev.Handled = true;
|
||||
};
|
||||
|
||||
var delete = new MenuItem();
|
||||
delete.Header = App.Text("Welcome.Delete");
|
||||
delete.Click += (o, ev) => {
|
||||
DeleteNode(node);
|
||||
ev.Handled = true;
|
||||
};
|
||||
|
||||
menu.Items.Add(rename);
|
||||
menu.Items.Add(delete);
|
||||
menu.IsOpen = true;
|
||||
|
@ -201,82 +228,176 @@ namespace SourceGit.Views.Widgets {
|
|||
#endregion
|
||||
|
||||
#region DRAP_DROP_EVENTS
|
||||
private void OnPageDragEnter(object sender, DragEventArgs e) {
|
||||
if (e.Data.GetDataPresent(DataFormats.FileDrop) || e.Data.GetDataPresent(typeof(Node))) {
|
||||
dropArea.Visibility = Visibility.Visible;
|
||||
}
|
||||
private void OnPageMouseDown(object sender, MouseButtonEventArgs e) {
|
||||
var itemHistory = treeHistory.FindItem(e.OriginalSource as DependencyObject);
|
||||
|
||||
if (itemHistory == null) {
|
||||
treeHistory.UnselectAll();
|
||||
}
|
||||
|
||||
private void OnPageDragLeave(object sender, DragEventArgs e) {
|
||||
dropArea.Visibility = Visibility.Hidden;
|
||||
var itemBookmark = treeBookmarks.FindItem(e.OriginalSource as DependencyObject);
|
||||
|
||||
if (itemBookmark == null) {
|
||||
treeBookmarks.UnselectAll();
|
||||
}
|
||||
|
||||
private void OnPageDrop(object sender, DragEventArgs e) {
|
||||
dropArea.Visibility = Visibility.Hidden;
|
||||
clearBookmark = false;
|
||||
}
|
||||
|
||||
private void OnTreeMouseMove(object sender, MouseEventArgs e) {
|
||||
if (e.LeftButton != MouseButtonState.Pressed) return;
|
||||
private void OnPageMouseMove(object sender, MouseEventArgs e) {
|
||||
if (e.LeftButton != MouseButtonState.Pressed) {
|
||||
return;
|
||||
}
|
||||
|
||||
var item = tree.FindItem(e.OriginalSource as DependencyObject);
|
||||
if (item == null) return;
|
||||
var item = treeHistory.FindItem(e.OriginalSource as DependencyObject);
|
||||
|
||||
tree.UnselectAll();
|
||||
if (item == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
treeHistory.UnselectAll();
|
||||
var adorner = new Controls.DragDropAdorner(item);
|
||||
DragDrop.DoDragDrop(item, item.DataContext, DragDropEffects.Move);
|
||||
adorner.Remove();
|
||||
}
|
||||
|
||||
private void OnTreeDragOver(object sender, DragEventArgs e) {
|
||||
if (!e.Data.GetDataPresent(DataFormats.FileDrop) && !e.Data.GetDataPresent(typeof(Node))) return;
|
||||
private void OnPageDrop(object sender, DragEventArgs e) {
|
||||
bool rebuild = false;
|
||||
|
||||
var item = tree.FindItem(e.OriginalSource as DependencyObject);
|
||||
if (item == null) return;
|
||||
if (e.Data.GetDataPresent(DataFormats.FileDrop)) {
|
||||
if (!MakeSureReady()) {
|
||||
return;
|
||||
}
|
||||
|
||||
var paths = e.Data.GetData(DataFormats.FileDrop) as string[];
|
||||
|
||||
foreach (var path in paths) {
|
||||
var dir = new Commands.QueryGitDir(path).Result();
|
||||
|
||||
if (dir != null) {
|
||||
var root = new Commands.GetRepositoryRootPath(path).Result();
|
||||
Models.Preference.Instance.AddRepository(root, dir, "");
|
||||
CheckAndOpen(path);
|
||||
rebuild = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (e.Data.GetDataPresent(typeof(Node))) {
|
||||
var node = e.Data.GetData(typeof(Node)) as Node;
|
||||
|
||||
if (node.IsGroup) {
|
||||
e.Handled = true;
|
||||
return;
|
||||
}
|
||||
else {
|
||||
var repo = Models.Preference.Instance.FindRepository(node.Id);
|
||||
|
||||
if (repo != null && repo.Bookmark != 0 && clearBookmark) {
|
||||
repo.Bookmark = 0;
|
||||
}
|
||||
clearBookmark = false;
|
||||
rebuild = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (rebuild) {
|
||||
UpdateTree();
|
||||
}
|
||||
|
||||
var node = item.DataContext as Node;
|
||||
if (node.IsGroup && !item.IsExpanded) item.IsExpanded = true;
|
||||
e.Handled = true;
|
||||
}
|
||||
|
||||
private void OnTreeDrop(object sender, DragEventArgs e) {
|
||||
bool rebuild = false;
|
||||
dropArea.Visibility = Visibility.Hidden;
|
||||
private void OnTreeBookmarksDragEnter(object sender, DragEventArgs e) {
|
||||
if (e.Data.GetDataPresent(DataFormats.FileDrop) || e.Data.GetDataPresent(typeof(Node))) {
|
||||
dropArea.Visibility = Visibility.Visible;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTreeBookmarksDragLeave(object sender, DragEventArgs e) {
|
||||
dropArea.Visibility = Visibility.Hidden;
|
||||
}
|
||||
|
||||
private void OnTreeBookmarksDragOver(object sender, DragEventArgs e) {
|
||||
if (!e.Data.GetDataPresent(DataFormats.FileDrop) && !e.Data.GetDataPresent(typeof(Node))) {
|
||||
return;
|
||||
}
|
||||
|
||||
var item = treeBookmarks.FindItem(e.OriginalSource as DependencyObject);
|
||||
|
||||
if (item == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
var node = item.DataContext as Node;
|
||||
|
||||
if (node.IsGroup && !item.IsExpanded) {
|
||||
item.IsExpanded = true;
|
||||
}
|
||||
|
||||
clearBookmark = true;
|
||||
|
||||
e.Handled = true;
|
||||
}
|
||||
|
||||
private void OnTreeBookmarksDrop(object sender, DragEventArgs e) {
|
||||
bool rebuild = false;
|
||||
var parent = "";
|
||||
var to = tree.FindItem(e.OriginalSource as DependencyObject);
|
||||
|
||||
clearBookmark = false;
|
||||
dropArea.Visibility = Visibility.Hidden;
|
||||
var to = treeBookmarks.FindItem(e.OriginalSource as DependencyObject);
|
||||
|
||||
if (to != null) {
|
||||
var dst = to.DataContext as Node;
|
||||
parent = dst.IsGroup ? dst.Id : dst.ParentId;
|
||||
}
|
||||
|
||||
if (e.Data.GetDataPresent(DataFormats.FileDrop)) {
|
||||
if (!MakeSureReady()) return;
|
||||
if (!MakeSureReady()) {
|
||||
return;
|
||||
}
|
||||
|
||||
var paths = e.Data.GetData(DataFormats.FileDrop) as string[];
|
||||
|
||||
foreach (var path in paths) {
|
||||
var dir = new Commands.QueryGitDir(path).Result();
|
||||
|
||||
if (dir != null) {
|
||||
var root = new Commands.GetRepositoryRootPath(path).Result();
|
||||
Models.Preference.Instance.AddRepository(root, dir, parent);
|
||||
CheckAndOpen(path);
|
||||
Models.Preference.Instance.AddRepository(root, dir, parent).Bookmark = 1; // 默认添加的标签;
|
||||
// CheckAndOpen(path);
|
||||
rebuild = true;
|
||||
}
|
||||
}
|
||||
} else if (e.Data.GetDataPresent(typeof(Node))) {
|
||||
var src = e.Data.GetData(typeof(Node)) as Node;
|
||||
if (src.IsGroup) {
|
||||
if (!Models.Preference.Instance.IsSubGroup(src.Id, parent)) {
|
||||
Models.Preference.Instance.FindGroup(src.Id).Parent = parent;
|
||||
}
|
||||
else if (e.Data.GetDataPresent(typeof(Node))) {
|
||||
var node = e.Data.GetData(typeof(Node)) as Node;
|
||||
|
||||
if (node.IsGroup) {
|
||||
if (!Models.Preference.Instance.IsSubGroup(node.Id, parent)) {
|
||||
Models.Preference.Instance.FindGroup(node.Id).Parent = parent;
|
||||
rebuild = true;
|
||||
}
|
||||
} else {
|
||||
Models.Preference.Instance.FindRepository(src.Id).GroupId = parent;
|
||||
}
|
||||
else {
|
||||
var repo = Models.Preference.Instance.FindRepository(node.Id);
|
||||
|
||||
if (repo != null) {
|
||||
repo.GroupId = parent;
|
||||
|
||||
if (repo.Bookmark == 0) {
|
||||
repo.Bookmark = 1;
|
||||
}
|
||||
}
|
||||
|
||||
rebuild = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (rebuild) UpdateTree();
|
||||
if (rebuild) {
|
||||
UpdateTree();
|
||||
}
|
||||
|
||||
e.Handled = true;
|
||||
}
|
||||
#endregion
|
||||
|
@ -284,7 +405,8 @@ namespace SourceGit.Views.Widgets {
|
|||
#region DATA
|
||||
private void UpdateTree(string editingNodeId = null) {
|
||||
var groupNodes = new Dictionary<string, Node>();
|
||||
var nodes = new List<Node>();
|
||||
var nodesHistory = new List<Node>();
|
||||
var nodesBookmarks = new List<Node>();
|
||||
|
||||
foreach (var group in Models.Preference.Instance.Groups) {
|
||||
Node node = new Node() {
|
||||
|
@ -297,17 +419,15 @@ namespace SourceGit.Views.Widgets {
|
|||
Bookmark = 0,
|
||||
Children = new List<Node>(),
|
||||
};
|
||||
|
||||
groupNodes.Add(node.Id, node);
|
||||
}
|
||||
|
||||
nodes.Clear();
|
||||
|
||||
foreach (var kv in groupNodes) {
|
||||
if (groupNodes.ContainsKey(kv.Value.ParentId)) {
|
||||
groupNodes[kv.Value.ParentId].Children.Add(kv.Value);
|
||||
} else {
|
||||
nodes.Add(kv.Value);
|
||||
}
|
||||
else {
|
||||
nodesBookmarks.Add(kv.Value);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -322,21 +442,29 @@ namespace SourceGit.Views.Widgets {
|
|||
Bookmark = repo.Bookmark,
|
||||
Children = new List<Node>(),
|
||||
};
|
||||
nodesHistory.Add(node);
|
||||
|
||||
if (repo.Bookmark != 0) {
|
||||
if (groupNodes.ContainsKey(repo.GroupId)) {
|
||||
groupNodes[repo.GroupId].Children.Add(node);
|
||||
} else {
|
||||
nodes.Add(node);
|
||||
}
|
||||
else {
|
||||
nodesBookmarks.Add(node);
|
||||
}
|
||||
}
|
||||
|
||||
tree.ItemsSource = nodes;
|
||||
OnNodeEdited?.Invoke(node);
|
||||
}
|
||||
|
||||
treeHistory.ItemsSource = nodesHistory;
|
||||
treeBookmarks.ItemsSource = nodesBookmarks;
|
||||
}
|
||||
|
||||
private void DeleteNode(Node node) {
|
||||
if (node.IsGroup) {
|
||||
Models.Preference.Instance.RemoveGroup(node.Id);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
Models.Preference.Instance.RemoveRepository(node.Id);
|
||||
}
|
||||
|
||||
|
@ -348,11 +476,14 @@ namespace SourceGit.Views.Widgets {
|
|||
Models.Exception.Raise(App.Text("NotConfigured"));
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private void CheckAndOpen(string path) {
|
||||
if (!MakeSureReady()) return;
|
||||
if (!MakeSureReady()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Directory.Exists(path)) {
|
||||
Models.Exception.Raise(App.Text("PathNotFound", path));
|
||||
|
@ -360,6 +491,7 @@ namespace SourceGit.Views.Widgets {
|
|||
}
|
||||
|
||||
var root = new Commands.GetRepositoryRootPath(path).Result();
|
||||
|
||||
if (root == null) {
|
||||
new Popups.Init(path).Show();
|
||||
return;
|
||||
|
@ -368,28 +500,37 @@ namespace SourceGit.Views.Widgets {
|
|||
var gitDir = new Commands.QueryGitDir(root).Result();
|
||||
var repo = Models.Preference.Instance.AddRepository(root, gitDir, "");
|
||||
Models.Watcher.Open(repo);
|
||||
treeHistory.UnselectAll();
|
||||
treeBookmarks.UnselectAll();
|
||||
}
|
||||
|
||||
public void UpdateNodes(string id, int bookmark, IEnumerable<Node> nodes = null) {
|
||||
if (nodes == null) nodes = tree.ItemsSource.OfType<Node>();
|
||||
if (nodes == null) {
|
||||
nodes = treeHistory.ItemsSource.OfType<Node>();
|
||||
}
|
||||
|
||||
foreach (var node in nodes) {
|
||||
if (!node.IsGroup) {
|
||||
if (node.Id == id) {
|
||||
node.Bookmark = bookmark;
|
||||
Models.Preference.Instance.FindRepository(node.Id).Bookmark = bookmark;
|
||||
UpdateTree();
|
||||
break;
|
||||
}
|
||||
} else if (node.Children.Count > 0) {
|
||||
}
|
||||
else if (node.Children.Count > 0) {
|
||||
UpdateNodes(id, bookmark, node.Children);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RENAME_NODES
|
||||
private void RenameStart(object sender, RoutedEventArgs e) {
|
||||
var edit = sender as Controls.TextEdit;
|
||||
if (edit == null || !edit.IsVisible) return;
|
||||
|
||||
if (edit == null || !edit.IsVisible) {
|
||||
return;
|
||||
}
|
||||
|
||||
edit.SelectAll();
|
||||
edit.Focus();
|
||||
|
@ -399,7 +540,8 @@ namespace SourceGit.Views.Widgets {
|
|||
if (e.Key == Key.Escape) {
|
||||
UpdateTree();
|
||||
e.Handled = true;
|
||||
} else if (e.Key == Key.Enter) {
|
||||
}
|
||||
else if (e.Key == Key.Enter) {
|
||||
RenameEnd(sender, e);
|
||||
e.Handled = true;
|
||||
}
|
||||
|
@ -407,7 +549,10 @@ namespace SourceGit.Views.Widgets {
|
|||
|
||||
private void RenameEnd(object sender, RoutedEventArgs e) {
|
||||
var edit = sender as Controls.TextEdit;
|
||||
if (edit == null) return;
|
||||
|
||||
if (edit == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(edit.Text)) {
|
||||
UpdateTree();
|
||||
|
@ -416,15 +561,19 @@ namespace SourceGit.Views.Widgets {
|
|||
}
|
||||
|
||||
var node = edit.DataContext as Node;
|
||||
|
||||
if (node != null) {
|
||||
node.Name = edit.Text;
|
||||
node.IsEditing = false;
|
||||
|
||||
if (node.IsGroup) {
|
||||
Models.Preference.Instance.RenameGroup(node.Id, edit.Text);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
Models.Preference.Instance.RenameRepository(node.Id, node.Name);
|
||||
OnNodeEdited?.Invoke(node);
|
||||
}
|
||||
|
||||
e.Handled = false;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue