add Duplicate command to Edit menu

Author: bhaller

QtSLiM/QtSLiMAppDelegate.cpp

@@ -1008,7 +1008,7 @@ void QtSLiMAppDelegate::addActionsForGlobalMenuItems(QWidget *window)
     }
     {
         QAction *actionShowDebuggingOutput = new QAction("Show Debugging Output", this);
-        actionShowDebuggingOutput->setShortcut(flagsAndKey(Qt::ControlModifier, Qt::Key_D));
+        actionShowDebuggingOutput->setShortcut(flagsAndKey(Qt::ControlModifier | Qt::ShiftModifier, Qt::Key_D));
         connect(actionShowDebuggingOutput, &QAction::triggered, qtSLiMAppDelegate, &QtSLiMAppDelegate::dispatch_showDebuggingOutput);
         window->addAction(actionShowDebuggingOutput);
     }
@@ -1080,6 +1080,12 @@ void QtSLiMAppDelegate::addActionsForGlobalMenuItems(QWidget *window)
         connect(actionPaste, &QAction::triggered, qtSLiMAppDelegate, &QtSLiMAppDelegate::dispatch_paste);
         window->addAction(actionPaste);
     }
+    {
+        QAction *actionDuplicate = new QAction("Duplicate", this);
+        actionDuplicate->setShortcut(flagsAndKey(Qt::ControlModifier, Qt::Key_D));
+        connect(actionDuplicate, &QAction::triggered, qtSLiMAppDelegate, &QtSLiMAppDelegate::dispatch_duplicate);
+        window->addAction(actionDuplicate);
+    }
     {
         QAction *actionDelete = new QAction("Delete", this);
         //actionDelete->setShortcut(flagsAndKey(Qt::ControlModifier, Qt::Key_V));
@@ -1495,6 +1501,15 @@ void QtSLiMAppDelegate::dispatch_paste(void)
         plainTextEdit->paste();
 }
 
+void QtSLiMAppDelegate::dispatch_duplicate(void)
+{
+    QWidget *focusWidget = QApplication::focusWidget();
+    QtSLiMScriptTextEdit *scriptEdit = dynamic_cast<QtSLiMScriptTextEdit*>(focusWidget);
+    
+    if (scriptEdit && scriptEdit->isEnabled() && !scriptEdit->isReadOnly())
+        scriptEdit->duplicateSelection();
+}
+
 void QtSLiMAppDelegate::dispatch_delete(void)
 {
     QWidget *focusWidget = QApplication::focusWidget();

QtSLiM/QtSLiMAppDelegate.h

@@ -137,6 +137,7 @@ public slots:
     void dispatch_cut(void);
     void dispatch_copy(void);
     void dispatch_paste(void);
+    void dispatch_duplicate(void);
     void dispatch_delete(void);
     void dispatch_selectAll(void);
 

QtSLiM/QtSLiMScriptTextEdit.cpp

@@ -2675,6 +2675,34 @@ void QtSLiMScriptTextEdit::copyAsHTML(void)
     }
 }
 
+void QtSLiMScriptTextEdit::duplicateSelection(void)
+{
+    if (isEnabled() && !isReadOnly())
+    {
+        QTextCursor &&edit_cursor = textCursor();
+        QString selectedString = edit_cursor.selectedText();
+        int pasteStart = edit_cursor.selectionEnd();
+        
+        edit_cursor.beginEditBlock();
+        
+        edit_cursor.setPosition(pasteStart, QTextCursor::MoveAnchor);
+        edit_cursor.insertText(selectedString);
+        
+        int pasteEnd = edit_cursor.position();
+        
+        edit_cursor.setPosition(pasteStart, QTextCursor::MoveAnchor);
+        edit_cursor.setPosition(pasteEnd, QTextCursor::KeepAnchor);
+        
+        // end the editing block, producing one undo-able operation
+        edit_cursor.endEditBlock();
+        setTextCursor(edit_cursor);
+    }
+    else
+    {
+        qApp->beep();
+    }
+}
+
 void QtSLiMScriptTextEdit::shiftSelectionLeft(void)
 {
     if (isEnabled() && !isReadOnly())

QtSLiM/QtSLiMScriptTextEdit.h

@@ -201,6 +201,7 @@ class QtSLiMScriptTextEdit : public QtSLiMTextEdit
 
 public slots:
     void copyAsHTML(void);
+    void duplicateSelection(void);
     void shiftSelectionLeft(void);
     void shiftSelectionRight(void);
     void commentUncommentSelection(void);

QtSLiM/QtSLiMWindow.cpp

@@ -3325,6 +3325,7 @@ void QtSLiMWindow::updateMenuEnablingSHARED(QWidget *p_focusWidget)
     bool isScriptTextEdit = (!!scriptEdit);
     bool isModifiableScriptTextEdit = (isScriptTextEdit && !scriptEdit->isReadOnly());
 
+    ui->actionDuplicate->setEnabled(isModifiableScriptTextEdit);
     ui->actionCopyAsHTML->setEnabled(isScriptTextEdit);
     ui->actionShiftLeft->setEnabled(isModifiableScriptTextEdit);
     ui->actionShiftRight->setEnabled(isModifiableScriptTextEdit);

QtSLiM/QtSLiMWindow.ui

@@ -1383,6 +1383,7 @@ QSlider::handle:horizontal:disabled {
     <addaction name="actionCopy"/>
     <addaction name="actionCopyAsHTML"/>
     <addaction name="actionPaste"/>
+    <addaction name="actionDuplicate"/>
     <addaction name="actionDelete"/>
     <addaction name="actionSelectAll"/>
     <addaction name="separator"/>
@@ -1918,7 +1919,7 @@ QSlider::handle:horizontal:disabled {
     <string>Show Debugging Output</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+D</string>
+    <string>Ctrl+Shift+D</string>
    </property>
   </action>
   <action name="actionClearDebug">
@@ -2102,6 +2103,14 @@ QSlider::handle:horizontal:disabled {
     <string>Show a chart depicting the plot symbols used by Plot's points() method</string>
    </property>
   </action>
+  <action name="actionDuplicate">
+   <property name="text">
+    <string>Duplicate</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

QtSLiM/QtSLiMWindow_glue.cpp

@@ -229,6 +229,7 @@ void QtSLiMWindow::glueUI(void)
     connect(ui->actionCut, &QAction::triggered, qtSLiMAppDelegate, &QtSLiMAppDelegate::dispatch_cut);
     connect(ui->actionCopy, &QAction::triggered, qtSLiMAppDelegate, &QtSLiMAppDelegate::dispatch_copy);
     connect(ui->actionPaste, &QAction::triggered, qtSLiMAppDelegate, &QtSLiMAppDelegate::dispatch_paste);
+    connect(ui->actionDuplicate, &QAction::triggered, qtSLiMAppDelegate, &QtSLiMAppDelegate::dispatch_duplicate);
     connect(ui->actionDelete, &QAction::triggered, qtSLiMAppDelegate, &QtSLiMAppDelegate::dispatch_delete);
     connect(ui->actionSelectAll, &QAction::triggered, qtSLiMAppDelegate, &QtSLiMAppDelegate::dispatch_selectAll);
 

VERSIONS

@@ -35,6 +35,7 @@ development head (in the master branch):
 	partial fix for #530, extend cor() and cov() to support correlation/covariance between the columns of a matrix (or matrices), as in R
 		policy change: cov(x, y), cor(x, y), var(x), and sd(x) with x and/or y of length 1 now returns NAN (used to return NULL);
 			this is because you can't make a matrix containing NULLs, and Eidos doesn't have NA (which is what R uses in this case)
+	add Duplicate command to the Edit command, command-D, useful for code editing; change Show Debugging Output to shift-command-D
 
 
 version 5.0 (Eidos version 4.0):