New "Open Windows" menu, showing currently open windows by title.

core/src/aboutview.cpp

@@ -51,4 +51,5 @@ void AboutView::closeEvent(QCloseEvent *event)
 {
 	event->ignore();
 	((QMdiSubWindow*)this->parent())->hide();
+	emit windowHiding((QMdiSubWindow*)this->parent());
 }

core/src/aboutview.h

@@ -43,6 +43,8 @@ class AboutView : public QWidget
 	QString m_commit;
 	QString m_hash;
 	Ui::AboutView ui;
+signals:
+	void windowHiding(QWidget *parent);
 };
 
 #endif // ABOUTVIEW_H

core/src/emsinfoview.cpp

@@ -173,6 +173,7 @@ void EmsInfoView::closeEvent(QCloseEvent *event)
 {
 	event->ignore();
 	((QMdiSubWindow*)this->parent())->hide();
+	emit windowHiding((QMdiSubWindow*)this->parent());
 }
 void EmsInfoView::locationIdInfo(unsigned short locationid,QString title,MemoryLocationInfo info)
 {

core/src/emsinfoview.h

@@ -24,6 +24,7 @@
 
 #include <QWidget>
 #include <QCloseEvent>
+#include <QMdiSubWindow>
 #include "memorylocationinfo.h"
 #include "datatype.h"
 #include "ui_emsinfo.h"
@@ -52,6 +53,7 @@ public slots:
 signals:
 	void displayLocationId(int locid, bool isram,DataType type);
 	void checkSync();
+	void windowHiding(QMdiSubWindow *parent);
 };
 
 #endif // EMSINFO_H

core/src/emsstatus.cpp

@@ -37,6 +37,7 @@ void EmsStatus::closeEvent(QCloseEvent *event)
 {
 	event->ignore();
 	this->hide();
+	emit windowHiding((QMdiSubWindow*)this->parent());
 }
 EmsStatus::~EmsStatus()
 {

core/src/emsstatus.h

@@ -24,6 +24,7 @@
 
 #include <QDockWidget>
 #include <QCloseEvent>
+#include <QMdiSubWindow>
 #include "ui_emsstatus.h"
 
 class EmsStatus : public QDockWidget
@@ -40,6 +41,7 @@ class EmsStatus : public QDockWidget
 signals:
 	void hardResetRequest();
 	void softResetRequest();
+	void windowHiding(QMdiSubWindow *parent);
 private:
 	Ui::EmsStatus ui;
 };

core/src/flagview.cpp

@@ -41,6 +41,7 @@ void FlagView::closeEvent(QCloseEvent *event)
 {
 	event->ignore();
 	((QMdiSubWindow*)this->parent())->hide();
+	emit windowHiding((QMdiSubWindow*)this->parent());
 }
 void FlagView::passData(QVariantMap data)
 {

core/src/flagview.h

@@ -40,6 +40,8 @@ class FlagView : public QWidget
 	void closeEvent(QCloseEvent *event);
 private:
 	Ui::DataFlags ui;
+signals:
+	void windowHiding(QMdiSubWindow *parent);
 };
 
 #endif // DATAFLAGS_H

core/src/gaugeview.cpp

@@ -41,6 +41,7 @@ void GaugeView::closeEvent(QCloseEvent *event)
 {
 	event->ignore();
 	((QMdiSubWindow*)this->parent())->hide();
+	emit windowHiding((QMdiSubWindow*)this->parent());
 }
 void GaugeView::passData(QVariantMap data)
 {

core/src/gaugeview.h

@@ -24,6 +24,7 @@
 
 #include <QWidget>
 #include <QCloseEvent>
+#include <QMdiSubWindow>
 #include "ui_datagauges.h"
 #include "gaugewidget.h"
 #include "datapacketdecoder.h"
@@ -49,6 +50,8 @@ class GaugeView : public QWidget
 	void closeEvent(QCloseEvent *event);
 private slots:
 	void guiUpdateTimerTick();
+signals:
+	void windowHiding(QMdiSubWindow *parent);
 };
 
 #endif // GAUGEVIEW_H

core/src/interrogateprogressview.cpp

@@ -34,6 +34,12 @@ void InterrogateProgressView::closeEvent(QCloseEvent *event)
 {
 	event->ignore();
 	((QMdiSubWindow*)this->parent())->hide();
+	emit windowHiding((QMdiSubWindow*)this->parent());
+}
+void InterrogateProgressView::hideEvent(QHideEvent *event)
+{
+	Q_UNUSED(event)
+	emit windowHiding((QMdiSubWindow*)this->parent());
 }
 void InterrogateProgressView::reset()
 {

core/src/interrogateprogressview.h

@@ -24,6 +24,7 @@
 
 #include <QWidget>
 #include <QCloseEvent>
+#include <QMdiSubWindow>
 #include "ui_interrogateprogressview.h"
 #include "overviewprogressitemdelegate.h"
 class InterrogateProgressView : public QWidget
@@ -45,13 +46,15 @@ class InterrogateProgressView : public QWidget
 	int progress() { return ui.progressBar->value(); }
 protected:
 	void closeEvent(QCloseEvent *event);
+	void hideEvent(QHideEvent *event);
 private:
 	Ui::InterrogateProgressView ui;
 	QMap<int,int> m_typeToOverviewListMap;
 private slots:
 	void cancelClickedSlot();
 signals:
 	void cancelClicked();
+	void windowHiding(QMdiSubWindow *parent);
 };
 
 #endif // INTERROGATEPROGRESSVIEW_H

core/src/interrogateprogressview.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Interrogation Progress</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>

core/src/mainwindow.cpp

@@ -190,6 +190,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 	connect(ui.actionParameter_View,SIGNAL(triggered()),this,SLOT(menu_windows_ParameterViewClicked()));
 	ui.actionInterrogation_Progress->setEnabled(false);
 
+
 	emsInfo=0;
 	dataTables=0;
 	dataFlags=0;
@@ -321,7 +322,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 
 
 	//ui.menuWizards
-
+	connect(ui.mdiArea,SIGNAL(subWindowActivated(QMdiSubWindow*)),this,SLOT(subMdiWindowActivated(QMdiSubWindow*)));
 
 }
 void MainWindow::menu_windows_interrogateProgressViewClicked()
@@ -1107,6 +1108,7 @@ void MainWindow::createView(unsigned short locid,DataType type)
 		view->setData(locid,data);
 
 		QMdiSubWindow *win = ui.mdiArea->addSubWindow(view);
+		connect(win,SIGNAL(destroyed(QObject*)),this,SLOT(rawDataViewDestroyed(QObject*)));
 		win->setWindowTitle("Ram Location 0x" + QString::number(locid,16).toUpper());
 		win->setGeometry(0,0,((view->width() < this->width()-160) ? view->width() : this->width()-160),((view->height() < this->height()-100) ? view->height() : this->height()-100));
 		m_rawDataView[locid] = view;
@@ -1163,8 +1165,14 @@ void MainWindow::rawDataViewDestroyed(QObject *object)
 			QMdiSubWindow *win = qobject_cast<QMdiSubWindow*>(object->parent());
 			if (!win)
 			{
-				return;
+				win = qobject_cast<QMdiSubWindow*>(object);
+				if (!win)
+				{
+					return;
+				}
 			}
+			ui.menuOpen_Windows->removeAction(m_mdiSubWindowToActionMap[win]);
+			m_mdiSubWindowToActionMap.remove(win);
 			win->hide();
 			ui.mdiArea->removeSubWindow(win);
 			return;
@@ -1561,6 +1569,7 @@ void MainWindow::emsCommsConnected()
 		progressView = new InterrogateProgressView();
 		connect(progressView,SIGNAL(destroyed(QObject*)),this,SLOT(interrogateProgressViewDestroyed(QObject*)));
 		interrogateProgressMdiWindow = ui.mdiArea->addSubWindow(progressView);
+		interrogateProgressMdiWindow->setWindowTitle(progressView->windowTitle());
 		interrogateProgressMdiWindow->setGeometry(progressView->geometry());
 		connect(progressView,SIGNAL(cancelClicked()),this,SLOT(interrogateProgressViewCancelClicked()));
 		progressView->setMaximum(0);
@@ -1950,6 +1959,59 @@ void MainWindow::logPayloadReceived(QByteArray header,QByteArray payload)
 	Q_UNUSED(payload)
 	pidcount++;
 }
+void MainWindow::windowHidden(QMdiSubWindow* window)
+{
+	if (window && m_mdiSubWindowToActionMap.contains(window))
+	{
+		ui.menuOpen_Windows->removeAction(m_mdiSubWindowToActionMap[window]);
+		m_mdiSubWindowToActionMap.remove(window);
+	}
+}
+void MainWindow::windowDestroyed(QObject *window)
+{
+	if (window && m_mdiSubWindowToActionMap.contains((QMdiSubWindow*)window))
+	{
+		ui.menuOpen_Windows->removeAction(m_mdiSubWindowToActionMap[(QMdiSubWindow*)window]);
+		m_mdiSubWindowToActionMap.remove((QMdiSubWindow*)window);
+	}
+}
+
+void MainWindow::bringToFrontAndShow()
+{
+	for (QMap<QMdiSubWindow*,QAction*>::const_iterator i=m_mdiSubWindowToActionMap.constBegin();i!=m_mdiSubWindowToActionMap.constEnd();i++)
+	{
+		if (i.value() == sender())
+		{
+			i.key()->show();
+			QApplication::postEvent(i.key(), new QEvent(QEvent::Show));
+			QApplication::postEvent(i.key(), new QEvent(QEvent::WindowActivate));
+		}
+
+	}
+}
+
+void MainWindow::subMdiWindowActivated(QMdiSubWindow* window)
+{
+	if (window && !m_mdiSubWindowToActionMap.contains(window))
+	{
+		if (window->isVisible())
+		{
+		//connect(window,SIGNAL(windowStateChanged(Qt::WindowStates,Qt::WindowStates))
+		QAction *action = ui.menuOpen_Windows->addAction(window->windowTitle());
+		connect(action,SIGNAL(triggered()),this,SLOT(bringToFrontAndShow()));
+		connect(window->widget(),SIGNAL(windowHiding(QMdiSubWindow*)),this,SLOT(windowHidden(QMdiSubWindow*)));
+		connect(window,SIGNAL(destroyed(QObject*)),this,SLOT(windowDestroyed(QObject*)));
+		m_mdiSubWindowToActionMap[window] = action;
+		}
+		//connect(action,SIGNAL(triggered(bool)),window,SLOT(setVisible(bool)));
+		//connect(action,SIGNAL(triggered()),this,SLOT(bringToFrontAndShow()));
+		QLOG_DEBUG() << "Window Activated New:" << window->windowTitle();
+	}
+	else if (window)
+	{
+		QLOG_DEBUG() << "Window Activated Old:" << window->windowTitle();
+	}
+}
 
 MainWindow::~MainWindow()
 {

core/src/mainwindow.h

@@ -164,7 +164,11 @@ class MainWindow : public QMainWindow
 	//EmsData *emsData;
 	//EmsData *checkEmsData;
 	int m_currentEcuClock;
+	QMap<QMdiSubWindow*,QAction*> m_mdiSubWindowToActionMap;
 private slots:
+	void windowHidden(QMdiSubWindow* window);
+	void bringToFrontAndShow();
+	void windowDestroyed(QObject *window);
 	void interrogationData(QMap<QString,QString> datamap);
 	void emsCommsSilence();
 	void emsCommsSilenceBroken();
@@ -232,6 +236,7 @@ private slots:
 	void interrogateTaskSucceed(int sequence);
 	void interrogateTaskFail(int sequence);
 	void locationIdList(QList<unsigned short> idlist);
+	void subMdiWindowActivated(QMdiSubWindow* window);
 
 };
 

core/src/mainwindow.ui

@@ -44,7 +44,7 @@
      <x>0</x>
      <y>0</y>
      <width>1525</width>
-     <height>27</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -79,6 +79,7 @@
     <addaction name="actionEMS_Status"/>
     <addaction name="actionInterrogation_Progress"/>
     <addaction name="actionParameter_View"/>
+    <addaction name="separator"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
@@ -91,9 +92,15 @@
      <string>Wizards</string>
     </property>
    </widget>
+   <widget class="QMenu" name="menuOpen_Windows">
+    <property name="title">
+     <string>Open Windows</string>
+    </property>
+   </widget>
    <addaction name="menuFile"/>
    <addaction name="menuEdit"/>
    <addaction name="menuWindows"/>
+   <addaction name="menuOpen_Windows"/>
    <addaction name="menuWizards"/>
    <addaction name="menuHelp"/>
   </widget>

core/src/packetstatusview.cpp

@@ -131,7 +131,14 @@ void PacketStatusView::closeEvent(QCloseEvent *event)
 {
 	event->ignore();
 	((QMdiSubWindow*)this->parent())->hide();
+	emit windowHiding((QMdiSubWindow*)this->parent());
 }
+void PacketStatusView::hideEvent(QHideEvent *event)
+{
+	Q_UNUSED(event)
+	emit windowHiding((QMdiSubWindow*)this->parent());
+}
+
 PacketStatusView::~PacketStatusView()
 {
 }

core/src/packetstatusview.h

@@ -23,6 +23,7 @@
 #define PACKETSTATUSVIEW_H
 
 #include <QWidget>
+#include <QMdiSubWindow>
 #include "ui_packetstatusview.h"
 class PacketStatusView : public QWidget
 {
@@ -39,8 +40,11 @@ public slots:
 	void passDecoderFailure(QByteArray packet);
 protected:
 	void closeEvent(QCloseEvent *event);
+	void hideEvent(QHideEvent *event);
 private:
 	Ui::PacketStatusView ui;
+signals:
+	void windowHiding(QMdiSubWindow *parent);
 };
 
 #endif // PACKETSTATUSVIEW_H

core/src/parameterview.cpp

@@ -3,6 +3,7 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QScrollArea>
+#include <QCloseEvent>
 #include <parameterwidget.h>
 #include "QsLog.h"
 
@@ -24,6 +25,12 @@ void ParameterView::addConfig(QString name,ConfigData *data)
     Q_UNUSED(data)
 
 }
+void ParameterView::closeEvent(QCloseEvent *event)
+{
+	event->ignore();
+	((QMdiSubWindow*)this->parent())->hide();
+	emit windowHiding((QMdiSubWindow*)this->parent());
+}
 
 void ParameterView::currentItemChanged(QTreeWidgetItem *current,QTreeWidgetItem *prev)
 {

core/src/parameterview.h

@@ -2,6 +2,7 @@
 #define PARAMETERVIEW_H
 
 #include <QWidget>
+#include <QMdiSubWindow>
 #include "ui_parameterview.h"
 #include "configblock.h"
 #include "parameterwidget.h"
@@ -30,8 +31,11 @@ class ParameterView : public QWidget
 	MenuSetup m_metaMenu;
 	QList<ConfigBlock> m_memoryConfigBlockList;
 	Ui::Form ui;
+protected:
+	void closeEvent(QCloseEvent *event);
 signals:
 	void saveSingleData(unsigned short locationid,QByteArray data, unsigned short offset, unsigned short size);
+	void windowHiding(QMdiSubWindow *parent);
 public slots:
 	void currentItemChanged(QTreeWidgetItem *current,QTreeWidgetItem *prev);
 	void itemSelectionChanged();

core/src/tableview.cpp

@@ -38,6 +38,7 @@ void TableView::closeEvent(QCloseEvent *event)
 {
 	event->ignore();
 	((QMdiSubWindow*)this->parent())->hide();
+	emit windowHiding((QMdiSubWindow*)this->parent());
 }
 void TableView::passDecoder(DataPacketDecoder *decoder)
 {