forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

project context menu in workspace tree

This commit is contained in:
Vadim Lopatin 2015-12-10 13:30:04 +03:00
parent a32119b914
commit adc2f7f4ec
2 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/dlangide/ui/frame.d
View File

@ -128,15 +128,16 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener {
}); });
} }
protected void buildAndRunProject() { protected void buildAndRunProject(Project project) {
if (!currentWorkspace) if (!currentWorkspace)
return; return;
Project project = currentWorkspace.startupProject; if (!project)
project = currentWorkspace.startupProject;
if (!project) { if (!project) {
window.showMessageBox(UIString("Cannot run project"d), UIString("Startup project is not specified"d)); window.showMessageBox(UIString("Cannot run project"d), UIString("Startup project is not specified"d));
return; return;
} }
buildProject(BuildOperation.Build, delegate(int result) { buildProject(BuildOperation.Build, project, delegate(int result) {
if (!result) { if (!result) {
runProject(); runProject();
} }
@ -678,26 +679,26 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener {
return true; return true;
case IDEActions.BuildProject: case IDEActions.BuildProject:
case IDEActions.BuildWorkspace: case IDEActions.BuildWorkspace:
buildProject(BuildOperation.Build); buildProject(BuildOperation.Build, cast(Project)a.objectParam);
return true; return true;
case IDEActions.RebuildProject: case IDEActions.RebuildProject:
case IDEActions.RebuildWorkspace: case IDEActions.RebuildWorkspace:
buildProject(BuildOperation.Rebuild); buildProject(BuildOperation.Rebuild, cast(Project)a.objectParam);
return true; return true;
case IDEActions.CleanProject: case IDEActions.CleanProject:
case IDEActions.CleanWorkspace: case IDEActions.CleanWorkspace:
buildProject(BuildOperation.Clean); buildProject(BuildOperation.Clean, cast(Project)a.objectParam);
return true; return true;
case IDEActions.DebugStart: case IDEActions.DebugStart:
case IDEActions.DebugStartNoDebug: case IDEActions.DebugStartNoDebug:
case IDEActions.DebugContinue: case IDEActions.DebugContinue:
buildAndRunProject(); buildAndRunProject(cast(Project)a.objectParam);
return true; return true;
case IDEActions.DebugStop: case IDEActions.DebugStop:
stopExecution(); stopExecution();
return true; return true;
case IDEActions.UpdateProjectDependencies: case IDEActions.UpdateProjectDependencies:
buildProject(BuildOperation.Upgrade); buildProject(BuildOperation.Upgrade, cast(Project)a.objectParam);
return true; return true;
case IDEActions.RefreshProject: case IDEActions.RefreshProject:
refreshWorkspace(); refreshWorkspace();
@ -1075,16 +1076,22 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener {
} }
} }
void buildProject(BuildOperation buildOp, BuildResultListener listener = null) { void buildProject(BuildOperation buildOp, Project project, BuildResultListener listener = null) {
if (!currentWorkspace || !currentWorkspace.startupProject) { if (!currentWorkspace) {
_logPanel.logLine("No workspace is opened");
return;
}
if (!project)
project = currentWorkspace.startupProject;
if (!project) {
_logPanel.logLine("No project is opened"); _logPanel.logLine("No project is opened");
return; return;
} }
ProjectSettings projectSettings = currentWorkspace.startupProject.settings; ProjectSettings projectSettings = project.settings;
string toolchain = projectSettings.getToolchain(_settings); string toolchain = projectSettings.getToolchain(_settings);
string arch = projectSettings.getArch(_settings); string arch = projectSettings.getArch(_settings);
bool verbose = projectSettings.buildVerbose; bool verbose = projectSettings.buildVerbose;
Builder op = new Builder(this, currentWorkspace.startupProject, _logPanel, currentWorkspace.projectConfiguration, currentWorkspace.buildConfiguration, buildOp, Builder op = new Builder(this, project, _logPanel, currentWorkspace.projectConfiguration, currentWorkspace.buildConfiguration, buildOp,
verbose, verbose,
toolchain, toolchain,
arch, arch,

23
src/dlangide/ui/wspanel.d
View File

@ -79,9 +79,15 @@ class WorkspacePanel : DockWindow {
ACTION_FILE_WORKSPACE_CLOSE); ACTION_FILE_WORKSPACE_CLOSE);
_projectPopupMenu = new MenuItem(); _projectPopupMenu = new MenuItem();
_projectPopupMenu.add(ACTION_FILE_NEW_SOURCE_FILE, _projectPopupMenu.add(ACTION_PROJECT_SET_STARTUP,
ACTION_PROJECT_FOLDER_REFRESH, ACTION_PROJECT_FOLDER_REFRESH,
ACTION_PROJECT_FOLDER_OPEN_ITEM, ACTION_FILE_NEW_SOURCE_FILE,
//ACTION_PROJECT_FOLDER_OPEN_ITEM,
ACTION_PROJECT_BUILD,
ACTION_PROJECT_REBUILD,
ACTION_PROJECT_CLEAN,
ACTION_PROJECT_UPDATE_DEPENDENCIES,
ACTION_PROJECT_SETTINGS,
//ACTION_PROJECT_FOLDER_REMOVE_ITEM //ACTION_PROJECT_FOLDER_REMOVE_ITEM
); );
@ -172,12 +178,25 @@ class WorkspacePanel : DockWindow {
foreach(project; _workspace.projects) { foreach(project; _workspace.projects) {
TreeItem p = root.newChild(project.filename, project.name, project.isDependency ? "project-d-dependency" : "project-d"); TreeItem p = root.newChild(project.filename, project.name, project.isDependency ? "project-d-dependency" : "project-d");
p.intParam = ProjectItemType.Project; p.intParam = ProjectItemType.Project;
p.objectParam = project;
addProjectItems(p, project.items); addProjectItems(p, project.items);
} }
} else { } else {
_tree.items.newChild("none", "No workspace"d, "project-development"); _tree.items.newChild("none", "No workspace"d, "project-development");
} }
_tree.onTreeContentChange(null); _tree.onTreeContentChange(null);
if (_workspace) {
TreeItem root = _tree.items.child(0);
for (int i = 0; i < root.childCount; i++) {
TreeItem child = root.child(i);
if (child.intParam == ProjectItemType.Project) {
Object obj = child.objectParam;
Project prj = cast(Project)obj;
if (prj && prj.isDependency)
child.collapse();
}
}
}
} }
@property void workspace(Workspace w) { @property void workspace(Workspace w) {