Test arm

.github/workflows/deploy-linux.yml

@@ -2,7 +2,7 @@ name: deploy-linux
 on:
   push:
     branches:
-      - process_reset_err
+      - test_arm1
   release:
     types:
       - published

.github/workflows/deploy-macos.yml

@@ -3,7 +3,7 @@ name: deploy-macos
 on:
   push:
     branches:
-      - LESTO_project
+      - test_arm
   release:
     types:
       - published
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest ]
+        os: [ macos-14 ]
         conda_platform: [ osx-arm64 ]
         artifact_name: [ gemsgui-macos ]
 
@@ -73,6 +73,7 @@ jobs:
           mkdir .build && cd .build
           cmake -GNinja .. \
             -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_OSX_ARCHITECTURES=arm64 \
             -DCMAKE_INSTALL_PREFIX=${{ steps.strings2.outputs.deploy-output-dir }}
           ninja
           ninja install
@@ -87,30 +88,72 @@ jobs:
           cp "Resources/rungems3-mac.sh" "${{ steps.strings.outputs.deploy-name }}/rungems3.sh"
           cp "Resources/README-macos.txt" "${{ steps.strings.outputs.deploy-name }}/README.txt"
 
+      - name: Install timeout tool
+        run: brew install coreutils
+
       # -------------------------
-      # ZIP packaging
+      # Verify architecture + smoke test GUI app
       # -------------------------
-      - name: Create zip archive for GitHub release
+      - name: Verify runner architecture
         run: |
-          cd ${{ github.workspace }}
-          zip -r ${{ steps.strings2.outputs.deploy-output-name }} ${{ steps.strings.outputs.deploy-name }}
+          echo "uname -m:"
+          uname -m
+          if [ "$(uname -m)" != "arm64" ]; then
+            echo "ERROR: Not running on ARM64 runner"
+            exit 1
+          fi
+
+      - name: Smoke test GEMSGUI
+        run: |
+          APP="${{ steps.strings2.outputs.deploy-output-dir }}/gem-selektor.app/Contents/MacOS/gem-selektor"
+          set +e
+          gtimeout 10 "$APP" -u "$HOME/gems-user-dir"
+          EXIT_CODE=$?
+          set -e
+          if [ "$EXIT_CODE" -ne 124 ] && [ "$EXIT_CODE" -ne 0 ]; then
+            echo "App crashed with exit code $EXIT_CODE"
+            exit 1
+          fi
 
       # -------------------------
-      # DMG packaging (system Qt)
+      # macdeployqt (NO DMG)
       # -------------------------
-      - name: Clean previous DMG
-        run: |
-          hdiutil detach /Volumes/gem-selektor || true
-          rm -f gem-selektor.dmg
-
-      - name: Create DMG with macdeployqt
+      - name: Run macdeployqt (no DMG)
         shell: bash -l {0}
         run: |
           conda activate GEMSGUI
           cd "${{ steps.strings2.outputs.deploy-output-dir }}"
-          /Users/runner/miniconda3/envs/GEMSGUI/lib/qt6/bin/macdeployqt gem-selektor.app -verbose=2 -dmg
+          /Users/runner/miniconda3/envs/GEMSGUI/lib/qt6/bin/macdeployqt gem-selektor.app -verbose=2
+
+      # -------------------------
+      # Ad-hoc signing
+      # -------------------------
+      - name: Ad-hoc sign .app bundle
+        run: |
+          cd "${{ steps.strings2.outputs.deploy-output-dir }}"
+          xattr -dr com.apple.quarantine gem-selektor.app || true
+          codesign --force --deep --sign - gem-selektor.app
+          codesign --verify --deep --strict gem-selektor.app
+
+      # -------------------------
+      # Create DMG (signed app inside)
+      # -------------------------
+      - name: Create DMG
+        run: |
+          cd "${{ steps.strings2.outputs.deploy-output-dir }}"
+          hdiutil create -volname gem-selektor \
+            -srcfolder gem-selektor.app \
+            -ov -format UDZO gem-selektor.dmg
           mv gem-selektor.dmg "${{ github.workspace }}/macos-${{ steps.strings.outputs.deploy-name }}.dmg"
 
+      # -------------------------
+      # ZIP packaging
+      # -------------------------
+      - name: Create zip archive for GitHub release
+        run: |
+          cd ${{ github.workspace }}
+          zip -r ${{ steps.strings2.outputs.deploy-output-name }} ${{ steps.strings.outputs.deploy-name }}
+
       # -------------------------
       # Upload artifacts
       # -------------------------

.github/workflows/deploy-windows.yml

@@ -2,7 +2,7 @@ name: deploy-windows
 on:
   push:
     branches:
-      - LESTO_project1
+      - test_arm
   release:
     types:
       - published

App/main.cpp

@@ -28,9 +28,7 @@
 
 #include <QApplication>
 #include <QtWidgets>
-#include "visor.h"
 #include "GemsMainWindow.h"
-#include "GEMS3K/jsonconfig.h"
 
 class TIntegApp:  public QApplication
 {
@@ -80,7 +78,7 @@ TIntegApp::TIntegApp(int& c, char** v):
 void TIntegApp::InitMainWindow()
 {
     pVisorImp = new TVisorImp(argc, argv);
-    // styleHints()->setColorScheme(static_cast<Qt::ColorScheme>(pVisorImp->getColorScheme()));
+    styleHints()->setColorScheme(static_cast<Qt::ColorScheme>(pVisorImp->getColorScheme()));
     pVisorImp->show();
     // init Help Window
     pVisorImp->GetHelp();

GUI/Dialogs4/GemsMainWindow.cpp

@@ -83,6 +83,7 @@ TVisorImp::TVisorImp(int c, char** v):
     ui->setupUi(this);
     GEMS3KGenerator::default_type_f = GEMS3KGenerator::f_json;
     ui->action_Use_ThermoFUN->setChecked(GEMS3KGenerator::default_type_f>=GEMS3KGenerator::f_thermofun);
+    ui->actionExpanded_view->setChecked(getPhaseExpandMode());
 
     (void)statusBar();
     //setMinimumSize( 300, 200 );
@@ -222,6 +223,9 @@ TVisorImp::TVisorImp(int c, char** v):
             GEMS3KGenerator::default_type_f = GEMS3KGenerator::f_json;
         }
     });
+    connect( ui->actionExpanded_view, &QAction::toggled, [&](bool checked){
+        setPhaseExpandMode(checked);
+    });
     connect( ui->action_calcMode, SIGNAL( triggered()), this, SLOT(CmCalcMode()));
     connect( ui->actionDataBaseMode, SIGNAL( triggered()), this, SLOT(CmDataBaseMode()));
 

GUI/Dialogs4/GemsMainWindow.h

@@ -28,7 +28,6 @@
 #include <QHBoxLayout>
 #include <QTableWidget>
 #include "module_w.h"
-#include "v_vals.h"
 
 QT_BEGIN_NAMESPACE
 class QLabel;
@@ -162,6 +161,7 @@ class TVisorImp: public QMainWindow
     int charWidth;
     int charHeight;
     int colorScheme=0;
+    bool phaseExpandMode = false;
 
     char TCpoint[32];  // Step point ID for stepwise mode
 
@@ -214,6 +214,11 @@ class TVisorImp: public QMainWindow
             updateTime = updInterval;
     }
 
+    void setPhaseExpandMode(bool expand_all)
+    {  phaseExpandMode = expand_all;  }
+    bool getPhaseExpandMode() const
+    {  return phaseExpandMode;   }
+
     const char* version();
     const char* getGEMTitle();
     const QFont& getCellFont() const

GUI/Dialogs4/GemsMainWindow4.ui

@@ -114,6 +114,7 @@
     <addaction name="sactionPrecise"/>
     <addaction name="sactionStepwise"/>
     <addaction name="action_Use_ThermoFUN"/>
+    <addaction name="actionExpanded_view"/>
    </widget>
    <widget class="QMenu" name="smenu_View">
     <property name="title">
@@ -1301,6 +1302,14 @@
     <string>Import JSON files...</string>
    </property>
   </action>
+  <action name="actionExpanded_view">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Expanded view</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../GUI.qrc"/>

GUI/Dialogs4/HelpWindow.cpp

@@ -108,7 +108,7 @@ HelpWindow::HelpWindow( QWidget* parent):
 
     //End Ui form
 
-    QString collectionFile = QString( pVisor->docDir().c_str() )+ QLatin1String("gems3help.qhc");
+    QString collectionFile = QString::fromStdString(pVisor->localDocDir())+ QLatin1String("gems3help.qhc");
     // "/home/gems/gemworks/gems3/shared/doc/html/gems3help.qhc";
 
     findLine = nullptr;

GUI/Dialogs4/SettingsDialog.cpp

@@ -17,6 +17,8 @@
 //-------------------------------------------------------------------
 
 #include <QFontDialog>
+#include <QApplication>
+#include <QStyleHints>
 
 #include "ui_SettingsDialog4.h"
 #include "SettingsDialog.h"
@@ -35,20 +37,15 @@ SettingsDialog::SettingsDialog (QWidget* parent)
     setWindowTitle( "GEM-Selektor: Settings and preferences" );
 
     ui->pUpdateInterval->setValue( pVisorImp->updateInterval() );
-
     ui->comboBox->setCurrentIndex(pVisorImp->getColorScheme());
-    ui->pLocalDocDir->setText(pVisor->localDocDir().c_str());
-    ui->pRemoteHTML->setText(pVisor->remoteHTML().c_str());
-    //pLocalDoc->setChecked(pVisor->localDoc());
-    //pRemoteDoc->setChecked(!pVisor->localDoc());
-    ui->pSysDBDir->setText(pVisor->sysGEMDir().c_str());
-    ui->pUserDBDir->setText(pVisor->userGEMDir().c_str());
-    ui->pUserDBDir->setText(pVisor->userProfDir().c_str());
+    ui->pLocalDocDir->setText(QString::fromStdString(pVisor->localDocDir()));
+    ui->pSysDBDir->setText(QString::fromStdString(pVisor->sysGEMDir()));
+    //ui->pUserDBDir->setText(pVisor->userGEMDir().c_str());
+    ui->pUserDBDir->setText(QString::fromStdString(pVisor->userProfDir()));
     ui->pFontRawName->setText(cellFont.toString());
     ui->pNumDigits->setValue(pVisor->getDoubleDigits());
     ui->pUpdateInterval->setValue(pVisorImp->updateInterval());
     ui->pConfigAutosave->setChecked(pVisor->getConfigAutosave());
-    //    pConfigAutosave->setChecked( true );
 
     if( pVisor->getElemPrMode() )
     {   ui->rbNewPrMode->setChecked( true );
@@ -84,20 +81,14 @@ void SettingsDialog::accept()
 void SettingsDialog::CmApply()
 {
     pVisorImp->setCellFont(cellFont);
-
     pVisorImp->setColorScheme(ui->comboBox->currentIndex());
     pVisor->setDoubleDigits(ui->pNumDigits->value());
     pVisorImp->setUpdateInterval( ui->pUpdateInterval->value() );
     pVisor->setConfigAutosave( ui->pConfigAutosave->isChecked() );
     pVisor->setElemPrMode(ui->rbNewPrMode->isChecked());
-
-    pVisor->setLocalDocDir(ui->pLocalDocDir->text().toStdString());
-    pVisor->setRemoteHTML(ui->pRemoteHTML->text().toStdString());
-
+    //pVisor->setLocalDocDir(ui->pLocalDocDir->text().toStdString());
     pVisor->setDefaultBuiltinTDB(ui->pBuiltinTDB->text().toStdString());
-
-    //pVisor->setLocalDoc(pLocalDoc->isChecked());
-
+    qApp->styleHints()->setColorScheme(static_cast<Qt::ColorScheme>(pVisorImp->getColorScheme()));
     //pVisorImp->Update(true);
 }