AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-08-03 07:16:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'scripteditorplz' into 'master'

Browse Source 
Improve multiline script editing

Closes #8579

See merge request OpenMW/openmw!4728
This commit is contained in:
psi29a 2025-07-31 07:21:06 +00:00
commit 405388b89f
3 changed files with 75 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/opencs/model/prefs/values.hpp
View File

@ -507,8 +507,10 @@ namespace CSMPrefs
Settings::SettingValue<std::string> mOrbitRollRight{ mIndex, sName, "orbit-roll-right", "E" };
Settings::SettingValue<std::string> mOrbitSpeedMode{ mIndex, sName, "orbit-speed-mode", "" };
Settings::SettingValue<std::string> mOrbitCenterSelection{ mIndex, sName, "orbit-center-selection", "C" };
Settings::SettingValue<std::string> mScriptEditorComment{ mIndex, sName, "script-editor-comment", "" };
Settings::SettingValue<std::string> mScriptEditorUncomment{ mIndex, sName, "script-editor-uncomment", "" };
Settings::SettingValue<std::string> mScriptEditorComment{ mIndex, sName, "script-editor-comment",
"Ctrl+Slash" };
Settings::SettingValue<std::string> mScriptEditorUncomment{ mIndex, sName, "script-editor-uncomment",
"Ctrl+Shift+Question" };
};
struct ModelsCategory : Settings::WithIndex

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

@ -21,6 +21,24 @@
#include "../../model/world/tablemimedata.hpp"
#include "../../model/world/universalid.hpp"
namespace
{
void prependToEachLine(QTextCursor begin, const QString& text)
{
QTextCursor end = begin;
begin.setPosition(begin.selectionStart());
begin.movePosition(QTextCursor::StartOfLine);
end.setPosition(end.selectionEnd());
end.movePosition(QTextCursor::EndOfLine);
begin.beginEditBlock();
for (; begin < end; begin.movePosition(QTextCursor::EndOfLine), begin.movePosition(QTextCursor::Right))
{
begin.insertText(text);
}
begin.endEditBlock();
}
}
CSVWorld::ScriptEdit::ChangeLock::ChangeLock(ScriptEdit& edit)
: mEdit(edit)
{
@ -46,6 +64,55 @@ bool CSVWorld::ScriptEdit::event(QEvent* event)
return QPlainTextEdit::event(event);
}
void CSVWorld::ScriptEdit::keyPressEvent(QKeyEvent* event)
{
if (event->key() == Qt::Key_Backtab)
{
QTextCursor cursor = textCursor();
QTextCursor end = cursor;
cursor.setPosition(cursor.selectionStart());
cursor.movePosition(QTextCursor::StartOfLine);
end.setPosition(end.selectionEnd());
end.movePosition(QTextCursor::EndOfLine);
cursor.beginEditBlock();
for (; cursor < end; cursor.movePosition(QTextCursor::EndOfLine), cursor.movePosition(QTextCursor::Right))
{
cursor.select(QTextCursor::LineUnderCursor);
QString line = cursor.selectedText();
if (line.isEmpty())
continue;
qsizetype index = 0;
if (line[0] == '\t')
index = 1;
else
{
// Remove up to a tab worth of spaces instead
while (line[index].isSpace() && index < mTabCharCount && line[index] != '\t')
index++;
}
if (index != 0)
{
line.remove(0, index);
cursor.insertText(line);
}
}
cursor.endEditBlock();
return;
}
else if (event->key() == Qt::Key_Tab)
{
QTextCursor cursor = textCursor();
if (cursor.hasSelection())
{
prependToEachLine(cursor, "\t");
return;
}
}
QPlainTextEdit::keyPressEvent(event);
}
CSVWorld::ScriptEdit::ScriptEdit(const CSMDoc::Document& document, ScriptHighlighter::Mode mode, QWidget* parent)
: QPlainTextEdit(parent)
, mChangeLocked(0)
@ -316,22 +383,7 @@ void CSVWorld::ScriptEdit::markOccurrences()
void CSVWorld::ScriptEdit::commentSelection()
{
QTextCursor begin = textCursor();
QTextCursor end = begin;
begin.setPosition(begin.selectionStart());
begin.movePosition(QTextCursor::StartOfLine);
end.setPosition(end.selectionEnd());
end.movePosition(QTextCursor::EndOfLine);
begin.beginEditBlock();
for (; begin < end; begin.movePosition(QTextCursor::EndOfLine), begin.movePosition(QTextCursor::Right))
{
begin.insertText(";");
}
begin.endEditBlock();
prependToEachLine(textCursor(), ";");
}
void CSVWorld::ScriptEdit::uncommentSelection()
@ -345,17 +397,16 @@ void CSVWorld::ScriptEdit::uncommentSelection()
end.movePosition(QTextCursor::EndOfLine);
begin.beginEditBlock();
for (; begin < end; begin.movePosition(QTextCursor::EndOfLine), begin.movePosition(QTextCursor::Right))
{
begin.select(QTextCursor::LineUnderCursor);
QString line = begin.selectedText();
if (line.size() == 0)
if (line.isEmpty())
continue;
// get first nonspace character in line
int index;
qsizetype index;
for (index = 0; index != line.size(); ++index)
{
if (!line[index].isSpace())

1
apps/opencs/view/world/scriptedit.hpp
View File

@ -74,6 +74,7 @@ namespace CSVWorld
protected:
bool event(QEvent* event) override;
void keyPressEvent(QKeyEvent* e) override;
public:
ScriptEdit(const CSMDoc::Document& document, ScriptHighlighter::Mode mode, QWidget* parent);