1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00

Merge remote-tracking branch 'artemutin/scriptSearchRedirect'

This commit is contained in:
Marc Zinnschlag 2015-10-09 17:15:11 +02:00
commit 3b39572274

View File

@ -198,16 +198,33 @@ void CSVWorld::ScriptSubView::useHint (const std::string& hint)
if (hint.empty()) if (hint.empty())
return; return;
if (hint[0]=='l') unsigned line = 0, column = 0;
{ char c;
std::istringstream stream (hint.c_str()+1); std::istringstream stream (hint.c_str()+1);
switch(hint[0]){
char ignore; case 'R':
int line; case 'r':
int column;
if (stream >> ignore >> line >> column)
{ {
QModelIndex index = mModel->getModelIndex (getUniversalId().getId(), mColumn);
QString source = mModel->data (index).toString();
unsigned pos, dummy;
if (!(stream >> c >> dummy >> pos) )
return;
for (unsigned i = 0; i <= pos; ++i){
if (source[i] == '\n'){
++line;
column = i+1;
}
}
column = pos - column;
break;
}
case 'l':
if (!(stream >> c >> line >> column))
return;
}
QTextCursor cursor = mEditor->textCursor(); QTextCursor cursor = mEditor->textCursor();
cursor.movePosition (QTextCursor::Start); cursor.movePosition (QTextCursor::Start);
@ -216,8 +233,6 @@ void CSVWorld::ScriptSubView::useHint (const std::string& hint)
mEditor->setFocus(); mEditor->setFocus();
mEditor->setTextCursor (cursor); mEditor->setTextCursor (cursor);
}
}
} }
void CSVWorld::ScriptSubView::textChanged() void CSVWorld::ScriptSubView::textChanged()