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

Removed the "Join Lines Up" action

Browse Source 
It was a bit confusing, since it reversed the order of the lines. When
this would be fixed, the added value of this action is very small, since
you can then also simply move your cursor one up before joining the
lines.
This commit is contained in:
Thorbjørn Lindeijer
2010-01-20 17:51:05 +01:00
parent 46a96c25b0
commit 808198c41c
5 changed files with 14 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,8 +86,7 @@ TextEditorActionHandler::TextEditorActionHandler(const QString &context,
m_moveLineDownAction(0),
m_copyLineUpAction(0),
m_copyLineDownAction(0),
m_joinLineUpAction(0),
m_joinLineDownAction(0),
m_joinLinesAction(0),
m_optionalActions(optionalActions),
m_currentEditor(0),
m_initialized(false)
@@ -285,15 +284,10 @@ void TextEditorActionHandler::createActions()
command->setDefaultKeySequence(QKeySequence(tr("Ctrl+Alt+Down")));
connect(m_copyLineDownAction, SIGNAL(triggered()), this, SLOT(copyLineDown()));
m_joinLineUpAction= new QAction(tr("Join Line Up"), this);
command = am->registerAction(m_joinLineUpAction, Constants::JOIN_LINE_UP, m_contextId);
command->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+J")));
connect(m_joinLineUpAction, SIGNAL(triggered()), this, SLOT(joinLineUp()));
m_joinLineDownAction= new QAction(tr("Join Line Down"), this);
command = am->registerAction(m_joinLineDownAction, Constants::JOIN_LINE_DOWN, m_contextId);
m_joinLinesAction= new QAction(tr("Join Lines"), this);
command = am->registerAction(m_joinLinesAction, Constants::JOIN_LINES, m_contextId);
command->setDefaultKeySequence(QKeySequence(tr("Ctrl+J")));
connect(m_joinLineDownAction, SIGNAL(triggered()), this, SLOT(joinLineDown()));
connect(m_joinLinesAction, SIGNAL(triggered()), this, SLOT(joinLines()));
}
bool TextEditorActionHandler::supportsAction(const QString & /*id */) const
@@ -455,8 +449,7 @@ FUNCTION(moveLineUp)
FUNCTION(moveLineDown)
FUNCTION(copyLineUp)
FUNCTION(copyLineDown)
FUNCTION(joinLineUp)
FUNCTION(joinLineDown)
FUNCTION(joinLines)
void TextEditorActionHandler::updateCurrentEditor(Core::IEditor *editor)
{