From 9a79a069306cd16c430510170f9bcd45acf7519b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Thu, 14 May 2009 17:24:35 +0200
Subject: [PATCH] Introduce a Delete Line action that doesn't copy to clipboard
The version that does copy to clipboard is now called Cut Line, and is
still mapped to Shift+Delete by default.
---
src/plugins/texteditor/basetexteditor.cpp | 15 +++++++++++++--
src/plugins/texteditor/basetexteditor.h | 4 ++++
.../texteditor/texteditoractionhandler.cpp | 9 +++++++--
src/plugins/texteditor/texteditoractionhandler.h | 2 ++
src/plugins/texteditor/texteditorconstants.h | 5 +++--
5 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 8af95a69825..7a25b43c7fc 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -3622,8 +3622,7 @@ void BaseTextEditor::changeEvent(QEvent *e)
}
}
-// shift+del
-void BaseTextEditor::deleteLine()
+void BaseTextEditor::maybeSelectLine()
{
QTextCursor cursor = textCursor();
if (!cursor.hasSelection()) {
@@ -3638,9 +3637,21 @@ void BaseTextEditor::deleteLine()
}
setTextCursor(cursor);
}
+}
+
+// shift+del
+void BaseTextEditor::cutLine()
+{
+ maybeSelectLine();
cut();
}
+void BaseTextEditor::deleteLine()
+{
+ maybeSelectLine();
+ textCursor().removeSelectedText();
+}
+
void BaseTextEditor::setExtraSelections(ExtraSelectionKind kind, const QList<QTextEdit::ExtraSelection> &selections)
{
if (selections.isEmpty() && d->m_extraSelections[kind].isEmpty())
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index c93cd86123b..e45ab281f95 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -370,6 +370,7 @@ public slots:
void zoomIn(int range = 1);
void zoomOut(int range = 1);
+ void cutLine();
void deleteLine();
void unCollapseAll();
void collapse();
@@ -406,6 +407,9 @@ protected:
bool canInsertFromMimeData(const QMimeData *source) const;
void insertFromMimeData(const QMimeData *source);
+private:
+ void maybeSelectLine();
+
public:
void duplicateFrom(BaseTextEditor *editor);
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index 0c4821992cc..9aa4e1609b2 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -72,6 +72,7 @@ TextEditorActionHandler::TextEditorActionHandler(const QString &context,
m_unCollapseAllAction = 0;
m_collapseAction = 0;
m_expandAction = 0;
+ m_cutLineAction = 0;
m_deleteLineAction = 0;
m_selectEncodingAction = 0;
m_increaseFontSizeAction = 0;
@@ -173,9 +174,13 @@ void TextEditorActionHandler::createActions()
connect(m_unCommentSelectionAction, SIGNAL(triggered()), this, SLOT(unCommentSelection()));
advancedMenu->addAction(command, Core::Constants::G_EDIT_FORMAT);
+ m_cutLineAction = new QAction(tr("Cut &Line"), this);
+ command = am->registerAction(m_cutLineAction, Constants::CUT_LINE, m_contextId);
+ command->setDefaultKeySequence(QKeySequence(tr("Shift+Del")));
+ connect(m_cutLineAction, SIGNAL(triggered()), this, SLOT(cutLine()));
+
m_deleteLineAction = new QAction(tr("Delete &Line"), this);
command = am->registerAction(m_deleteLineAction, Constants::DELETE_LINE, m_contextId);
- command->setDefaultKeySequence(QKeySequence(tr("Shift+Del")));
connect(m_deleteLineAction, SIGNAL(triggered()), this, SLOT(deleteLine()));
m_collapseAction = new QAction(tr("Collapse"), this);
@@ -385,6 +390,7 @@ FUNCTION2(formatAction, format)
FUNCTION2(selectAllAction, selectAll)
FUNCTION(cleanWhitespace)
FUNCTION(unCommentSelection)
+FUNCTION(cutLine)
FUNCTION(deleteLine)
FUNCTION(unCollapseAll)
FUNCTION(collapse)
@@ -416,7 +422,6 @@ void TextEditorActionHandler::updateCurrentEditor(Core::IEditor *editor)
}
}
-
const QPointer<BaseTextEditor> &TextEditorActionHandler::currentEditor() const
{
return m_currentEditor;
diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h
index 4b216a5290b..1061b7a9674 100644
--- a/src/plugins/texteditor/texteditoractionhandler.h
+++ b/src/plugins/texteditor/texteditoractionhandler.h
@@ -98,6 +98,7 @@ private slots:
void unCollapseAll();
void collapse();
void expand();
+ void cutLine();
void deleteLine();
void selectEncoding();
void increaseFontSize();
@@ -129,6 +130,7 @@ private:
QAction *m_unCollapseAllAction;
QAction *m_collapseAction;
QAction *m_expandAction;
+ QAction *m_cutLineAction;
QAction *m_deleteLineAction;
QAction *m_selectEncodingAction;
QAction *m_increaseFontSizeAction;
diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h
index a8dfac2b5c0..8278a224fc5 100644
--- a/src/plugins/texteditor/texteditorconstants.h
+++ b/src/plugins/texteditor/texteditorconstants.h
@@ -51,8 +51,9 @@ const char * const GOTO_BLOCK_END = "TextEditor.GotoBlockEnd";
const char * const GOTO_BLOCK_END_WITH_SELECTION = "TextEditor.GotoBlockEndWithSelection";
const char * const SELECT_BLOCK_UP = "TextEditor.SelectBlockUp";
const char * const SELECT_BLOCK_DOWN = "TextEditor.SelectBlockDown";
-const char * const MOVE_LINE_UP = "TextEditor.MoveLineUp";
-const char * const MOVE_LINE_DOWN = "TextEditor.MoveLineDown";
+const char * const MOVE_LINE_UP = "TextEditor.MoveLineUp";
+const char * const MOVE_LINE_DOWN = "TextEditor.MoveLineDown";
+const char * const CUT_LINE = "TextEditor.CutLine";
const char * const DELETE_LINE = "TextEditor.DeleteLine";
const char * const DELETE_WORD = "TextEditor.DeleteWord";
const char * const SELECT_ENCODING = "TextEditor.SelectEncoding";
--
GitLab