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

store lock state and pass it on to edit mode

Browse source
This commit is contained in:
Marc Zinnschlag 2015-09-24 16:07:17 +02:00
parent b2cb5f0374
commit 3ada08af90
4 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/opencs/view/render/editmode.cpp
View file

@ -21,3 +21,8 @@ void CSVRender::EditMode::updateUserSetting (const QString& name, const QStringL
{ {
} }
void CSVRender::EditMode::setEditLock (bool locked)
{
}

3
apps/opencs/view/render/editmode.hpp
View file

@ -25,6 +25,9 @@ namespace CSVRender
/// Default-implementation: Do nothing. /// Default-implementation: Do nothing.
virtual void updateUserSetting (const QString& name, const QStringList& value); virtual void updateUserSetting (const QString& name, const QStringList& value);
/// Default-implementation: Ignored.
virtual void setEditLock (bool locked);
}; };
} }

13
apps/opencs/view/world/scenesubview.cpp
View file

@ -28,7 +28,7 @@
CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
: SubView (id), mScene(NULL), mLayout(new QHBoxLayout), mDocument(document), mToolbar(NULL), : SubView (id), mScene(NULL), mLayout(new QHBoxLayout), mDocument(document), mToolbar(NULL),
mEditMode (0) mEditMode (0), mLocked (false)
{ {
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
@ -131,7 +131,8 @@ CSVWidget::SceneToolbar* CSVWorld::SceneSubView::makeToolbar (CSVRender::Worldsp
void CSVWorld::SceneSubView::setEditLock (bool locked) void CSVWorld::SceneSubView::setEditLock (bool locked)
{ {
mLocked = locked;
dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent()).setEditLock (locked);
} }
void CSVWorld::SceneSubView::setStatusBar (bool show) void CSVWorld::SceneSubView::setStatusBar (bool show)
@ -258,4 +259,12 @@ void CSVWorld::SceneSubView::replaceToolbarAndWorldspace (CSVRender::WorldspaceW
mScene->selectDefaultNavigationMode(); mScene->selectDefaultNavigationMode();
setFocusProxy (mScene); setFocusProxy (mScene);
connect (mEditMode, SIGNAL (modeChanged (const std::string&)),
this, SLOT (editModeChanged (const std::string&)));
}
void CSVWorld::SceneSubView::editModeChanged (const std::string& id)
{
dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent()).setEditLock (mLocked);
} }

3
apps/opencs/view/world/scenesubview.hpp
View file

@ -47,6 +47,7 @@ namespace CSVWorld
CSVWidget::SceneToolbar* mToolbar; CSVWidget::SceneToolbar* mToolbar;
std::string mTitle; std::string mTitle;
CSVWidget::SceneToolMode *mEditMode; CSVWidget::SceneToolMode *mEditMode;
bool mLocked;
public: public:
@ -85,6 +86,8 @@ namespace CSVWorld
void cellSelectionChanged (const CSMWorld::UniversalId& id); void cellSelectionChanged (const CSMWorld::UniversalId& id);
void handleDrop(const std::vector<CSMWorld::UniversalId>& data); void handleDrop(const std::vector<CSMWorld::UniversalId>& data);
void editModeChanged (const std::string& id);
}; };
} }