From ef3e949e74a0fb461c7d7cb23245c8273ffb5ccb Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Thu, 22 Aug 2024 16:01:24 +0200 Subject: [PATCH 1/7] Move plot.* to resources/plot/ --- fmusim-gui/CMakeLists.txt | 6 ++++-- fmusim-gui/{ => resources/plot}/plot.html | 0 fmusim-gui/{ => resources/plot}/plot.qrc | 1 + fmusim-gui/{ => resources/plot}/plotly-2.32.0.js | 0 fmusim-gui/{ => resources/plot}/plotly-2.33.0.min.js | 0 5 files changed, 5 insertions(+), 2 deletions(-) rename fmusim-gui/{ => resources/plot}/plot.html (100%) rename fmusim-gui/{ => resources/plot}/plot.qrc (75%) rename fmusim-gui/{ => resources/plot}/plotly-2.32.0.js (100%) rename fmusim-gui/{ => resources/plot}/plotly-2.33.0.min.js (100%) diff --git a/fmusim-gui/CMakeLists.txt b/fmusim-gui/CMakeLists.txt index ad25727e..6f8f70a0 100644 --- a/fmusim-gui/CMakeLists.txt +++ b/fmusim-gui/CMakeLists.txt @@ -46,7 +46,6 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) ${PROJECT_SOURCES} ModelVariablesTableModel.h ModelVariablesTableModel.cpp - plot.html ../src/FMI1.c ../src/FMI2.c ../include/FMI1.h @@ -89,7 +88,10 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) ../fmusim/FMICVode.c buttons.qrc - plot.qrc + + resources/plot/plot.html + resources/plot/plot.qrc + icons/variables/variables.qrc VariablesFilterModel.h VariablesFilterModel.cpp SimulationThread.h SimulationThread.cpp diff --git a/fmusim-gui/plot.html b/fmusim-gui/resources/plot/plot.html similarity index 100% rename from fmusim-gui/plot.html rename to fmusim-gui/resources/plot/plot.html diff --git a/fmusim-gui/plot.qrc b/fmusim-gui/resources/plot/plot.qrc similarity index 75% rename from fmusim-gui/plot.qrc rename to fmusim-gui/resources/plot/plot.qrc index 9a99b00b..16d0b6ee 100644 --- a/fmusim-gui/plot.qrc +++ b/fmusim-gui/resources/plot/plot.qrc @@ -2,5 +2,6 @@ plot.html plotly-2.32.0.js + plotly-2.33.0.min.js diff --git a/fmusim-gui/plotly-2.32.0.js b/fmusim-gui/resources/plot/plotly-2.32.0.js similarity index 100% rename from fmusim-gui/plotly-2.32.0.js rename to fmusim-gui/resources/plot/plotly-2.32.0.js diff --git a/fmusim-gui/plotly-2.33.0.min.js b/fmusim-gui/resources/plot/plotly-2.33.0.min.js similarity index 100% rename from fmusim-gui/plotly-2.33.0.min.js rename to fmusim-gui/resources/plot/plotly-2.33.0.min.js From 9b23ffc61d5388e436e4b8187f61c69b4dcabc89 Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Thu, 22 Aug 2024 16:13:54 +0200 Subject: [PATCH 2/7] Move build resources to resources/build/ --- fmusim-gui/BuildPlatformBinaryThread.cpp | 14 +++++++------- fmusim-gui/CMakeLists.txt | 1 + fmusim-gui/resources.qrc | 7 ------- fmusim-gui/resources/{ => build}/CMakeLists.txt | 0 fmusim-gui/resources/build/build.qrc | 11 +++++++++++ .../resources/{ => build}/fmi2FunctionTypes.h | 0 fmusim-gui/resources/{ => build}/fmi2Functions.h | 0 .../resources/{ => build}/fmi2TypesPlatform.h | 0 .../resources/{ => build}/fmi3FunctionTypes.h | 0 fmusim-gui/resources/{ => build}/fmi3Functions.h | 0 .../resources/{ => build}/fmi3PlatformTypes.h | 0 11 files changed, 19 insertions(+), 14 deletions(-) rename fmusim-gui/resources/{ => build}/CMakeLists.txt (100%) create mode 100644 fmusim-gui/resources/build/build.qrc rename fmusim-gui/resources/{ => build}/fmi2FunctionTypes.h (100%) rename fmusim-gui/resources/{ => build}/fmi2Functions.h (100%) rename fmusim-gui/resources/{ => build}/fmi2TypesPlatform.h (100%) rename fmusim-gui/resources/{ => build}/fmi3FunctionTypes.h (100%) rename fmusim-gui/resources/{ => build}/fmi3Functions.h (100%) rename fmusim-gui/resources/{ => build}/fmi3PlatformTypes.h (100%) diff --git a/fmusim-gui/BuildPlatformBinaryThread.cpp b/fmusim-gui/BuildPlatformBinaryThread.cpp index e057efb4..d2fc5834 100644 --- a/fmusim-gui/BuildPlatformBinaryThread.cpp +++ b/fmusim-gui/BuildPlatformBinaryThread.cpp @@ -32,16 +32,16 @@ void BuildPlatformBinaryThread::run() { buildDirectory.setAutoRemove(removeBuilDirectory); - QFile::copy(":/resources/CMakeLists.txt", buildDirectory.filePath("CMakeLists.txt")); + QFile::copy(":/build/CMakeLists.txt", buildDirectory.filePath("CMakeLists.txt")); if (modelDescription->fmiMajorVersion == 2) { - QFile::copy(":/resources/fmi2Functions.h", buildDirectory.filePath("fmi2Functions.h")); - QFile::copy(":/resources/fmi2FunctionTypes.h", buildDirectory.filePath("fmi2FunctionTypes.h")); - QFile::copy(":/resources/fmi2TypesPlatform.h", buildDirectory.filePath("fmi2TypesPlatform.h")); + QFile::copy(":/build/fmi2Functions.h", buildDirectory.filePath("fmi2Functions.h")); + QFile::copy(":/build/fmi2FunctionTypes.h", buildDirectory.filePath("fmi2FunctionTypes.h")); + QFile::copy(":/build/fmi2TypesPlatform.h", buildDirectory.filePath("fmi2TypesPlatform.h")); } else { - QFile::copy(":/resources/fmi3Functions.h", buildDirectory.filePath("fmi3Functions.h")); - QFile::copy(":/resources/fmi3FunctionTypes.h", buildDirectory.filePath("fmi3FunctionTypes.h")); - QFile::copy(":/resources/fmi3PlatformTypes.h", buildDirectory.filePath("fmi3PlatformTypes.h")); + QFile::copy(":/build/fmi3Functions.h", buildDirectory.filePath("fmi3Functions.h")); + QFile::copy(":/build/fmi3FunctionTypes.h", buildDirectory.filePath("fmi3FunctionTypes.h")); + QFile::copy(":/build/fmi3PlatformTypes.h", buildDirectory.filePath("fmi3PlatformTypes.h")); } size_t nSourceFiles; diff --git a/fmusim-gui/CMakeLists.txt b/fmusim-gui/CMakeLists.txt index 6f8f70a0..f29c8ff0 100644 --- a/fmusim-gui/CMakeLists.txt +++ b/fmusim-gui/CMakeLists.txt @@ -104,6 +104,7 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) PlotUtil.h PlotUtil.cpp resources/app-icon.rc + resources/build/build.qrc ) target_include_directories(fmusim-gui PRIVATE diff --git a/fmusim-gui/resources.qrc b/fmusim-gui/resources.qrc index 567e52a5..1ebf409e 100644 --- a/fmusim-gui/resources.qrc +++ b/fmusim-gui/resources.qrc @@ -1,12 +1,5 @@ fmusim.svg - resources/CMakeLists.txt - resources/fmi2FunctionTypes.h - resources/fmi2TypesPlatform.h - resources/fmi3Functions.h - resources/fmi3FunctionTypes.h - resources/fmi3PlatformTypes.h - resources/fmi2Functions.h diff --git a/fmusim-gui/resources/CMakeLists.txt b/fmusim-gui/resources/build/CMakeLists.txt similarity index 100% rename from fmusim-gui/resources/CMakeLists.txt rename to fmusim-gui/resources/build/CMakeLists.txt diff --git a/fmusim-gui/resources/build/build.qrc b/fmusim-gui/resources/build/build.qrc new file mode 100644 index 00000000..111a7acf --- /dev/null +++ b/fmusim-gui/resources/build/build.qrc @@ -0,0 +1,11 @@ + + + CMakeLists.txt + fmi2Functions.h + fmi2FunctionTypes.h + fmi2TypesPlatform.h + fmi3Functions.h + fmi3FunctionTypes.h + fmi3PlatformTypes.h + + diff --git a/fmusim-gui/resources/fmi2FunctionTypes.h b/fmusim-gui/resources/build/fmi2FunctionTypes.h similarity index 100% rename from fmusim-gui/resources/fmi2FunctionTypes.h rename to fmusim-gui/resources/build/fmi2FunctionTypes.h diff --git a/fmusim-gui/resources/fmi2Functions.h b/fmusim-gui/resources/build/fmi2Functions.h similarity index 100% rename from fmusim-gui/resources/fmi2Functions.h rename to fmusim-gui/resources/build/fmi2Functions.h diff --git a/fmusim-gui/resources/fmi2TypesPlatform.h b/fmusim-gui/resources/build/fmi2TypesPlatform.h similarity index 100% rename from fmusim-gui/resources/fmi2TypesPlatform.h rename to fmusim-gui/resources/build/fmi2TypesPlatform.h diff --git a/fmusim-gui/resources/fmi3FunctionTypes.h b/fmusim-gui/resources/build/fmi3FunctionTypes.h similarity index 100% rename from fmusim-gui/resources/fmi3FunctionTypes.h rename to fmusim-gui/resources/build/fmi3FunctionTypes.h diff --git a/fmusim-gui/resources/fmi3Functions.h b/fmusim-gui/resources/build/fmi3Functions.h similarity index 100% rename from fmusim-gui/resources/fmi3Functions.h rename to fmusim-gui/resources/build/fmi3Functions.h diff --git a/fmusim-gui/resources/fmi3PlatformTypes.h b/fmusim-gui/resources/build/fmi3PlatformTypes.h similarity index 100% rename from fmusim-gui/resources/fmi3PlatformTypes.h rename to fmusim-gui/resources/build/fmi3PlatformTypes.h From 47e7d0f205aeca42945fded976c6af0bda864c59 Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Thu, 22 Aug 2024 16:24:10 +0200 Subject: [PATCH 3/7] Move variables to resources/variables/ --- fmusim-gui/AbstractModelVariablesModel.cpp | 8 ++++---- fmusim-gui/CMakeLists.txt | 3 ++- fmusim-gui/icons/variables/variables.qrc | 9 --------- .../dark => resources/variables}/float-input.svg | 0 .../dark => resources/variables}/float-output.svg | 0 .../variables}/float-parameter.svg | 0 .../dark => resources/variables}/float-variable.svg | 0 .../dark => resources/variables}/subsystem.svg | 0 .../variables/variables.afdesign | Bin fmusim-gui/resources/variables/variables.qrc | 9 +++++++++ 10 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 fmusim-gui/icons/variables/variables.qrc rename fmusim-gui/{icons/variables/dark => resources/variables}/float-input.svg (100%) rename fmusim-gui/{icons/variables/dark => resources/variables}/float-output.svg (100%) rename fmusim-gui/{icons/variables/dark => resources/variables}/float-parameter.svg (100%) rename fmusim-gui/{icons/variables/dark => resources/variables}/float-variable.svg (100%) rename fmusim-gui/{icons/variables/dark => resources/variables}/subsystem.svg (100%) rename fmusim-gui/{icons => resources}/variables/variables.afdesign (100%) create mode 100644 fmusim-gui/resources/variables/variables.qrc diff --git a/fmusim-gui/AbstractModelVariablesModel.cpp b/fmusim-gui/AbstractModelVariablesModel.cpp index 8c066aac..1fadee5a 100644 --- a/fmusim-gui/AbstractModelVariablesModel.cpp +++ b/fmusim-gui/AbstractModelVariablesModel.cpp @@ -132,13 +132,13 @@ QVariant AbstractModelVariablesModel::columnData(const FMIModelVariable *variabl case FMIParameter: case FMIStructuralParameter: case FMICalculatedParameter: - return QIcon(":/variables/dark/float-parameter.svg"); + return QIcon(":/variables/float-parameter.svg"); case FMIInput: - return QIcon(":/variables/dark/float-input.svg"); + return QIcon(":/variables/float-input.svg"); case FMIOutput: - return QIcon(":/variables/dark/float-output.svg"); + return QIcon(":/variables/float-output.svg"); default: - return QIcon(":/variables/dark/float-variable.svg"); + return QIcon(":/variables/float-variable.svg"); } default: return QVariant(); diff --git a/fmusim-gui/CMakeLists.txt b/fmusim-gui/CMakeLists.txt index f29c8ff0..1b27710d 100644 --- a/fmusim-gui/CMakeLists.txt +++ b/fmusim-gui/CMakeLists.txt @@ -92,7 +92,8 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) resources/plot/plot.html resources/plot/plot.qrc - icons/variables/variables.qrc + resources/variables/variables.qrc + VariablesFilterModel.h VariablesFilterModel.cpp SimulationThread.h SimulationThread.cpp resources.qrc diff --git a/fmusim-gui/icons/variables/variables.qrc b/fmusim-gui/icons/variables/variables.qrc deleted file mode 100644 index 6b516680..00000000 --- a/fmusim-gui/icons/variables/variables.qrc +++ /dev/null @@ -1,9 +0,0 @@ - - - dark/float-input.svg - dark/float-output.svg - dark/float-parameter.svg - dark/float-variable.svg - dark/subsystem.svg - - diff --git a/fmusim-gui/icons/variables/dark/float-input.svg b/fmusim-gui/resources/variables/float-input.svg similarity index 100% rename from fmusim-gui/icons/variables/dark/float-input.svg rename to fmusim-gui/resources/variables/float-input.svg diff --git a/fmusim-gui/icons/variables/dark/float-output.svg b/fmusim-gui/resources/variables/float-output.svg similarity index 100% rename from fmusim-gui/icons/variables/dark/float-output.svg rename to fmusim-gui/resources/variables/float-output.svg diff --git a/fmusim-gui/icons/variables/dark/float-parameter.svg b/fmusim-gui/resources/variables/float-parameter.svg similarity index 100% rename from fmusim-gui/icons/variables/dark/float-parameter.svg rename to fmusim-gui/resources/variables/float-parameter.svg diff --git a/fmusim-gui/icons/variables/dark/float-variable.svg b/fmusim-gui/resources/variables/float-variable.svg similarity index 100% rename from fmusim-gui/icons/variables/dark/float-variable.svg rename to fmusim-gui/resources/variables/float-variable.svg diff --git a/fmusim-gui/icons/variables/dark/subsystem.svg b/fmusim-gui/resources/variables/subsystem.svg similarity index 100% rename from fmusim-gui/icons/variables/dark/subsystem.svg rename to fmusim-gui/resources/variables/subsystem.svg diff --git a/fmusim-gui/icons/variables/variables.afdesign b/fmusim-gui/resources/variables/variables.afdesign similarity index 100% rename from fmusim-gui/icons/variables/variables.afdesign rename to fmusim-gui/resources/variables/variables.afdesign diff --git a/fmusim-gui/resources/variables/variables.qrc b/fmusim-gui/resources/variables/variables.qrc new file mode 100644 index 00000000..b363aba6 --- /dev/null +++ b/fmusim-gui/resources/variables/variables.qrc @@ -0,0 +1,9 @@ + + + float-input.svg + float-output.svg + float-parameter.svg + float-variable.svg + subsystem.svg + + From 6c34bef4711c5be6e8ff8c1cc2d3bc06567d4736 Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Thu, 22 Aug 2024 16:27:12 +0200 Subject: [PATCH 4/7] Make model info selectable --- fmusim-gui/MainWindow.ui | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/fmusim-gui/MainWindow.ui b/fmusim-gui/MainWindow.ui index e8a94334..fe75f9f5 100644 --- a/fmusim-gui/MainWindow.ui +++ b/fmusim-gui/MainWindow.ui @@ -34,7 +34,7 @@ - 2 + 1 @@ -183,6 +183,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + @@ -218,6 +221,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + @@ -225,6 +231,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + @@ -232,6 +241,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + @@ -245,6 +257,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + @@ -259,6 +274,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + @@ -283,6 +301,9 @@ true + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + @@ -290,6 +311,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + @@ -297,6 +321,9 @@ + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + @@ -319,8 +346,8 @@ 0 0 - 68 - 34 + 631 + 377 From 364d33673b81238ef78ddceaa55ca8f9be069bc7 Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Fri, 23 Aug 2024 09:56:42 +0200 Subject: [PATCH 5/7] Move app icon to resources/icon/ --- fmusim-gui/CMakeLists.txt | 4 ++-- fmusim-gui/MainWindow.ui | 8 ++++---- fmusim-gui/resources.qrc | 5 ----- fmusim-gui/resources/app-icon.rc | 2 -- .../icon/icon.afdesign} | Bin .../resources/{app-icon.ico => icon/icon.ico} | Bin fmusim-gui/resources/icon/icon.qrc | 5 +++++ fmusim-gui/resources/icon/icon.rc | 2 ++ fmusim-gui/{fmusim.svg => resources/icon/icon.svg} | 0 9 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 fmusim-gui/resources.qrc delete mode 100644 fmusim-gui/resources/app-icon.rc rename fmusim-gui/{app-icon.afdesign => resources/icon/icon.afdesign} (100%) rename fmusim-gui/resources/{app-icon.ico => icon/icon.ico} (100%) create mode 100644 fmusim-gui/resources/icon/icon.qrc create mode 100644 fmusim-gui/resources/icon/icon.rc rename fmusim-gui/{fmusim.svg => resources/icon/icon.svg} (100%) diff --git a/fmusim-gui/CMakeLists.txt b/fmusim-gui/CMakeLists.txt index 1b27710d..d00fe9f9 100644 --- a/fmusim-gui/CMakeLists.txt +++ b/fmusim-gui/CMakeLists.txt @@ -96,7 +96,6 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) VariablesFilterModel.h VariablesFilterModel.cpp SimulationThread.h SimulationThread.cpp - resources.qrc BuildPlatformBinaryDialog.h BuildPlatformBinaryDialog.cpp BuildPlatformBinaryDialog.ui BuildPlatformBinaryThread.h BuildPlatformBinaryThread.cpp @@ -104,7 +103,8 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) AbstractModelVariablesModel.h AbstractModelVariablesModel.cpp PlotUtil.h PlotUtil.cpp - resources/app-icon.rc + resources/icon/icon.qrc + resources/icon/icon.rc resources/build/build.qrc ) diff --git a/fmusim-gui/MainWindow.ui b/fmusim-gui/MainWindow.ui index fe75f9f5..35db22df 100644 --- a/fmusim-gui/MainWindow.ui +++ b/fmusim-gui/MainWindow.ui @@ -11,11 +11,11 @@ - FMUSim GUI + FMUSim - - :/fmusim.svg:/fmusim.svg + + :/icon/icon.svg:/icon/icon.svg @@ -1398,7 +1398,7 @@ - + diff --git a/fmusim-gui/resources.qrc b/fmusim-gui/resources.qrc deleted file mode 100644 index 1ebf409e..00000000 --- a/fmusim-gui/resources.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - fmusim.svg - - diff --git a/fmusim-gui/resources/app-icon.rc b/fmusim-gui/resources/app-icon.rc deleted file mode 100644 index abf531e9..00000000 --- a/fmusim-gui/resources/app-icon.rc +++ /dev/null @@ -1,2 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "app-icon.ico" - diff --git a/fmusim-gui/app-icon.afdesign b/fmusim-gui/resources/icon/icon.afdesign similarity index 100% rename from fmusim-gui/app-icon.afdesign rename to fmusim-gui/resources/icon/icon.afdesign diff --git a/fmusim-gui/resources/app-icon.ico b/fmusim-gui/resources/icon/icon.ico similarity index 100% rename from fmusim-gui/resources/app-icon.ico rename to fmusim-gui/resources/icon/icon.ico diff --git a/fmusim-gui/resources/icon/icon.qrc b/fmusim-gui/resources/icon/icon.qrc new file mode 100644 index 00000000..7baf1d39 --- /dev/null +++ b/fmusim-gui/resources/icon/icon.qrc @@ -0,0 +1,5 @@ + + + icon.svg + + diff --git a/fmusim-gui/resources/icon/icon.rc b/fmusim-gui/resources/icon/icon.rc new file mode 100644 index 00000000..2c3fa656 --- /dev/null +++ b/fmusim-gui/resources/icon/icon.rc @@ -0,0 +1,2 @@ +IDI_ICON1 ICON DISCARDABLE "icon.ico" + diff --git a/fmusim-gui/fmusim.svg b/fmusim-gui/resources/icon/icon.svg similarity index 100% rename from fmusim-gui/fmusim.svg rename to fmusim-gui/resources/icon/icon.svg From 35995e4bf48e94e8d4ec086957591df75cace20e Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Fri, 23 Aug 2024 10:14:44 +0200 Subject: [PATCH 6/7] Fix path to subsystem.svg --- fmusim-gui/ModelVariablesTreeModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fmusim-gui/ModelVariablesTreeModel.cpp b/fmusim-gui/ModelVariablesTreeModel.cpp index dc0c2633..9b301a14 100644 --- a/fmusim-gui/ModelVariablesTreeModel.cpp +++ b/fmusim-gui/ModelVariablesTreeModel.cpp @@ -62,7 +62,7 @@ QVariant ModelVariablesTreeModel::data(const QModelIndex &index, int role) const } if (index.column() == NameColumn && role == Qt::DecorationRole) { - return QIcon(":/variables/dark/subsystem.svg"); + return QIcon(":/variables/subsystem.svg"); } return QVariant(); From fcf6f84a5b45ddabd576d6be37598fe337b2b77e Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Fri, 23 Aug 2024 10:35:30 +0200 Subject: [PATCH 7/7] Move buttons to resources/ --- fmusim-gui/CMakeLists.txt | 3 +- fmusim-gui/MainWindow.ui | 71 +++++++----------- fmusim-gui/buttons.qrc | 42 ----------- fmusim-gui/buttons/book.svg | 9 --- fmusim-gui/buttons/file-earmark-zip.svg | 12 --- fmusim-gui/buttons/folder-open.svg | 7 -- fmusim-gui/buttons/graph.svg | 9 --- fmusim-gui/buttons/light/gear.svg | 12 --- fmusim-gui/buttons/list-task.svg | 15 ---- fmusim-gui/buttons/play.svg | 9 --- fmusim-gui/buttons/stop.svg | 9 --- .../{ => resources}/buttons/buttons.afdesign | Bin fmusim-gui/resources/buttons/buttons.qrc | 28 +++++++ .../{ => resources}/buttons/dark/book.svg | 0 .../buttons/dark/file-earmark-zip.svg | 0 .../buttons/dark/folder-open.svg | 0 .../{ => resources}/buttons/dark/gear.svg | 0 .../{ => resources}/buttons/dark/graph.svg | 0 .../{ => resources}/buttons/dark/hammer.svg | 0 .../{ => resources}/buttons/dark/info.svg | 0 .../buttons/dark/list-task.svg | 0 .../buttons/dark/new-window.svg | 0 .../{ => resources}/buttons/dark/play.svg | 0 .../{ => resources}/buttons/dark/side-bar.svg | 0 .../{ => resources}/buttons/dark/stop.svg | 0 .../{ => resources}/buttons/light/book.svg | 0 .../buttons/light/file-earmark-zip.svg | 0 .../buttons/light/folder-open.svg | 0 .../buttons/light}/gear.svg | 0 .../{ => resources}/buttons/light/graph.svg | 0 .../{ => resources}/buttons/light/hammer.svg | 0 .../{ => resources}/buttons/light/info.svg | 0 .../buttons/light/list-task.svg | 0 .../buttons/light/new-window.svg | 0 .../{ => resources}/buttons/light/play.svg | 0 .../buttons/light/side-bar.svg | 0 .../{ => resources}/buttons/light/stop.svg | 0 .../tools}/dark/broom.svg | 0 .../tools}/dark/checkers.png | Bin .../tools}/dark/columns.svg | 0 .../tools}/dark/input-variable.svg | 0 .../tools}/dark/list.svg | 0 .../tools}/dark/local-variable.svg | 0 .../tools}/dark/output-variable.svg | 0 .../tools}/dark/parameter.svg | 0 .../tools}/light/broom.svg | 0 .../tools}/light/columns.svg | 0 .../tools}/light/input-variable.svg | 0 .../tools}/light/list.svg | 0 .../tools}/light/local-variable.svg | 0 .../tools}/light/output-variable.svg | 0 .../tools}/light/parameter.svg | 0 .../tools/tools.afdesign} | Bin fmusim-gui/resources/tools/tools.qrc | 19 +++++ 54 files changed, 76 insertions(+), 169 deletions(-) delete mode 100644 fmusim-gui/buttons.qrc delete mode 100644 fmusim-gui/buttons/book.svg delete mode 100644 fmusim-gui/buttons/file-earmark-zip.svg delete mode 100644 fmusim-gui/buttons/folder-open.svg delete mode 100644 fmusim-gui/buttons/graph.svg delete mode 100644 fmusim-gui/buttons/light/gear.svg delete mode 100644 fmusim-gui/buttons/list-task.svg delete mode 100644 fmusim-gui/buttons/play.svg delete mode 100644 fmusim-gui/buttons/stop.svg rename fmusim-gui/{ => resources}/buttons/buttons.afdesign (100%) create mode 100644 fmusim-gui/resources/buttons/buttons.qrc rename fmusim-gui/{ => resources}/buttons/dark/book.svg (100%) rename fmusim-gui/{ => resources}/buttons/dark/file-earmark-zip.svg (100%) rename fmusim-gui/{ => resources}/buttons/dark/folder-open.svg (100%) rename fmusim-gui/{ => resources}/buttons/dark/gear.svg (100%) rename fmusim-gui/{ => resources}/buttons/dark/graph.svg (100%) rename fmusim-gui/{ => resources}/buttons/dark/hammer.svg (100%) rename fmusim-gui/{ => resources}/buttons/dark/info.svg (100%) rename fmusim-gui/{ => resources}/buttons/dark/list-task.svg (100%) rename fmusim-gui/{ => resources}/buttons/dark/new-window.svg (100%) rename fmusim-gui/{ => resources}/buttons/dark/play.svg (100%) rename fmusim-gui/{ => resources}/buttons/dark/side-bar.svg (100%) rename fmusim-gui/{ => resources}/buttons/dark/stop.svg (100%) rename fmusim-gui/{ => resources}/buttons/light/book.svg (100%) rename fmusim-gui/{ => resources}/buttons/light/file-earmark-zip.svg (100%) rename fmusim-gui/{ => resources}/buttons/light/folder-open.svg (100%) rename fmusim-gui/{buttons => resources/buttons/light}/gear.svg (100%) rename fmusim-gui/{ => resources}/buttons/light/graph.svg (100%) rename fmusim-gui/{ => resources}/buttons/light/hammer.svg (100%) rename fmusim-gui/{ => resources}/buttons/light/info.svg (100%) rename fmusim-gui/{ => resources}/buttons/light/list-task.svg (100%) rename fmusim-gui/{ => resources}/buttons/light/new-window.svg (100%) rename fmusim-gui/{ => resources}/buttons/light/play.svg (100%) rename fmusim-gui/{ => resources}/buttons/light/side-bar.svg (100%) rename fmusim-gui/{ => resources}/buttons/light/stop.svg (100%) rename fmusim-gui/{buttons => resources/tools}/dark/broom.svg (100%) rename fmusim-gui/{buttons => resources/tools}/dark/checkers.png (100%) rename fmusim-gui/{buttons => resources/tools}/dark/columns.svg (100%) rename fmusim-gui/{buttons => resources/tools}/dark/input-variable.svg (100%) rename fmusim-gui/{buttons => resources/tools}/dark/list.svg (100%) rename fmusim-gui/{buttons => resources/tools}/dark/local-variable.svg (100%) rename fmusim-gui/{buttons => resources/tools}/dark/output-variable.svg (100%) rename fmusim-gui/{buttons => resources/tools}/dark/parameter.svg (100%) rename fmusim-gui/{buttons => resources/tools}/light/broom.svg (100%) rename fmusim-gui/{buttons => resources/tools}/light/columns.svg (100%) rename fmusim-gui/{buttons => resources/tools}/light/input-variable.svg (100%) rename fmusim-gui/{buttons => resources/tools}/light/list.svg (100%) rename fmusim-gui/{buttons => resources/tools}/light/local-variable.svg (100%) rename fmusim-gui/{buttons => resources/tools}/light/output-variable.svg (100%) rename fmusim-gui/{buttons => resources/tools}/light/parameter.svg (100%) rename fmusim-gui/{buttons/toolbuttons.afdesign => resources/tools/tools.afdesign} (100%) create mode 100644 fmusim-gui/resources/tools/tools.qrc diff --git a/fmusim-gui/CMakeLists.txt b/fmusim-gui/CMakeLists.txt index d00fe9f9..4bb1e0be 100644 --- a/fmusim-gui/CMakeLists.txt +++ b/fmusim-gui/CMakeLists.txt @@ -87,7 +87,8 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) ../fmusim/FMICVode.h ../fmusim/FMICVode.c - buttons.qrc + resources/buttons/buttons.qrc + resources/tools/tools.qrc resources/plot/plot.html resources/plot/plot.qrc diff --git a/fmusim-gui/MainWindow.ui b/fmusim-gui/MainWindow.ui index 35db22df..5ad77638 100644 --- a/fmusim-gui/MainWindow.ui +++ b/fmusim-gui/MainWindow.ui @@ -996,12 +996,9 @@ Filter parameter variables - - P - - - :/buttons/dark/parameter.svg:/buttons/dark/parameter.svg + + :/tools/dark/parameter.svg:/tools/dark/parameter.svg true @@ -1019,12 +1016,9 @@ Show optional columns - - C - - - :/buttons/dark/columns.svg:/buttons/dark/columns.svg + + :/tools/dark/columns.svg:/tools/dark/columns.svg true @@ -1039,12 +1033,9 @@ Filter local variables - - L - - - :/buttons/dark/local-variable.svg:/buttons/dark/local-variable.svg + + :/tools/dark/local-variable.svg:/tools/dark/local-variable.svg @@ -1068,12 +1059,9 @@ Show list view - - ... - - - :/buttons/dark/list.svg:/buttons/dark/list.svg + + :/tools/dark/list.svg:/tools/dark/list.svg true @@ -1101,12 +1089,9 @@ Filter output variables - - O - - - :/buttons/dark/output-variable.svg:/buttons/dark/output-variable.svg + + :/tools/dark/output-variable.svg:/tools/dark/output-variable.svg true @@ -1124,12 +1109,9 @@ Filter input variables - - I - - - :/buttons/dark/input-variable.svg:/buttons/dark/input-variable.svg + + :/tools/dark/input-variable.svg:/tools/dark/input-variable.svg true @@ -1148,8 +1130,8 @@ Clear all plots - - :/buttons/dark/broom.svg:/buttons/dark/broom.svg + + :/tools/dark/broom.svg:/tools/dark/broom.svg true @@ -1216,7 +1198,7 @@ true - + :/buttons/dark/gear.svg:/buttons/dark/gear.svg @@ -1231,7 +1213,7 @@ true - + :/buttons/dark/file-earmark-zip.svg:/buttons/dark/file-earmark-zip.svg @@ -1246,7 +1228,7 @@ true - + :/buttons/dark/book.svg:/buttons/dark/book.svg @@ -1261,7 +1243,7 @@ true - + :/buttons/dark/graph.svg:/buttons/dark/graph.svg @@ -1273,7 +1255,7 @@ - + :/buttons/dark/folder-open.svg:/buttons/dark/folder-open.svg @@ -1288,7 +1270,7 @@ - + :/buttons/dark/play.svg:/buttons/dark/play.svg @@ -1314,7 +1296,7 @@ true - + :/buttons/dark/list-task.svg:/buttons/dark/list-task.svg @@ -1329,7 +1311,7 @@ true - + :/buttons/dark/side-bar.svg:/buttons/dark/side-bar.svg @@ -1344,7 +1326,7 @@ true - + :/buttons/dark/info.svg:/buttons/dark/info.svg @@ -1359,7 +1341,7 @@ - + :/buttons/dark/new-window.svg:/buttons/dark/new-window.svg @@ -1374,7 +1356,7 @@ - + :/buttons/dark/hammer.svg:/buttons/dark/hammer.svg @@ -1397,8 +1379,9 @@ - + + diff --git a/fmusim-gui/buttons.qrc b/fmusim-gui/buttons.qrc deleted file mode 100644 index e5be88d1..00000000 --- a/fmusim-gui/buttons.qrc +++ /dev/null @@ -1,42 +0,0 @@ - - - buttons/dark/book.svg - buttons/dark/file-earmark-zip.svg - buttons/dark/folder-open.svg - buttons/dark/gear.svg - buttons/dark/graph.svg - buttons/dark/list-task.svg - buttons/dark/play.svg - buttons/dark/stop.svg - buttons/light/book.svg - buttons/light/file-earmark-zip.svg - buttons/light/folder-open.svg - buttons/light/gear.svg - buttons/light/graph.svg - buttons/light/list-task.svg - buttons/light/play.svg - buttons/light/stop.svg - buttons/dark/side-bar.svg - buttons/light/side-bar.svg - buttons/dark/columns.svg - buttons/dark/parameter.svg - buttons/dark/output-variable.svg - buttons/dark/input-variable.svg - buttons/dark/local-variable.svg - buttons/light/columns.svg - buttons/light/output-variable.svg - buttons/light/input-variable.svg - buttons/light/local-variable.svg - buttons/light/parameter.svg - buttons/dark/info.svg - buttons/light/info.svg - buttons/dark/new-window.svg - buttons/light/new-window.svg - buttons/dark/hammer.svg - buttons/light/hammer.svg - buttons/dark/list.svg - buttons/light/list.svg - buttons/dark/broom.svg - buttons/light/broom.svg - - diff --git a/fmusim-gui/buttons/book.svg b/fmusim-gui/buttons/book.svg deleted file mode 100644 index 66f9dc78..00000000 --- a/fmusim-gui/buttons/book.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/fmusim-gui/buttons/file-earmark-zip.svg b/fmusim-gui/buttons/file-earmark-zip.svg deleted file mode 100644 index 1f41d882..00000000 --- a/fmusim-gui/buttons/file-earmark-zip.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/fmusim-gui/buttons/folder-open.svg b/fmusim-gui/buttons/folder-open.svg deleted file mode 100644 index 1f9e19a8..00000000 --- a/fmusim-gui/buttons/folder-open.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/fmusim-gui/buttons/graph.svg b/fmusim-gui/buttons/graph.svg deleted file mode 100644 index 2946b2e2..00000000 --- a/fmusim-gui/buttons/graph.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/fmusim-gui/buttons/light/gear.svg b/fmusim-gui/buttons/light/gear.svg deleted file mode 100644 index ef078d80..00000000 --- a/fmusim-gui/buttons/light/gear.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/fmusim-gui/buttons/list-task.svg b/fmusim-gui/buttons/list-task.svg deleted file mode 100644 index 2ecbcbdf..00000000 --- a/fmusim-gui/buttons/list-task.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/fmusim-gui/buttons/play.svg b/fmusim-gui/buttons/play.svg deleted file mode 100644 index 977d696b..00000000 --- a/fmusim-gui/buttons/play.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/fmusim-gui/buttons/stop.svg b/fmusim-gui/buttons/stop.svg deleted file mode 100644 index 3444ee88..00000000 --- a/fmusim-gui/buttons/stop.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/fmusim-gui/buttons/buttons.afdesign b/fmusim-gui/resources/buttons/buttons.afdesign similarity index 100% rename from fmusim-gui/buttons/buttons.afdesign rename to fmusim-gui/resources/buttons/buttons.afdesign diff --git a/fmusim-gui/resources/buttons/buttons.qrc b/fmusim-gui/resources/buttons/buttons.qrc new file mode 100644 index 00000000..f03ca41a --- /dev/null +++ b/fmusim-gui/resources/buttons/buttons.qrc @@ -0,0 +1,28 @@ + + + dark/book.svg + dark/file-earmark-zip.svg + dark/folder-open.svg + dark/gear.svg + dark/graph.svg + dark/hammer.svg + dark/info.svg + dark/list-task.svg + dark/new-window.svg + dark/play.svg + dark/side-bar.svg + dark/stop.svg + light/book.svg + light/file-earmark-zip.svg + light/folder-open.svg + light/gear.svg + light/graph.svg + light/hammer.svg + light/info.svg + light/list-task.svg + light/new-window.svg + light/play.svg + light/side-bar.svg + light/stop.svg + + diff --git a/fmusim-gui/buttons/dark/book.svg b/fmusim-gui/resources/buttons/dark/book.svg similarity index 100% rename from fmusim-gui/buttons/dark/book.svg rename to fmusim-gui/resources/buttons/dark/book.svg diff --git a/fmusim-gui/buttons/dark/file-earmark-zip.svg b/fmusim-gui/resources/buttons/dark/file-earmark-zip.svg similarity index 100% rename from fmusim-gui/buttons/dark/file-earmark-zip.svg rename to fmusim-gui/resources/buttons/dark/file-earmark-zip.svg diff --git a/fmusim-gui/buttons/dark/folder-open.svg b/fmusim-gui/resources/buttons/dark/folder-open.svg similarity index 100% rename from fmusim-gui/buttons/dark/folder-open.svg rename to fmusim-gui/resources/buttons/dark/folder-open.svg diff --git a/fmusim-gui/buttons/dark/gear.svg b/fmusim-gui/resources/buttons/dark/gear.svg similarity index 100% rename from fmusim-gui/buttons/dark/gear.svg rename to fmusim-gui/resources/buttons/dark/gear.svg diff --git a/fmusim-gui/buttons/dark/graph.svg b/fmusim-gui/resources/buttons/dark/graph.svg similarity index 100% rename from fmusim-gui/buttons/dark/graph.svg rename to fmusim-gui/resources/buttons/dark/graph.svg diff --git a/fmusim-gui/buttons/dark/hammer.svg b/fmusim-gui/resources/buttons/dark/hammer.svg similarity index 100% rename from fmusim-gui/buttons/dark/hammer.svg rename to fmusim-gui/resources/buttons/dark/hammer.svg diff --git a/fmusim-gui/buttons/dark/info.svg b/fmusim-gui/resources/buttons/dark/info.svg similarity index 100% rename from fmusim-gui/buttons/dark/info.svg rename to fmusim-gui/resources/buttons/dark/info.svg diff --git a/fmusim-gui/buttons/dark/list-task.svg b/fmusim-gui/resources/buttons/dark/list-task.svg similarity index 100% rename from fmusim-gui/buttons/dark/list-task.svg rename to fmusim-gui/resources/buttons/dark/list-task.svg diff --git a/fmusim-gui/buttons/dark/new-window.svg b/fmusim-gui/resources/buttons/dark/new-window.svg similarity index 100% rename from fmusim-gui/buttons/dark/new-window.svg rename to fmusim-gui/resources/buttons/dark/new-window.svg diff --git a/fmusim-gui/buttons/dark/play.svg b/fmusim-gui/resources/buttons/dark/play.svg similarity index 100% rename from fmusim-gui/buttons/dark/play.svg rename to fmusim-gui/resources/buttons/dark/play.svg diff --git a/fmusim-gui/buttons/dark/side-bar.svg b/fmusim-gui/resources/buttons/dark/side-bar.svg similarity index 100% rename from fmusim-gui/buttons/dark/side-bar.svg rename to fmusim-gui/resources/buttons/dark/side-bar.svg diff --git a/fmusim-gui/buttons/dark/stop.svg b/fmusim-gui/resources/buttons/dark/stop.svg similarity index 100% rename from fmusim-gui/buttons/dark/stop.svg rename to fmusim-gui/resources/buttons/dark/stop.svg diff --git a/fmusim-gui/buttons/light/book.svg b/fmusim-gui/resources/buttons/light/book.svg similarity index 100% rename from fmusim-gui/buttons/light/book.svg rename to fmusim-gui/resources/buttons/light/book.svg diff --git a/fmusim-gui/buttons/light/file-earmark-zip.svg b/fmusim-gui/resources/buttons/light/file-earmark-zip.svg similarity index 100% rename from fmusim-gui/buttons/light/file-earmark-zip.svg rename to fmusim-gui/resources/buttons/light/file-earmark-zip.svg diff --git a/fmusim-gui/buttons/light/folder-open.svg b/fmusim-gui/resources/buttons/light/folder-open.svg similarity index 100% rename from fmusim-gui/buttons/light/folder-open.svg rename to fmusim-gui/resources/buttons/light/folder-open.svg diff --git a/fmusim-gui/buttons/gear.svg b/fmusim-gui/resources/buttons/light/gear.svg similarity index 100% rename from fmusim-gui/buttons/gear.svg rename to fmusim-gui/resources/buttons/light/gear.svg diff --git a/fmusim-gui/buttons/light/graph.svg b/fmusim-gui/resources/buttons/light/graph.svg similarity index 100% rename from fmusim-gui/buttons/light/graph.svg rename to fmusim-gui/resources/buttons/light/graph.svg diff --git a/fmusim-gui/buttons/light/hammer.svg b/fmusim-gui/resources/buttons/light/hammer.svg similarity index 100% rename from fmusim-gui/buttons/light/hammer.svg rename to fmusim-gui/resources/buttons/light/hammer.svg diff --git a/fmusim-gui/buttons/light/info.svg b/fmusim-gui/resources/buttons/light/info.svg similarity index 100% rename from fmusim-gui/buttons/light/info.svg rename to fmusim-gui/resources/buttons/light/info.svg diff --git a/fmusim-gui/buttons/light/list-task.svg b/fmusim-gui/resources/buttons/light/list-task.svg similarity index 100% rename from fmusim-gui/buttons/light/list-task.svg rename to fmusim-gui/resources/buttons/light/list-task.svg diff --git a/fmusim-gui/buttons/light/new-window.svg b/fmusim-gui/resources/buttons/light/new-window.svg similarity index 100% rename from fmusim-gui/buttons/light/new-window.svg rename to fmusim-gui/resources/buttons/light/new-window.svg diff --git a/fmusim-gui/buttons/light/play.svg b/fmusim-gui/resources/buttons/light/play.svg similarity index 100% rename from fmusim-gui/buttons/light/play.svg rename to fmusim-gui/resources/buttons/light/play.svg diff --git a/fmusim-gui/buttons/light/side-bar.svg b/fmusim-gui/resources/buttons/light/side-bar.svg similarity index 100% rename from fmusim-gui/buttons/light/side-bar.svg rename to fmusim-gui/resources/buttons/light/side-bar.svg diff --git a/fmusim-gui/buttons/light/stop.svg b/fmusim-gui/resources/buttons/light/stop.svg similarity index 100% rename from fmusim-gui/buttons/light/stop.svg rename to fmusim-gui/resources/buttons/light/stop.svg diff --git a/fmusim-gui/buttons/dark/broom.svg b/fmusim-gui/resources/tools/dark/broom.svg similarity index 100% rename from fmusim-gui/buttons/dark/broom.svg rename to fmusim-gui/resources/tools/dark/broom.svg diff --git a/fmusim-gui/buttons/dark/checkers.png b/fmusim-gui/resources/tools/dark/checkers.png similarity index 100% rename from fmusim-gui/buttons/dark/checkers.png rename to fmusim-gui/resources/tools/dark/checkers.png diff --git a/fmusim-gui/buttons/dark/columns.svg b/fmusim-gui/resources/tools/dark/columns.svg similarity index 100% rename from fmusim-gui/buttons/dark/columns.svg rename to fmusim-gui/resources/tools/dark/columns.svg diff --git a/fmusim-gui/buttons/dark/input-variable.svg b/fmusim-gui/resources/tools/dark/input-variable.svg similarity index 100% rename from fmusim-gui/buttons/dark/input-variable.svg rename to fmusim-gui/resources/tools/dark/input-variable.svg diff --git a/fmusim-gui/buttons/dark/list.svg b/fmusim-gui/resources/tools/dark/list.svg similarity index 100% rename from fmusim-gui/buttons/dark/list.svg rename to fmusim-gui/resources/tools/dark/list.svg diff --git a/fmusim-gui/buttons/dark/local-variable.svg b/fmusim-gui/resources/tools/dark/local-variable.svg similarity index 100% rename from fmusim-gui/buttons/dark/local-variable.svg rename to fmusim-gui/resources/tools/dark/local-variable.svg diff --git a/fmusim-gui/buttons/dark/output-variable.svg b/fmusim-gui/resources/tools/dark/output-variable.svg similarity index 100% rename from fmusim-gui/buttons/dark/output-variable.svg rename to fmusim-gui/resources/tools/dark/output-variable.svg diff --git a/fmusim-gui/buttons/dark/parameter.svg b/fmusim-gui/resources/tools/dark/parameter.svg similarity index 100% rename from fmusim-gui/buttons/dark/parameter.svg rename to fmusim-gui/resources/tools/dark/parameter.svg diff --git a/fmusim-gui/buttons/light/broom.svg b/fmusim-gui/resources/tools/light/broom.svg similarity index 100% rename from fmusim-gui/buttons/light/broom.svg rename to fmusim-gui/resources/tools/light/broom.svg diff --git a/fmusim-gui/buttons/light/columns.svg b/fmusim-gui/resources/tools/light/columns.svg similarity index 100% rename from fmusim-gui/buttons/light/columns.svg rename to fmusim-gui/resources/tools/light/columns.svg diff --git a/fmusim-gui/buttons/light/input-variable.svg b/fmusim-gui/resources/tools/light/input-variable.svg similarity index 100% rename from fmusim-gui/buttons/light/input-variable.svg rename to fmusim-gui/resources/tools/light/input-variable.svg diff --git a/fmusim-gui/buttons/light/list.svg b/fmusim-gui/resources/tools/light/list.svg similarity index 100% rename from fmusim-gui/buttons/light/list.svg rename to fmusim-gui/resources/tools/light/list.svg diff --git a/fmusim-gui/buttons/light/local-variable.svg b/fmusim-gui/resources/tools/light/local-variable.svg similarity index 100% rename from fmusim-gui/buttons/light/local-variable.svg rename to fmusim-gui/resources/tools/light/local-variable.svg diff --git a/fmusim-gui/buttons/light/output-variable.svg b/fmusim-gui/resources/tools/light/output-variable.svg similarity index 100% rename from fmusim-gui/buttons/light/output-variable.svg rename to fmusim-gui/resources/tools/light/output-variable.svg diff --git a/fmusim-gui/buttons/light/parameter.svg b/fmusim-gui/resources/tools/light/parameter.svg similarity index 100% rename from fmusim-gui/buttons/light/parameter.svg rename to fmusim-gui/resources/tools/light/parameter.svg diff --git a/fmusim-gui/buttons/toolbuttons.afdesign b/fmusim-gui/resources/tools/tools.afdesign similarity index 100% rename from fmusim-gui/buttons/toolbuttons.afdesign rename to fmusim-gui/resources/tools/tools.afdesign diff --git a/fmusim-gui/resources/tools/tools.qrc b/fmusim-gui/resources/tools/tools.qrc new file mode 100644 index 00000000..63e73827 --- /dev/null +++ b/fmusim-gui/resources/tools/tools.qrc @@ -0,0 +1,19 @@ + + + dark/broom.svg + dark/checkers.png + dark/columns.svg + dark/input-variable.svg + dark/list.svg + dark/local-variable.svg + dark/output-variable.svg + dark/parameter.svg + light/broom.svg + light/columns.svg + light/input-variable.svg + light/list.svg + light/local-variable.svg + light/output-variable.svg + light/parameter.svg + +