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

Remove unneded revert and delete slots

Browse source
This commit is contained in:
Marek Kochanowicz 2014-06-16 11:58:55 +02:00
parent 786c68f09a
commit d6288a8055
2 changed files with 3 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
apps/opencs/view/world/dialoguesubview.cpp
View file

@ -495,8 +495,8 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
connect(nextButton, SIGNAL(clicked()), this, SLOT(nextId())); connect(nextButton, SIGNAL(clicked()), this, SLOT(nextId()));
connect(prevButton, SIGNAL(clicked()), this, SLOT(prevId())); connect(prevButton, SIGNAL(clicked()), this, SLOT(prevId()));
connect(cloneButton, SIGNAL(clicked()), this, SLOT(cloneRequest())); connect(cloneButton, SIGNAL(clicked()), this, SLOT(cloneRequest()));
connect(revertButton, SIGNAL(clicked()), this, SLOT(revertRecord())); connect(revertButton, SIGNAL(clicked()), &mCommandDispatcher, SLOT(executeRevert()));
connect(deleteButton, SIGNAL(clicked()), this, SLOT(deleteRecord())); connect(deleteButton, SIGNAL(clicked()), &mCommandDispatcher, SLOT(executeDelete()));
mMainLayout = new QVBoxLayout(mainWidget); mMainLayout = new QVBoxLayout(mainWidget);
@ -638,83 +638,9 @@ void CSVWorld::DialogueSubView::tableMimeDataDropped(QWidget* editor,
} }
} }
void CSVWorld::DialogueSubView::revertRecord()
{
const int rows = mTable->rowCount();
QModelIndex currentIndex(mTable->getModelIndex(mCurrentId, 0));
if (!currentIndex.isValid())
{
return;
}
const int currentRow = currentIndex.row();
if (!mLocked && mTable->columnCount() > 0 && currentRow < mTable->rowCount() )
{
CSMWorld::RecordBase::State state =
static_cast<CSMWorld::RecordBase::State> (mTable->data (mTable->index (currentRow, 1)).toInt());
if (state!=CSMWorld::RecordBase::State_BaseOnly)
{
mUndoStack.push(new CSMWorld::RevertCommand(*mTable, mCurrentId));
}
if (rows != mTable->rowCount())
{
if (mTable->rowCount() == 0)
{
mEditWidget->setDisabled(true); //closing the editor is other option
return;
}
if (currentIndex.row() >= mTable->rowCount())
{
prevId();
} else {
dataChanged(currentIndex);
}
}
}
}
void CSVWorld::DialogueSubView::deleteRecord()
{
const int rows = mTable->rowCount();
QModelIndex currentIndex(mTable->getModelIndex(mCurrentId, 0));
CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State>(mTable->data (mTable->index (currentIndex.row(), 1)).toInt());
bool deledetedOrErased = (state == CSMWorld::RecordBase::State_Deleted);
if (!mLocked &&
currentIndex.isValid() &&
mTable->columnCount() > 0 &&
!deledetedOrErased &&
currentIndex.row() < rows &&
mBottom->canCreateAndDelete())
{
mUndoStack.push(new CSMWorld::DeleteCommand(*mTable, mCurrentId));
if (rows != mTable->rowCount())
{
if (mTable->rowCount() == 0)
{
mEditWidget->setDisabled(true); //closing the editor is other option
return;
}
if (currentIndex.row() >= mTable->rowCount())
{
prevId();
} else {
dataChanged(currentIndex);
}
}
}
}
void CSVWorld::DialogueSubView::requestFocus (const std::string& id) void CSVWorld::DialogueSubView::requestFocus (const std::string& id)
{ {
mCurrentId = std::string(id); changeCurrentId(id);
mEditWidget->remake(mTable->getModelIndex (id, 0).row()); mEditWidget->remake(mTable->getModelIndex (id, 0).row());
} }

4
apps/opencs/view/world/dialoguesubview.hpp
View file

@ -195,10 +195,6 @@ namespace CSVWorld
void viewRecord(); void viewRecord();
void revertRecord();
void deleteRecord();
void cloneRequest(); void cloneRequest();
void dataChanged(const QModelIndex & index); void dataChanged(const QModelIndex & index);