Merge branch 'ipceDocks' of https://github.com/USGS-Astrogeology/ISIS3 into ipceDocks (87a73f90) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/apps/ipce/IpceMainWindow.cpp

+0 −3

Original line number	Diff line number	Diff line
		@@ -89,8 +89,6 @@ namespace Isis {
		//centralWidget->hide();
		setDockNestingEnabled(true);

		m_activeView = NULL;

		try {
		m_directory = new Directory(this);
		connect(m_directory, SIGNAL( newWidgetAvailable(QWidget *) ),
		@@ -466,7 +464,6 @@ namespace Isis {
		QSize iconSize(25, 45);
		m_permToolBar->setIconSize(iconSize);
		m_permToolBar->setObjectName("PermanentToolBar");

		addToolBar(m_permToolBar);

		foreach ( QAction *action, m_directory->permToolBarActions() ) {

isis/src/qisis/apps/ipce/IpceMainWindow.h

+3 −5

Original line number	Diff line number	Diff line
		@@ -138,7 +138,9 @@ namespace Isis {
		* Cleanup connections are made for the views and the docks to ensure
		* that cleanup happens for both. Fixes #5433.
		* @history 2018-06-13 Tracie Sucharski - Fixed cleanup of views and QDockWidgets.
		* @history 2018-06-13 Kaitlyn Lee - Removed code adding the save active control net button and
		* @history 2018-06-13 Kaitlyn Lee - Since views now inherit from QMainWindow, each individual
		* view has its own toolbar, so having an active toolbar and tool pad is
		* not needed. Removed code adding the save active control net button and
		* the toolpad, since control nets can be saved with the project save button.
		* @history 2018-06-15 Tracie Sucharski - Fixed break to recent projects. The readSettings
		* must be called before initializeActions to get the recent projects
		@@ -220,13 +222,9 @@ namespace Isis {
		QList<QAction *> m_helpMenuActions;//!< Internal list of help actions

		QList<QAction *> m_permToolBarActions;//!< Internal list of permanent toolbar actions
		QList<QAction *> m_activeToolBarActions;//!< Internal list of active toolbar actions
		QList<QAction *> m_toolPadActions;//!< Internal list of toolpad actions

		QAction *m_cascadeViewsAction; //!< Action that cascades the mdi area
		QAction *m_tileViewsAction; //!< Action that tiles the mdi area

		AbstractProjectItemView *m_activeView; //!< The active view
		};
		}

isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.cpp

+15 −91

Original line number	Diff line number	Diff line
		@@ -149,33 +149,17 @@ namespace Isis {
		}


		/**
		* Returns a list of actions appropriate for the permanent tool bar.
		*
		* @return @b QList<QAction *> The actions
		*/
		QList<QAction *> AbstractProjectItemView::permToolBarActions() {
		return QList<QAction *>();
		}

		void AbstractProjectItemView::moveEvent(QMoveEvent *event) {
		QMainWindow::moveEvent(event);

		/**
		* Returns a list of actions appropriate for the active tool bar.
		*
		* @return @b QList<QAction *> The actions
		*/
		QList<QAction *> AbstractProjectItemView::activeToolBarActions() {
		return QList<QAction *>();
		emit windowChangeEvent(false);
		}


		/**
		* Returns a list of actions appropriate for the tool pad.
		*
		* @return @b QList<QAction *> The actions
		*/
		QList<QAction *> AbstractProjectItemView::toolPadActions() {
		return QList<QAction *>();
		void AbstractProjectItemView::resizeEvent(QResizeEvent *event) {
		QMainWindow::resizeEvent(event);

		emit windowChangeEvent(false);
		}


		@@ -189,66 +173,6 @@ namespace Isis {
		}


		/**
		* Returns a list of actions appropriate for a file menu.
		*
		* @return @b QList<QAction *> The actions
		*/
		QList<QAction *> AbstractProjectItemView::fileMenuActions() {
		return QList<QAction *>();
		}


		/**
		* Returns a list of actions appropriate for a project menu.
		*
		* @return @b QList<QAction *> The actions
		*/
		QList<QAction *> AbstractProjectItemView::projectMenuActions() {
		return QList<QAction *>();
		}


		/**
		* Returns a list of actions appropriate for an edit menu.
		*
		* @return @b QList<QAction *> The actions
		*/
		QList<QAction *> AbstractProjectItemView::editMenuActions() {
		return QList<QAction *>();
		}


		/**
		* Returns a list of actions appropriate for a view menu.
		*
		* @return @b QList<QAction *> The actions
		*/
		QList<QAction *> AbstractProjectItemView::viewMenuActions() {
		return QList<QAction *>();
		}


		/**
		* Returns a list of actions appropriate for a settings menu.
		*
		* @return @b QList<QAction *> The actions
		*/
		QList<QAction *> AbstractProjectItemView::settingsMenuActions() {
		return QList<QAction *>();
		}


		/**
		* Returns a list of actions appropriate for a help menu.
		*
		* @return @b QList<QAction *> The actions
		*/
		QList<QAction *> AbstractProjectItemView::helpMenuActions() {
		return QList<QAction *>();
		}


		/**
		* Returns the current item of the model.
		*

isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.h

+15 −15

Original line number	Diff line number	Diff line
		@@ -66,6 +66,11 @@ namespace Isis {
		* to be main windows themselves, changing from an mdi interface to an
		* sdi interface.
		* @history 2018-05-30 Tracie Sucharski - Added the WindowFlag to set this as a Widget.
		* @history 2018-06-15 Kaitlyn Lee - Removed methods returing toolbar and menu actions because each
		* individual has its own toolbar. These methods are not needed anymore.
		* @History 2018-06-18 Summer Stapleton - Overloaded moveEvent and resizeEvent and added a
		* windowChangeEvent signal to allow project to recognize a new save
		* state. Fixes #5114
		*/
		class AbstractProjectItemView : public QMainWindow {

		@@ -81,25 +86,20 @@ namespace Isis {
		virtual void dragMoveEvent(QDragMoveEvent *event);
		virtual void dropEvent(QDropEvent *event);

		virtual QList<QAction *> permToolBarActions();
		virtual QList<QAction *> activeToolBarActions();
		virtual QList<QAction *> toolPadActions();
		virtual void moveEvent(QMoveEvent *event);
		virtual void resizeEvent(QResizeEvent *event);

		virtual QList<QAction *> contextMenuActions();

		virtual QList<QAction *> fileMenuActions();
		virtual QList<QAction *> projectMenuActions();
		virtual QList<QAction *> editMenuActions();
		virtual QList<QAction *> viewMenuActions();
		virtual QList<QAction *> settingsMenuActions();
		virtual QList<QAction *> helpMenuActions();

		virtual ProjectItem *currentItem();
		virtual QList<ProjectItem *> selectedItems();

		virtual ProjectItemModel *internalModel();
		virtual void setInternalModel(ProjectItemModel *model);

		signals:
		void windowChangeEvent(bool event);

		public slots:
		virtual void addItem(ProjectItem *item);
		virtual void addItems(QList<ProjectItem *> items);

isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp

+0 −32

Original line number	Diff line number	Diff line
		@@ -97,36 +97,4 @@ namespace Isis {
		QSize ControlPointEditView::sizeHint() const {
		return QSize(800, 600);
		}


		/**
		* Returns a list of actions for the permanent tool bar.
		*
		* @return (QList<QAction *>) The actions
		*/
		QList<QAction *> ControlPointEditView::permToolBarActions() {
		return m_permToolBar->actions();
		}


		/**
		* Returns a list of actions for the active tool bar.
		*
		* @return (QList<QAction *>) The actions
		*/
		QList<QAction *> ControlPointEditView::activeToolBarActions() {
		QList<QAction *> actions;
		actions.append(m_activeToolBarAction);
		return actions;
		}


		/**
		* Returns a list of actions for the tool pad.
		*
		* @return (QList<QAction *>) The actions
		*/
		QList<QAction *> ControlPointEditView::toolPadActions() {
		return m_toolPad->actions();
		}
		}