krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

moved document state enum to a separate file

Browse source
This commit is contained in:
Marc Zinnschlag 2012-12-08 14:44:03 +01:00
parent fdc7e93835
commit a2b4f43176
8 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/CMakeLists.txt
View file

@ -17,7 +17,7 @@ set (OPENCS_SRC
set (OPENCS_HDR
editor.hpp
model/doc/documentmanager.hpp model/doc/document.hpp
model/doc/documentmanager.hpp model/doc/document.hpp model/doc/state.hpp
model/world/universalid.hpp model/world/record.hpp model/world/idcollection.hpp model/world/data.hpp
model/world/idtable.hpp model/world/columns.hpp model/world/idtableproxymodel.hpp

5
apps/opencs/model/doc/document.cpp
View file

@ -16,7 +16,6 @@ CSMDoc::Document::Document (const std::string& name)
// dummy implementation -> remove when proper verify is implemented.
mVerifyCount = 0;
}
QUndoStack& CSMDoc::Document::getUndoStack()
@ -32,10 +31,10 @@ int CSMDoc::Document::getState() const
state |= State_Modified;
if (mSaveCount)
state |= State_Locked | State_Saving;
state |= State_Locked | State_Saving | State_Operation;
if (mVerifyCount)
state |= State_Locked | State_Verifying;
state |= State_Locked | State_Verifying | State_Operation;
return state;
}

14
apps/opencs/model/doc/document.hpp
View file

@ -11,24 +11,14 @@
#include "../tools/tools.hpp"
#include "state.hpp"
namespace CSMDoc
{
class Document : public QObject
{
Q_OBJECT
public:
enum State
{
State_Modified = 1,
State_Locked = 2,
State_Saving = 4,
State_Verifying = 8,
State_Compiling = 16, // not implemented yet
State_Searching = 32 // not implemented yet
};
private:
std::string mName; ///< \todo replace name with ESX list

19
apps/opencs/model/doc/state.hpp Normal file
View file

@ -0,0 +1,19 @@
#ifndef CSM_DOC_STATE_H
#define CSM_DOC_STATE_H
namespace CSMDoc
{
enum State
{
State_Modified = 1,
State_Locked = 2,
State_Operation = 4,
State_Saving = 8,
State_Verifying = 16,
State_Compiling = 32, // not implemented yet
State_Searching = 64 // not implemented yet
};
}
#endif

4
apps/opencs/model/tools/tools.cpp
View file

@ -5,7 +5,7 @@
#include "verifier.hpp"
#include "../doc/document.hpp"
#include "../doc/state.hpp"
CSMTools::Verifier *CSMTools::Tools::getVerifier()
{
@ -42,5 +42,5 @@ void CSMTools::Tools::abortOperation (int type)
void CSMTools::Tools::verifierDone()
{
emit done (CSMDoc::Document::State_Verifying);
emit done (CSMDoc::State_Verifying);
}

4
apps/opencs/model/tools/verifier.cpp
View file

@ -3,7 +3,7 @@
#include <QTimer>
#include "../doc/document.hpp"
#include "../doc/state.hpp"
void CSMTools::Verifier::run()
{
@ -26,7 +26,7 @@ void CSMTools::Verifier::abort()
void CSMTools::Verifier::verify()
{
++mStep;
emit progress (mStep, 1000, CSMDoc::Document::State_Verifying);
emit progress (mStep, 1000, CSMDoc::State_Verifying);
if (mStep>=1000)
exit();

4
apps/opencs/view/doc/operation.cpp
View file

@ -13,8 +13,8 @@ void CSVDoc::Operation::updateLabel (int threads)
switch (mType)
{
case CSMDoc::Document::State_Saving: name = "saving"; break;
case CSMDoc::Document::State_Verifying: name = "verifying"; break;
case CSMDoc::State_Saving: name = "saving"; break;
case CSMDoc::State_Verifying: name = "verifying"; break;
}
std::ostringstream stream;

12
apps/opencs/view/doc/view.cpp
View file

@ -83,7 +83,7 @@ void CSVDoc::View::updateTitle()
stream << mDocument->getName();
if (mDocument->getState() & CSMDoc::Document::State_Modified)
if (mDocument->getState() & CSMDoc::State_Modified)
stream << " *";
if (mViewTotal>1)
@ -94,7 +94,7 @@ void CSVDoc::View::updateTitle()
void CSVDoc::View::updateActions()
{
bool editing = !(mDocument->getState() & CSMDoc::Document::State_Locked);
bool editing = !(mDocument->getState() & CSMDoc::State_Locked);
for (std::vector<QAction *>::iterator iter (mEditingActions.begin()); iter!=mEditingActions.end(); ++iter)
(*iter)->setEnabled (editing);
@ -102,8 +102,8 @@ void CSVDoc::View::updateActions()
mUndo->setEnabled (editing & mDocument->getUndoStack().canUndo());
mRedo->setEnabled (editing & mDocument->getUndoStack().canRedo());
mSave->setEnabled (!(mDocument->getState() & CSMDoc::Document::State_Saving));
mVerify->setEnabled (!(mDocument->getState() & CSMDoc::Document::State_Verifying));
mSave->setEnabled (!(mDocument->getState() & CSMDoc::State_Saving));
mVerify->setEnabled (!(mDocument->getState() & CSMDoc::State_Verifying));
}
CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int totalViews)
@ -155,7 +155,7 @@ void CSVDoc::View::updateDocumentState()
static const int operations[] =
{
CSMDoc::Document::State_Saving, CSMDoc::Document::State_Verifying,
CSMDoc::State_Saving, CSMDoc::State_Verifying,
-1 // end marker
};
@ -168,7 +168,7 @@ void CSVDoc::View::updateDocumentState()
QList<CSVWorld::SubView *> subViews = findChildren<CSVWorld::SubView *>();
for (QList<CSVWorld::SubView *>::iterator iter (subViews.begin()); iter!=subViews.end(); ++iter)
(*iter)->setEditLock (state & CSMDoc::Document::State_Locked);
(*iter)->setEditLock (state & CSMDoc::State_Locked);
}
void CSVDoc::View::updateProgress (int current, int max, int type, int threads)