mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix script editor undo/redo context menu actions

Browse Source
This commit is contained in:
PlutonicOverkill 2017-04-27 19:48:01 +12:00
parent 6063d8e31b
commit e685de0f84
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/opencs/view/world/scriptedit.cpp
View File

@ -306,10 +306,14 @@ void CSVWorld::ScriptEdit::commentSelection()
end.setPosition(end.selectionEnd()); end.setPosition(end.selectionEnd());
end.movePosition(QTextCursor::EndOfLine); end.movePosition(QTextCursor::EndOfLine);
begin.beginEditBlock();
for (; begin < end; begin.movePosition(QTextCursor::EndOfLine), begin.movePosition(QTextCursor::Right)) for (; begin < end; begin.movePosition(QTextCursor::EndOfLine), begin.movePosition(QTextCursor::Right))
{ {
begin.insertText(";"); begin.insertText(";");
} }
begin.endEditBlock();
} }
void CSVWorld::ScriptEdit::uncommentSelection() void CSVWorld::ScriptEdit::uncommentSelection()
@ -322,6 +326,8 @@ void CSVWorld::ScriptEdit::uncommentSelection()
end.setPosition(end.selectionEnd()); end.setPosition(end.selectionEnd());
end.movePosition(QTextCursor::EndOfLine); end.movePosition(QTextCursor::EndOfLine);
begin.beginEditBlock();
for (; begin < end; begin.movePosition(QTextCursor::EndOfLine), begin.movePosition(QTextCursor::Right)) { for (; begin < end; begin.movePosition(QTextCursor::EndOfLine), begin.movePosition(QTextCursor::Right)) {
begin.select(QTextCursor::LineUnderCursor); begin.select(QTextCursor::LineUnderCursor);
QString line = begin.selectedText(); QString line = begin.selectedText();
@ -345,6 +351,8 @@ void CSVWorld::ScriptEdit::uncommentSelection()
begin.insertText(line); begin.insertText(line);
} }
} }
begin.endEditBlock();
} }
void CSVWorld::ScriptEdit::resizeEvent(QResizeEvent *e) void CSVWorld::ScriptEdit::resizeEvent(QResizeEvent *e)
@ -358,6 +366,16 @@ void CSVWorld::ScriptEdit::resizeEvent(QResizeEvent *e)
void CSVWorld::ScriptEdit::contextMenuEvent(QContextMenuEvent *event) void CSVWorld::ScriptEdit::contextMenuEvent(QContextMenuEvent *event)
{ {
QMenu *menu = createStandardContextMenu(); QMenu *menu = createStandardContextMenu();
// remove redo/undo since they are disabled
QList<QAction*> menuActions = menu->actions();
for (QList<QAction*>::iterator i = menuActions.begin(); i < menuActions.end(); ++i)
{
if ((*i)->text().contains("Undo") || (*i)->text().contains("Redo"))
{
(*i)->setVisible(false);
}
}
menu->addAction(mCommentAction); menu->addAction(mCommentAction);
menu->addAction(mUncommentAction); menu->addAction(mUncommentAction);