Change to search for Wizards in $HOME, and in /usr/share/EMStudio

fredcooke · Nov 24, 2013 · 6163351 · 6163351
1 parent a3ed9ed
commit 6163351
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/core/src/mainwindow.cpp b/core/src/mainwindow.cpp
@@ -1530,25 +1530,9 @@ void MainWindow::emsOperatingSystem(QString os)
 {
 	emsinfo.operatingSystem = os;
 }
-
-void MainWindow::emsCommsConnected()
+void MainWindow::loadWizards(QString dir)
 {
-	emsComms->startInterrogation();
-	m_interrogationFailureCount = 0;
-	ui.actionSave_Offline_Data->setEnabled(true);
-	ui.actionLoad_Offline_Data->setEnabled(true);
-	while (ui.menuWizards->actions().size() > 0)
-	{
-		QAction *action = ui.menuWizards->actions().takeFirst();
-		ui.menuWizards->removeAction(action);
-		delete action;
-	}
-	for (int i=0;i<m_wizardList.size();i++)
-	{
-		delete m_wizardList[i];
-	}
-	m_wizardList.clear();
-	QDir wizards("Wizards");
+	QDir wizards(dir);
 	foreach (QString file,wizards.entryList(QDir::Files | QDir::NoDotAndDotDot))
 	{
 		if (file.endsWith(".qml"))
@@ -1571,6 +1555,30 @@ void MainWindow::emsCommsConnected()
 			connect(view,SIGNAL(visibilityChanged(bool)),action,SLOT(setChecked(bool)));
 		}
 	}
+}
+
+void MainWindow::emsCommsConnected()
+{
+	emsComms->startInterrogation();
+	m_interrogationFailureCount = 0;
+	ui.actionSave_Offline_Data->setEnabled(true);
+	ui.actionLoad_Offline_Data->setEnabled(true);
+	while (ui.menuWizards->actions().size() > 0)
+	{
+		QAction *action = ui.menuWizards->actions().takeFirst();
+		ui.menuWizards->removeAction(action);
+		delete action;
+	}
+	for (int i=0;i<m_wizardList.size();i++)
+	{
+		delete m_wizardList[i];
+	}
+	m_wizardList.clear();
+	//m_defaultsDir
+	QDir defaultsdir(m_defaultsDir);
+	loadWizards(defaultsdir.absolutePath() + "/wizards");
+	loadWizards("wizards");
+	loadWizards(m_localHomeDir + "/wizards");
     //virtual QList<QString> getConfigList()=0;
 	for (int i=0;i<emsComms->getConfigList().size();i++)
 	{

diff --git a/core/src/mainwindow.h b/core/src/mainwindow.h
@@ -89,6 +89,7 @@ class MainWindow : public QMainWindow
 	void setPlugin(QString plugin);
 	void connectToEms();
 private:
+	void loadWizards(QString dir);
 	QList<unsigned short> m_locationIdList;
 	bool m_checkEmsDataInUse;
 	bool m_offlineMode;