feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: add action to paste without autoFormat

Browse Source 
Fixes: QTCREATORBUG-20887
Change-Id: Iedc6b584c9c1cc48804025653d0749e054a406f8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-11-18 08:30:05 +01:00
parent dc8edcefba
commit c5c3214cfb
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/texteditor/texteditor.cpp
View File

@@ -764,6 +764,7 @@ public:
bool m_animateAutoComplete = true; bool m_animateAutoComplete = true;
bool m_highlightAutoComplete = true; bool m_highlightAutoComplete = true;
bool m_skipAutoCompletedText = true; bool m_skipAutoCompletedText = true;
bool m_skipFormatOnPaste = false;
bool m_removeAutoCompletedText = true; bool m_removeAutoCompletedText = true;
bool m_keepAutoCompletionHighlight = false; bool m_keepAutoCompletionHighlight = false;
QList<QTextCursor> m_autoCompleteHighlightPos; QList<QTextCursor> m_autoCompleteHighlightPos;
@@ -7613,6 +7614,13 @@ void TextEditorWidget::circularPaste()
} }
} }
void TextEditorWidget::pasteWithoutFormat()
{
d->m_skipFormatOnPaste = true;
paste();
d->m_skipFormatOnPaste = false;
}
void TextEditorWidget::switchUtf8bom() void TextEditorWidget::switchUtf8bom()
{ {
textDocument()->switchUtf8Bom(); textDocument()->switchUtf8Bom();
@@ -7790,9 +7798,10 @@ void TextEditorWidget::insertFromMimeData(const QMimeData *source)
int reindentBlockEnd = cursor.blockNumber() - (hasFinalNewline?1:0); int reindentBlockEnd = cursor.blockNumber() - (hasFinalNewline?1:0);
if (reindentBlockStart < reindentBlockEnd if (!d->m_skipFormatOnPaste
|| (reindentBlockStart == reindentBlockEnd && (reindentBlockStart < reindentBlockEnd
&& (!insertAtBeginningOfLine || hasFinalNewline))) { || (reindentBlockStart == reindentBlockEnd
&& (!insertAtBeginningOfLine || hasFinalNewline)))) {
if (insertAtBeginningOfLine && !hasFinalNewline) { if (insertAtBeginningOfLine && !hasFinalNewline) {
QTextCursor unnecessaryWhitespace = cursor; QTextCursor unnecessaryWhitespace = cursor;
unnecessaryWhitespace.setPosition(cursorPosition); unnecessaryWhitespace.setPosition(cursorPosition);

1
src/plugins/texteditor/texteditor.h
View File

@@ -366,6 +366,7 @@ public:
void setExtraEncodingSettings(const TextEditor::ExtraEncodingSettings &); void setExtraEncodingSettings(const TextEditor::ExtraEncodingSettings &);
void circularPaste(); void circularPaste();
void pasteWithoutFormat();
void switchUtf8bom(); void switchUtf8bom();
void zoomF(float delta); void zoomF(float delta);

7
src/plugins/texteditor/texteditoractionhandler.cpp
View File

@@ -317,8 +317,11 @@ void TextEditorActionHandlerPrivate::createActions()
[] (TextEditorWidget *w) { w->selectEncoding(); }, false, tr("Select Encoding..."), [] (TextEditorWidget *w) { w->selectEncoding(); }, false, tr("Select Encoding..."),
QKeySequence(), G_EDIT_OTHER, editMenu); QKeySequence(), G_EDIT_OTHER, editMenu);
m_circularPasteAction = registerAction(CIRCULAR_PASTE, m_circularPasteAction = registerAction(CIRCULAR_PASTE,
[] (TextEditorWidget *w) { w->circularPaste(); }, false, tr("Paste from Clipboard History"), [] (TextEditorWidget *w) { w->circularPaste(); }, false, tr("Paste from Clipboard History"),
QKeySequence(tr("Ctrl+Shift+V")), G_EDIT_COPYPASTE, editMenu); QKeySequence(tr("Ctrl+Shift+V")), G_EDIT_COPYPASTE, editMenu);
m_circularPasteAction = registerAction(NO_FORMAT_PASTE,
[] (TextEditorWidget *w) { w->pasteWithoutFormat(); }, false, tr("Paste without Formatting"),
QKeySequence(Core::useMacShortcuts ? tr("Cmd+Opt+Shift+V") : QString()), G_EDIT_COPYPASTE, editMenu);
// register "Edit -> Advanced" Menu Actions // register "Edit -> Advanced" Menu Actions
Core::ActionContainer *advancedEditMenu = Core::ActionManager::actionContainer(M_EDIT_ADVANCED); Core::ActionContainer *advancedEditMenu = Core::ActionManager::actionContainer(M_EDIT_ADVANCED);

1
src/plugins/texteditor/texteditorconstants.h
View File

@@ -203,6 +203,7 @@ const char INFO_MISSING_SYNTAX_DEFINITION[] = "TextEditor.InfoSyntaxDefinition";
const char INFO_MULTIPLE_SYNTAX_DEFINITIONS[] = "TextEditor.InfoMultipleSyntaxDefinitions"; const char INFO_MULTIPLE_SYNTAX_DEFINITIONS[] = "TextEditor.InfoMultipleSyntaxDefinitions";
const char TASK_OPEN_FILE[] = "TextEditor.Task.OpenFile"; const char TASK_OPEN_FILE[] = "TextEditor.Task.OpenFile";
const char CIRCULAR_PASTE[] = "TextEditor.CircularPaste"; const char CIRCULAR_PASTE[] = "TextEditor.CircularPaste";
const char NO_FORMAT_PASTE[] = "TextEditor.NoFormatPaste";
const char SWITCH_UTF8BOM[] = "TextEditor.SwitchUtf8bom"; const char SWITCH_UTF8BOM[] = "TextEditor.SwitchUtf8bom";
const char INDENT[] = "TextEditor.Indent"; const char INDENT[] = "TextEditor.Indent";
const char UNINDENT[] = "TextEditor.Unindent"; const char UNINDENT[] = "TextEditor.Unindent";