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

additional fixes for restoring recent files - #275 #73 after PR 273

This commit is contained in:
Vadim Lopatin 2017-09-12 12:03:02 +03:00
parent 251fd6b8f7
commit f609859598
2 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -12,7 +12,7 @@
"stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi", "views/res/hdpi"],
"dependencies": {
"dlangui": "==0.9.124",
"dlangui": "==0.9.125",
"dsymbol": "~>0.2.9",
"dcd": "~>0.9.1"
},

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

@ -448,6 +448,7 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
editor.editorTool = new DEditorTool(this);
else
editor.editorTool = new DefaultEditorTool(this);
_tabs.layout(_tabs.pos);
} else {
destroy(editor);
if (window)
@ -1156,8 +1157,10 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
}
void closeWorkspace() {
if (currentWorkspace)
if (currentWorkspace) {
saveListOfOpenedFiles();
currentWorkspace.save();
}
askForUnsavedEdits(delegate() {
setWorkspace(null);
showHomeScreen();
@ -1421,16 +1424,7 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
dcdInterface.warmUp(project.importPaths);
}
void openFileOrWorkspace(string filename) {
// Open DlangIDE workspace file
if (filename.isWorkspaceFile) {
Workspace ws = new Workspace(this);
if (ws.load(filename)) {
askForUnsavedEdits(delegate() {
setWorkspace(ws);
hideHomeScreen();
// Write workspace to recent workspaces list
_settings.updateRecentWorkspace(filename);
void restoreListOfOpenedFiles() {
// All was opened, attempt to restore files
WorkspaceFile[] files = currentWorkspace.files();
for (int i; i < files.length; i++)
@ -1443,9 +1437,40 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
// file is opened in tab
auto source = cast(DSourceEdit)_tabs.tabBody(filename);
// Caret position
source.setCaretPos(column, row);
source.setCaretPos(column, row, true, true);
}
}
}
void saveListOfOpenedFiles() {
WorkspaceFile[] files;
for (auto i = 0; i < _tabs.tabCount(); i++)
{
auto edit = cast(DSourceEdit)_tabs.tabBody(i);
if (edit !is null) {
auto file = new WorkspaceFile();
file.filename = edit.filename();
file.row = edit.caretPos.pos;
file.column = edit.caretPos.line;
files ~= file;
}
}
currentWorkspace.files(files);
// saving workspace
currentWorkspace.save();
}
void openFileOrWorkspace(string filename) {
// Open DlangIDE workspace file
if (filename.isWorkspaceFile) {
Workspace ws = new Workspace(this);
if (ws.load(filename)) {
askForUnsavedEdits(delegate() {
setWorkspace(ws);
hideHomeScreen();
// Write workspace to recent workspaces list
_settings.updateRecentWorkspace(filename);
restoreListOfOpenedFiles();
});
} else {
window.showMessageBox(UIString.fromId("ERROR_OPEN_WORKSPACE"c).value, UIString.fromId("ERROR_OPENING_WORKSPACE"c).value);
@ -1620,21 +1645,7 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
askForUnsavedEdits(delegate() {
if (currentWorkspace) {
// Remember opened files
WorkspaceFile[] files;
for (auto i = 0; i < _tabs.tabCount(); i++)
{
auto edit = cast(DSourceEdit)_tabs.tabBody(i);
if (edit !is null) {
auto file = new WorkspaceFile();
file.filename = edit.filename();
file.row = edit.caretPos.pos;
file.column = edit.caretPos.line;
files ~= file;
}
}
currentWorkspace.files(files);
// saving workspace
currentWorkspace.save();
saveListOfOpenedFiles();
}
window.close();
});