Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-13 05:44:11 +02:00
Code Activity

Fixed file moving issues, multi-select issues

Browse source
This commit is contained in:
Brian Fiete 2021-01-21 05:19:27 -08:00
parent 5dfb4a8f2e
commit 0543dfec65
2 changed files with 94 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

8
IDE/src/Project.bf
View file

@ -280,6 +280,14 @@ namespace IDE
if ((wasWatching) && (changePath)) if ((wasWatching) && (changePath))
StartWatching(); StartWatching();
} }
public void RecalcPath()
{
mPath.Clear();
mPath.Append(mParentFolder.mPath);
mPath.Append(Path.DirectorySeparatorChar);
mPath.Append(mName);
}
} }
public class ProjectSource : ProjectFileItem public class ProjectSource : ProjectFileItem

37
IDE/src/ui/ProjectPanel.bf
View file

@ -321,12 +321,15 @@ namespace IDE.ui
var destPath = targetProjectFolder.GetFullImportPath(.. scope .()); var destPath = targetProjectFolder.GetFullImportPath(.. scope .());
destPath.AppendF($"{Path.DirectorySeparatorChar}{sourceProjectFileItem.mName}"); destPath.AppendF($"{Path.DirectorySeparatorChar}{sourceProjectFileItem.mName}");
if (!targetProjectFolder.mChildMap.TryAdd(sourceProjectFileItem.mName, sourceProjectFileItem))
{
fileErrors.Add(scope:: .(destPath));
}
else
{
if (File.Move(sourcePath, destPath) case .Ok) if (File.Move(sourcePath, destPath) case .Ok)
{ {
gApp.FileRenamed(sourceProjectFileItem, sourcePath, destPath); gApp.FileRenamed(sourceProjectFileItem, sourcePath, destPath);
}
else
fileErrors.Add(scope:: .(destPath));
if (targetProjectFolder != sourceProjectItem.mParentFolder) if (targetProjectFolder != sourceProjectItem.mParentFolder)
{ {
@ -336,6 +339,15 @@ namespace IDE.ui
targetListItem.AddChildAtIndex(0, source); targetListItem.AddChildAtIndex(0, source);
targetListItem.mOpenButton.Open(true, false); targetListItem.mOpenButton.Open(true, false);
targetProjectFolder.AddChildAtIndex(0, sourceProjectItem); targetProjectFolder.AddChildAtIndex(0, sourceProjectItem);
sourceProjectFileItem.RecalcPath();
}
}
else
{
targetProjectFolder.mChildMap.Remove(sourceProjectFileItem.mName);
fileErrors.Add(scope:: .(destPath));
}
} }
} }
} }
@ -2309,8 +2321,7 @@ namespace IDE.ui
item = menu.AddItem("Ignore"); item = menu.AddItem("Ignore");
item.mOnMenuItemSelected.Add(new (item) => item.mOnMenuItemSelected.Add(new (item) =>
{ {
var selectedItem = GetSelectedItem(); mListView.GetRoot().WithSelectedItems(scope (selectedItem) =>
if (selectedItem != null)
{ {
ProjectItem projectItem; ProjectItem projectItem;
mListViewToProjectMap.TryGetValue(selectedItem, out projectItem); mListViewToProjectMap.TryGetValue(selectedItem, out projectItem);
@ -2320,7 +2331,7 @@ namespace IDE.ui
projectItem.mIncludeKind = .Ignore; projectItem.mIncludeKind = .Ignore;
projectItem.mProject.SetChanged(); projectItem.mProject.SetChanged();
} }
} });
}); });
} }
else if (projectItem.mIncludeKind == .Manual) else if (projectItem.mIncludeKind == .Manual)
@ -2338,8 +2349,11 @@ namespace IDE.ui
item = menu.AddItem("Unignore"); item = menu.AddItem("Unignore");
item.mOnMenuItemSelected.Add(new (item) => item.mOnMenuItemSelected.Add(new (item) =>
{ {
var projectItem = GetSelectedProjectItem(); mListView.GetRoot().WithSelectedItems(scope (selectedItem) =>
if ((projectItem != null) && (projectItem.mIncludeKind == .Ignore)) {
ProjectItem projectItem;
mListViewToProjectMap.TryGetValue(selectedItem, out projectItem);
if (projectItem.mIncludeKind == .Ignore)
{ {
if (projectItem.mParentFolder.IsIgnored()) if (projectItem.mParentFolder.IsIgnored())
projectItem.mIncludeKind = .Auto; projectItem.mIncludeKind = .Auto;
@ -2347,6 +2361,7 @@ namespace IDE.ui
Unignore(projectItem); Unignore(projectItem);
} }
}); });
});
} }
if (let projectFolder = projectItem as ProjectFolder) if (let projectFolder = projectItem as ProjectFolder)
@ -2360,7 +2375,10 @@ namespace IDE.ui
item.mOnMenuItemSelected.Add(new (item) => item.mOnMenuItemSelected.Add(new (item) =>
{ {
let projectItem = GetSelectedProjectItem(); mListView.GetRoot().WithSelectedItems(scope (selectedItem) =>
{
ProjectItem projectItem;
mListViewToProjectMap.TryGetValue(selectedItem, out projectItem);
if (let projectFolder = projectItem as ProjectFolder) if (let projectFolder = projectItem as ProjectFolder)
{ {
projectFolder.mProject.SetChanged(); projectFolder.mProject.SetChanged();
@ -2409,6 +2427,7 @@ namespace IDE.ui
} }
} }
}); });
});
} }
} }