Commit 7722f907 authored by dcookastrog's avatar dcookastrog
Browse files

Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into devRadii

parents f6314619 a227e648

isis/src/qisis/objs/TableMainWindow/TableMainWindow.cpp

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ namespace Isis { 


    QAction *clear = new QAction(this);

    clear->setText("Clear table");

    clear->setShortcut(Qt::CTRL + Qt::Key_Delete);

    connect(clear, SIGNAL(triggered()), this, SLOT(clearTable()));



    QAction *close = new QAction(this);

isis/src/qisis/objs/TableMainWindow/TableMainWindow.h

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ namespace Isis { 
  *                          Added resizeColumn() slot and readColumnSettings().

  *                          modified writeSettings() to write updated settings on destroy.

  *                          Fixes #5142.

  *   @history 2018-04-20 Adam Goins - Added the ctrl+del keyboard shortcut to the TableMainWindow's

  *                          "Clear Table" menu option. Fixes #4912.

  */

  class TableMainWindow : public MainWindow {

      Q_OBJECT