Mercurial > octave-antonio
changeset 20078:2d638e67aeef
remove Qt figure window menu items that won't work for 4.0.0 release
* Figure.h, Figure.cc (Figure::createFigureToolBarAndMenuBar):
Don't add Cut and Paste menu items to the edit menu.
(Figure::editCut, Figure::editPaste): Delete private slot functions.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 14 Apr 2015 23:32:07 -0400 |
| parents | 69f92e0affd2 |
| children | 27c0285828f8 |
| files | libgui/graphics/Figure.cc libgui/graphics/Figure.h |
| diffstat | 2 files changed, 2 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc Sat Apr 11 17:25:35 2015 +0200 +++ b/libgui/graphics/Figure.cc Tue Apr 14 23:32:07 2015 -0400 @@ -315,10 +315,6 @@ editMenu->menuAction ()->setObjectName ("builtinMenu"); editMenu->addAction (tr ("Cop&y"), this, SLOT (editCopy (void)), Qt::CTRL|Qt::Key_C)->setEnabled (false); - editMenu->addAction (tr ("Cu&t"), this, SLOT (editCut (void)), - Qt::CTRL|Qt::Key_X)->setEnabled (false); - editMenu->addAction (tr ("&Paste"), this, SLOT (editPaste(void)), - Qt::CTRL|Qt::Key_V)->setEnabled (false); editMenu->addSeparator (); editMenu->addActions (m_mouseModeGroup->actions ()); @@ -829,16 +825,8 @@ void Figure::editCopy (void) { -} - -void -Figure::editCut (void) -{ -} - -void -Figure::editPaste (void) -{ + // FIXME: implement this by printing to a temporary file in some + // format (jpg? png? pdf?) and copying the result to the clipboard. } void
--- a/libgui/graphics/Figure.h Sat Apr 11 17:25:35 2015 +0200 +++ b/libgui/graphics/Figure.h Tue Apr 14 23:32:07 2015 -0400 @@ -116,8 +116,6 @@ void fileSaveFigureAs (void); void fileCloseFigure (void); void editCopy (void); - void editCut (void); - void editPaste (void); void helpAboutQtHandles (void); void updateMenuBar (void); void updateContainer (void);