Mercurial > octave
changeset 25448:5f9f17a81e18
remove obsolete paste table action in variable editor (bug #53002)
* variable-editor.cc (add_edit_actions): no action for pasting a table;
(variable_editor_view::pasteClipboard): move code from
variable_editor_view::pasteTableClipboardhere;
(variable_editor_view::pasteTableClipboard): remove function;
(variable_editor::edit_variable): do not connect the signal for
pasting table;
(variable_editor::pasteTableClipboardhere): remove function;
(variable_editor::construct_tool_bar): do not add paste table action
* variable-editor.h: remove pasteTableClipboard and
paste_table_clipboard_signal
| author | Torsten <mttl@mailbox.org> |
|---|---|
| date | Mon, 11 Jun 2018 21:58:56 +0200 |
| parents | fa66d81d0956 |
| children | d2d9701d2dcb |
| files | libgui/src/variable-editor.cc libgui/src/variable-editor.h |
| diffstat | 2 files changed, 0 insertions(+), 61 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/variable-editor.cc Mon Jun 11 15:11:25 2018 -0400 +++ b/libgui/src/variable-editor.cc Mon Jun 11 21:58:56 2018 +0200 @@ -583,12 +583,6 @@ tr ("Paste"), this, SLOT (pasteClipboard ())); - // FIXME: Different icon for Paste Table? - - menu->addAction (resource_manager::icon ("edit-paste"), - tr ("Paste Table"), - this, SLOT (pasteTableClipboard ())); - menu->addSeparator (); menu->addAction (resource_manager::icon ("edit-delete"), @@ -859,38 +853,6 @@ QClipboard *clipboard = QApplication::clipboard (); QString text = clipboard->text (); - if (indices.isEmpty ()) - { - if (size () == QSize (1,1)) - mod->setData (mod->index (0,0), text.toDouble ()); - else if (size () == QSize (0,0)) - { - mod->insertColumn (0); - mod->insertRow (0); - mod->setData (mod->index (0,0), text.toDouble ()); - } - } - else - { - QStringList cells = text.split(QRegExp("\n|\r\n|\r")); - int clen = cells.size (); - for (int i = 0; i < indices.size (); i++) - mod->setData (indices[i], cells.at (i % clen).toDouble ()); - } - } - - void variable_editor_view::pasteTableClipboard (void) - { - if (! hasFocus ()) - return; - - QAbstractItemModel *mod = model (); - QItemSelectionModel *sel = selectionModel (); - QList<QModelIndex> indices = sel->selectedIndexes (); - - QClipboard *clipboard = QApplication::clipboard (); - QString text = clipboard->text (); - QPoint start, end; QPoint tabsize = QPoint (mod->rowCount (), mod->columnCount ()); @@ -1262,8 +1224,6 @@ edit_view, SLOT (copyClipboard ())); connect (this, SIGNAL (paste_clipboard_signal ()), edit_view, SLOT (pasteClipboard ())); - connect (this, SIGNAL (paste_table_clipboard_signal ()), - edit_view, SLOT (pasteTableClipboard ())); connect (this, SIGNAL (selected_command_signal (const QString&)), edit_view, SLOT (selected_command_requested (const QString&))); connect (edit_view->horizontalHeader (), @@ -1564,14 +1524,6 @@ } void - variable_editor::pasteTableClipboard (void) - { - emit paste_table_clipboard_signal (); - - emit updated (); - } - - void variable_editor::levelUp (void) { emit level_up_signal (); @@ -1678,13 +1630,6 @@ tr ("Paste"), this, SLOT (pasteClipboard ())); action->setStatusTip(tr("Paste clipboard into variable data")); - // FIXME: Different icon for Paste Table? - - action = add_tool_bar_button (resource_manager::icon ("edit-paste"), - tr ("Paste Table"), - this, SLOT (pasteTableClipboard ())); - action->setStatusTip(tr("Another paste clipboard into variable data")); - m_tool_bar->addSeparator (); // FIXME: Add a print item?
--- a/libgui/src/variable-editor.h Mon Jun 11 15:11:25 2018 -0400 +++ b/libgui/src/variable-editor.h Mon Jun 11 21:58:56 2018 +0200 @@ -194,8 +194,6 @@ void pasteClipboard (void); - void pasteTableClipboard (void); - void handle_horizontal_scroll_action (int action); void handle_vertical_scroll_action (int action); @@ -329,8 +327,6 @@ void pasteClipboard (void); - void pasteTableClipboard (void); - void levelUp (void); // Send command to Octave interpreter. @@ -353,8 +349,6 @@ void paste_clipboard_signal (void); - void paste_table_clipboard_signal (void); - void level_up_signal (void); void save_signal (void);