Mercurial > octave-nkf

changeset 16649:de1f8e4b6b9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more copy/paste tweaks * QTerminal.h (QTerminal::QTerminal): Put copy and paste slots in the addAction calls. * main-window.cc (main_window::construct_edit_menu): Put copy and paste slots in the addAction calls.
author John W. Eaton <jwe@octave.org>
date Mon, 13 May 2013 07:54:58 -0400
parents b04413e5a811
children 18d3c1b981e7
files libgui/qterminal/libqterminal/QTerminal.h libgui/src/main-window.cc
diffstat 2 files changed, 9 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/QTerminal.h	Mon May 13 07:26:37 2013 -0400
+++ b/libgui/qterminal/libqterminal/QTerminal.h	Mon May 13 07:54:58 2013 -0400
@@ -102,8 +102,13 @@
 
     _contextMenu = new QMenu (this);
 
-    QAction *copyAction  = _contextMenu->addAction ("Copy");
-    QAction *pasteAction = _contextMenu->addAction ("Paste");
+    QAction *copyAction 
+      = _contextMenu->addAction (tr ("Copy"),
+                                 this, SLOT (copyClipboard ()));
+
+    QAction *pasteAction
+      = _contextMenu->addAction (tr ("Paste"),
+                                 this, SLOT (pasteClipboard ()));
 
     copyAction->setShortcut (QKeySequence::Copy);
     pasteAction->setShortcut (QKeySequence::Paste);
@@ -111,12 +116,6 @@
     addAction (copyAction);
     addAction (pasteAction);
 
-    connect (copyAction, SIGNAL (triggered()),
-             this, SLOT (copyClipboard ()));
-
-    connect (pasteAction, SIGNAL (triggered()),
-             this, SLOT (pasteClipboard ()));
-
     connect (this, SIGNAL (customContextMenuRequested (QPoint)),
              this, SLOT (handleCustomContextMenuRequested (QPoint)));
 
--- a/libgui/src/main-window.cc	Mon May 13 07:26:37 2013 -0400
+++ b/libgui/src/main-window.cc	Mon May 13 07:54:58 2013 -0400
@@ -1039,12 +1039,12 @@
 
   _copy_action
     = edit_menu->addAction (QIcon (":/actions/icons/editcopy.png"),
-                            tr ("Copy"));
+                            tr ("Copy"), this, SLOT (copyClipboard ()));
   _copy_action->setShortcut (ctrl_shift + Qt::Key_C);
 
   _paste_action
     = edit_menu->addAction (QIcon (":/actions/icons/editpaste.png"),
-                            tr ("Paste"));
+                            tr ("Paste"), this, SLOT (pasteClipboard ()));
   _paste_action->setShortcut (ctrl_shift + Qt::Key_V);
 
   edit_menu->addSeparator ();
@@ -1064,12 +1064,6 @@
   QAction *clear_workspace_action
     = edit_menu->addAction (tr ("Clear Workspace"));
 
-  connect (_copy_action, SIGNAL (triggered()),
-           this, SLOT (copyClipboard ()));
-
-  connect (_paste_action, SIGNAL (triggered()),
-           this, SLOT (pasteClipboard ()));
-
   connect (find_files_action, SIGNAL (triggered()),
            this, SLOT (find_files ()));