vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only ask to save if document has been changed. Remembers old save-points. Also corrected an error message.

Browse Source
This commit is contained in:
Erik Faye-Lund 2008-10-14 12:28:13 +00:00
parent b0224c0f2b
commit 45a9afd6bf
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/syncdocument.cpp
View File

@ -57,6 +57,8 @@ bool SyncDocument::load(const std::string &fileName)
} }
} }
this->exec(multiCmd); this->exec(multiCmd);
savePointDelta = 0;
savePointUnreachable = false;
} }
catch(_com_error &e) catch(_com_error &e)
{ {
@ -108,13 +110,14 @@ bool SyncDocument::save(const std::string &fileName)
trackElem->appendChild(keyElem); trackElem->appendChild(keyElem);
} }
} }
doc->save(fileName.c_str()); doc->save(fileName.c_str());
savePointDelta = 0;
savePointUnreachable = false;
} }
catch(_com_error &e) catch(_com_error &e)
{ {
char temp[256]; char temp[256];
_snprintf(temp, 256, "Error loading: %s\n", (const char*)_bstr_t(e.Description())); _snprintf(temp, 256, "Error saving: %s\n", (const char*)_bstr_t(e.Description()));
MessageBox(NULL, temp, NULL, MB_OK | MB_ICONERROR | MB_SETFOREGROUND); MessageBox(NULL, temp, NULL, MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
return false; return false;
} }

22
editor/syncdocument.h
View File

@ -15,7 +15,7 @@
class SyncDocument : public sync::Data class SyncDocument : public sync::Data
{ {
public: public:
SyncDocument() : sync::Data(), clientPaused(true) {} SyncDocument() : sync::Data(), clientPaused(true), savePointDelta(0), savePointUnreachable(true) {}
~SyncDocument(); ~SyncDocument();
size_t createTrack(const std::basic_string<TCHAR> &name) size_t createTrack(const std::basic_string<TCHAR> &name)
@ -219,6 +219,9 @@ public:
undoStack.push(cmd); undoStack.push(cmd);
cmd->exec(this); cmd->exec(this);
clearRedoStack(); clearRedoStack();
if (savePointDelta < 0) savePointUnreachable = true;
savePointDelta++;
} }
bool undo() bool undo()
@ -230,6 +233,9 @@ public:
redoStack.push(cmd); redoStack.push(cmd);
cmd->undo(this); cmd->undo(this);
savePointDelta--;
return true; return true;
} }
@ -242,6 +248,9 @@ public:
undoStack.push(cmd); undoStack.push(cmd);
cmd->exec(this); cmd->exec(this);
savePointDelta++;
return true; return true;
} }
@ -294,6 +303,12 @@ public:
bool load(const std::string &fileName); bool load(const std::string &fileName);
bool save(const std::string &fileName); bool save(const std::string &fileName);
bool modified()
{
if (savePointUnreachable) return true;
return 0 != savePointDelta;
}
NetworkSocket clientSocket; NetworkSocket clientSocket;
std::map<size_t, size_t> clientRemap; std::map<size_t, size_t> clientRemap;
@ -301,6 +316,11 @@ public:
private: private:
std::vector<size_t> trackOrder; std::vector<size_t> trackOrder;
// undo / redo functionality
std::stack<Command*> undoStack; std::stack<Command*> undoStack;
std::stack<Command*> redoStack; std::stack<Command*> redoStack;
int savePointDelta; // how many undos must be done to get to the last saved state
bool savePointUnreachable; // is the save-point reachable?
}; };

10
editor/synctracker2.cpp
View File

@ -325,9 +325,13 @@ void fileSave()
void attemptQuit() void attemptQuit()
{ {
UINT res = MessageBox(hwnd, _T("Save before exit?"), mainWindowTitle, MB_YESNOCANCEL | MB_ICONQUESTION); if (document.modified())
if (IDYES == res) fileSave(); {
if (IDCANCEL != res) DestroyWindow(hwnd); UINT res = MessageBox(hwnd, _T("Save before exit?"), mainWindowTitle, MB_YESNOCANCEL | MB_ICONQUESTION);
if (IDYES == res) fileSave();
if (IDCANCEL != res) DestroyWindow(hwnd);
}
else DestroyWindow(hwnd);
} }