Merge branch 'develop' into release-2.8

Author: SteveMaas1978

.github/workflows/linux-pull-request.yml

@@ -14,7 +14,7 @@ jobs:
   call_workflow:
     uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable-pull-request.yml@develop
     with:
-      aws-ami-id: ami-0590ebdb5afffb782
+      aws-ami-id: ami-0e02b23806d44a8fc
       aws-sg-id: sg-0ca7912782cf1538b
       aws-instance-type: c5a.8xlarge
       package-name: febio-studio

.github/workflows/linux-push.yml

@@ -12,7 +12,7 @@ jobs:
   call_workflow:
     uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable-push.yml@develop
     with:
-      aws-ami-id: ami-0590ebdb5afffb782
+      aws-ami-id: ami-0e02b23806d44a8fc
       aws-sg-id: sg-0ca7912782cf1538b
       runTests: false
       package-name: febio-studio

.github/workflows/linux-release.yml

@@ -13,6 +13,6 @@ jobs:
   call_workflow:
     uses: febiosoftware/febio-workflows/.github/workflows/linux-release.yml@develop
     with:
-      aws-ami-id: ami-0b97a2de37c43b9ba
+      aws-ami-id: ami-0e02b23806d44a8fc
       aws-sg-id: sg-0ca7912782cf1538b
     secrets: inherit

.github/workflows/windows-pull-request.yml

@@ -15,7 +15,7 @@ jobs:
     uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable-pull-request.yml@develop
     with:
       register-runner-timeout: 10
-      aws-ami-id: ami-0b18c665dbe9efa75
+      aws-ami-id: ami-0ecb160c4a6bfd01d
       aws-sg-id: sg-0ca7912782cf1538b
       aws-instance-type: c5a.8xlarge
       package-name: febio-studio

.github/workflows/windows-push.yml

@@ -12,7 +12,7 @@ jobs:
   call_workflow:
     uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable-push.yml@develop
     with:
-      aws-ami-id: ami-0b18c665dbe9efa75
+      aws-ami-id: ami-0ecb160c4a6bfd01d
       aws-sg-id: sg-0ca7912782cf1538b
       aws-instance-type: c5a.8xlarge
       runTests: false

.github/workflows/windows-release.yml

@@ -13,6 +13,6 @@ jobs:
   call_workflow:
     uses: febiosoftware/febio-workflows/.github/workflows/windows-release.yml@develop
     with:
-      aws-ami-id: ami-0b18c665dbe9efa75
+      aws-ami-id: ami-0ecb160c4a6bfd01d
       aws-sg-id: sg-0ca7912782cf1538b
     secrets: inherit

CMakeLists.txt

@@ -29,38 +29,40 @@ if(NOT Qt_Root)
     set(Qt_Root "" CACHE PATH "Path to the root Qt directory (e.g. /opt/Qt)")
 endif()
 
-if(NOT CMAKE_PREFIX_PATH)
+if(NOT Qt6_DIR OR NOT CMAKE_PREFIX_PATH)
     if(WIN32)
-      find_path(Qt_TEMP Qt6/Qt6Config.cmake
-        PATHS ${Qt_Root}/ ${Qt_Root}/* ${Qt_Root}/*/* C:/Qt/* C:/Qt*/* $ENV{HOME}/Qt/* $ENV{HOME}/*/Qt/* /Qt/* /Qt*/*
-        PATH_SUFFIXES "share" "lib/cmake" "msvc2015_64" "msvc2017_64" "msvc2019_64"
-        PATH_SUFFIXES "msvc2015_64" "msvc2017_64" "msvc2019_64"
-        DOC "Qt CMake Directory"
-        NO_DEFAULT_PATH)
+        find_path(Qt_TEMP Qt6Config.cmake
+            PATHS ${Qt_Root}/ ${Qt_Root}/* ${Qt_Root}/*/* C:/Qt/* C:/Qt*/* $ENV{HOME}/Qt/* $ENV{HOME}/*/Qt/* /Qt/* /Qt*/*
+            PATH_SUFFIXES "lib/cmake/Qt6" "msvc2019_64/lib/cmake/Qt6"
+            DOC "Qt CMake Directory"
+            NO_DEFAULT_PATH)
     elseif(APPLE)
-        find_path(Qt_TEMP lib/cmake/Qt6/Qt6Config.cmake
+        find_path(Qt_TEMP Qt6Config.cmake
             PATHS ${Qt_Root}/ ${Qt_Root}/* ${Qt_Root}/*/* /opt/Qt/* /opt/Qt*/* /usr/local/Qt/* /usr/local/Qt*/*
               $ENV{HOME}/Qt/* $ENV{HOME}/*/Qt/* /Qt/* /Qt*/*
-            PATH_SUFFIXES "clang_64"
+            PATH_SUFFIXES "lib/cmake/Qt6" "clang_64/lib/cmake/Qt6"
             DOC "Qt6 CMake Directory"
             NO_DEFAULT_PATH)
     else()
-        find_path(Qt_TEMP cmake/Qt6/Qt6Config.cmake
+        find_path(Qt_TEMP Qt6Config.cmake
             PATHS ${Qt_Root}/ ${Qt_Root}/* ${Qt_Root}/*/* /opt/Qt/* /opt/Qt*/* /usr/local/Qt/* /usr/local/Qt*/* 
                 $ENV{HOME}/Qt/* $ENV{HOME}/*/Qt6 $ENV{HOME}/*/Qt/* /Qt/* /Qt*/* 
-            PATH_SUFFIXES "gcc_64" "lib"
+            PATH_SUFFIXES "gcc_64/lib/cmake/Qt6" "lib/cmake/Qt6"
             DOC "Qt CMake Directory"
             NO_DEFAULT_PATH)
     endif()
 
     if(Qt_TEMP)
-        set(CMAKE_PREFIX_PATH ${Qt_TEMP} CACHE INTERNAL "Path to Qt6 installation prefix.")
+        set(Qt6_DIR ${Qt_TEMP} CACHE INTERNAL "Path to Qt6 installation prefix.")
+
+        set(CMAKE_PREFIX_PATH ${Qt_TEMP}/../../.. CACHE INTERNAL "Qt Prefix.")
+
         unset(Qt_TEMP CACHE)
     else()
         unset(Qt_TEMP CACHE)
     endif()
 
-    if(NOT CMAKE_PREFIX_PATH)
+    if(NOT Qt6_DIR OR NOT CMAKE_PREFIX_PATH)
         message(FATAL_ERROR "Unable to locate Qt6Config.cmake. Please check the value of Qt6_Root and set it to the root directory of your Qt6 installation (e.g. /opt/Qt).")
     endif()
 endif()

FEBioStudio/DlgFEBioOptimize.cpp

@@ -219,7 +219,6 @@ class Ui::CDlgFEBioOptimize
 public:
 	FSModel*	m_fem;
 	FEBioOpt	opt;
-	int			m_theme;
 
 	// page2 (Options)
 	QComboBox*	method;
@@ -253,12 +252,6 @@ class Ui::CDlgFEBioOptimize
 public:
 	void setup(QWizard* w)
 	{
-		if (m_theme == 1)
-		{
-			w->setWizardStyle(QWizard::ClassicStyle);
-			w->setStyleSheet("background-color:#353535");
-		}
-
 		w->addPage(GenerateIntro());
 		w->addPage(GenerateOptionsPage());
 		w->addPage(GenerateParametersPage());
@@ -427,11 +420,6 @@ class Ui::CDlgFEBioOptimize
 		paramTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
 		paramTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
 
-		if (m_theme == 0)
-			paramTable->setStyleSheet("QHeaderView::section { background-color:lightgray }");
-		else
-			paramTable->setStyleSheet("QHeaderView::section { background-color:gray }");
-
 		QVBoxLayout* l = new QVBoxLayout;
 		l->addLayout(form);
 		l->addLayout(h);
@@ -484,11 +472,6 @@ class Ui::CDlgFEBioOptimize
 			dataTable->setSelectionMode(QAbstractItemView::SingleSelection);
 			dataTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
 
-			if (m_theme == 0)
-				dataTable->setStyleSheet("QHeaderView::section { background-color:lightgray }");
-			else
-				dataTable->setStyleSheet("QHeaderView::section { background-color:gray }");
-
 			l1->addLayout(form);
 			l1->addLayout(h);
 			l1->addWidget(dataTable);
@@ -562,7 +545,6 @@ CDlgFEBioOptimize::CDlgFEBioOptimize(CMainWindow* parent) : QWizard(parent), ui(
 	CModelDocument* doc = dynamic_cast<CModelDocument*>(parent->GetDocument());
 
 	setWindowTitle("Generate FEBio optimization");
-	ui->m_theme = parent->currentTheme();
 	ui->m_fem = doc->GetFSModel();
 	ui->setup(this);
 

FEBioStudio/DlgSettings.cpp

@@ -37,6 +37,8 @@ SOFTWARE.*/
 #include <QTabWidget>
 #include <QListWidget>
 #include <QAction>
+#include <QApplication>
+#include <QStyleHints>
 #include <QLabel>
 #include <QDialogButtonBox>
 #include <QInputDialog>
@@ -154,11 +156,6 @@ class CUIProps : public CDataPropertyList
 	{
 		addBoolProperty(&m_apply, "Emulate apply action");
 		addBoolProperty(&m_bcmd , "Clear undo stack on save");
-		QStringList themes  = QStringList() << "Default" << "Dark";
-#ifdef LINUX
-		themes << "Adwaita" << "Adwaita Dark";
-#endif
-		addEnumProperty(&m_theme, "Theme")->setEnumValues(themes);
 		addProperty("Recent files list", CProperty::Action)->info = QString("Clear");
 		addIntProperty(&m_autoSaveInterval, "AutoSave Interval (s)");
 	}
@@ -1128,7 +1125,6 @@ void CDlgSettings::UpdateSettings()
 
 	ui->m_ui->m_apply = (view.m_apply == 1);
 	ui->m_ui->m_bcmd = m_pwnd->clearCommandStackOnSave();
-	ui->m_ui->m_theme = m_pwnd->currentTheme();
 	ui->m_ui->m_autoSaveInterval = m_pwnd->autoSaveInterval();
 
 	ui->m_select->m_bconnect = view.m_bconn;
@@ -1220,8 +1216,8 @@ void CDlgSettings::apply()
 
 	if (view.m_defaultFGColorOption == 0)
 	{
-		int theme = m_pwnd->currentTheme();
-		if (theme == 0) view.m_defaultFGColor = GLColor(0,0,0);
+		int theme = 0;
+		if (qApp->styleHints()->colorScheme() != Qt::ColorScheme::Dark) view.m_defaultFGColor = GLColor(0,0,0);
 		else view.m_defaultFGColor = GLColor(255, 255, 255);
 	}
 	GLWidget::set_base_color(view.m_defaultFGColor);
@@ -1278,14 +1274,6 @@ void CDlgSettings::apply()
 	m_pwnd->setClearCommandStackOnSave(ui->m_ui->m_bcmd);
 	m_pwnd->setAutoSaveInterval(ui->m_ui->m_autoSaveInterval);
 
-	int oldTheme = m_pwnd->currentTheme();
-	if (ui->m_ui->m_theme != oldTheme)
-	{
-		m_pwnd->setCurrentTheme(ui->m_ui->m_theme);
-		view.Defaults(ui->m_ui->m_theme);
-		QMessageBox::information(this, "FEBio Studio", "Changing the theme requires a restart of FEBio Studio for all changes to take effect.");
-	}
-
 	// update units
 	int newUnit = ui->m_unit->m_unit;
 	int nops = ui->m_unit->getOption();
@@ -1339,7 +1327,8 @@ void CDlgSettings::onReset()
 	CGLDocument* pdoc = m_pwnd->GetGLDocument();
 	CGLView* glview = m_pwnd->GetGLView();
 	GLViewSettings& view = glview->GetViewSettings();
-	int ntheme = m_pwnd->currentTheme();
+	int ntheme = 0;
+    if(qApp->styleHints()->colorScheme() == Qt::ColorScheme::Dark) ntheme = 1;
 	view.Defaults(ntheme);
 	UpdateSettings();
 	m_pwnd->RedrawGL();

FEBioStudio/GLView.cpp

@@ -32,6 +32,8 @@ SOFTWARE.*/
 #include <GL/glu.h>
 #endif
 #include "MainWindow.h"
+#include <QApplication>
+#include <QStyleHints>
 #include "BuildPanel.h"
 #include "CreatePanel.h"
 #include "ModelDocument.h"
@@ -1258,7 +1260,9 @@ void CGLView::initializeGL()
 void CGLView::Reset()
 {
 	// default display properties
-	int ntheme = m_pWnd->currentTheme();
+	int ntheme = 0;
+    if(qApp->styleHints()->colorScheme() == Qt::ColorScheme::Dark) ntheme = 1;
+
 	m_view.Defaults(ntheme);
 
 	GLHighlighter::ClearHighlights();