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

Start of package management

Browse source
This commit is contained in:
Brian Fiete 2021-02-25 08:10:21 -08:00
parent e517a9745a
commit e6c4a95ccd
25 changed files with 4316 additions and 692 deletions
Download patch file Download diff file Expand all files Collapse all files

9
IDE/src/ui/InstalledProjectDialog.bf
View file

@ -69,7 +69,7 @@ namespace IDE.ui
{
InstalledProject installedProject = new .();
installedProject.mName = new String(registryEntry.mProjName);
switch (registryEntry.mLocation.mVerSpec)
switch (registryEntry.mLocation)
{
case .Path(let path):
installedProject.mPath = new String();
@ -176,13 +176,12 @@ namespace IDE.ui
let entry = mFilteredList[idx];
let verSpec = new VerSpecRecord();
verSpec.SetSemVer("*");
VerSpec verSpec = .SemVer(new .("*"));
defer verSpec.Dispose();
let project = gApp.mProjectPanel.ImportProject(entry.mPath, verSpec);
if (project == null)
{
delete verSpec;
return;
}
if (project.mProjectName != entry.mName)
@ -195,7 +194,7 @@ namespace IDE.ui
{
if (projectSpec.mProjectName == project.mProjectName)
{
projectSpec.mVerSpec.SetPath(relProjectPath);
projectSpec.mVerSpec = .Path(new String(relProjectPath));
}
}
}

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

@ -84,7 +84,13 @@ namespace IDE.ui
if (project != null)
{
hasChanged = project.mHasChanged;
if (project.mLocked)
if (project.mDeferState != .None)
{
//g.Draw(DarkTheme.sDarkTheme.GetImage(.LockIcon), g.mFont.GetWidth(mLabel) + mLabelOffset + LabelX + GS!(-3), 0);
g.DrawString(scope String()..Append('.', 1 + (mUpdateCnt / 20) % 3), g.mFont.GetWidth(mLabel) + mLabelOffset + LabelX + GS!(3), 0);
changeX += GS!(12);
}
else if (project.mLocked)
{
g.Draw(DarkTheme.sDarkTheme.GetImage(.LockIcon), g.mFont.GetWidth(mLabel) + mLabelOffset + LabelX + GS!(-3), 0);
changeX += GS!(12);
@ -1986,7 +1992,7 @@ namespace IDE.ui
}
}
public Project ImportProject(String filePath, VerSpecRecord verSpec = null)
public Project ImportProject(String filePath, VerSpec verSpec = .None)
{
if (!File.Exists(filePath))
{

3
IDE/src/ui/ProjectProperties.bf
View file

@ -741,8 +741,7 @@ namespace IDE.ui
{
var dep = new Project.Dependency();
dep.mProjectName = new String(listViewItem.mLabel);
dep.mVerSpec = new .();
dep.mVerSpec.SetSemVer("*");
dep.mVerSpec = .SemVer(new .("*"));
mProject.mDependencies.Add(dep);
}
}

6
IDE/src/ui/StatusBar.bf
View file

@ -167,7 +167,7 @@ namespace IDE.ui
mConfigComboBox.mDisabled = !canChangeConfig;
mPlatformComboBox.mDisabled = !canChangeConfig;
if ((gApp.IsCompiling || gApp.mRunningTestScript) && (mUpdateCnt % 8 == 0))
if ((gApp.IsCompiling || gApp.mRunningTestScript || (gApp.mWorkspace.mProjectLoadState == .Preparing)) && (mUpdateCnt % 8 == 0))
MarkDirtyEx(8);
var debugState = gApp.mDebugger.GetRunState();
@ -398,6 +398,10 @@ namespace IDE.ui
{
DrawStatusBox("Const Evaluation");
}
else if (gApp.mWorkspace.mProjectLoadState == .Preparing)
{
DrawStatusBox("Loading Projects");
}
else
mStatusBoxUpdateCnt = -1;