Unverified Commit 2ec58d0c authored by Tracie Sucharski's avatar Tracie Sucharski Committed by GitHub
Browse files

Merge pull request #159 from USGS-Astrogeology/revert-157-ipce

Revert "Ipce"
parents be5eb296 0887f4e8
Loading
Loading
Loading
Loading
+0 −1
Original line number Original line Diff line number Diff line
../../objs/AbstractProjectItemViewMW/AbstractProjectItemViewMW.cpp
 No newline at end of file
+0 −1
Original line number Original line Diff line number Diff line
../../objs/AbstractProjectItemViewMW/AbstractProjectItemViewMW.h
 No newline at end of file
+0 −1
Original line number Original line Diff line number Diff line
../../objs/CubeDnView/CubeDnView.cpp
 No newline at end of file
+0 −1
Original line number Original line Diff line number Diff line
../../objs/CubeDnView/CubeDnView.h
 No newline at end of file
+18 −40
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@
#include <QTreeView>
#include <QTreeView>
#include <QVariant>
#include <QVariant>


#include "AbstractProjectItemViewMW.h"
#include "AbstractProjectItemView.h"
#include "Directory.h"
#include "Directory.h"
#include "FileName.h"
#include "FileName.h"
#include "IException.h"
#include "IException.h"
@@ -76,13 +76,12 @@ namespace Isis {
      QMainWindow(parent) {
      QMainWindow(parent) {
    m_maxThreadCount = -1;
    m_maxThreadCount = -1;


//  QMdiArea *centralWidget = new QMdiArea;
    QMdiArea *centralWidget = new QMdiArea;
//  centralWidget->setActivationOrder(QMdiArea::StackingOrder);
    centralWidget->setActivationOrder(QMdiArea::StackingOrder);


//  connect(centralWidget, SIGNAL( subWindowActivated(QMdiSubWindow *) ),
    connect(centralWidget, SIGNAL( subWindowActivated(QMdiSubWindow *) ),
//          this, SLOT( onSubWindowActivated(QMdiSubWindow *) ) );
            this, SLOT( onSubWindowActivated(QMdiSubWindow *) ) );


    QWidget *centralWidget = new QWidget;
    setCentralWidget(centralWidget);
    setCentralWidget(centralWidget);
    setDockNestingEnabled(true);
    setDockNestingEnabled(true);


@@ -90,8 +89,6 @@ namespace Isis {


    try {
    try {
      m_directory = new Directory(this);
      m_directory = new Directory(this);
      connect(m_directory, SIGNAL(newDockAvailable(QMainWindow *)),
              this, SLOT(addDock(QMainWindow *)));
      connect(m_directory, SIGNAL( newWidgetAvailable(QWidget *) ),
      connect(m_directory, SIGNAL( newWidgetAvailable(QWidget *) ),
              this, SLOT( addView(QWidget *) ) );
              this, SLOT( addView(QWidget *) ) );
      connect(m_directory, SIGNAL(viewClosed(QWidget *)), this, SLOT(removeView(QWidget *)));
      connect(m_directory, SIGNAL(viewClosed(QWidget *)), this, SLOT(removeView(QWidget *)));
@@ -192,9 +189,9 @@ namespace Isis {
    addToolBar(m_toolPad);
    addToolBar(m_toolPad);
    updateToolBarActions();
    updateToolBarActions();


//  setTabbedViewMode();
    setTabbedViewMode();
//  centralWidget->setTabsMovable(true);
    centralWidget->setTabsMovable(true);
//  centralWidget->setTabsClosable(true);
    centralWidget->setTabsClosable(true);


    QStringList args = QCoreApplication::arguments();
    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
   * This is connected from Directory's newWidgetAvailable signal and called when re-attaching a
   * view which was detached from the MDI main window.
   * view which was detached from the MDI main window.
@@ -247,8 +227,6 @@ namespace Isis {
      if ( QMdiArea *mdiArea = qobject_cast<QMdiArea *>( centralWidget() ) ) {
      if ( QMdiArea *mdiArea = qobject_cast<QMdiArea *>( centralWidget() ) ) {
        mdiArea->addSubWindow(newWidget);
        mdiArea->addSubWindow(newWidget);
        newWidget->show();
        newWidget->show();
        mdiArea->setActiveSubWindow(qobject_cast<QMdiSubWindow *>(newWidget));
        setActiveView(qobject_cast<AbstractProjectItemView *>(newWidget));
      }
      }
    }
    }
  }
  }
@@ -613,15 +591,15 @@ namespace Isis {
            this, SLOT( toggleViewMode() ) );
            this, SLOT( toggleViewMode() ) );
    m_viewMenuActions.append(viewModeAction);
    m_viewMenuActions.append(viewModeAction);


//  m_cascadeViewsAction = new QAction("Cascade Views", this);
    m_cascadeViewsAction = new QAction("Cascade Views", this);
//  connect(m_cascadeViewsAction, SIGNAL( triggered() ),
    connect(m_cascadeViewsAction, SIGNAL( triggered() ),
//          centralWidget(), SLOT( cascadeSubWindows() ) );
            centralWidget(), SLOT( cascadeSubWindows() ) );
//  m_viewMenuActions.append(m_cascadeViewsAction);
    m_viewMenuActions.append(m_cascadeViewsAction);
//

//  m_tileViewsAction = new QAction("Tile Views", this);
    m_tileViewsAction = new QAction("Tile Views", this);
//  connect(m_tileViewsAction, SIGNAL( triggered() ),
    connect(m_tileViewsAction, SIGNAL( triggered() ),
//          centralWidget(), SLOT( tileSubWindows() ) );
            centralWidget(), SLOT( tileSubWindows() ) );
//  m_viewMenuActions.append(m_tileViewsAction);
    m_viewMenuActions.append(m_tileViewsAction);


    QAction *detachActiveViewAction = new QAction("Detach Active View", this);
    QAction *detachActiveViewAction = new QAction("Detach Active View", this);
    connect(detachActiveViewAction, SIGNAL( triggered() ),
    connect(detachActiveViewAction, SIGNAL( triggered() ),
Loading