Commit 23ba2548 authored by Summer Stapleton's avatar Summer Stapleton
Browse files

Fixing merge conflicts

parents 3270c0cb c48b8344

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

+26 −0
Original line number Diff line number Diff line
@@ -353,6 +353,10 @@ namespace Isis { 
    connect( tabViewsAction, SIGNAL(triggered()), this, SLOT(tabViews()) );

    m_viewMenuActions.append(tabViewsAction);



    QAction *tileViewsAction = new QAction("Tile Views", this);

    connect( tileViewsAction, SIGNAL(triggered()), this, SLOT(tileViews()) );

    m_viewMenuActions.append(tileViewsAction);



    QAction *undoAction = m_directory->undoAction();

    undoAction->setShortcut(Qt::Key_Z | Qt::CTRL);
@@ -816,6 +820,28 @@ namespace Isis { 
  }





  /**

   * Tile all open attached/detached views

   */

  void IpceMainWindow::tileViews() {

    // splitDockWidget() takes two widgets and tiles them, so an easy way to do

    // this is to grab the first view and tile the rest with the first.

    QDockWidget *firstView = m_viewDocks.first();



    foreach (QDockWidget *currentView, m_viewDocks) {

      // We have to reattach a view before it can be tiled. If it is attached,

      // this will have no affect. We have to call addDockWidget() to untab any views.

      currentView->setFloating(false);

      addDockWidget(Qt::LeftDockWidgetArea, currentView, Qt::Horizontal);



      if (currentView == firstView) {

        continue;

      }

      splitDockWidget(firstView, currentView, Qt::Horizontal);

    }

  }





/**

 * Raises the warningWidget to the front of the tabs. Connected to warning signal from directory.

 */

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

+4 −1
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ namespace Isis { 
   *                           state can be reset after the IpceMainWindow::show() causes resize and

   *                           move events which in turn cause the project clean flag to be false

   *                           even though the project has just opened.

   *   @history 2018-07-05 Kaitlyn Lee - Added tilViews() and the menu option to tile all docked/undocked

   *                           and tabbed/untabbed views.

   *   @history 2018-07-07 Summer Stapleton - Added check in the closeEvent() for changes to any 

   *                           TemplateEditorWidget currently open to create a pop-up warning/

   *                           option to save.
@@ -189,6 +191,7 @@ namespace Isis { 
      void enterWhatsThisMode();



      void tabViews();

      void tileViews();



      void raiseWarningTab();

      void cleanupViewDockList(QObject *obj);