Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[NEW_FEATURE] Automatic Backup System (in progress).

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1207 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2014-03-31 20:44:17 +00:00
parent 33189832ba
commit 6f7689170d
1 changed files with 51 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
PowerEditor/src/Notepad_plus.cpp
View File

@ -4254,12 +4254,20 @@ void Notepad_plus::getCurrentOpenedFiles(Session & session)
session._activeSubIndex = _subDocTab.getCurrentTabIndex();
//Use _invisibleEditView to temporarily open documents to retrieve markers
//Buffer * mainBuf = _mainEditView.getCurrentBuffer();
//Buffer * subBuf = _subEditView.getCurrentBuffer();
Document oldDoc = _invisibleEditView.execute(SCI_GETDOCPOINTER);
for (int i = 0, len = _mainDocTab.nbItem(); i < len ; ++i)
const int nbElem = 2;
DocTabView *docTab[nbElem];
docTab[0] = &_mainDocTab;
docTab[1] = &_subDocTab;
for (size_t k = 0; k < nbElem; ++k)
{
BufferID bufID = _mainDocTab.getBufferByIndex(i);
for (int i = 0, len = docTab[k]->nbItem(); i < len ; ++i)
{
BufferID bufID = docTab[k]->getBufferByIndex(i);
ScintillaEditView *editView = k == 0?&_mainEditView:&_subEditView;
int activeIndex = int(k == 0?session._activeMainIndex:session._activeSubIndex);
vector<sessionFileInfo> *viewFiles = (vector<sessionFileInfo> *)(k == 0?&(session._mainViewFiles):&(session._subViewFiles));
Buffer * buf = MainFileManager->getBufferByID(bufID);
if (!buf->isUntitled())
@ -4278,10 +4286,8 @@ void Notepad_plus::getCurrentOpenedFiles(Session & session)
{
generic_string languageName = getLangFromMenu(buf);
const TCHAR *langName = languageName.c_str();
sessionFileInfo sfi(buf->getFullPathName(), langName, buf->getEncoding(), buf->getPosition(editView), buf->getBackupFileName().c_str(), int(buf->getLastModifiedTimestamp()));
sessionFileInfo sfi(buf->getFullPathName(), langName, buf->getEncoding(), buf->getPosition(&_mainEditView), buf->getBackupFileName().c_str(), int(buf->getLastModifiedTimestamp()));
//_mainEditView.activateBuffer(buf->getID());
_invisibleEditView.execute(SCI_SETDOCPOINTER, 0, buf->getDocument());
int maxLine = _invisibleEditView.execute(SCI_GETLINECOUNT);
@ -4293,16 +4299,15 @@ void Notepad_plus::getCurrentOpenedFiles(Session & session)
}
}
if (i == int(session._activeMainIndex))
if (i == activeIndex)
{
_mainEditView.getCurrentFoldStates(sfi._foldStates);
editView->getCurrentFoldStates(sfi._foldStates);
}
else
{
sfi._foldStates = buf->getHeaderLineState(&_mainEditView);
sfi._foldStates = buf->getHeaderLineState(editView);
}
session._mainViewFiles.push_back(sfi);
viewFiles->push_back(sfi);
}
// We enable Wow64 system, if it was disabled
@ -4313,39 +4318,6 @@ void Notepad_plus::getCurrentOpenedFiles(Session & session)
}
}
}
for (int i = 0, len = _subDocTab.nbItem(); i < len ; ++i)
{
BufferID bufID = _subDocTab.getBufferByIndex(i);
Buffer * buf = MainFileManager->getBufferByID(bufID);
if (!buf->isUntitled() && PathFileExists(buf->getFullPathName()))
{
generic_string languageName = getLangFromMenu( buf );
const TCHAR *langName = languageName.c_str();
sessionFileInfo sfi(buf->getFullPathName(), langName, buf->getEncoding(), buf->getPosition(&_subEditView), buf->getBackupFileName().c_str(), int(buf->getLastModifiedTimestamp()));
_invisibleEditView.execute(SCI_SETDOCPOINTER, 0, buf->getDocument());
int maxLine = _invisibleEditView.execute(SCI_GETLINECOUNT);
for (int j = 0 ; j < maxLine ; ++j)
{
if ((_invisibleEditView.execute(SCI_MARKERGET, j)&(1 << MARK_BOOKMARK)) != 0)
{
sfi.marks.push_back(j);
}
}
if (i == int(session._activeSubIndex))
{
_subEditView.getCurrentFoldStates(sfi._foldStates);
}
else
{
sfi._foldStates = buf->getHeaderLineState(&_subEditView);
}
session._subViewFiles.push_back(sfi);
}
}
_invisibleEditView.execute(SCI_SETDOCPOINTER, 0, oldDoc);
}