refactor: QML gui

.github/workflows/package/osx/action.yml

@@ -51,12 +51,12 @@ runs:
       export PATH="$(python3 -m site --user-base)/bin:$PATH"
 
       # Set variables
-      appName=Dissolve-GUI-QML-${{ runner.arch }}
+      appName=Dissolve2-GUI-${{ runner.arch }}
       appDirName=${appName}.app
-      packageName=Dissolve-GUI-QML-${{ runner.arch }}-${{ inputs.currentVersion }}
+      packageName=Dissolve2-GUI-${{ runner.arch }}-${{ inputs.currentVersion }}
 
       # Prepare the dmg file content
-      ./prep-dmg -a Dissolve-GUI-QML-${{ runner.arch }} -v ${{ inputs.currentVersion }} -b build/bin/dissolve-gui-qml.app/Contents/MacOS/dissolve-gui-qml -d ${Qt6_ROOT} -i icon/icon-1024x1024.png -p build/bin/dissolve-gui-qml.app/Contents/Info.plist -q src/gui/qml
+      ./prep-dmg -a Dissolve2-GUI-${{ runner.arch }} -v ${{ inputs.currentVersion }} -b build/bin/dissolve2-gui.app/Contents/MacOS/dissolve2-gui -d ${Qt6_ROOT} -i icon/icon-1024x1024.png -p build/bin/dissolve2-gui.app/Contents/Info.plist -q src/gui/qml
 
       # Copy dependencies into Frameworks folder in app bundle
       cp -v ./build/direct_deploy/*/lib/*.dylib ${packageName}/${appDirName}/Contents/Frameworks/
@@ -69,7 +69,7 @@ runs:
       export PATH="$(python3 -m site --user-base)/bin:$PATH"
 
       # Set variables
-      appName=Dissolve-GUI-QML-${{ runner.arch }}
+      appName=Dissolve2-GUI-${{ runner.arch }}
       appDirName=${appName}.app
       packageName=Dissolve-GUI-${{ runner.arch }}-${{ inputs.currentVersion }}
       dmgName=Dissolve-GUI-${{ inputs.currentVersion }}-${{ runner.arch }}

CMakeLists.txt

@@ -151,7 +151,7 @@ endif(GUI)
 if(WIN32)
   set(target_name Dissolve)
   set(gui_target_name Dissolve-GUI)
-  set(qmlgui_target_name Dissolve-GUI-QML)
+  set(qmlgui_target_name Dissolve2-GUI)
 
   # Adjust external include directories for GUI
   if(GUI)
@@ -176,7 +176,7 @@ endif(WIN32)
 if(UNIX)
   set(target_name dissolve)
   set(gui_target_name dissolve-gui)
-  set(qmlgui_target_name dissolve-gui-qml)
+  set(qmlgui_target_name dissolve2-gui)
 
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 endif(UNIX)
@@ -192,7 +192,7 @@ if(APPLE)
 
   set(target_name dissolve)
   set(gui_target_name dissolve-gui)
-  set(qmlgui_target_name dissolve-gui-qml)
+  set(qmlgui_target_name dissolve2-gui)
 
   add_definitions(-D_MAC)
 
@@ -253,8 +253,8 @@ target_include_directories(
 if(GUI)
 
   # Dissolve QML GUI
-  qt_add_executable(${qmlgui_target_name} MACOSX_BUNDLE ${SRCS}/dissolve-gui-qml.cpp)
-  set_source_files_properties(${SRCS}/gui-qml/qml/DissolveMain.qml PROPERTIES QT_RESOURCE_ALIAS qml/DissolveMain.qml)
+  qt_add_executable(${qmlgui_target_name} MACOSX_BUNDLE ${SRCS}/dissolve2-gui.cpp)
+  set_source_files_properties(${SRCS}/gui2/qml/DissolveMain.qml PROPERTIES QT_RESOURCE_ALIAS qml/DissolveMain.qml)
 
   qt_add_qml_module(
     ${qmlgui_target_name}
@@ -263,20 +263,13 @@ if(GUI)
     URI
     Dissolve
     QML_FILES
-    ${SRCS}/gui-qml/qml/DissolveMain.qml
-    ${SRCS}/gui/qml/nodeGraph/ForcefieldDialog.qml
-    ${SRCS}/gui/qml/nodeGraph/GraphView.qml
-    ${SRCS}/gui/qml/nodeGraph/GraphDelegate.qml
-    ${SRCS}/gui/qml/nodeGraph/ParameterDelegate.qml
-    ${SRCS}/gui/qml/nodeGraph/NodeBox.qml
-    ${SRCS}/gui/qml/nodeGraph/SpeciesDialog.qml
-    ${SRCS}/gui/qml/nodeGraph/ElementComboBox.qml
+    ${SRCS}/gui2/qml/DissolveMain.qml
     RESOURCES
   )
 
   # Set project-local include directories for target (we expect to need less of these dependencies over time)
   target_include_directories(
-    ${qmlgui_target_name} PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/gui/gui_autogen/include
+    ${qmlgui_target_name} PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/gui2/gui_autogen/include
                                   ${Qt6Core_INCLUDE_DIRS} ${Qt6Gui_INCLUDE_DIRS}
   )
 
@@ -348,23 +341,23 @@ if(GUI)
 
   # Link to models when developing QML Dissolve in Visual Studio
   if(MSVC_DEV)
-    set(QML_GUI_LIBS models)
+    set(QML_GUI_LIBS models2)
   endif(MSVC_DEV)
 
   # Dissolve2 QML plugins
   set(QML_PLUGINS
       # QtQuick plotting library
       QuickPlotplugin
       # Icons (.svg)
-      icons_moduleplugin
+      icons_moduleplugin dialogs_moduleplugin controls_moduleplugin nodeGraph_moduleplugin periodicTable_moduleplugin
   )
 
   # Main Dissolve GUI
   target_link_libraries(
     ${qmlgui_target_name}
     PUBLIC ${WHOLE_ARCHIVE_FLAG} ${BASIC_LINK_LIBS}
            # Module gui libs
-           gui-qml ${QML_GUI_LIBS} ${NO_WHOLE_ARCHIVE_FLAG} ${QML_PLUGINS}
+           gui2 ${QML_GUI_LIBS} ${NO_WHOLE_ARCHIVE_FLAG} ${QML_PLUGINS}
     PRIVATE # External libs
             Qt6::Quick3D Qt6::Qml Qt6::Widgets ${CORE_LINK_LIBS} ${THREADING_LINK_LIBS}
   )

ci/windows/dissolve-gui.iss

@@ -5,7 +5,7 @@
 #define MyAppVersion GetEnv('DISSOLVE_VERSION')
 #define MyAppPublisher "Team Dissolve"
 #define MyAppURL "https://www.projectdissolve.com/"
-#define MyAppExeName "Dissolve-GUI-QML.exe"
+#define MyAppExeName "Dissolve2-GUI.exe"
 
 ; Locations of bin directories of Dissolve, Qt, GnuWin, MinGW etc.
 #define DissolveDir GetEnv('DISSOLVE_DIR')
@@ -27,11 +27,11 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={commonpf}\Dissolve-GUI-QML
+DefaultDirName={commonpf}\Dissolve2-GUI
 DefaultGroupName={#MyAppName}
 LicenseFile=..\..\LICENSE.txt
 OutputDir=..\..\
-OutputBaseFilename=Dissolve-GUI-QML-{#MyAppVersion}-Win64
+OutputBaseFilename=Dissolve2-GUI-{#MyAppVersion}-Win64
 SetupIconFile=Dissolve.ico
 Compression=lzma
 SolidCompression=yes

src/CMakeLists.txt

@@ -9,8 +9,7 @@ add_subdirectory(math)
 add_subdirectory(neta)
 
 if(GUI)
-  add_subdirectory(gui)
-  add_subdirectory(gui-qml)
+  add_subdirectory(gui2)
 endif(GUI)
 
 add_subdirectory(nodes)

src/dissolve-gui-qml.cpp → src/dissolve2-gui.cpp

@@ -2,8 +2,9 @@
 // Copyright (c) 2026 Team Dissolve and contributors
 
 #include "base/messenger.h"
-#include "gui/models/dissolveModel.h"
-#include "gui/models/types.h"
+#include "gui2/models/dissolveModel.h"
+#include "gui2/models/nodeRegistryModel.h"
+#include "gui2/models/types.h"
 #include "main/cli.h"
 #include "main/dissolve.h"
 #include "main/version.h"
@@ -22,6 +23,8 @@ int main(int args, char **argv)
     DissolveModel dissolveModel;
     dissolveModel.setDissolve(dissolve);
 
+    NodeRegistryModel nodeRegistryModel;
+
     // Parse CLI options
     CLIOptions options;
     if (options.parse(args, argv, true) != CLIOptions::Success)
@@ -35,6 +38,7 @@ int main(int args, char **argv)
 
     QQmlApplicationEngine engine;
     engine.rootContext()->setContextProperty("dissolve", &dissolveModel);
+    engine.rootContext()->setContextProperty("nodeRegistry", &nodeRegistryModel);
     const QUrl url(u"qrc:/Dissolve/qml/DissolveMain.qml"_qs);
     Types::registerDissolveQmlTypes();
 
@@ -45,7 +49,7 @@ int main(int args, char **argv)
 
     QCoreApplication::setOrganizationName("Team Dissolve");
     QCoreApplication::setOrganizationDomain("www.projectdissolve.com");
-    QCoreApplication::setApplicationName("Dissolve-GUI-QML");
+    QCoreApplication::setApplicationName("Dissolve2-GUI");
 
     // Set native siblings attribute to prevent odd rendering artefacts on some systems
     app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
@@ -55,7 +59,7 @@ int main(int args, char **argv)
     QLocale::setDefault(QLocale::C);
 
     // Print GPL license information
-    Messenger::print("Dissolve-GUI-QML {} version {}, Copyright (C) 2026 Team Dissolve and contributors.\n", Version::appType(),
+    Messenger::print("Dissolve2-GUI {} version {}, Copyright (C) 2026 Team Dissolve and contributors.\n", Version::appType(),
                      Version::info());
     Messenger::print("Source repository: {}.\n", Version::repoUrl());
     Messenger::print("Dissolve comes with ABSOLUTELY NO WARRANTY.\n");