Commit cefc08a2 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Revert "Merge branch 'ipceDocks' into ipce" 

This reverts commit 0b56f047, reversing
changes made to 745c6cde.
parent 0b56f047

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

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../objs/AbstractProjectItemViewMW/AbstractProjectItemViewMW.cpp
 
 No newline at end of file

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

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../objs/AbstractProjectItemViewMW/AbstractProjectItemViewMW.h
 
 No newline at end of file

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

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../objs/CubeDnView/CubeDnView.cpp
 
 No newline at end of file

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

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../objs/CubeDnView/CubeDnView.h
 
 No newline at end of file

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

+18 −38
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <QTreeView>

#include <QVariant>



#include "AbstractProjectItemViewMW.h"

#include "AbstractProjectItemView.h"

#include "Directory.h"

#include "FileName.h"

#include "IException.h"
@@ -76,13 +76,12 @@ namespace Isis { 
      QMainWindow(parent) {

    m_maxThreadCount = -1;



//  QMdiArea *centralWidget = new QMdiArea;

//  centralWidget->setActivationOrder(QMdiArea::StackingOrder);

    QMdiArea *centralWidget = new QMdiArea;

    centralWidget->setActivationOrder(QMdiArea::StackingOrder);



//  connect(centralWidget, SIGNAL( subWindowActivated(QMdiSubWindow *) ),

//          this, SLOT( onSubWindowActivated(QMdiSubWindow *) ) );

    connect(centralWidget, SIGNAL( subWindowActivated(QMdiSubWindow *) ),

            this, SLOT( onSubWindowActivated(QMdiSubWindow *) ) );



    QWidget *centralWidget = new QWidget;

    setCentralWidget(centralWidget);

    setDockNestingEnabled(true);
@@ -90,8 +89,6 @@ namespace Isis { 


    try {

      m_directory = new Directory(this);

      connect(m_directory, SIGNAL(newDockAvailable(QMainWindow *)),

              this, SLOT(addDock(QMainWindow *)));

      connect(m_directory, SIGNAL( newWidgetAvailable(QWidget *) ),

              this, SLOT( addView(QWidget *) ) );

      connect(m_directory, SIGNAL(viewClosed(QWidget *)), this, SLOT(removeView(QWidget *)));
@@ -192,9 +189,9 @@ namespace Isis { 
    addToolBar(m_toolPad);

    updateToolBarActions();



//  setTabbedViewMode();

//  centralWidget->setTabsMovable(true);

//  centralWidget->setTabsClosable(true);

    setTabbedViewMode();

    centralWidget->setTabsMovable(true);

    centralWidget->setTabsClosable(true);



    QStringList args = QCoreApplication::arguments();
@@ -210,23 +207,6 @@ namespace Isis { 
  }





  void IpceMainWindow::addDock(QMainWindow *newWidgetForDock) {



    QDockWidget *dock = new QDockWidget(newWidgetForDock->windowTitle());

    dock->setWidget(newWidgetForDock);

    dock->setObjectName(newWidgetForDock->windowTitle());



    // This needs to eventually be a work order...

    dock->setAttribute(Qt::WA_DeleteOnClose);



    connect(newWidgetForDock, SIGNAL(destroyed(QObject *)),

            dock, SLOT(deleteLater()));



    addDockWidget(Qt::RightDockWidgetArea, dock);

//    addDockWidget(area, dock, orientation);

  }





  /**

   * This is connected from Directory's newWidgetAvailable signal and called when re-attaching a

   * view which was detached from the MDI main window.
@@ -613,15 +593,15 @@ namespace Isis { 
            this, SLOT( toggleViewMode() ) );

    m_viewMenuActions.append(viewModeAction);



//  m_cascadeViewsAction = new QAction("Cascade Views", this);

//  connect(m_cascadeViewsAction, SIGNAL( triggered() ),

//          centralWidget(), SLOT( cascadeSubWindows() ) );

//  m_viewMenuActions.append(m_cascadeViewsAction);

//

//  m_tileViewsAction = new QAction("Tile Views", this);

//  connect(m_tileViewsAction, SIGNAL( triggered() ),

//          centralWidget(), SLOT( tileSubWindows() ) );

//  m_viewMenuActions.append(m_tileViewsAction);

    m_cascadeViewsAction = new QAction("Cascade Views", this);

    connect(m_cascadeViewsAction, SIGNAL( triggered() ),

            centralWidget(), SLOT( cascadeSubWindows() ) );

    m_viewMenuActions.append(m_cascadeViewsAction);



    m_tileViewsAction = new QAction("Tile Views", this);

    connect(m_tileViewsAction, SIGNAL( triggered() ),

            centralWidget(), SLOT( tileSubWindows() ) );

    m_viewMenuActions.append(m_tileViewsAction);



    QAction *detachActiveViewAction = new QAction("Detach Active View", this);

    connect(detachActiveViewAction, SIGNAL( triggered() ),