Merge pull request #1272 from vdonnefort/scide/ctrl+w

scide: add OSX delete word ctrl+w shortcut
supercollider · Nov 7, 2015 · cf99448 · cf99448
2 parents 1c76ff0 + 007a8a3
commit cf99448
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/editors/sc-ide/widgets/code_editor/editor.cpp b/editors/sc-ide/widgets/code_editor/editor.cpp
@@ -1155,6 +1155,18 @@ void GenericCodeEditor::moveLineDown()
     moveLineUpDown(false);
 }
 
+void GenericCodeEditor::deleteWord()
+{
+    QTextCursor cur = textCursor();
+
+    cur.beginEditBlock();
+
+    cur.movePosition(QTextCursor::StartOfWord, QTextCursor::KeepAnchor);
+    cur.deletePreviousChar();
+
+    cur.endEditBlock();
+}
+
 void GenericCodeEditor::gotoPreviousEmptyLine()
 {
     gotoEmptyLineUpDown(true);

diff --git a/editors/sc-ide/widgets/code_editor/editor.hpp b/editors/sc-ide/widgets/code_editor/editor.hpp
@@ -84,6 +84,7 @@ public slots:
     void copyLineDown();
     void moveLineUp();
     void moveLineDown();
+    void deleteWord();
     void gotoPreviousEmptyLine();
     void gotoNextEmptyLine();
     void setActiveAppearance(bool active);

diff --git a/editors/sc-ide/widgets/multi_editor.cpp b/editors/sc-ide/widgets/multi_editor.cpp
@@ -468,6 +468,15 @@ void MultiEditor::createActions()
     mEditorSigMux->connect(action, SIGNAL(triggered()), SLOT(moveLineDown()));
     settings->addAction( action, "editor-move-line-down", editorCategory);
 
+    mActions[DeleteWord] = action = new QAction(
+        QIcon::fromTheme("edit-deleteword"), tr("Delete Word"), this);
+#ifdef Q_OS_MAC
+    action->setShortcut(tr("Meta+W", "Delete Word"));
+#endif
+    action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    mEditorSigMux->connect(action, SIGNAL(triggered()), SLOT(deleteWord()));
+    settings->addAction(action, "delete-word", editorCategory);
+
     mActions[GotoPreviousBlock] = action = new QAction(
         QIcon::fromTheme("edit-gotopreviousblock"), tr("Go to Previous Block"), this);
     action->setShortcut(tr("Ctrl+[", "Go to Previous Block"));
@@ -687,6 +696,7 @@ void MultiEditor::createActions()
     addAction(mActions[CopyLineDown]);
     addAction(mActions[MoveLineUp]);
     addAction(mActions[MoveLineDown]);
+    addAction(mActions[DeleteWord]);
     addAction(mActions[GotoPreviousBlock]);
     addAction(mActions[GotoNextBlock]);
     addAction(mActions[SelectEnclosingBlock]);
@@ -713,6 +723,7 @@ void MultiEditor::updateActions()
     mActions[CopyLineDown]->setEnabled( editor );
     mActions[MoveLineUp]->setEnabled( editor );
     mActions[MoveLineDown]->setEnabled( editor );
+    mActions[DeleteWord]->setEnabled( editor );
     mActions[GotoPreviousEmptyLine]->setEnabled( editor );
     mActions[GotoNextEmptyLine]->setEnabled( editor );
     mActions[DocClose]->setEnabled( editor );

diff --git a/editors/sc-ide/widgets/multi_editor.hpp b/editors/sc-ide/widgets/multi_editor.hpp
@@ -92,6 +92,7 @@ class MultiEditor : public QWidget
         CopyLineDown,
         MoveLineUp,
         MoveLineDown,
+	DeleteWord,
 
         GotoPreviousBlock,
         GotoNextBlock,