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

Improve Copy/CutLine actions usability

Browse Source 
This patch implements two features:
1. Reimplement CopyLine to move text cursor at the beginning of line
2. Add copy/cutLine action to Advanced Edit menu, to make it
   discoverable for editor users.

Change-Id: I0bf336ebee4dbf5afd2c759e47b1830271bd9d18
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Frantisek Vacek
2014-02-24 12:08:39 +01:00
committed by David Schulz
parent f3973ebcfd
commit fa998d2d2c
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/coreconstants.h
View File

@@ -159,6 +159,7 @@ const char G_EDIT_OTHER[] = "QtCreator.Group.Edit.Other";
// Advanced edit menu groups // Advanced edit menu groups
const char G_EDIT_FORMAT[] = "QtCreator.Group.Edit.Format"; const char G_EDIT_FORMAT[] = "QtCreator.Group.Edit.Format";
const char G_EDIT_COLLAPSING[] = "QtCreator.Group.Edit.Collapsing"; const char G_EDIT_COLLAPSING[] = "QtCreator.Group.Edit.Collapsing";
const char G_EDIT_TEXT[] = "QtCreator.Group.Edit.Text";
const char G_EDIT_BLOCKS[] = "QtCreator.Group.Edit.Blocks"; const char G_EDIT_BLOCKS[] = "QtCreator.Group.Edit.Blocks";
const char G_EDIT_FONT[] = "QtCreator.Group.Edit.Font"; const char G_EDIT_FONT[] = "QtCreator.Group.Edit.Font";
const char G_EDIT_EDITOR[] = "QtCreator.Group.Edit.Editor"; const char G_EDIT_EDITOR[] = "QtCreator.Group.Edit.Editor";

2
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -411,12 +411,14 @@ EditorManager::EditorManager(QWidget *parent) :
medit->addMenu(advancedMenu, Constants::G_EDIT_ADVANCED); medit->addMenu(advancedMenu, Constants::G_EDIT_ADVANCED);
advancedMenu->menu()->setTitle(tr("Ad&vanced")); advancedMenu->menu()->setTitle(tr("Ad&vanced"));
advancedMenu->appendGroup(Constants::G_EDIT_FORMAT); advancedMenu->appendGroup(Constants::G_EDIT_FORMAT);
advancedMenu->appendGroup(Constants::G_EDIT_TEXT);
advancedMenu->appendGroup(Constants::G_EDIT_COLLAPSING); advancedMenu->appendGroup(Constants::G_EDIT_COLLAPSING);
advancedMenu->appendGroup(Constants::G_EDIT_BLOCKS); advancedMenu->appendGroup(Constants::G_EDIT_BLOCKS);
advancedMenu->appendGroup(Constants::G_EDIT_FONT); advancedMenu->appendGroup(Constants::G_EDIT_FONT);
advancedMenu->appendGroup(Constants::G_EDIT_EDITOR); advancedMenu->appendGroup(Constants::G_EDIT_EDITOR);
// Advanced menu separators // Advanced menu separators
advancedMenu->addSeparator(editManagerContext, Constants::G_EDIT_TEXT);
advancedMenu->addSeparator(editManagerContext, Constants::G_EDIT_COLLAPSING); advancedMenu->addSeparator(editManagerContext, Constants::G_EDIT_COLLAPSING);
advancedMenu->addSeparator(editManagerContext, Constants::G_EDIT_BLOCKS); advancedMenu->addSeparator(editManagerContext, Constants::G_EDIT_BLOCKS);
advancedMenu->addSeparator(editManagerContext, Constants::G_EDIT_FONT); advancedMenu->addSeparator(editManagerContext, Constants::G_EDIT_FONT);

2
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -5060,6 +5060,8 @@ void BaseTextEditorWidget::copyLine()
QTextCursor prevCursor = textCursor(); QTextCursor prevCursor = textCursor();
maybeSelectLine(); maybeSelectLine();
copy(); copy();
if (!prevCursor.hasSelection())
prevCursor.movePosition(QTextCursor::StartOfBlock);
setTextCursor(prevCursor); setTextCursor(prevCursor);
} }

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

@@ -136,12 +136,6 @@ void TextEditorActionHandler::createActions()
SLOT(gotoAction())); SLOT(gotoAction()));
m_printAction = registerAction(PRINT, m_printAction = registerAction(PRINT,
SLOT(printAction())); SLOT(printAction()));
m_cutLineAction = registerAction(CUT_LINE,
SLOT(cutLine()), true, tr("Cut &Line"),
QKeySequence(tr("Shift+Del")));
m_copyLineAction = registerAction(COPY_LINE,
SLOT(copyLine()), false, tr("Copy &Line"),
QKeySequence(tr("Ctrl+Ins")));
m_deleteLineAction = registerAction(DELETE_LINE, m_deleteLineAction = registerAction(DELETE_LINE,
SLOT(deleteLine()), true, tr("Delete &Line")); SLOT(deleteLine()), true, tr("Delete &Line"));
m_deleteEndOfWordAction = registerAction(DELETE_END_OF_WORD, m_deleteEndOfWordAction = registerAction(DELETE_END_OF_WORD,
@@ -241,6 +235,14 @@ void TextEditorActionHandler::createActions()
SLOT(unCommentSelection()), true, tr("Toggle Comment &Selection"), SLOT(unCommentSelection()), true, tr("Toggle Comment &Selection"),
QKeySequence(tr("Ctrl+/")), QKeySequence(tr("Ctrl+/")),
G_EDIT_FORMAT, advancedEditMenu); G_EDIT_FORMAT, advancedEditMenu);
m_cutLineAction = registerAction(CUT_LINE,
SLOT(cutLine()), true, tr("Cut &Line"),
QKeySequence(tr("Shift+Del")),
G_EDIT_TEXT, advancedEditMenu);
m_copyLineAction = registerAction(COPY_LINE,
SLOT(copyLine()), false, tr("Copy &Line"),
QKeySequence(tr("Ctrl+Ins")),
G_EDIT_TEXT, advancedEditMenu);
m_foldAction = registerAction(FOLD, m_foldAction = registerAction(FOLD,
SLOT(fold()), true, tr("Fold"), SLOT(fold()), true, tr("Fold"),
QKeySequence(tr("Ctrl+<")), QKeySequence(tr("Ctrl+<")),