Commit ff649532 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Renamed MenuItem to ProjectItemViewMenu.

parent 9da0147f

isis/src/qisis/objs/AbstractProjectItemView/MenuItem.cpp→isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.cpp

+2 −13
Original line number Diff line number Diff line
@@ -20,21 +20,10 @@ 
 *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on

 *   http://www.usgs.gov/privacy.html.

 */

#include "MenuItem.h"

#include "ProjectItemViewMenu.h"



namespace Isis {



  /**

   * Constructs a MenuItem with the QMenu constructor

   *

   * @param title  Title of the menu

   *

   * @param parent Parent widget

   */

  //  MenuItem::MenuItem(const QString &title, QWidget *parent = 0) {

  //   QMenu(title, parent);

  // }





  /**

   * Overrides the closeEvent to emit the signal menuClosed().
@@ -42,7 +31,7 @@ namespace Isis { 
   *

   * @param event The close event

   */

  void MenuItem::closeEvent(QCloseEvent *event) {

  void ProjectItemViewMenu::closeEvent(QCloseEvent *event) {

    emit menuClosed();

  }

}

isis/src/qisis/objs/AbstractProjectItemView/MenuItem.h→isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.h

+5 −5
Original line number Diff line number Diff line 
#ifndef MenuItem_h

#define MenuItem_h

#ifndef ProjectItemViewMenu_h

#define ProjectItemViewMenu_h

/**

 * @file

 * $Date$
@@ -37,11 +37,11 @@ namespace Isis { 
   *   @history 2018-06-27 Kaitlyn Lee - Original version.

   */



  class MenuItem : public QMenu {

  class ProjectItemViewMenu : public QMenu {

    Q_OBJECT



    public:

      MenuItem(const QString &title, QWidget *parent = 0) : QMenu(title, parent){};

      ProjectItemViewMenu(const QString &title, QWidget *parent = 0) : QMenu(title, parent){};



    signals:

      void menuClosed();

isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include "FileName.h"

#include "Project.h"

#include "XmlStackedHandlerReader.h"

#include "MenuItem.h"

#include "ProjectItemViewMenu.h"



namespace Isis {

  /**
@@ -112,7 +112,7 @@ namespace Isis { 
    QMap< QAction *, QList< QString > > actionMap = m_cnetEditorWidget->menuActions();

    QMapIterator< QAction *, QList< QString > > actionMapIter(actionMap);



    m_tablesMenu = new MenuItem("&Tables");

    m_tablesMenu = new ProjectItemViewMenu("&Tables");

    connect(m_tablesMenu, SIGNAL(menuClosed()), this, SLOT(disableActions()));

    menuBar()->addMenu(m_tablesMenu);

isis/src/qisis/objs/CnetEditorView/CnetEditorView.h

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ namespace Isis { 
  class Project;

  class ToolPad;

  class XmlStackedHandlerReader;

  class MenuItem;

  class ProjectItemViewMenu;



  /**

   * Ipce view containing the CnetEditorWidget
@@ -120,7 +120,7 @@ class CnetEditorView : public AbstractProjectItemView { 
    QPointer<Control> m_control;



    QToolBar *m_permToolBar; //!< The permanent tool bar

    MenuItem *m_tablesMenu; //!< View menu for storing actions

    ProjectItemViewMenu *m_tablesMenu; //!< View menu for storing actions



  };

}

isis/src/qisis/objs/CubeDnView/CubeDnView.cpp

+4 −4
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ 
#include "XmlStackedHandlerReader.h"

#include "ZoomTool.h"



#include "MenuItem.h"

#include "ProjectItemViewMenu.h"



namespace Isis {

  /**
@@ -195,15 +195,15 @@ namespace Isis { 
    m_separatorAction = new QAction(this);

    m_separatorAction->setSeparator(true);



    m_viewMenu = new MenuItem("&View");

    m_viewMenu = new ProjectItemViewMenu("&View");

    connect(m_viewMenu, SIGNAL(menuClosed()), this, SLOT(disableActions()));

    menuBar()->addMenu(m_viewMenu);



    m_optionsMenu = new MenuItem("&Options");

    m_optionsMenu = new ProjectItemViewMenu("&Options");

    connect(m_optionsMenu, SIGNAL(menuClosed()), this, SLOT(disableActions()));

    menuBar()->addMenu(m_optionsMenu);



    m_windowMenu = new MenuItem("&Window");

    m_windowMenu = new ProjectItemViewMenu("&Window");

    connect(m_windowMenu, SIGNAL(menuClosed()), this, SLOT(disableActions()));

    menuBar()->addMenu(m_windowMenu);