From cc6e3e86ffcf6105503ebd9a88613d51218d59b6 Mon Sep 17 00:00:00 2001 From: Adeel Asghar Date: Thu, 31 Oct 2019 13:06:26 +0100 Subject: [PATCH] Restructured & added a GUI testing framework Use the subdirs structure. Create a static lib of OMEdit. The static lib is linked for the GUI application and used by the testsuite for running the tests. --- Makefile.in | 11 +- Makefile.omdev.mingw | 5 +- OMEdit/.gitignore | 65 ++- OMEdit/Makefile.in | 46 -- OMEdit/Makefile.omdev.mingw | 64 ++- OMEdit/Makefile.unix.in | 71 +++ OMEdit/OMEdit.pro | 38 ++ OMEdit/OMEdit/OMEditGUI/OMEdit.config.in | 27 - OMEdit/{OMEdit => }/OMEditGUI/Info.plist | 0 OMEdit/{OMEdit => }/OMEditGUI/OMEdit.manifest | 14 +- OMEdit/OMEditGUI/OMEditGUI.pro | 74 +++ OMEdit/OMEditGUI/OMEditGUI.unix.config.pri.in | 31 + OMEdit/OMEditGUI/OMEditGUI.win.config.pri | 67 +++ OMEdit/{OMEdit => }/OMEditGUI/main.cpp | 0 OMEdit/{OMEdit => }/OMEditGUI/rc_omedit.rc | 46 +- .../Animation/AbstractAnimationWindow.cpp | 0 .../Animation/AbstractAnimationWindow.h | 0 .../Animation/AnimationUtil.h | 0 .../Animation/AnimationWindow.cpp | 0 .../Animation/AnimationWindow.h | 0 .../Animation/ExtraShapes.cpp | 0 .../Animation/ExtraShapes.h | 0 .../Animation/FMUSettingsDialog.cpp | 0 .../Animation/FMUSettingsDialog.h | 0 .../Animation/FMUWrapper.cpp | 0 .../Animation/FMUWrapper.h | 0 .../Animation/GLWidget.cpp | 0 .../Animation/GLWidget.h | 0 .../Animation/OpenGLWidget.cpp | 0 .../Animation/OpenGLWidget.h | 0 .../Animation/Shapes.cpp | 0 .../Animation/Shapes.h | 0 .../Animation/ThreeDViewer.cpp | 0 .../Animation/ThreeDViewer.h | 0 .../Animation/TimeManager.cpp | 0 .../Animation/TimeManager.h | 0 .../Animation/ViewerWidget.cpp | 0 .../Animation/ViewerWidget.h | 0 .../Animation/Visualizer.cpp | 0 .../Animation/Visualizer.h | 0 .../Animation/VisualizerCSV.cpp | 0 .../Animation/VisualizerCSV.h | 0 .../Animation/VisualizerFMU.cpp | 0 .../Animation/VisualizerFMU.h | 0 .../Animation/VisualizerMAT.cpp | 0 .../Animation/VisualizerMAT.h | 0 .../Animation/rapidxml.hpp | 0 .../Annotations/BitmapAnnotation.cpp | 0 .../Annotations/BitmapAnnotation.h | 0 .../Annotations/EllipseAnnotation.cpp | 0 .../Annotations/EllipseAnnotation.h | 0 .../Annotations/LineAnnotation.cpp | 0 .../Annotations/LineAnnotation.h | 0 .../Annotations/PolygonAnnotation.cpp | 0 .../Annotations/PolygonAnnotation.h | 0 .../Annotations/RectangleAnnotation.cpp | 0 .../Annotations/RectangleAnnotation.h | 0 .../Annotations/ShapeAnnotation.cpp | 0 .../Annotations/ShapeAnnotation.h | 0 .../Annotations/ShapePropertiesDialog.cpp | 0 .../Annotations/ShapePropertiesDialog.h | 0 .../Annotations/TextAnnotation.cpp | 0 .../Annotations/TextAnnotation.h | 0 .../Component/Component.cpp | 0 .../Component/Component.h | 0 .../Component/ComponentProperties.cpp | 0 .../Component/ComponentProperties.h | 0 .../Component/CornerItem.cpp | 0 .../Component/CornerItem.h | 0 .../Component/Transformation.cpp | 0 .../Component/Transformation.h | 0 .../CrashReport/CrashReportDialog.cpp | 0 .../CrashReport/CrashReportDialog.h | 0 .../CrashReport/GDBBacktrace.cpp | 0 .../CrashReport/GDBBacktrace.h | 0 .../CrashReport/backtrace.c | 0 .../CrashReport/backtrace.h | 0 .../Debugger/Attach/AttachToProcessDialog.cpp | 0 .../Debugger/Attach/AttachToProcessDialog.h | 0 .../Debugger/Attach/ProcessListModel.cpp | 0 .../Debugger/Attach/ProcessListModel.h | 0 .../Debugger/Breakpoints/BreakpointDialog.cpp | 0 .../Debugger/Breakpoints/BreakpointDialog.h | 0 .../Debugger/Breakpoints/BreakpointMarker.cpp | 0 .../Debugger/Breakpoints/BreakpointMarker.h | 0 .../Breakpoints/BreakpointsWidget.cpp | 0 .../Debugger/Breakpoints/BreakpointsWidget.h | 0 .../Debugger/DebuggerConfigurationsDialog.cpp | 0 .../Debugger/DebuggerConfigurationsDialog.h | 0 .../Debugger/GDB/CommandFactory.cpp | 0 .../Debugger/GDB/CommandFactory.h | 0 .../Debugger/GDB/GDBAdapter.cpp | 0 .../Debugger/GDB/GDBAdapter.h | 0 .../Debugger/Locals/LocalsWidget.cpp | 0 .../Debugger/Locals/LocalsWidget.h | 0 .../Debugger/Locals/ModelicaValue.cpp | 0 .../Debugger/Locals/ModelicaValue.h | 0 .../Debugger/Parser/GDBMIOutput.g | 538 +++++++++--------- .../Debugger/Parser/GDBMIParser.cpp | 0 .../Debugger/Parser/GDBMIParser.h | 0 .../Debugger/Parser/Makefile.common | 0 .../Debugger/Parser/Makefile.lib.common | 0 .../Debugger/Parser/Makefile.lib.omdev.mingw | 0 .../Debugger/Parser/Makefile.lib.unix.in | 0 .../Debugger/Parser/Makefile.omdev.mingw | 0 .../Debugger/Parser/Makefile.unix.in | 0 .../Debugger/Parser/README.txt | 0 .../Debugger/Parser/SampleGDBMIOutput.txt | 0 .../Debugger/Parser/main.cpp | 0 .../StackFrames/StackFramesWidget.cpp | 0 .../Debugger/StackFrames/StackFramesWidget.h | 0 .../Editors/BaseEditor.cpp | 0 .../Editors/BaseEditor.h | 0 .../Editors/CEditor.cpp | 0 .../OMEditGUI => OMEditLIB}/Editors/CEditor.h | 0 .../Editors/CompositeModelEditor.cpp | 0 .../Editors/CompositeModelEditor.h | 0 .../Editors/HTMLEditor.cpp | 0 .../Editors/HTMLEditor.h | 0 .../Editors/MetaModelicaEditor.cpp | 0 .../Editors/MetaModelicaEditor.h | 0 .../Editors/ModelicaEditor.cpp | 0 .../Editors/ModelicaEditor.h | 0 .../Editors/OMSimulatorEditor.cpp | 0 .../Editors/OMSimulatorEditor.h | 0 .../Editors/TextEditor.cpp | 0 .../Editors/TextEditor.h | 0 .../Editors/TransformationsEditor.cpp | 0 .../Editors/TransformationsEditor.h | 0 .../FMI/ImportFMUDialog.cpp | 0 .../FMI/ImportFMUDialog.h | 0 .../FMI/ImportFMUModelDescriptionDialog.cpp | 0 .../FMI/ImportFMUModelDescriptionDialog.h | 0 .../Git/CleanDialog.cpp | 0 .../OMEditGUI => OMEditLIB}/Git/CleanDialog.h | 0 .../Git/CommitChangesDialog.cpp | 0 .../Git/CommitChangesDialog.h | 0 .../Git/GitCommands.cpp | 0 .../OMEditGUI => OMEditLIB}/Git/GitCommands.h | 0 .../Git/RevertCommitsDialog.cpp | 0 .../Git/RevertCommitsDialog.h | 0 .../OMEditGUI => OMEditLIB}/MainWindow.cpp | 36 +- .../OMEditGUI => OMEditLIB}/MainWindow.h | 10 +- .../Makefile.omdev.mingw | 0 .../OMEditGUI => OMEditLIB}/Makefile.unix.in | 0 .../Modeling/CoOrdinateSystem.cpp | 0 .../Modeling/CoOrdinateSystem.h | 0 .../Modeling/Commands.cpp | 0 .../Modeling/Commands.h | 0 .../Modeling/DocumentationWidget.cpp | 0 .../Modeling/DocumentationWidget.h | 0 .../Modeling/FunctionArgumentDialog.cpp | 0 .../Modeling/FunctionArgumentDialog.h | 0 .../Modeling/ItemDelegate.cpp | 0 .../Modeling/ItemDelegate.h | 0 .../Modeling/LibraryTreeWidget.cpp | 0 .../Modeling/LibraryTreeWidget.h | 0 .../Modeling/MessagesWidget.cpp | 0 .../Modeling/MessagesWidget.h | 0 .../Modeling/ModelWidgetContainer.cpp | 0 .../Modeling/ModelWidgetContainer.h | 0 .../Modeling/ModelicaClassDialog.cpp | 0 .../Modeling/ModelicaClassDialog.h | 0 .../OMEditGUI => OMEditLIB}/OMC/OMCProxy.cpp | 52 +- .../OMEditGUI => OMEditLIB}/OMC/OMCProxy.h | 0 .../OMEditApplication.cpp | 31 +- .../OMEditApplication.h | 2 +- .../OMEditGUI.pro => OMEditLIB/OMEditLIB.pro} | 95 +--- OMEdit/OMEditLIB/OMEditLIB.unix.config.pri.in | 17 + .../OMEditGUI => OMEditLIB}/OMS/BusDialog.cpp | 0 .../OMEditGUI => OMEditLIB}/OMS/BusDialog.h | 0 .../OMS/ElementPropertiesDialog.cpp | 0 .../OMS/ElementPropertiesDialog.h | 0 .../OMS/InstantiateDialog.cpp | 0 .../OMS/InstantiateDialog.h | 0 .../OMS/ModelDialog.cpp | 0 .../OMEditGUI => OMEditLIB}/OMS/ModelDialog.h | 0 .../OMEditGUI => OMEditLIB}/OMS/OMSProxy.cpp | 0 .../OMEditGUI => OMEditLIB}/OMS/OMSProxy.h | 0 .../OMS/OMSSimulationDialog.cpp | 0 .../OMS/OMSSimulationDialog.h | 0 .../OMS/OMSSimulationOptions.h | 0 .../OMS/OMSSimulationOutputWidget.cpp | 0 .../OMS/OMSSimulationOutputWidget.h | 0 .../OMS/SystemSimulationInformationDialog.cpp | 0 .../OMS/SystemSimulationInformationDialog.h | 0 .../Options/NotificationsDialog.cpp | 0 .../Options/NotificationsDialog.h | 0 .../Options/OptionsDialog.cpp | 7 +- .../Options/OptionsDialog.h | 0 .../Plotting/DiagramWindow.cpp | 0 .../Plotting/DiagramWindow.h | 0 .../Plotting/PlotWindowContainer.cpp | 0 .../Plotting/PlotWindowContainer.h | 0 .../Plotting/VariablesWidget.cpp | 0 .../Plotting/VariablesWidget.h | 0 .../XMLSchema/tlmModelDescription.xsd | 0 .../Resources/bitmaps/check.png | Bin .../Resources/css/stylesheet.qss | 0 .../Resources/icons/add-connector.svg | 0 .../Resources/icons/add-icon.svg | 0 .../Resources/icons/add-system.svg | 0 .../Resources/icons/align-center.svg | 0 .../Resources/icons/align-interfaces.svg | 0 .../Resources/icons/align-left.svg | 0 .../Resources/icons/align-right.svg | 0 .../Resources/icons/animation.svg | 0 .../icons/array-parametric-plot-window.svg | 0 .../Resources/icons/array-plot-window.svg | 0 .../Resources/icons/arrow-end-fill.svg | 0 .../Resources/icons/arrow-end-open-half.svg | 0 .../Resources/icons/arrow-end-open.svg | 0 .../Resources/icons/arrow-start-fill.svg | 0 .../Resources/icons/arrow-start-open-half.svg | 0 .../Resources/icons/arrow-start-open.svg | 0 .../Resources/icons/background-color-icon.svg | 0 .../Resources/icons/bitmap-delete.svg | 0 .../Resources/icons/bitmap-shape.svg | 0 .../Resources/icons/block-icon.svg | 0 .../Resources/icons/bold-icon.svg | 0 .../icons/boolean-input-connector.svg | 0 .../icons/boolean-output-connector.svg | 0 .../Resources/icons/bottom.svg | 0 .../Resources/icons/breakpoint_disabled.svg | 0 .../Resources/icons/breakpoint_enabled.svg | 0 .../Resources/icons/bring-forward.svg | 0 .../Resources/icons/bring-to-front.svg | 0 .../Resources/icons/bullet-list.svg | 0 .../Resources/icons/bus-connector.svg | 0 .../Resources/icons/bus.svg | 0 .../Resources/icons/changeColor.svg | 0 .../Resources/icons/check-all.svg | 0 .../Resources/icons/check.svg | 0 .../Resources/icons/checkered.svg | 0 .../Resources/icons/class-icon.svg | 0 .../Resources/icons/clear.svg | 0 .../Resources/icons/completerAnnotation.svg | 0 .../Resources/icons/completerClass.svg | 0 .../Resources/icons/completerCodeSnippets.svg | 0 .../Resources/icons/completerComponent.svg | 0 .../Resources/icons/completerType.svg | 0 .../Resources/icons/completerkeyword.svg | 0 .../Resources/icons/connect-mode.svg | 0 .../Resources/icons/connector-icon.svg | 0 .../Resources/icons/console.svg | 0 .../Resources/icons/control-panel.svg | 0 .../Resources/icons/copy.svg | 0 .../Resources/icons/csv.svg | 0 .../Resources/icons/cut.svg | 0 .../Resources/icons/debugger.svg | 0 .../Resources/icons/decrease-indent.svg | 0 .../Resources/icons/delete.svg | 0 .../Resources/icons/down.svg | 0 .../Resources/icons/duplicate.svg | 0 .../Resources/icons/edit-icon.svg | 0 .../Resources/icons/edit-info-header.svg | 0 .../Resources/icons/edit-info.svg | 0 .../Resources/icons/edit-revisions.svg | 0 .../Resources/icons/ellipse-shape.svg | 0 .../Resources/icons/equational-debugger.svg | 0 .../Resources/icons/exit.svg | 0 .../Resources/icons/export-fmu.svg | 0 .../Resources/icons/export-omnotebook.svg | 0 .../Resources/icons/export-variables.svg | 0 .../Resources/icons/export-xml.svg | 0 .../Resources/icons/fill-backward.svg | 0 .../Resources/icons/fill-cross-diagnol.svg | 0 .../Resources/icons/fill-cross.svg | 0 .../Resources/icons/fill-forward.svg | 0 .../icons/fill-horizontal-cylinder.svg | 0 .../Resources/icons/fill-horizontal.svg | 0 .../Resources/icons/fill-none.svg | 0 .../Resources/icons/fill-solid.svg | 0 .../Resources/icons/fill-sphere.svg | 0 .../icons/fill-vertical-cylinder.svg | 0 .../Resources/icons/fill-vertical.svg | 0 .../Resources/icons/fillstyle.svg | 0 .../Resources/icons/flatmodel.svg | 0 .../Resources/icons/flip-horizontal.svg | 0 .../Resources/icons/flip-vertical.svg | 0 .../Resources/icons/fmi.svg | 0 .../Resources/icons/fmu-icon.svg | 0 .../Resources/icons/function-icon.svg | 0 .../Resources/icons/general.svg | 0 .../Resources/icons/grid.svg | 0 .../Resources/icons/import-fmu.svg | 0 .../Resources/icons/import-omnotebook.svg | 0 .../Resources/icons/import-tlmmodel.svg | 0 .../Resources/icons/increase-indent.svg | 0 .../Resources/icons/info-icon.svg | 0 .../Resources/icons/initialize.svg | 0 .../Resources/icons/instantiate.svg | 0 .../icons/integer-input-connector.svg | 0 .../icons/integer-output-connector.svg | 0 .../Resources/icons/interaction.svg | 0 .../Resources/icons/interface-data.svg | 0 .../Resources/icons/interrupt.svg | 0 .../Resources/icons/invisible.svg | 0 .../Resources/icons/italic-icon.svg | 0 .../Resources/icons/justify.svg | 0 .../Resources/icons/libraries.svg | 0 .../Resources/icons/line-dash-dot-dot.svg | 0 .../Resources/icons/line-dash-dot.svg | 0 .../Resources/icons/line-dash.svg | 0 .../Resources/icons/line-dot.svg | 0 .../Resources/icons/line-none.svg | 0 .../Resources/icons/line-shape.svg | 0 .../Resources/icons/line-solid.svg | 0 .../Resources/icons/linestyle.svg | 0 .../Resources/icons/link-external.svg | 0 .../Resources/icons/link.svg | 0 .../Resources/icons/lock.svg | 0 .../Resources/icons/mat.svg | 0 .../Resources/icons/messages.svg | 0 .../Resources/icons/model-icon.svg | 0 .../Resources/icons/model.svg | 0 .../Resources/icons/modeling.png | Bin .../Resources/icons/modeltext.svg | 0 .../Resources/icons/new.svg | 0 .../Resources/icons/next.svg | 0 .../Resources/icons/notificationicon.svg | 0 .../Resources/icons/numbered-list.svg | 0 .../Resources/icons/omedit.icns | Bin .../Resources/icons/omedit.ico | Bin .../Resources/icons/omedit.png | Bin .../Resources/icons/omedit_splashscreen.png | Bin .../Resources/icons/omplot.png | Bin .../Resources/icons/omshell.svg | 0 .../Resources/icons/open.svg | 0 .../Resources/icons/optimization-icon.svg | 0 .../Resources/icons/options.svg | 0 .../Resources/icons/order.svg | 0 .../Resources/icons/package-icon.svg | 0 .../icons/parametric-plot-window.svg | 0 .../Resources/icons/paste.svg | 0 .../Resources/icons/pause.svg | 0 .../Resources/icons/perspective0.svg | 0 .../Resources/icons/perspective1.svg | 0 .../Resources/icons/perspective2.svg | 0 .../Resources/icons/perspective3.svg | 0 .../Resources/icons/play_animation.svg | 0 .../Resources/icons/plot-window.svg | 0 .../Resources/icons/plt.svg | 0 .../Resources/icons/polygon-shape.svg | 0 .../Resources/icons/previous.svg | 0 .../Resources/icons/print.svg | 0 .../Resources/icons/quit.svg | 0 .../Resources/icons/re-simulate.svg | 0 .../Resources/icons/re-simulation-center.svg | 0 .../Resources/icons/real-input-connector.svg | 0 .../Resources/icons/real-output-connector.svg | 0 .../Resources/icons/record-icon.svg | 0 .../Resources/icons/rectangle-shape.svg | 0 .../Resources/icons/redo.svg | 0 .../Resources/icons/refresh.svg | 0 .../Resources/icons/resume.svg | 0 .../Resources/icons/rotateCameraLeft.svg | 0 .../Resources/icons/rotateCameraRight.svg | 0 .../Resources/icons/rotateanticlockwise.svg | 0 .../Resources/icons/rotateclockwise.svg | 0 .../Resources/icons/save.svg | 0 .../Resources/icons/saveall.svg | 0 .../Resources/icons/saveas.svg | 0 .../Resources/icons/sc-system-icon.svg | 0 .../Resources/icons/send-backward.svg | 0 .../Resources/icons/send-to-back.svg | 0 .../Resources/icons/simulate-animation.svg | 0 .../Resources/icons/simulate-debug.svg | 0 .../Resources/icons/simulate-equation.svg | 0 .../Resources/icons/simulate.svg | 0 .../Resources/icons/simulation-center.svg | 0 .../Resources/icons/simulation-parameters.svg | 0 .../Resources/icons/step-into.svg | 0 .../Resources/icons/step-over.svg | 0 .../Resources/icons/step-return.svg | 0 .../Resources/icons/strikethrough-icon.svg | 0 .../Resources/icons/subscript-icon.svg | 0 .../Resources/icons/superscript-icon.svg | 0 .../Resources/icons/switch.svg | 0 .../Resources/icons/text-color-icon.svg | 0 .../Resources/icons/text-shape.svg | 0 .../Resources/icons/texture.svg | 0 .../Resources/icons/tlm-bus.svg | 0 .../icons/tlm-electric-bus-connector.svg | 0 .../icons/tlm-hydraulic-bus-connector.svg | 0 .../Resources/icons/tlm-icon.svg | 0 .../icons/tlm-input-bus-connector.svg | 0 .../icons/tlm-mechanical-bus-connector.svg | 0 .../icons/tlm-output-bus-connector.svg | 0 .../icons/tlm-rotational-bus-connector.svg | 0 .../Resources/icons/tlm-simulate.svg | 0 .../Resources/icons/tlm-system-icon.svg | 0 .../Resources/icons/top.svg | 0 .../Resources/icons/traceability.svg | 0 .../Resources/icons/transition-mode.svg | 0 .../Resources/icons/transparency.svg | 0 .../Resources/icons/txt.svg | 0 .../Resources/icons/type-icon.svg | 0 .../Resources/icons/underline-icon.svg | 0 .../Resources/icons/undo.svg | 0 .../Resources/icons/unlink.svg | 0 .../Resources/icons/unlock.svg | 0 .../Resources/icons/up.svg | 0 .../Resources/icons/update.svg | 0 .../Resources/icons/wc-system-icon.svg | 0 .../Resources/icons/zoomIn.svg | 0 .../Resources/icons/zoomOut.svg | 0 .../Resources/icons/zoomReset.svg | 0 .../Resources/nls/OMEdit_de.ts | 0 .../Resources/nls/OMEdit_es.ts | 0 .../Resources/nls/OMEdit_fr.ts | 0 .../Resources/nls/OMEdit_it.ts | 0 .../Resources/nls/OMEdit_ja.ts | 0 .../Resources/nls/OMEdit_ro.ts | 0 .../Resources/nls/OMEdit_ru.ts | 0 .../Resources/nls/OMEdit_sv.ts | 0 .../Resources/nls/OMEdit_zh_CN.ts | 0 .../Resources/nls/README.md | 0 .../Resources/nls/tsupdate.bat | 0 .../Search/SearchWidget.cpp | 0 .../Search/SearchWidget.h | 0 .../Simulation/OpcUaClient.cpp | 0 .../Simulation/OpcUaClient.h | 0 .../Simulation/SimulationDialog.cpp | 0 .../Simulation/SimulationDialog.h | 0 .../Simulation/SimulationOptions.h | 0 .../Simulation/SimulationOutputHandler.cpp | 0 .../Simulation/SimulationOutputHandler.h | 0 .../Simulation/SimulationOutputWidget.cpp | 0 .../Simulation/SimulationOutputWidget.h | 0 .../Simulation/SimulationProcessThread.cpp | 0 .../Simulation/SimulationProcessThread.h | 0 .../Simulation/TranslationFlagsWidget.cpp | 0 .../Simulation/TranslationFlagsWidget.h | 0 .../TLM/FetchInterfaceDataDialog.cpp | 0 .../TLM/FetchInterfaceDataDialog.h | 0 .../TLM/FetchInterfaceDataThread.cpp | 0 .../TLM/FetchInterfaceDataThread.h | 0 .../TLM/TLMCoSimulationDialog.cpp | 0 .../TLM/TLMCoSimulationDialog.h | 0 .../TLM/TLMCoSimulationOptions.h | 0 .../TLM/TLMCoSimulationOutputWidget.cpp | 0 .../TLM/TLMCoSimulationOutputWidget.h | 0 .../TLM/TLMCoSimulationThread.cpp | 0 .../TLM/TLMCoSimulationThread.h | 0 .../TraceabilityGraphViewWidget.cpp | 0 .../TraceabilityGraphViewWidget.h | 0 .../TraceabilityInformationURI.cpp | 0 .../Traceability/TraceabilityInformationURI.h | 0 .../TransformationalDebugger/OMDumpXML.cpp | 0 .../TransformationalDebugger/OMDumpXML.h | 0 .../TransformationsWidget.cpp | 0 .../TransformationsWidget.h | 0 .../diff_match_patch.cpp | 0 .../diff_match_patch.h | 0 .../OMEditGUI => OMEditLIB}/Util/Helper.cpp | 0 .../OMEditGUI => OMEditLIB}/Util/Helper.h | 0 .../Util/ResourceCache.cpp | 0 .../Util/ResourceCache.h | 0 .../Util/StringHandler.cpp | 0 .../Util/StringHandler.h | 0 .../Util/Utilities.cpp | 0 .../OMEditGUI => OMEditLIB}/Util/Utilities.h | 0 .../resource_omedit.qrc | 0 .../BrowseElectricalAnalogBasic.pro | 39 ++ .../BrowseElectricalAnalogBasic/Test.cpp | 56 ++ .../BrowseElectricalAnalogBasic/Test.h | 48 ++ .../BrowseMediaAirReferenceMoistAir.pro | 39 ++ .../BrowseMediaAirReferenceMoistAir/Test.cpp | 57 ++ .../BrowseMediaAirReferenceMoistAir/Test.h | 48 ++ OMEdit/Testsuite/Common/Testsuite.pri | 62 ++ OMEdit/Testsuite/Common/Util.cpp | 51 ++ OMEdit/Testsuite/Common/Util.h | 71 +++ OMEdit/Testsuite/Makefile.omdev.mingw | 34 ++ OMEdit/Testsuite/Makefile.unix.in | 32 ++ OMEdit/Testsuite/Testsuite.pro | 35 ++ OMEdit/configure.ac | 4 +- OMEdit/{OMEdit/OMEditGUI => }/omc_config.h.in | 0 doc/UsersGuide/Makefile | 2 +- doc/UsersGuide/source/omedit.rst | 2 +- 480 files changed, 1382 insertions(+), 545 deletions(-) delete mode 100644 OMEdit/Makefile.in create mode 100644 OMEdit/Makefile.unix.in create mode 100644 OMEdit/OMEdit.pro delete mode 100644 OMEdit/OMEdit/OMEditGUI/OMEdit.config.in rename OMEdit/{OMEdit => }/OMEditGUI/Info.plist (100%) rename OMEdit/{OMEdit => }/OMEditGUI/OMEdit.manifest (95%) create mode 100644 OMEdit/OMEditGUI/OMEditGUI.pro create mode 100644 OMEdit/OMEditGUI/OMEditGUI.unix.config.pri.in create mode 100644 OMEdit/OMEditGUI/OMEditGUI.win.config.pri rename OMEdit/{OMEdit => }/OMEditGUI/main.cpp (100%) rename OMEdit/{OMEdit => }/OMEditGUI/rc_omedit.rc (82%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/AbstractAnimationWindow.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/AbstractAnimationWindow.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/AnimationUtil.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/AnimationWindow.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/AnimationWindow.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/ExtraShapes.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/ExtraShapes.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/FMUSettingsDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/FMUSettingsDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/FMUWrapper.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/FMUWrapper.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/GLWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/GLWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/OpenGLWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/OpenGLWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/Shapes.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/Shapes.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/ThreeDViewer.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/ThreeDViewer.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/TimeManager.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/TimeManager.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/ViewerWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/ViewerWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/Visualizer.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/Visualizer.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/VisualizerCSV.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/VisualizerCSV.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/VisualizerFMU.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/VisualizerFMU.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/VisualizerMAT.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/VisualizerMAT.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Animation/rapidxml.hpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/BitmapAnnotation.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/BitmapAnnotation.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/EllipseAnnotation.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/EllipseAnnotation.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/LineAnnotation.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/LineAnnotation.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/PolygonAnnotation.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/PolygonAnnotation.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/RectangleAnnotation.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/RectangleAnnotation.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/ShapeAnnotation.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/ShapeAnnotation.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/ShapePropertiesDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/ShapePropertiesDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/TextAnnotation.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Annotations/TextAnnotation.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Component/Component.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Component/Component.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Component/ComponentProperties.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Component/ComponentProperties.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Component/CornerItem.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Component/CornerItem.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Component/Transformation.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Component/Transformation.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/CrashReport/CrashReportDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/CrashReport/CrashReportDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/CrashReport/GDBBacktrace.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/CrashReport/GDBBacktrace.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/CrashReport/backtrace.c (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/CrashReport/backtrace.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Attach/AttachToProcessDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Attach/AttachToProcessDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Attach/ProcessListModel.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Attach/ProcessListModel.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Breakpoints/BreakpointDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Breakpoints/BreakpointDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Breakpoints/BreakpointMarker.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Breakpoints/BreakpointMarker.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Breakpoints/BreakpointsWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Breakpoints/BreakpointsWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/DebuggerConfigurationsDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/DebuggerConfigurationsDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/GDB/CommandFactory.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/GDB/CommandFactory.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/GDB/GDBAdapter.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/GDB/GDBAdapter.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Locals/LocalsWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Locals/LocalsWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Locals/ModelicaValue.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Locals/ModelicaValue.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/GDBMIOutput.g (96%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/GDBMIParser.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/GDBMIParser.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/Makefile.common (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/Makefile.lib.common (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/Makefile.lib.omdev.mingw (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/Makefile.lib.unix.in (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/Makefile.omdev.mingw (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/Makefile.unix.in (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/README.txt (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/SampleGDBMIOutput.txt (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/Parser/main.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/StackFrames/StackFramesWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Debugger/StackFrames/StackFramesWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/BaseEditor.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/BaseEditor.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/CEditor.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/CEditor.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/CompositeModelEditor.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/CompositeModelEditor.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/HTMLEditor.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/HTMLEditor.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/MetaModelicaEditor.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/MetaModelicaEditor.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/ModelicaEditor.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/ModelicaEditor.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/OMSimulatorEditor.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/OMSimulatorEditor.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/TextEditor.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/TextEditor.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/TransformationsEditor.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Editors/TransformationsEditor.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/FMI/ImportFMUDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/FMI/ImportFMUDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/FMI/ImportFMUModelDescriptionDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/FMI/ImportFMUModelDescriptionDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Git/CleanDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Git/CleanDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Git/CommitChangesDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Git/CommitChangesDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Git/GitCommands.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Git/GitCommands.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Git/RevertCommitsDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Git/RevertCommitsDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/MainWindow.cpp (99%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/MainWindow.h (98%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Makefile.omdev.mingw (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Makefile.unix.in (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/CoOrdinateSystem.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/CoOrdinateSystem.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/Commands.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/Commands.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/DocumentationWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/DocumentationWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/FunctionArgumentDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/FunctionArgumentDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/ItemDelegate.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/ItemDelegate.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/LibraryTreeWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/LibraryTreeWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/MessagesWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/MessagesWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/ModelWidgetContainer.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/ModelWidgetContainer.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/ModelicaClassDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Modeling/ModelicaClassDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMC/OMCProxy.cpp (98%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMC/OMCProxy.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMEditApplication.cpp (92%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMEditApplication.h (94%) rename OMEdit/{OMEdit/OMEditGUI/OMEditGUI.pro => OMEditLIB/OMEditLIB.pro} (74%) create mode 100644 OMEdit/OMEditLIB/OMEditLIB.unix.config.pri.in rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/BusDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/BusDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/ElementPropertiesDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/ElementPropertiesDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/InstantiateDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/InstantiateDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/ModelDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/ModelDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/OMSProxy.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/OMSProxy.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/OMSSimulationDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/OMSSimulationDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/OMSSimulationOptions.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/OMSSimulationOutputWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/OMSSimulationOutputWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/SystemSimulationInformationDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/OMS/SystemSimulationInformationDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Options/NotificationsDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Options/NotificationsDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Options/OptionsDialog.cpp (99%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Options/OptionsDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Plotting/DiagramWindow.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Plotting/DiagramWindow.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Plotting/PlotWindowContainer.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Plotting/PlotWindowContainer.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Plotting/VariablesWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Plotting/VariablesWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/XMLSchema/tlmModelDescription.xsd (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/bitmaps/check.png (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/css/stylesheet.qss (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/add-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/add-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/add-system.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/align-center.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/align-interfaces.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/align-left.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/align-right.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/animation.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/array-parametric-plot-window.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/array-plot-window.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/arrow-end-fill.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/arrow-end-open-half.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/arrow-end-open.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/arrow-start-fill.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/arrow-start-open-half.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/arrow-start-open.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/background-color-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/bitmap-delete.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/bitmap-shape.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/block-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/bold-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/boolean-input-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/boolean-output-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/bottom.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/breakpoint_disabled.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/breakpoint_enabled.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/bring-forward.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/bring-to-front.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/bullet-list.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/bus-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/bus.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/changeColor.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/check-all.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/check.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/checkered.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/class-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/clear.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/completerAnnotation.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/completerClass.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/completerCodeSnippets.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/completerComponent.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/completerType.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/completerkeyword.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/connect-mode.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/connector-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/console.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/control-panel.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/copy.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/csv.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/cut.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/debugger.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/decrease-indent.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/delete.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/down.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/duplicate.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/edit-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/edit-info-header.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/edit-info.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/edit-revisions.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/ellipse-shape.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/equational-debugger.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/exit.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/export-fmu.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/export-omnotebook.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/export-variables.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/export-xml.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fill-backward.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fill-cross-diagnol.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fill-cross.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fill-forward.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fill-horizontal-cylinder.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fill-horizontal.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fill-none.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fill-solid.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fill-sphere.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fill-vertical-cylinder.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fill-vertical.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fillstyle.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/flatmodel.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/flip-horizontal.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/flip-vertical.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fmi.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/fmu-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/function-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/general.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/grid.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/import-fmu.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/import-omnotebook.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/import-tlmmodel.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/increase-indent.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/info-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/initialize.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/instantiate.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/integer-input-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/integer-output-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/interaction.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/interface-data.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/interrupt.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/invisible.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/italic-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/justify.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/libraries.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/line-dash-dot-dot.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/line-dash-dot.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/line-dash.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/line-dot.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/line-none.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/line-shape.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/line-solid.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/linestyle.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/link-external.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/link.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/lock.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/mat.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/messages.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/model-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/model.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/modeling.png (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/modeltext.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/new.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/next.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/notificationicon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/numbered-list.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/omedit.icns (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/omedit.ico (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/omedit.png (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/omedit_splashscreen.png (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/omplot.png (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/omshell.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/open.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/optimization-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/options.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/order.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/package-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/parametric-plot-window.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/paste.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/pause.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/perspective0.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/perspective1.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/perspective2.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/perspective3.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/play_animation.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/plot-window.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/plt.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/polygon-shape.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/previous.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/print.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/quit.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/re-simulate.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/re-simulation-center.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/real-input-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/real-output-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/record-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/rectangle-shape.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/redo.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/refresh.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/resume.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/rotateCameraLeft.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/rotateCameraRight.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/rotateanticlockwise.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/rotateclockwise.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/save.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/saveall.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/saveas.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/sc-system-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/send-backward.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/send-to-back.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/simulate-animation.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/simulate-debug.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/simulate-equation.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/simulate.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/simulation-center.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/simulation-parameters.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/step-into.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/step-over.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/step-return.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/strikethrough-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/subscript-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/superscript-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/switch.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/text-color-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/text-shape.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/texture.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/tlm-bus.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/tlm-electric-bus-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/tlm-hydraulic-bus-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/tlm-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/tlm-input-bus-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/tlm-mechanical-bus-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/tlm-output-bus-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/tlm-rotational-bus-connector.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/tlm-simulate.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/tlm-system-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/top.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/traceability.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/transition-mode.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/transparency.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/txt.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/type-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/underline-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/undo.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/unlink.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/unlock.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/up.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/update.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/wc-system-icon.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/zoomIn.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/zoomOut.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/icons/zoomReset.svg (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/nls/OMEdit_de.ts (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/nls/OMEdit_es.ts (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/nls/OMEdit_fr.ts (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/nls/OMEdit_it.ts (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/nls/OMEdit_ja.ts (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/nls/OMEdit_ro.ts (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/nls/OMEdit_ru.ts (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/nls/OMEdit_sv.ts (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/nls/OMEdit_zh_CN.ts (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/nls/README.md (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Resources/nls/tsupdate.bat (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Search/SearchWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Search/SearchWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/OpcUaClient.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/OpcUaClient.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/SimulationDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/SimulationDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/SimulationOptions.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/SimulationOutputHandler.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/SimulationOutputHandler.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/SimulationOutputWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/SimulationOutputWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/SimulationProcessThread.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/SimulationProcessThread.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/TranslationFlagsWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Simulation/TranslationFlagsWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TLM/FetchInterfaceDataDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TLM/FetchInterfaceDataDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TLM/FetchInterfaceDataThread.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TLM/FetchInterfaceDataThread.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TLM/TLMCoSimulationDialog.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TLM/TLMCoSimulationDialog.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TLM/TLMCoSimulationOptions.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TLM/TLMCoSimulationOutputWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TLM/TLMCoSimulationOutputWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TLM/TLMCoSimulationThread.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TLM/TLMCoSimulationThread.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Traceability/TraceabilityGraphViewWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Traceability/TraceabilityGraphViewWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Traceability/TraceabilityInformationURI.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Traceability/TraceabilityInformationURI.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TransformationalDebugger/OMDumpXML.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TransformationalDebugger/OMDumpXML.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TransformationalDebugger/TransformationsWidget.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TransformationalDebugger/TransformationsWidget.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TransformationalDebugger/diff_match_patch.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/TransformationalDebugger/diff_match_patch.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Util/Helper.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Util/Helper.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Util/ResourceCache.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Util/ResourceCache.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Util/StringHandler.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Util/StringHandler.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Util/Utilities.cpp (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/Util/Utilities.h (100%) rename OMEdit/{OMEdit/OMEditGUI => OMEditLIB}/resource_omedit.qrc (100%) create mode 100644 OMEdit/Testsuite/BrowseElectricalAnalogBasic/BrowseElectricalAnalogBasic.pro create mode 100644 OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.cpp create mode 100644 OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.h create mode 100644 OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/BrowseMediaAirReferenceMoistAir.pro create mode 100644 OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.cpp create mode 100644 OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.h create mode 100644 OMEdit/Testsuite/Common/Testsuite.pri create mode 100644 OMEdit/Testsuite/Common/Util.cpp create mode 100644 OMEdit/Testsuite/Common/Util.h create mode 100644 OMEdit/Testsuite/Makefile.omdev.mingw create mode 100644 OMEdit/Testsuite/Makefile.unix.in create mode 100644 OMEdit/Testsuite/Testsuite.pro rename OMEdit/{OMEdit/OMEditGUI => }/omc_config.h.in (100%) diff --git a/Makefile.in b/Makefile.in index 006e83cbbf0..cebbca4d7ed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,11 @@ # main Makefile template for Linux and MacOS, populated by configure +defaultMakefileTarget = Makefile.unix + all: @ALL_TARGETS@ @OMLIBRARY_TARGET@ .PRECIOUS: Makefile -.PHONY: omc omlibrary-all omlibrary-core omplot omedit omnotebook omoptim omshell omc-diff omsimulator ReferenceFiles testsuite-depends +.PHONY: omc omlibrary-all omlibrary-core omplot omedit omedit-testsuite omnotebook omoptim omshell omc-diff omsimulator ReferenceFiles testsuite-depends omc: omc.skip omc.skip: @@ -17,7 +19,10 @@ omplot.skip: omc $(MAKE) -C OMPlot omedit: omedit.skip omedit.skip: omc omplot omsimulator - $(MAKE) -C OMEdit + $(MAKE) -f $(defaultMakefileTarget) -C OMEdit +omedit-testsuite: omedit-testsuite.skip +omedit-testsuite.skip: omedit + $(MAKE) -f $(defaultMakefileTarget) -C OMEdit/Testsuite omsimulator: omsimulator.skip omsimulator.skip: $(MAKE) -C OMSimulator config-3rdParty CERES=OFF "host_short=@host_short@" CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" CXXFLAGS="@CXXFLAGS@" @@ -40,7 +45,7 @@ ReferenceFiles.skip: $(MAKE) -C testsuite/ReferenceFiles testsuite-depends: omc-diff ReferenceFiles -SOURCE_DIRS_UTF8=OMEdit/OMEdit OMShell/OMShell OMNotebook/OMNotebook OMOptim/OMOptim OMPlot/OMPlot OMCompiler/Compiler/ OMCompiler/SimulationRuntime/ `bash -c echo testsuite/flattening/libraries/3rdParty/{PlanarMechanics,siemens,SiemensPower,ThermoSysPro}` testsuite/openmodelica/modelicaML testsuite/AVM testsuite/simulation +SOURCE_DIRS_UTF8=OMEdit OMShell/OMShell OMNotebook/OMNotebook OMOptim/OMOptim OMPlot/OMPlot OMCompiler/Compiler/ OMCompiler/SimulationRuntime/ `bash -c echo testsuite/flattening/libraries/3rdParty/{PlanarMechanics,siemens,SiemensPower,ThermoSysPro}` testsuite/openmodelica/modelicaML testsuite/AVM testsuite/simulation SOURCE_DIRS=$(SOURCE_DIRS_UTF8) # testsuite/flattening/libraries/3rdParty/HumMod bom-error: diff --git a/Makefile.omdev.mingw b/Makefile.omdev.mingw index 5793ab043da..ba7f98ba400 100644 --- a/Makefile.omdev.mingw +++ b/Makefile.omdev.mingw @@ -34,7 +34,7 @@ BUILDTYPE=Debug endif -.PHONY: omc omc-diff omlibrary-core omplot omedit omsimulator omnotebook omshell omoptim +.PHONY: omc omc-diff omlibrary-core omplot omedit omedit-testsuite omsimulator omnotebook omshell omoptim all: omc omc-diff omlibrary-core @@ -56,6 +56,9 @@ omplot: omc qtclientsDLLs omedit: omplot omsimulator qtclientsDLLs $(MAKE) -f $(defaultMakefileTarget) -C OMEdit OMBUILDDIR=$(OMBUILDDIR) +omedit-testsuite: omedit + $(MAKE) -f $(defaultMakefileTarget) -C OMEdit/Testsuite OMBUILDDIR=$(OMBUILDDIR) + omsimulator: $(MAKE) -C OMSimulator config-3rdParty $(MAKE) -C OMSimulator config-OMSimulator OMBUILDDIR=$(OMBUILDDIR) diff --git a/OMEdit/.gitignore b/OMEdit/.gitignore index dd3ea5ff629..fb1eb5752b5 100644 --- a/OMEdit/.gitignore +++ b/OMEdit/.gitignore @@ -1,5 +1,6 @@ *.a *.config +*.unix.config.pri *.dll *.exe *.lib @@ -15,32 +16,46 @@ /configure /install-sh /Makefile -/OMEdit*/bin/ -/OMEdit*/build/release/ -/OMEdit/generatedfiles/ -/OMEdit/OMEditGUI/.qmake.stash -/OMEdit/OMEditGUI/Debugger/Parser/GDBMIOutput.tokens -/OMEdit/OMEditGUI/Debugger/Parser/GDBMIOutputLexer.c -/OMEdit/OMEditGUI/Debugger/Parser/GDBMIOutputLexer.h -/OMEdit/OMEditGUI/Debugger/Parser/GDBMIOutputParser.c -/OMEdit/OMEditGUI/Debugger/Parser/GDBMIOutputParser.h -/OMEdit/OMEditGUI/Debugger/Parser/libGDBMIParser.a -/OMEdit/OMEditGUI/Debugger/Parser/Makefile.lib.unix -/OMEdit/OMEditGUI/Makefile -/OMEdit/OMEditGUI/Makefile.Debug -/OMEdit/OMEditGUI/Makefile.Release -/OMEdit/OMEditGUI/object_script.* -/OMEdit/OMEditGUI/omc_config.h -/OMEdit/OMEditGUI/OMC/Parser/OMCOutput.tokens -/OMEdit/OMEditGUI/OMC/Parser/OMCOutputLexer.c -/OMEdit/OMEditGUI/OMC/Parser/OMCOutputLexer.cpp -/OMEdit/OMEditGUI/OMC/Parser/OMCOutputLexer.h -/OMEdit/OMEditGUI/OMC/Parser/OMCOutputParser.c -/OMEdit/OMEditGUI/OMC/Parser/OMCOutputParser.cpp -/OMEdit/OMEditGUI/OMC/Parser/OMCOutputParser.h -/OMEdit/OMEditGUI/OMEditGUI.pro.* -/OMEdit/OMEditGUI/version.h +/bin/ +/build/release/ +.qmake.stash +omc_config.h +OMEdit.pro.* +/OMEditLIB/generatedfiles/ +/OMEditLIB/.qmake.stash +/OMEditLIB/Debugger/Parser/GDBMIOutput.tokens +/OMEditLIB/Debugger/Parser/GDBMIOutputLexer.c +/OMEditLIB/Debugger/Parser/GDBMIOutputLexer.h +/OMEditLIB/Debugger/Parser/GDBMIOutputParser.c +/OMEditLIB/Debugger/Parser/GDBMIOutputParser.h +/OMEditLIB/Debugger/Parser/libGDBMIParser.a +/OMEditLIB/Debugger/Parser/Makefile.lib.unix +/OMEditLIB/Makefile +/OMEditLIB/Makefile.Debug +/OMEditLIB/Makefile.Release +/OMEditLIB/object_script.* +/OMEditLIB/OMC/Parser/OMCOutput.tokens +/OMEditLIB/OMC/Parser/OMCOutputLexer.c +/OMEditLIB/OMC/Parser/OMCOutputLexer.cpp +/OMEditLIB/OMC/Parser/OMCOutputLexer.h +/OMEditLIB/OMC/Parser/OMCOutputParser.c +/OMEditLIB/OMC/Parser/OMCOutputParser.cpp +/OMEditLIB/OMC/Parser/OMCOutputParser.h +/OMEditLIB/OMEditLIB.pro.* +/OMEditGUI/.qmake.stash +/OMEditGUI/Makefile +/OMEditGUI/Makefile.Debug +/OMEditGUI/Makefile.Release +/OMEditGUI/object_script.* +/OMEditGUI/OMEditGUI.pro.* +/OMEditGUI/version.h /qjson-0.8.1/build/ /qmake.sh Makefile.unix qm.stamp +Testsuite/Makefile +Testsuite/Testsuite.pro.* +Testsuite/*/generatedfiles/ +Testsuite/*/Makefile +Testsuite/*/Makefile.Debug +Testsuite/*/Makefile.Release diff --git a/OMEdit/Makefile.in b/OMEdit/Makefile.in deleted file mode 100644 index a3551b4c3fd..00000000000 --- a/OMEdit/Makefile.in +++ /dev/null @@ -1,46 +0,0 @@ -all: omedit - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -CMAKE=CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" cmake -CMAKE_TARGET = "Unix Makefiles" - -ifeq (@APP@,) -install: - mkdir -p ${DESTDIR}/@bindir@ - cp -a build/bin/OMEdit@EXE@ ${DESTDIR}/@bindir@ -else -install: - mkdir -p ${DESTDIR}/Applications/ - cp -a build/Applications/OMEdit@APP@ ${DESTDIR}/Applications/ -endif - mkdir -p ${DESTDIR}/lib/@host_short@/omc/ ${DESTDIR}/share/omedit/nls/ - cp -a build/lib/@host_short@/omc/* ${DESTDIR}/lib/@host_short@/omc/ - cp -a build/share/omedit/nls/* ${DESTDIR}/share/omedit/nls/ - -mkbuilddirs: - mkdir -p build/bin @OMBUILDDIR@/share/omedit/nls @OMBUILDDIR@/lib/@host_short@/omc -omedit: mkbuilddirs qjson-build - $(MAKE) -C OMEdit/OMEditGUI -f Makefile.unix -clean: - $(MAKE) -C OMEdit/OMEditGUI -f Makefile.unix clean - test ! -f qjson/build/Makefile || $(MAKE) -C qjson/build clean - rm -rf qjson/build -distclean: clean - rm -f config.status configure Makefile OMEdit/OMEditGUI/Makefile.unix OMEdit/OMEditGUI/OMEdit.config -Makefile: Makefile.in config.status - ./config.status -config.status: configure - ./config.status -recheck -configure: configure.ac common/m4/corba.m4 common/m4/omhome.m4 common/m4/qmake.m4 - autoconf - -qjson-build: - test -d qjson - mkdir -p qjson/build/include/qjson - (cd qjson/build && test -f Makefile || CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" CXXFLAGS="@CXXFLAGS@" $(CMAKE) .. @QT4BUILD@ -G $(CMAKE_TARGET)) - test -f qjson/build/lib/libqjson$(SHREXT) || $(MAKE) -C qjson/build - test ! `uname` = Darwin || install_name_tool -id @rpath/libqjson.0.dylib qjson/build/lib/libqjson.0.dylib - cp -a qjson/build/lib/libqjson*$(SHREXT)* @OMBUILDDIR@/lib/@host_short@/omc/ - cp -a qjson/src/*.h qjson/build/include/qjson diff --git a/OMEdit/Makefile.omdev.mingw b/OMEdit/Makefile.omdev.mingw index dee9b4e4ef1..70a5ab4b419 100644 --- a/OMEdit/Makefile.omdev.mingw +++ b/OMEdit/Makefile.omdev.mingw @@ -18,20 +18,72 @@ endif AR = ar CMAKE = $(OMDEVMSYS)/bin/cmake/bin/cmake CMAKE_TARGET = "MSYS Makefiles" +QMAKE=qmake + +builddir_bin=$(OMBUILDDIR)/bin +builddir_lib=$(OMBUILDDIR)/lib/omc +builddir_share=$(OMBUILDDIR)/share/ +resourcedir=./OMEditLIB/Resources/nls/ +CONFIG_DEFAULT_OPENMODELICAHOME = "$(OMBUILDDIR)/" +LSB_RELEASE = $(shell cmd /c "ver") + +NAME=OMEdit +EXE=.exe SHREXT=.dll +LIB=libOMEdit +LIBEXE=.a + +omedit: mkbuilddirs install + cp -puf ../common/pre-commit.sh $(shell git rev-parse --git-dir)/hooks/pre-commit mkbuilddirs: mkdir -p $(OMBUILDDIR)/share/omedit/nls - mkdir -p $(buildlib) - mkdir -p $(buildbin) + mkdir -p $(builddir_lib) + mkdir -p $(builddir_bin) -omedit: mkbuilddirs qjson-build - $(MAKE) -C OMEdit/OMEditGUI -f Makefile.omdev.mingw - cp -puf ../common/pre-commit.sh $(shell git rev-parse --git-dir)/hooks/pre-commit +install: build OMEditLIB/Resources/nls/qm.stamp + cp -p $(resourcedir)/*.qm $(builddir_share)/omedit/nls/ + cp -p bin/$(NAME)$(EXE) $(builddir_bin) + cp -p bin/$(LIB)$(LIBEXE) $(OMBUILDDIR)/lib/omc + +OMEditLIB/Resources/nls/qm.stamp: OMEditLIB/OMEditLIB.pro OMEditLIB/Resources/nls/*.ts + lrelease $< + @touch $@ + +build: omc_config.h $(NAME) + $(MAKE) -f Makefile + +$(NAME): Makefile + $(MAKE) -f Makefile + +parsergen: + $(MAKE) -C OMEditLIB/Debugger/Parser -f Makefile.lib.omdev.mingw + +Makefile: parsergen qjson-build OMEdit.pro + $(QMAKE) -r "CONFIG+=release" + +omc_config.h: + @echo Current omhome: "$(CONFIG_DEFAULT_OPENMODELICAHOME)" + @echo Current lsb_release: "$(LSB_RELEASE)" + @if test -f omc_config.h; \ + then \ + echo "#define CONFIG_DEFAULT_OPENMODELICAHOME \"$(CONFIG_DEFAULT_OPENMODELICAHOME)\"" > omc_config.h.tmp; \ + echo "#define LSB_RELEASE \"$(LSB_RELEASE)\"" >> omc_config.h.tmp; \ + diff omc_config.h omc_config.h.tmp > /dev/null; \ + if [ $$? -eq 0 ]; then echo No change in version; rm omc_config.h.tmp; \ + else echo version has changed. updating omc_config.h; \mv omc_config.h.tmp omc_config.h; \ + fi; \ + else \ + echo "#define CONFIG_DEFAULT_OPENMODELICAHOME \"$(CONFIG_DEFAULT_OPENMODELICAHOME)\"" > omc_config.h; \ + echo "#define LSB_RELEASE \"$(LSB_RELEASE)\"" >> omc_config.h; \ + fi; clean: cd qjson && rm -rf build - $(MAKE) -C OMEdit/OMEditGUI -f Makefile.omdev.mingw clean + $(MAKE) -C OMEditLIB/Debugger/Parser -f Makefile.lib.omdev.mingw clean + test ! -f Makefile || $(MAKE) -f Makefile clean + rm -f bin/$(NAME)$(EXE) bin/$(LIB)$(LIBEXE) + rm -rf omc_config.h Makefile OMEditLIB/debug OMEditLIB/release OMEditLIB/generatedfiles OMEditLIB/Makefile OMEditLIB/Makefile.Debug OMEditLIB/Makefile.Release OMEditLIB/object_script.* OMEditGUI/debug OMEditGUI/release OMEditGUI/Makefile OMEditGUI/Makefile.Debug OMEditGUI/Makefile.Release qjson-build: test -d qjson diff --git a/OMEdit/Makefile.unix.in b/OMEdit/Makefile.unix.in new file mode 100644 index 00000000000..8ebfa7080c9 --- /dev/null +++ b/OMEdit/Makefile.unix.in @@ -0,0 +1,71 @@ +all: omedit + +resourcedir=./OMEditLIB/Resources/nls/ + +NAME=OMEdit +APP=@APP@ +LIB=libOMEdit +LIBEXE=.a +QMAKE=@QMAKE@ +LRELEASE=@LRELEASE@ + +CMAKE=CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" cmake +CMAKE_TARGET = "Unix Makefiles" + +install: build OMEditLIB/Resources/nls/qm.stamp + cp -p $(resourcedir)/*.qm @OMBUILDDIR@/share/omedit/nls/ + if [ "$(APP)" = ".app" ]; then mkdir -p @OMBUILDDIR@/Applications/ ; cp -rp bin/OMEdit$(APP) @OMBUILDDIR@/Applications/ ; else cp -p bin/OMEdit @OMBUILDDIR@/bin/; fi + cp -p bin/$(LIB)$(LIBEXE) @OMBUILDDIR@/lib/@host_short@/omc/ + +OMEditLIB/Resources/nls/qm.stamp: OMEditLIB/OMEditLIB.pro OMEditLIB/Resources/nls/*.ts + $(LRELEASE) $< + @touch $@ + +$(NAME): parsergen qjson-build Makefile OMEditLIB/OMEditLIB.unix.config.pri OMEditGUI/OMEditGUI.unix.config.pri omc_config.h + $(MAKE) -f Makefile + +build: $(NAME) + +parsergen: + $(MAKE) -C OMEditLIB/Debugger/Parser -f Makefile.lib.unix + +Makefile: OMEdit.pro OMEditLIB/OMEditLIB.unix.config.pri OMEditGUI/OMEditGUI.unix.config.pri + @test ! -f $@ || rm $@ + $(QMAKE) -r +Makefile.unix: Makefile.unix.in + (cd @top_builddir@; ./config.status) +OMEditLIB/OMEditLIB.unix.config.pri: OMEditLIB/OMEditLIB.unix.config.pri.in + (cd @top_builddir@ && ./config.status) +OMEditGUI/OMEditGUI.unix.config.pri: OMEditGUI/OMEditGUI.unix.config.pri.in + (cd @top_builddir@ && ./config.status) +omc_config.h: omc_config.h.in + (cd @top_builddir@ && ./config.status) + +mkbuilddirs: + mkdir -p @OMBUILDDIR@/share/omedit/nls @OMBUILDDIR@/bin @OMBUILDDIR@/lib/@host_short@/omc +omedit: mkbuilddirs install + +clean: + test ! -f qjson/build/Makefile || $(MAKE) -C qjson/build clean + rm -rf qjson/build + $(MAKE) -C OMEditLIB/Debugger/Parser -f Makefile.lib.unix clean + test ! -f Makefile || $(MAKE) -f Makefile clean + rm -f bin/OMEdit$(APP) bin/$(LIB)$(LIBEXE) + rm -rf omc_config.h Makefile OMEditLIB/debug OMEditLIB/release OMEditLIB/generatedfiles OMEditLIB/Makefile OMEditLIB/Makefile.Debug OMEditLIB/Makefile.Release OMEditLIB/object_script.* OMEditGUI/debug OMEditGUI/release OMEditGUI/Makefile OMEditGUI/Makefile.Debug OMEditGUI/Makefile.Release + +distclean: clean + rm -rf config.log config.sub config.status install-sh autom4te.cache config.guess configure Makefile.unix OMEditLIB/OMEditLIB.unix.config.pri OMEditGUI/OMEditGUI.unix.config.pri + +config.status: configure + ./config.status -recheck +configure: configure.ac common/m4/corba.m4 common/m4/omhome.m4 common/m4/qmake.m4 + autoconf + +qjson-build: + test -d qjson + mkdir -p qjson/build/include/qjson + (cd qjson/build && test -f Makefile || CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" CXXFLAGS="@CXXFLAGS@" $(CMAKE) .. @QT4BUILD@ -G $(CMAKE_TARGET)) + test -f qjson/build/lib/libqjson$(SHREXT) || $(MAKE) -C qjson/build + test ! `uname` = Darwin || install_name_tool -id @rpath/libqjson.0.dylib qjson/build/lib/libqjson.0.dylib + cp -a qjson/build/lib/libqjson*$(SHREXT)* @OMBUILDDIR@/lib/@host_short@/omc/ + cp -a qjson/src/*.h qjson/build/include/qjson diff --git a/OMEdit/OMEdit.pro b/OMEdit/OMEdit.pro new file mode 100644 index 00000000000..93a35ddc32a --- /dev/null +++ b/OMEdit/OMEdit.pro @@ -0,0 +1,38 @@ +# + # This file is part of OpenModelica. + # + # Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + # c/o Linköpings universitet, Department of Computer and Information Science, + # SE-58183 Linköping, Sweden. + # + # All rights reserved. + # + # THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + # THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + # ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE + # OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE. + # + # The OpenModelica software and the Open Source Modelica + # Consortium (OSMC) Public License (OSMC-PL) are obtained + # from OSMC, either from the above address, + # from the URLs: http://www.ida.liu.se/projects/OpenModelica or + # http://www.openmodelica.org, and in the OpenModelica distribution. + # GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + # + # This program is distributed WITHOUT ANY WARRANTY; without + # even the implied warranty of MERCHANTABILITY or FITNESS + # FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + # IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + # + # See the full OSMC Public License conditions for more details. + # + #/ + +TEMPLATE = subdirs + +CONFIG += ordered + +SUBDIRS = OMEditLIB \ + OMEditGUI + +OMEditGUI.depends = OMEditLIB diff --git a/OMEdit/OMEdit/OMEditGUI/OMEdit.config.in b/OMEdit/OMEdit/OMEditGUI/OMEdit.config.in deleted file mode 100644 index 7299145cc78..00000000000 --- a/OMEdit/OMEdit/OMEditGUI/OMEdit.config.in +++ /dev/null @@ -1,27 +0,0 @@ -# @author Martin Sjölund - -QMAKE_CC = @CC@ -QMAKE_CXX = @CXX@ -QMAKE_LINK = @CXX@ - -OPENMODELICAHOME = @OPENMODELICAHOME@ - -LIBS += -L @OPENMODELICAHOME@/lib/@host_short@/omc -lOMPlot -lomqwt -lfmilib_shared -L../OMEditGUI/Debugger/Parser -lGDBMIParser -lomantlr3 @RPATH_QMAKE@ -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lomcgc -L@OMBUILDDIR@/lib/@host_short@/omc @LIBOSG@ -lomopcua -L@OMBUILDDIR@/lib -lOMSimulator -lqjson @LIB_BOOST_REGEX@ -INCLUDEPATH += @OPENMODELICAHOME@/include \ - @OPENMODELICAHOME@/include/omplot \ - @OPENMODELICAHOME@/include/omplot/qwt \ - @OPENMODELICAHOME@/include/@host_short@/omc/antlr3 \ - @OPENMODELICAHOME@/include/omc/scripting-API \ - @OPENMODELICAHOME@/include/omc/c \ - @OPENMODELICAHOME@/include/omc/c/util \ - @OPENMODELICAHOME@/include/omc/fmil \ - ../../qjson/build/include - -QMAKE_CXXFLAGS_RELEASE -= -O1 -QMAKE_CXXFLAGS_RELEASE -= -O2 - -QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@ -QMAKE_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ -QMAKE_LFLAGS += @LDFLAGS@ - -@QMAKE_CONFIG_OSG@ diff --git a/OMEdit/OMEdit/OMEditGUI/Info.plist b/OMEdit/OMEditGUI/Info.plist similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Info.plist rename to OMEdit/OMEditGUI/Info.plist diff --git a/OMEdit/OMEdit/OMEditGUI/OMEdit.manifest b/OMEdit/OMEditGUI/OMEdit.manifest similarity index 95% rename from OMEdit/OMEdit/OMEditGUI/OMEdit.manifest rename to OMEdit/OMEditGUI/OMEdit.manifest index f9fe30aef1e..2f99a7ec86d 100644 --- a/OMEdit/OMEdit/OMEditGUI/OMEdit.manifest +++ b/OMEdit/OMEditGUI/OMEdit.manifest @@ -1,8 +1,8 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro new file mode 100644 index 00000000000..0a5eb860200 --- /dev/null +++ b/OMEdit/OMEditGUI/OMEditGUI.pro @@ -0,0 +1,74 @@ +# + # This file is part of OpenModelica. + # + # Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + # c/o Linköpings universitet, Department of Computer and Information Science, + # SE-58183 Linköping, Sweden. + # + # All rights reserved. + # + # THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + # THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + # ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE + # OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE. + # + # The OpenModelica software and the Open Source Modelica + # Consortium (OSMC) Public License (OSMC-PL) are obtained + # from OSMC, either from the above address, + # from the URLs: http://www.ida.liu.se/projects/OpenModelica or + # http://www.openmodelica.org, and in the OpenModelica distribution. + # GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + # + # This program is distributed WITHOUT ANY WARRANTY; without + # even the implied warranty of MERCHANTABILITY or FITNESS + # FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + # IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + # + # See the full OSMC Public License conditions for more details. + # + #/ + +QT += network core gui webkit xml xmlpatterns svg opengl +greaterThan(QT_MAJOR_VERSION, 4) { + QT += printsupport widgets webkitwidgets concurrent +} + +TARGET = OMEdit +TEMPLATE = app + +LIBS += -L../bin -lOMEdit + +OMEDIT_ROOT = ../ + +# Windows libraries and includes +win32 { + include(OMEditGUI.win.config.pri) + RC_FILE = rc_omedit.rc +} else { # Unix libraries and includes + include(OMEditGUI.unix.config.pri) +} + +INCLUDEPATH += ../ \ + ../OMEditLIB \ + ../OMEditLIB/CrashReport \ + $$OPENMODELICAHOME/include/omc/c + +# Don't show the warnings from included headers. +for (path, INCLUDEPATH) { + QMAKE_CXXFLAGS += -isystem $${path} +} + +SOURCES += main.cpp + +# Please read the warnings. They are like vegetables; good for you even if you hate them. +CONFIG += warn_on +# Only disable the unused variable/function/parameter warning +win32 { + QMAKE_CXXFLAGS += -Wno-clobbered +} + +DESTDIR = ../bin + +ICON = ../OMEditLIB/Resources/icons/omedit.icns + +QMAKE_INFO_PLIST = Info.plist diff --git a/OMEdit/OMEditGUI/OMEditGUI.unix.config.pri.in b/OMEdit/OMEditGUI/OMEditGUI.unix.config.pri.in new file mode 100644 index 00000000000..2772cd7f3d5 --- /dev/null +++ b/OMEdit/OMEditGUI/OMEditGUI.unix.config.pri.in @@ -0,0 +1,31 @@ +# @author Adeel Asghar + +QMAKE_CC = @CC@ +QMAKE_CXX = @CXX@ +QMAKE_LINK = @CXX@ + +OPENMODELICAHOME = @OPENMODELICAHOME@ +host_short = @host_short@ + +LIBS += -L@OPENMODELICAHOME@/lib/$$host_short/omc -lOMPlot -lomqwt -lfmilib_shared -L$$OMEDIT_ROOT/OMEditLIB/Debugger/Parser -lGDBMIParser -lomantlr3 @RPATH_QMAKE@ -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lomcgc -L@OMBUILDDIR@/lib/$$host_short/omc @LIBOSG@ -lomopcua -L@OMBUILDDIR@/lib -lOMSimulator -lqjson @LIB_BOOST_REGEX@ + +QMAKE_CXXFLAGS_RELEASE -= -O1 +QMAKE_CXXFLAGS_RELEASE -= -O2 + +QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@ +QMAKE_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ +QMAKE_LFLAGS += @LDFLAGS@ + +# required for backtrace +# On unix we use backtrace of execinfo.h which requires -rdynamic +# The symbol names may be unavailable without the use of special linker +# options. For systems using the GNU linker, it is necessary to use +# the -rdynamic linker option. Note that names of "static" functions +# are not exposed, and won't be available in the backtrace. +CONFIG(release, debug|release) { + QMAKE_CXXFLAGS += -g + QMAKE_LFLAGS_RELEASE = -rdynamic +} +equals(QT_ARCH, i386)|equals(QT_ARCH, i486)|equals(QT_ARCH, i586)|equals(QT_ARCH, i686) { # 32-bit + LIBS += -latomic -lboost_atomic +} diff --git a/OMEdit/OMEditGUI/OMEditGUI.win.config.pri b/OMEdit/OMEditGUI/OMEditGUI.win.config.pri new file mode 100644 index 00000000000..e6d8ffc09e5 --- /dev/null +++ b/OMEdit/OMEditGUI/OMEditGUI.win.config.pri @@ -0,0 +1,67 @@ +# + # This file is part of OpenModelica. + # + # Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + # c/o Linköpings universitet, Department of Computer and Information Science, + # SE-58183 Linköping, Sweden. + # + # All rights reserved. + # + # THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + # THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + # ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE + # OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE. + # + # The OpenModelica software and the Open Source Modelica + # Consortium (OSMC) Public License (OSMC-PL) are obtained + # from OSMC, either from the above address, + # from the URLs: http://www.ida.liu.se/projects/OpenModelica or + # http://www.openmodelica.org, and in the OpenModelica distribution. + # GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + # + # This program is distributed WITHOUT ANY WARRANTY; without + # even the implied warranty of MERCHANTABILITY or FITNESS + # FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + # IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + # + # See the full OSMC Public License conditions for more details. + # + #/ + +OPENMODELICAHOME = $$(OMBUILDDIR) +# define used for OpenModelica C-API +DEFINES += IMPORT_INTO=1 +# win32 vs. win64 +contains(QT_ARCH, i386) { # 32-bit + QMAKE_LFLAGS += -Wl,--stack,16777216,--enable-auto-import,--large-address-aware +} else { # 64-bit + QMAKE_LFLAGS += -Wl,--stack,33554432,--enable-auto-import +} + +CONFIG(release, debug|release) { # release + # required for backtrace + # In order to get the stack trace in Windows we must add -g flag. Qt automatically adds the -O2 flag for optimization. + # We should also unset the QMAKE_LFLAGS_RELEASE define because it is defined as QMAKE_LFLAGS_RELEASE = -Wl,-s in qmake.conf file for MinGW + # -s will remove all symbol table and relocation information from the executable. + QMAKE_CXXFLAGS += -g -DUA_DYNAMIC_LINKING + QMAKE_LFLAGS_RELEASE = + # win32 vs. win64 + contains(QT_ARCH, i386) { # 32-bit + LIBS += -L$$(OMDEV)/tools/msys/mingw32/lib/binutils -L$$(OMDEV)/tools/msys/mingw32/bin -L$$(OMDEV)/tools/msys/mingw32/lib + } else { # 64-bit + LIBS += -L$$(OMDEV)/tools/msys/mingw64/lib/binutils -L$$(OMDEV)/tools/msys/mingw64/bin -L$$(OMDEV)/tools/msys/mingw64/lib + } + LIBS += -limagehlp -lbfd -lintl -liberty -llibosg.dll -llibosgViewer.dll -llibOpenThreads.dll -llibosgDB.dll -llibosgGA.dll +} else { # debug + contains(QT_ARCH, i386) { # 32-bit + LIBS += -L$$(OMDEV)/tools/msys/mingw32/lib + } else { # 64-bit + LIBS += -L$$(OMDEV)/tools/msys/mingw64/lib + } + LIBS += -llibosgd.dll -llibosgViewerd.dll -llibOpenThreadsd.dll -llibosgDBd.dll -llibosgGAd.dll +} +LIBS += -L$$OMEDIT_ROOT/OMEditLIB/Debugger/Parser -lGDBMIParser \ + -L$$(OMBUILDDIR)/lib/omc -lomantlr3 -lOMPlot -lomqwt -lomopcua \ + -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib -lModelicaExternalC -lomcgc -lpthread -lshlwapi \ + -lws2_32 \ + -L$$(OMBUILDDIR)/bin -lOMSimulator -lqjson diff --git a/OMEdit/OMEdit/OMEditGUI/main.cpp b/OMEdit/OMEditGUI/main.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/main.cpp rename to OMEdit/OMEditGUI/main.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/rc_omedit.rc b/OMEdit/OMEditGUI/rc_omedit.rc similarity index 82% rename from OMEdit/OMEdit/OMEditGUI/rc_omedit.rc rename to OMEdit/OMEditGUI/rc_omedit.rc index a1c34ff1489..005757ff30d 100644 --- a/OMEdit/OMEdit/OMEditGUI/rc_omedit.rc +++ b/OMEdit/OMEditGUI/rc_omedit.rc @@ -1,24 +1,24 @@ -#include - -VS_VERSION_INFO VERSIONINFO -BEGIN - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "Open Source Modelica Consortium (OSMC)\0" - VALUE "FileDescription", "OMEdit\0" - VALUE "FileVersion", "0.0.0.0\0" - VALUE "InternalName", "OMEdit\0" - VALUE "OriginalFilename", "OMEdit.exe\0" - VALUE "ProductName", "OMEdit - OpenModelica Connection Editor\0" - VALUE "ProductVersion", "0.0.0.0\0" - END - END -END -IDI_ICON1 ICON DISCARDABLE "Resources\\icons\\omedit.ico" +#include + +VS_VERSION_INFO VERSIONINFO +BEGIN + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Open Source Modelica Consortium (OSMC)\0" + VALUE "FileDescription", "OMEdit\0" + VALUE "FileVersion", "0.0.0.0\0" + VALUE "InternalName", "OMEdit\0" + VALUE "OriginalFilename", "OMEdit.exe\0" + VALUE "ProductName", "OMEdit - OpenModelica Connection Editor\0" + VALUE "ProductVersion", "0.0.0.0\0" + END + END +END +IDI_ICON1 ICON DISCARDABLE "..\\OMEditLIB\\Resources\\icons\\omedit.ico" 1 24 DISCARDABLE "OMEdit.manifest" \ No newline at end of file diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/AbstractAnimationWindow.cpp b/OMEdit/OMEditLIB/Animation/AbstractAnimationWindow.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/AbstractAnimationWindow.cpp rename to OMEdit/OMEditLIB/Animation/AbstractAnimationWindow.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/AbstractAnimationWindow.h b/OMEdit/OMEditLIB/Animation/AbstractAnimationWindow.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/AbstractAnimationWindow.h rename to OMEdit/OMEditLIB/Animation/AbstractAnimationWindow.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/AnimationUtil.h b/OMEdit/OMEditLIB/Animation/AnimationUtil.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/AnimationUtil.h rename to OMEdit/OMEditLIB/Animation/AnimationUtil.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/AnimationWindow.cpp b/OMEdit/OMEditLIB/Animation/AnimationWindow.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/AnimationWindow.cpp rename to OMEdit/OMEditLIB/Animation/AnimationWindow.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/AnimationWindow.h b/OMEdit/OMEditLIB/Animation/AnimationWindow.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/AnimationWindow.h rename to OMEdit/OMEditLIB/Animation/AnimationWindow.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/ExtraShapes.cpp b/OMEdit/OMEditLIB/Animation/ExtraShapes.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/ExtraShapes.cpp rename to OMEdit/OMEditLIB/Animation/ExtraShapes.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/ExtraShapes.h b/OMEdit/OMEditLIB/Animation/ExtraShapes.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/ExtraShapes.h rename to OMEdit/OMEditLIB/Animation/ExtraShapes.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/FMUSettingsDialog.cpp b/OMEdit/OMEditLIB/Animation/FMUSettingsDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/FMUSettingsDialog.cpp rename to OMEdit/OMEditLIB/Animation/FMUSettingsDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/FMUSettingsDialog.h b/OMEdit/OMEditLIB/Animation/FMUSettingsDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/FMUSettingsDialog.h rename to OMEdit/OMEditLIB/Animation/FMUSettingsDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/FMUWrapper.cpp b/OMEdit/OMEditLIB/Animation/FMUWrapper.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/FMUWrapper.cpp rename to OMEdit/OMEditLIB/Animation/FMUWrapper.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/FMUWrapper.h b/OMEdit/OMEditLIB/Animation/FMUWrapper.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/FMUWrapper.h rename to OMEdit/OMEditLIB/Animation/FMUWrapper.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/GLWidget.cpp b/OMEdit/OMEditLIB/Animation/GLWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/GLWidget.cpp rename to OMEdit/OMEditLIB/Animation/GLWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/GLWidget.h b/OMEdit/OMEditLIB/Animation/GLWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/GLWidget.h rename to OMEdit/OMEditLIB/Animation/GLWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/OpenGLWidget.cpp b/OMEdit/OMEditLIB/Animation/OpenGLWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/OpenGLWidget.cpp rename to OMEdit/OMEditLIB/Animation/OpenGLWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/OpenGLWidget.h b/OMEdit/OMEditLIB/Animation/OpenGLWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/OpenGLWidget.h rename to OMEdit/OMEditLIB/Animation/OpenGLWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/Shapes.cpp b/OMEdit/OMEditLIB/Animation/Shapes.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/Shapes.cpp rename to OMEdit/OMEditLIB/Animation/Shapes.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/Shapes.h b/OMEdit/OMEditLIB/Animation/Shapes.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/Shapes.h rename to OMEdit/OMEditLIB/Animation/Shapes.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/ThreeDViewer.cpp b/OMEdit/OMEditLIB/Animation/ThreeDViewer.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/ThreeDViewer.cpp rename to OMEdit/OMEditLIB/Animation/ThreeDViewer.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/ThreeDViewer.h b/OMEdit/OMEditLIB/Animation/ThreeDViewer.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/ThreeDViewer.h rename to OMEdit/OMEditLIB/Animation/ThreeDViewer.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/TimeManager.cpp b/OMEdit/OMEditLIB/Animation/TimeManager.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/TimeManager.cpp rename to OMEdit/OMEditLIB/Animation/TimeManager.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/TimeManager.h b/OMEdit/OMEditLIB/Animation/TimeManager.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/TimeManager.h rename to OMEdit/OMEditLIB/Animation/TimeManager.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/ViewerWidget.cpp b/OMEdit/OMEditLIB/Animation/ViewerWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/ViewerWidget.cpp rename to OMEdit/OMEditLIB/Animation/ViewerWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/ViewerWidget.h b/OMEdit/OMEditLIB/Animation/ViewerWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/ViewerWidget.h rename to OMEdit/OMEditLIB/Animation/ViewerWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/Visualizer.cpp b/OMEdit/OMEditLIB/Animation/Visualizer.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/Visualizer.cpp rename to OMEdit/OMEditLIB/Animation/Visualizer.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/Visualizer.h b/OMEdit/OMEditLIB/Animation/Visualizer.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/Visualizer.h rename to OMEdit/OMEditLIB/Animation/Visualizer.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/VisualizerCSV.cpp b/OMEdit/OMEditLIB/Animation/VisualizerCSV.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/VisualizerCSV.cpp rename to OMEdit/OMEditLIB/Animation/VisualizerCSV.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/VisualizerCSV.h b/OMEdit/OMEditLIB/Animation/VisualizerCSV.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/VisualizerCSV.h rename to OMEdit/OMEditLIB/Animation/VisualizerCSV.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/VisualizerFMU.cpp b/OMEdit/OMEditLIB/Animation/VisualizerFMU.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/VisualizerFMU.cpp rename to OMEdit/OMEditLIB/Animation/VisualizerFMU.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/VisualizerFMU.h b/OMEdit/OMEditLIB/Animation/VisualizerFMU.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/VisualizerFMU.h rename to OMEdit/OMEditLIB/Animation/VisualizerFMU.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/VisualizerMAT.cpp b/OMEdit/OMEditLIB/Animation/VisualizerMAT.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/VisualizerMAT.cpp rename to OMEdit/OMEditLIB/Animation/VisualizerMAT.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/VisualizerMAT.h b/OMEdit/OMEditLIB/Animation/VisualizerMAT.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/VisualizerMAT.h rename to OMEdit/OMEditLIB/Animation/VisualizerMAT.h diff --git a/OMEdit/OMEdit/OMEditGUI/Animation/rapidxml.hpp b/OMEdit/OMEditLIB/Animation/rapidxml.hpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Animation/rapidxml.hpp rename to OMEdit/OMEditLIB/Animation/rapidxml.hpp diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/BitmapAnnotation.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp rename to OMEdit/OMEditLIB/Annotations/BitmapAnnotation.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/BitmapAnnotation.h b/OMEdit/OMEditLIB/Annotations/BitmapAnnotation.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/BitmapAnnotation.h rename to OMEdit/OMEditLIB/Annotations/BitmapAnnotation.h diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/EllipseAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/EllipseAnnotation.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/EllipseAnnotation.cpp rename to OMEdit/OMEditLIB/Annotations/EllipseAnnotation.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/EllipseAnnotation.h b/OMEdit/OMEditLIB/Annotations/EllipseAnnotation.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/EllipseAnnotation.h rename to OMEdit/OMEditLIB/Annotations/EllipseAnnotation.h diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/LineAnnotation.cpp rename to OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/LineAnnotation.h b/OMEdit/OMEditLIB/Annotations/LineAnnotation.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/LineAnnotation.h rename to OMEdit/OMEditLIB/Annotations/LineAnnotation.h diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/PolygonAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/PolygonAnnotation.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/PolygonAnnotation.cpp rename to OMEdit/OMEditLIB/Annotations/PolygonAnnotation.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/PolygonAnnotation.h b/OMEdit/OMEditLIB/Annotations/PolygonAnnotation.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/PolygonAnnotation.h rename to OMEdit/OMEditLIB/Annotations/PolygonAnnotation.h diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/RectangleAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/RectangleAnnotation.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/RectangleAnnotation.cpp rename to OMEdit/OMEditLIB/Annotations/RectangleAnnotation.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/RectangleAnnotation.h b/OMEdit/OMEditLIB/Annotations/RectangleAnnotation.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/RectangleAnnotation.h rename to OMEdit/OMEditLIB/Annotations/RectangleAnnotation.h diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/ShapeAnnotation.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp rename to OMEdit/OMEditLIB/Annotations/ShapeAnnotation.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.h b/OMEdit/OMEditLIB/Annotations/ShapeAnnotation.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/ShapeAnnotation.h rename to OMEdit/OMEditLIB/Annotations/ShapeAnnotation.h diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.cpp b/OMEdit/OMEditLIB/Annotations/ShapePropertiesDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.cpp rename to OMEdit/OMEditLIB/Annotations/ShapePropertiesDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.h b/OMEdit/OMEditLIB/Annotations/ShapePropertiesDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.h rename to OMEdit/OMEditLIB/Annotations/ShapePropertiesDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp b/OMEdit/OMEditLIB/Annotations/TextAnnotation.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/TextAnnotation.cpp rename to OMEdit/OMEditLIB/Annotations/TextAnnotation.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Annotations/TextAnnotation.h b/OMEdit/OMEditLIB/Annotations/TextAnnotation.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Annotations/TextAnnotation.h rename to OMEdit/OMEditLIB/Annotations/TextAnnotation.h diff --git a/OMEdit/OMEdit/OMEditGUI/Component/Component.cpp b/OMEdit/OMEditLIB/Component/Component.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Component/Component.cpp rename to OMEdit/OMEditLIB/Component/Component.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Component/Component.h b/OMEdit/OMEditLIB/Component/Component.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Component/Component.h rename to OMEdit/OMEditLIB/Component/Component.h diff --git a/OMEdit/OMEdit/OMEditGUI/Component/ComponentProperties.cpp b/OMEdit/OMEditLIB/Component/ComponentProperties.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Component/ComponentProperties.cpp rename to OMEdit/OMEditLIB/Component/ComponentProperties.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Component/ComponentProperties.h b/OMEdit/OMEditLIB/Component/ComponentProperties.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Component/ComponentProperties.h rename to OMEdit/OMEditLIB/Component/ComponentProperties.h diff --git a/OMEdit/OMEdit/OMEditGUI/Component/CornerItem.cpp b/OMEdit/OMEditLIB/Component/CornerItem.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Component/CornerItem.cpp rename to OMEdit/OMEditLIB/Component/CornerItem.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Component/CornerItem.h b/OMEdit/OMEditLIB/Component/CornerItem.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Component/CornerItem.h rename to OMEdit/OMEditLIB/Component/CornerItem.h diff --git a/OMEdit/OMEdit/OMEditGUI/Component/Transformation.cpp b/OMEdit/OMEditLIB/Component/Transformation.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Component/Transformation.cpp rename to OMEdit/OMEditLIB/Component/Transformation.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Component/Transformation.h b/OMEdit/OMEditLIB/Component/Transformation.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Component/Transformation.h rename to OMEdit/OMEditLIB/Component/Transformation.h diff --git a/OMEdit/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.cpp b/OMEdit/OMEditLIB/CrashReport/CrashReportDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.cpp rename to OMEdit/OMEditLIB/CrashReport/CrashReportDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.h b/OMEdit/OMEditLIB/CrashReport/CrashReportDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/CrashReport/CrashReportDialog.h rename to OMEdit/OMEditLIB/CrashReport/CrashReportDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/CrashReport/GDBBacktrace.cpp b/OMEdit/OMEditLIB/CrashReport/GDBBacktrace.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/CrashReport/GDBBacktrace.cpp rename to OMEdit/OMEditLIB/CrashReport/GDBBacktrace.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/CrashReport/GDBBacktrace.h b/OMEdit/OMEditLIB/CrashReport/GDBBacktrace.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/CrashReport/GDBBacktrace.h rename to OMEdit/OMEditLIB/CrashReport/GDBBacktrace.h diff --git a/OMEdit/OMEdit/OMEditGUI/CrashReport/backtrace.c b/OMEdit/OMEditLIB/CrashReport/backtrace.c similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/CrashReport/backtrace.c rename to OMEdit/OMEditLIB/CrashReport/backtrace.c diff --git a/OMEdit/OMEdit/OMEditGUI/CrashReport/backtrace.h b/OMEdit/OMEditLIB/CrashReport/backtrace.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/CrashReport/backtrace.h rename to OMEdit/OMEditLIB/CrashReport/backtrace.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Attach/AttachToProcessDialog.cpp b/OMEdit/OMEditLIB/Debugger/Attach/AttachToProcessDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Attach/AttachToProcessDialog.cpp rename to OMEdit/OMEditLIB/Debugger/Attach/AttachToProcessDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Attach/AttachToProcessDialog.h b/OMEdit/OMEditLIB/Debugger/Attach/AttachToProcessDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Attach/AttachToProcessDialog.h rename to OMEdit/OMEditLIB/Debugger/Attach/AttachToProcessDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Attach/ProcessListModel.cpp b/OMEdit/OMEditLIB/Debugger/Attach/ProcessListModel.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Attach/ProcessListModel.cpp rename to OMEdit/OMEditLIB/Debugger/Attach/ProcessListModel.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Attach/ProcessListModel.h b/OMEdit/OMEditLIB/Debugger/Attach/ProcessListModel.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Attach/ProcessListModel.h rename to OMEdit/OMEditLIB/Debugger/Attach/ProcessListModel.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointDialog.cpp b/OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointDialog.cpp rename to OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointDialog.h b/OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointDialog.h rename to OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointMarker.cpp b/OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointMarker.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointMarker.cpp rename to OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointMarker.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointMarker.h b/OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointMarker.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointMarker.h rename to OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointMarker.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointsWidget.cpp b/OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointsWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointsWidget.cpp rename to OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointsWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointsWidget.h b/OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointsWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Breakpoints/BreakpointsWidget.h rename to OMEdit/OMEditLIB/Debugger/Breakpoints/BreakpointsWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/DebuggerConfigurationsDialog.cpp b/OMEdit/OMEditLIB/Debugger/DebuggerConfigurationsDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/DebuggerConfigurationsDialog.cpp rename to OMEdit/OMEditLIB/Debugger/DebuggerConfigurationsDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/DebuggerConfigurationsDialog.h b/OMEdit/OMEditLIB/Debugger/DebuggerConfigurationsDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/DebuggerConfigurationsDialog.h rename to OMEdit/OMEditLIB/Debugger/DebuggerConfigurationsDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/GDB/CommandFactory.cpp b/OMEdit/OMEditLIB/Debugger/GDB/CommandFactory.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/GDB/CommandFactory.cpp rename to OMEdit/OMEditLIB/Debugger/GDB/CommandFactory.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/GDB/CommandFactory.h b/OMEdit/OMEditLIB/Debugger/GDB/CommandFactory.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/GDB/CommandFactory.h rename to OMEdit/OMEditLIB/Debugger/GDB/CommandFactory.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/GDB/GDBAdapter.cpp b/OMEdit/OMEditLIB/Debugger/GDB/GDBAdapter.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/GDB/GDBAdapter.cpp rename to OMEdit/OMEditLIB/Debugger/GDB/GDBAdapter.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/GDB/GDBAdapter.h b/OMEdit/OMEditLIB/Debugger/GDB/GDBAdapter.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/GDB/GDBAdapter.h rename to OMEdit/OMEditLIB/Debugger/GDB/GDBAdapter.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Locals/LocalsWidget.cpp b/OMEdit/OMEditLIB/Debugger/Locals/LocalsWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Locals/LocalsWidget.cpp rename to OMEdit/OMEditLIB/Debugger/Locals/LocalsWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Locals/LocalsWidget.h b/OMEdit/OMEditLIB/Debugger/Locals/LocalsWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Locals/LocalsWidget.h rename to OMEdit/OMEditLIB/Debugger/Locals/LocalsWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Locals/ModelicaValue.cpp b/OMEdit/OMEditLIB/Debugger/Locals/ModelicaValue.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Locals/ModelicaValue.cpp rename to OMEdit/OMEditLIB/Debugger/Locals/ModelicaValue.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Locals/ModelicaValue.h b/OMEdit/OMEditLIB/Debugger/Locals/ModelicaValue.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Locals/ModelicaValue.h rename to OMEdit/OMEditLIB/Debugger/Locals/ModelicaValue.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/GDBMIOutput.g b/OMEdit/OMEditLIB/Debugger/Parser/GDBMIOutput.g similarity index 96% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/GDBMIOutput.g rename to OMEdit/OMEditLIB/Debugger/Parser/GDBMIOutput.g index eb4be0a753d..8c3001ff23a 100644 --- a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/GDBMIOutput.g +++ b/OMEdit/OMEditLIB/Debugger/Parser/GDBMIOutput.g @@ -1,269 +1,269 @@ -/* - * This file is part of OpenModelica. - * - * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), - * c/o Linkopings universitet, Department of Computer and Information Science, - * SE-58183 Linkoping, Sweden. - * - * All rights reserved. - * - * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR - * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. - * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE - * OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE. - * - * The OpenModelica software and the Open Source Modelica - * Consortium (OSMC) Public License (OSMC-PL) are obtained - * from OSMC, either from the above address, - * from the URLs: http://www.ida.liu.se/projects/OpenModelica or - * http://www.openmodelica.org, and in the OpenModelica distribution. - * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. - * - * This program is distributed WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH - * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. - * - * See the full OSMC Public License conditions for more details. - * - */ -/* - * @author Adeel Asghar - * Adrian Pop - * - * Based on gdb/mi Output Syntax defined here, - * https://sourceware.org/gdb/current/onlinedocs/gdb/GDB_002fMI-Output-Syntax.html#GDB_002fMI-Output-Syntax - */ -/* - * Copyright (c) 2010-2013 Ryan Sturmer - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * GDB Machine Interface Grammar for Python - * Ryan Sturmer - * 2009/04/20 - */ - -grammar GDBMIOutput; - -options { - ASTLabelType = pANTLR3_BASE_TREE; - language = C; -} - -@includes { -#include "GDBMIParser.h" -using namespace GDBMIParser; -} - -result_record returns [GDBMIResultRecord* miResultRecord] - @init { - miResultRecord = new GDBMIResultRecord; - } - : (TOKEN {miResultRecord->token = atoi((char*)$TOKEN.text->chars);})? RESULT - RESULT_CLASS {miResultRecord->cls = (char*)$RESULT_CLASS.text->chars;} - (COMMA result {miResultRecord->miResultsList.push_back($result.miResult);})* WS* NL? - ; - -output returns [GDBMIResponse* miResponse] - @init { - miResponse = new GDBMIResponse; - } - : (out_of_band_record {miResponse->type = GDBMIResponse::OutOfBandRecordResponse; miResponse->miOutOfBandRecordList.push_back($out_of_band_record.miOutOfBandRecord);})* - (result_record {miResponse->type = GDBMIResponse::ResultRecordResponse; miResponse->miResultRecord = $result_record.miResultRecord;})? WS* NL? - ; - -out_of_band_record returns [GDBMIOutOfBandRecord* miOutOfBandRecord] - @init { - miOutOfBandRecord = new GDBMIOutOfBandRecord; - } - : async_record {miOutOfBandRecord->type = GDBMIOutOfBandRecord::AsyncRecord; miOutOfBandRecord->miResultRecord = $async_record.miResultRecord;} - | stream_record {miOutOfBandRecord->type = GDBMIOutOfBandRecord::StreamRecord; miOutOfBandRecord->miStreamRecord = $stream_record.miStreamRecord;} - ; - -async_record returns [GDBMIResultRecord* miResultRecord] - : exec_async_output {miResultRecord = $exec_async_output.miResultRecord;} - | status_async_output {miResultRecord = $status_async_output.miResultRecord;} - | notify_async_output {miResultRecord = $notify_async_output.miResultRecord;} - ; - -exec_async_output returns [GDBMIResultRecord* miResultRecord] - : (TOKEN {miResultRecord->token = atoi((char*)$TOKEN.text->chars);})? EXEC async_output {miResultRecord = $async_output.miResultRecord;} - ; - -status_async_output returns [GDBMIResultRecord* miResultRecord] - : (TOKEN {miResultRecord->token = atoi((char*)$TOKEN.text->chars);})? STATUS async_output {miResultRecord = $async_output.miResultRecord;} - ; - -notify_async_output returns [GDBMIResultRecord* miResultRecord] - : (TOKEN {miResultRecord->token = atoi((char*)$TOKEN.text->chars);})? NOTIFY async_output {miResultRecord = $async_output.miResultRecord;} - ; - -async_output returns [GDBMIResultRecord* miResultRecord] - @init { - miResultRecord = new GDBMIResultRecord; - } - : (RESULT_CLASS {miResultRecord->cls = (char*)$RESULT_CLASS.text->chars;}) - (COMMA result {miResultRecord->miResultsList.push_back($result.miResult);})* NL? - ; - -var returns [string txt] - @init { - string txt; - } - : STRING { - txt = (char*)$STRING.text->chars; - } - ; - -constant returns [string txt] - @init { - string txt; - } - : C_STRING { - txt = (char*)$C_STRING.text->chars; - } - ; - -value returns [GDBMIValue* miValue] - @init { - miValue = new GDBMIValue; - } - : constant { - miValue->type = GDBMIValue::ConstantValue; - miValue->value = (char*)$constant.text->chars; - } - | modelica_tuple { - miValue->type = GDBMIValue::TupleValue; - miValue->miTuple = $modelica_tuple.miTuple; - } - | lista { - miValue->type = GDBMIValue::ListValue; - miValue->miList = $lista.miList; - } - ; - -result returns [GDBMIResult* miResult] - @init { - miResult = new GDBMIResult; - } - : (var '=' value) { - miResult->variable = (char*)$var.text->chars; - miResult->miValue = $value.miValue; - } - ; - -modelica_tuple returns [GDBMITuple* miTuple] - @init { - miTuple = new GDBMITuple; - } - : '{}' - | '{' a=result {miTuple->miResultsList.push_back(a);} (COMMA b=result {miTuple->miResultsList.push_back(b);})* '}' - ; - -stream_record returns [GDBMIStreamRecord *miStreamRecord] - @init { - miStreamRecord = new GDBMIStreamRecord; - } - : console_stream_output {miStreamRecord->type = GDBMIStreamRecord::ConsoleStream; miStreamRecord->value = $console_stream_output.txt;} - | target_stream_output {miStreamRecord->type = GDBMIStreamRecord::TargetStream; miStreamRecord->value = $target_stream_output.txt;} - | log_stream_output {miStreamRecord->type = GDBMIStreamRecord::LogStream; miStreamRecord->value = $log_stream_output.txt;} - ; - -lista returns [GDBMIList* miList] - @init { - miList = new GDBMIList; - } - : '[]' - | '[' a=value {miList->type = GDBMIList::ValuesList; miList->miValuesList.push_back(a);} (COMMA b=value {miList->miValuesList.push_back(b);})* ']' - | '[' c=result {miList->type = GDBMIList::ResultsList; miList->miResultsList.push_back(c);} (COMMA d=result {miList->miResultsList.push_back(d);})* ']' - ; - -console_stream_output returns [char* txt] - : CONSOLE C_STRING {txt = (char*)$C_STRING.text->chars;} - ; - -target_stream_output returns [char* txt] - : TARGET C_STRING {txt = (char*)$C_STRING.text->chars;} - ; - -log_stream_output returns [char* txt] - : LOG C_STRING {txt = (char*)$C_STRING.text->chars;} - ; - -// LEXER - -// Can't use the omission (!) operator here for some reason... weird. -C_STRING : '"' ('\\''"' | ~('"' |'\n'|'\r'))* '"'; - -RESULT_CLASS : - 'done' - | 'running' - | 'connected' - | 'error' - | 'exit' - | 'stopped' - | 'thread-group-added' - | 'thread-group-started' - | 'thread-group-created' - | 'thread-created' - | 'download' - | 'thread-group-exited' - | 'thread-exited' - | 'loaded' - | 'library-loaded' - | 'library-unloaded' - ; - -STRING : - ('_' | 'A'..'Z' | 'a'..'z')('-' | '_' | 'A'..'Z' | 'a'..'z'|'0'..'9')* - ; - -NL : - ('\r')?'\n' - ; - -WS : - (' ' | '\t') - ; - -TOKEN : - ('0'..'9')+ - ; - -COMMA : - ',' - ; - -EOM : - '(gdb)' - ; - -CONSOLE : - '~' - ; -TARGET : - '@' - ; -LOG : - '&' - ; - -EXEC : - '*' - ; -STATUS : - '+' - ; -NOTIFY : - '=' - ; - -RESULT : - '^' - ; +/* + * This file is part of OpenModelica. + * + * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + * c/o Linkopings universitet, Department of Computer and Information Science, + * SE-58183 Linkoping, Sweden. + * + * All rights reserved. + * + * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE + * OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE. + * + * The OpenModelica software and the Open Source Modelica + * Consortium (OSMC) Public License (OSMC-PL) are obtained + * from OSMC, either from the above address, + * from the URLs: http://www.ida.liu.se/projects/OpenModelica or + * http://www.openmodelica.org, and in the OpenModelica distribution. + * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + * + * This program is distributed WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + * + * See the full OSMC Public License conditions for more details. + * + */ +/* + * @author Adeel Asghar + * Adrian Pop + * + * Based on gdb/mi Output Syntax defined here, + * https://sourceware.org/gdb/current/onlinedocs/gdb/GDB_002fMI-Output-Syntax.html#GDB_002fMI-Output-Syntax + */ +/* + * Copyright (c) 2010-2013 Ryan Sturmer + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * GDB Machine Interface Grammar for Python + * Ryan Sturmer + * 2009/04/20 + */ + +grammar GDBMIOutput; + +options { + ASTLabelType = pANTLR3_BASE_TREE; + language = C; +} + +@includes { +#include "GDBMIParser.h" +using namespace GDBMIParser; +} + +result_record returns [GDBMIResultRecord* miResultRecord] + @init { + miResultRecord = new GDBMIResultRecord; + } + : (TOKEN {miResultRecord->token = atoi((char*)$TOKEN.text->chars);})? RESULT + RESULT_CLASS {miResultRecord->cls = (char*)$RESULT_CLASS.text->chars;} + (COMMA result {miResultRecord->miResultsList.push_back($result.miResult);})* WS* NL? + ; + +output returns [GDBMIResponse* miResponse] + @init { + miResponse = new GDBMIResponse; + } + : (out_of_band_record {miResponse->type = GDBMIResponse::OutOfBandRecordResponse; miResponse->miOutOfBandRecordList.push_back($out_of_band_record.miOutOfBandRecord);})* + (result_record {miResponse->type = GDBMIResponse::ResultRecordResponse; miResponse->miResultRecord = $result_record.miResultRecord;})? WS* NL? + ; + +out_of_band_record returns [GDBMIOutOfBandRecord* miOutOfBandRecord] + @init { + miOutOfBandRecord = new GDBMIOutOfBandRecord; + } + : async_record {miOutOfBandRecord->type = GDBMIOutOfBandRecord::AsyncRecord; miOutOfBandRecord->miResultRecord = $async_record.miResultRecord;} + | stream_record {miOutOfBandRecord->type = GDBMIOutOfBandRecord::StreamRecord; miOutOfBandRecord->miStreamRecord = $stream_record.miStreamRecord;} + ; + +async_record returns [GDBMIResultRecord* miResultRecord] + : exec_async_output {miResultRecord = $exec_async_output.miResultRecord;} + | status_async_output {miResultRecord = $status_async_output.miResultRecord;} + | notify_async_output {miResultRecord = $notify_async_output.miResultRecord;} + ; + +exec_async_output returns [GDBMIResultRecord* miResultRecord] + : (TOKEN {miResultRecord->token = atoi((char*)$TOKEN.text->chars);})? EXEC async_output {miResultRecord = $async_output.miResultRecord;} + ; + +status_async_output returns [GDBMIResultRecord* miResultRecord] + : (TOKEN {miResultRecord->token = atoi((char*)$TOKEN.text->chars);})? STATUS async_output {miResultRecord = $async_output.miResultRecord;} + ; + +notify_async_output returns [GDBMIResultRecord* miResultRecord] + : (TOKEN {miResultRecord->token = atoi((char*)$TOKEN.text->chars);})? NOTIFY async_output {miResultRecord = $async_output.miResultRecord;} + ; + +async_output returns [GDBMIResultRecord* miResultRecord] + @init { + miResultRecord = new GDBMIResultRecord; + } + : (RESULT_CLASS {miResultRecord->cls = (char*)$RESULT_CLASS.text->chars;}) + (COMMA result {miResultRecord->miResultsList.push_back($result.miResult);})* NL? + ; + +var returns [string txt] + @init { + string txt; + } + : STRING { + txt = (char*)$STRING.text->chars; + } + ; + +constant returns [string txt] + @init { + string txt; + } + : C_STRING { + txt = (char*)$C_STRING.text->chars; + } + ; + +value returns [GDBMIValue* miValue] + @init { + miValue = new GDBMIValue; + } + : constant { + miValue->type = GDBMIValue::ConstantValue; + miValue->value = (char*)$constant.text->chars; + } + | modelica_tuple { + miValue->type = GDBMIValue::TupleValue; + miValue->miTuple = $modelica_tuple.miTuple; + } + | lista { + miValue->type = GDBMIValue::ListValue; + miValue->miList = $lista.miList; + } + ; + +result returns [GDBMIResult* miResult] + @init { + miResult = new GDBMIResult; + } + : (var '=' value) { + miResult->variable = (char*)$var.text->chars; + miResult->miValue = $value.miValue; + } + ; + +modelica_tuple returns [GDBMITuple* miTuple] + @init { + miTuple = new GDBMITuple; + } + : '{}' + | '{' a=result {miTuple->miResultsList.push_back(a);} (COMMA b=result {miTuple->miResultsList.push_back(b);})* '}' + ; + +stream_record returns [GDBMIStreamRecord *miStreamRecord] + @init { + miStreamRecord = new GDBMIStreamRecord; + } + : console_stream_output {miStreamRecord->type = GDBMIStreamRecord::ConsoleStream; miStreamRecord->value = $console_stream_output.txt;} + | target_stream_output {miStreamRecord->type = GDBMIStreamRecord::TargetStream; miStreamRecord->value = $target_stream_output.txt;} + | log_stream_output {miStreamRecord->type = GDBMIStreamRecord::LogStream; miStreamRecord->value = $log_stream_output.txt;} + ; + +lista returns [GDBMIList* miList] + @init { + miList = new GDBMIList; + } + : '[]' + | '[' a=value {miList->type = GDBMIList::ValuesList; miList->miValuesList.push_back(a);} (COMMA b=value {miList->miValuesList.push_back(b);})* ']' + | '[' c=result {miList->type = GDBMIList::ResultsList; miList->miResultsList.push_back(c);} (COMMA d=result {miList->miResultsList.push_back(d);})* ']' + ; + +console_stream_output returns [char* txt] + : CONSOLE C_STRING {txt = (char*)$C_STRING.text->chars;} + ; + +target_stream_output returns [char* txt] + : TARGET C_STRING {txt = (char*)$C_STRING.text->chars;} + ; + +log_stream_output returns [char* txt] + : LOG C_STRING {txt = (char*)$C_STRING.text->chars;} + ; + +// LEXER + +// Can't use the omission (!) operator here for some reason... weird. +C_STRING : '"' ('\\''"' | ~('"' |'\n'|'\r'))* '"'; + +RESULT_CLASS : + 'done' + | 'running' + | 'connected' + | 'error' + | 'exit' + | 'stopped' + | 'thread-group-added' + | 'thread-group-started' + | 'thread-group-created' + | 'thread-created' + | 'download' + | 'thread-group-exited' + | 'thread-exited' + | 'loaded' + | 'library-loaded' + | 'library-unloaded' + ; + +STRING : + ('_' | 'A'..'Z' | 'a'..'z')('-' | '_' | 'A'..'Z' | 'a'..'z'|'0'..'9')* + ; + +NL : + ('\r')?'\n' + ; + +WS : + (' ' | '\t') + ; + +TOKEN : + ('0'..'9')+ + ; + +COMMA : + ',' + ; + +EOM : + '(gdb)' + ; + +CONSOLE : + '~' + ; +TARGET : + '@' + ; +LOG : + '&' + ; + +EXEC : + '*' + ; +STATUS : + '+' + ; +NOTIFY : + '=' + ; + +RESULT : + '^' + ; diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/GDBMIParser.cpp b/OMEdit/OMEditLIB/Debugger/Parser/GDBMIParser.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/GDBMIParser.cpp rename to OMEdit/OMEditLIB/Debugger/Parser/GDBMIParser.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/GDBMIParser.h b/OMEdit/OMEditLIB/Debugger/Parser/GDBMIParser.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/GDBMIParser.h rename to OMEdit/OMEditLIB/Debugger/Parser/GDBMIParser.h diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.common b/OMEdit/OMEditLIB/Debugger/Parser/Makefile.common similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.common rename to OMEdit/OMEditLIB/Debugger/Parser/Makefile.common diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.lib.common b/OMEdit/OMEditLIB/Debugger/Parser/Makefile.lib.common similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.lib.common rename to OMEdit/OMEditLIB/Debugger/Parser/Makefile.lib.common diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.lib.omdev.mingw b/OMEdit/OMEditLIB/Debugger/Parser/Makefile.lib.omdev.mingw similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.lib.omdev.mingw rename to OMEdit/OMEditLIB/Debugger/Parser/Makefile.lib.omdev.mingw diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.lib.unix.in b/OMEdit/OMEditLIB/Debugger/Parser/Makefile.lib.unix.in similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.lib.unix.in rename to OMEdit/OMEditLIB/Debugger/Parser/Makefile.lib.unix.in diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.omdev.mingw b/OMEdit/OMEditLIB/Debugger/Parser/Makefile.omdev.mingw similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.omdev.mingw rename to OMEdit/OMEditLIB/Debugger/Parser/Makefile.omdev.mingw diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.unix.in b/OMEdit/OMEditLIB/Debugger/Parser/Makefile.unix.in similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/Makefile.unix.in rename to OMEdit/OMEditLIB/Debugger/Parser/Makefile.unix.in diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/README.txt b/OMEdit/OMEditLIB/Debugger/Parser/README.txt similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/README.txt rename to OMEdit/OMEditLIB/Debugger/Parser/README.txt diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/SampleGDBMIOutput.txt b/OMEdit/OMEditLIB/Debugger/Parser/SampleGDBMIOutput.txt similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/SampleGDBMIOutput.txt rename to OMEdit/OMEditLIB/Debugger/Parser/SampleGDBMIOutput.txt diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/Parser/main.cpp b/OMEdit/OMEditLIB/Debugger/Parser/main.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/Parser/main.cpp rename to OMEdit/OMEditLIB/Debugger/Parser/main.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/StackFrames/StackFramesWidget.cpp b/OMEdit/OMEditLIB/Debugger/StackFrames/StackFramesWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/StackFrames/StackFramesWidget.cpp rename to OMEdit/OMEditLIB/Debugger/StackFrames/StackFramesWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Debugger/StackFrames/StackFramesWidget.h b/OMEdit/OMEditLIB/Debugger/StackFrames/StackFramesWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Debugger/StackFrames/StackFramesWidget.h rename to OMEdit/OMEditLIB/Debugger/StackFrames/StackFramesWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/BaseEditor.cpp b/OMEdit/OMEditLIB/Editors/BaseEditor.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/BaseEditor.cpp rename to OMEdit/OMEditLIB/Editors/BaseEditor.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/BaseEditor.h b/OMEdit/OMEditLIB/Editors/BaseEditor.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/BaseEditor.h rename to OMEdit/OMEditLIB/Editors/BaseEditor.h diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/CEditor.cpp b/OMEdit/OMEditLIB/Editors/CEditor.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/CEditor.cpp rename to OMEdit/OMEditLIB/Editors/CEditor.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/CEditor.h b/OMEdit/OMEditLIB/Editors/CEditor.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/CEditor.h rename to OMEdit/OMEditLIB/Editors/CEditor.h diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/CompositeModelEditor.cpp b/OMEdit/OMEditLIB/Editors/CompositeModelEditor.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/CompositeModelEditor.cpp rename to OMEdit/OMEditLIB/Editors/CompositeModelEditor.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/CompositeModelEditor.h b/OMEdit/OMEditLIB/Editors/CompositeModelEditor.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/CompositeModelEditor.h rename to OMEdit/OMEditLIB/Editors/CompositeModelEditor.h diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/HTMLEditor.cpp b/OMEdit/OMEditLIB/Editors/HTMLEditor.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/HTMLEditor.cpp rename to OMEdit/OMEditLIB/Editors/HTMLEditor.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/HTMLEditor.h b/OMEdit/OMEditLIB/Editors/HTMLEditor.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/HTMLEditor.h rename to OMEdit/OMEditLIB/Editors/HTMLEditor.h diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/MetaModelicaEditor.cpp b/OMEdit/OMEditLIB/Editors/MetaModelicaEditor.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/MetaModelicaEditor.cpp rename to OMEdit/OMEditLIB/Editors/MetaModelicaEditor.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/MetaModelicaEditor.h b/OMEdit/OMEditLIB/Editors/MetaModelicaEditor.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/MetaModelicaEditor.h rename to OMEdit/OMEditLIB/Editors/MetaModelicaEditor.h diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/ModelicaEditor.cpp b/OMEdit/OMEditLIB/Editors/ModelicaEditor.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/ModelicaEditor.cpp rename to OMEdit/OMEditLIB/Editors/ModelicaEditor.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/ModelicaEditor.h b/OMEdit/OMEditLIB/Editors/ModelicaEditor.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/ModelicaEditor.h rename to OMEdit/OMEditLIB/Editors/ModelicaEditor.h diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/OMSimulatorEditor.cpp b/OMEdit/OMEditLIB/Editors/OMSimulatorEditor.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/OMSimulatorEditor.cpp rename to OMEdit/OMEditLIB/Editors/OMSimulatorEditor.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/OMSimulatorEditor.h b/OMEdit/OMEditLIB/Editors/OMSimulatorEditor.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/OMSimulatorEditor.h rename to OMEdit/OMEditLIB/Editors/OMSimulatorEditor.h diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/TextEditor.cpp b/OMEdit/OMEditLIB/Editors/TextEditor.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/TextEditor.cpp rename to OMEdit/OMEditLIB/Editors/TextEditor.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/TextEditor.h b/OMEdit/OMEditLIB/Editors/TextEditor.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/TextEditor.h rename to OMEdit/OMEditLIB/Editors/TextEditor.h diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/TransformationsEditor.cpp b/OMEdit/OMEditLIB/Editors/TransformationsEditor.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/TransformationsEditor.cpp rename to OMEdit/OMEditLIB/Editors/TransformationsEditor.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/TransformationsEditor.h b/OMEdit/OMEditLIB/Editors/TransformationsEditor.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Editors/TransformationsEditor.h rename to OMEdit/OMEditLIB/Editors/TransformationsEditor.h diff --git a/OMEdit/OMEdit/OMEditGUI/FMI/ImportFMUDialog.cpp b/OMEdit/OMEditLIB/FMI/ImportFMUDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/FMI/ImportFMUDialog.cpp rename to OMEdit/OMEditLIB/FMI/ImportFMUDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/FMI/ImportFMUDialog.h b/OMEdit/OMEditLIB/FMI/ImportFMUDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/FMI/ImportFMUDialog.h rename to OMEdit/OMEditLIB/FMI/ImportFMUDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/FMI/ImportFMUModelDescriptionDialog.cpp b/OMEdit/OMEditLIB/FMI/ImportFMUModelDescriptionDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/FMI/ImportFMUModelDescriptionDialog.cpp rename to OMEdit/OMEditLIB/FMI/ImportFMUModelDescriptionDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/FMI/ImportFMUModelDescriptionDialog.h b/OMEdit/OMEditLIB/FMI/ImportFMUModelDescriptionDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/FMI/ImportFMUModelDescriptionDialog.h rename to OMEdit/OMEditLIB/FMI/ImportFMUModelDescriptionDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Git/CleanDialog.cpp b/OMEdit/OMEditLIB/Git/CleanDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Git/CleanDialog.cpp rename to OMEdit/OMEditLIB/Git/CleanDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Git/CleanDialog.h b/OMEdit/OMEditLIB/Git/CleanDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Git/CleanDialog.h rename to OMEdit/OMEditLIB/Git/CleanDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Git/CommitChangesDialog.cpp b/OMEdit/OMEditLIB/Git/CommitChangesDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Git/CommitChangesDialog.cpp rename to OMEdit/OMEditLIB/Git/CommitChangesDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Git/CommitChangesDialog.h b/OMEdit/OMEditLIB/Git/CommitChangesDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Git/CommitChangesDialog.h rename to OMEdit/OMEditLIB/Git/CommitChangesDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Git/GitCommands.cpp b/OMEdit/OMEditLIB/Git/GitCommands.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Git/GitCommands.cpp rename to OMEdit/OMEditLIB/Git/GitCommands.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Git/GitCommands.h b/OMEdit/OMEditLIB/Git/GitCommands.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Git/GitCommands.h rename to OMEdit/OMEditLIB/Git/GitCommands.h diff --git a/OMEdit/OMEdit/OMEditGUI/Git/RevertCommitsDialog.cpp b/OMEdit/OMEditLIB/Git/RevertCommitsDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Git/RevertCommitsDialog.cpp rename to OMEdit/OMEditLIB/Git/RevertCommitsDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Git/RevertCommitsDialog.h b/OMEdit/OMEditLIB/Git/RevertCommitsDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Git/RevertCommitsDialog.h rename to OMEdit/OMEditLIB/Git/RevertCommitsDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEditLIB/MainWindow.cpp similarity index 99% rename from OMEdit/OMEdit/OMEditGUI/MainWindow.cpp rename to OMEdit/OMEditLIB/MainWindow.cpp index 9644f65f70e..b892a8c40ce 100644 --- a/OMEdit/OMEdit/OMEditGUI/MainWindow.cpp +++ b/OMEdit/OMEditLIB/MainWindow.cpp @@ -77,8 +77,8 @@ #include -MainWindow::MainWindow(bool debug, QWidget *parent) - : QMainWindow(parent), mDebug(debug), mExitApplicationStatus(false) +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent), mExitApplicationStatus(false) { // This is a very convoluted way of asking for the default system font in Qt QFont systmFont("Monospace"); @@ -110,13 +110,12 @@ MainWindow *MainWindow::mpInstance = 0; /*! * \brief MainWindow::instance * Creates an instance of MainWindow. If we already have an instance then just return it. - * \param debug * \return */ -MainWindow *MainWindow::instance(bool debug) +MainWindow *MainWindow::instance() { if (!mpInstance) { - mpInstance = new MainWindow(debug); + mpInstance = new MainWindow; } return mpInstance; } @@ -128,22 +127,24 @@ MainWindow *MainWindow::instance(bool debug) */ void MainWindow::setUpMainWindow(threadData_t *threadData) { - // Reopen the standard output stream. - QString outputFileName = Utilities::tempDirectory() + "/omeditoutput.txt"; + if (!isTestsuiteRunning()) { + // Reopen the standard output stream. + QString outputFileName = Utilities::tempDirectory() + "/omeditoutput.txt"; #ifdef Q_OS_WIN - _wfreopen((wchar_t*)outputFileName.utf16(), L"w", stdout); + _wfreopen((wchar_t*)outputFileName.utf16(), L"w", stdout); #else - freopen(outputFileName.toUtf8().constData(), "w", stdout); + freopen(outputFileName.toUtf8().constData(), "w", stdout); #endif - setbuf(stdout, NULL); // used non-buffered stdout - // Reopen the standard error stream. - QString errorFileName = Utilities::tempDirectory() + "/omediterror.txt"; + setbuf(stdout, NULL); // used non-buffered stdout + // Reopen the standard error stream. + QString errorFileName = Utilities::tempDirectory() + "/omediterror.txt"; #ifdef Q_OS_WIN - _wfreopen((wchar_t*)errorFileName.utf16(), L"w", stderr); + _wfreopen((wchar_t*)errorFileName.utf16(), L"w", stderr); #else - freopen(outputFileName.toUtf8().constData(), "w", stderr); + freopen(outputFileName.toUtf8().constData(), "w", stderr); #endif - setbuf(stderr, NULL); // used non-buffered stderr + setbuf(stderr, NULL); // used non-buffered stderr + } SplashScreen::instance()->showMessage(tr("Initializing"), Qt::AlignRight, Qt::white); // Create an object of MessagesWidget. MessagesWidget::create(); @@ -536,9 +537,8 @@ void MainWindow::closeEvent(QCloseEvent *event) */ int MainWindow::askForExit() { - if (!OptionsDialog::instance()->getNotificationsPage()->getQuitApplicationCheckBox()->isChecked()) { - NotificationsDialog *pNotificationsDialog = new NotificationsDialog(NotificationsDialog::QuitApplication, - NotificationsDialog::QuestionIcon, this); + if (!OptionsDialog::instance()->getNotificationsPage()->getQuitApplicationCheckBox()->isChecked() && !isTestsuiteRunning()) { + NotificationsDialog *pNotificationsDialog = new NotificationsDialog(NotificationsDialog::QuitApplication, NotificationsDialog::QuestionIcon, this); return pNotificationsDialog->exec(); } return true; diff --git a/OMEdit/OMEdit/OMEditGUI/MainWindow.h b/OMEdit/OMEditLIB/MainWindow.h similarity index 98% rename from OMEdit/OMEdit/OMEditGUI/MainWindow.h rename to OMEdit/OMEditLIB/MainWindow.h index 7d0119faf25..af4cfb8cdfe 100644 --- a/OMEdit/OMEdit/OMEditGUI/MainWindow.h +++ b/OMEdit/OMEditLIB/MainWindow.h @@ -97,12 +97,15 @@ class MainWindow : public QMainWindow public: enum { MaxRecentFiles = 8 }; private: - MainWindow(bool debug, QWidget *parent = 0); + MainWindow(QWidget *parent = 0); static MainWindow *mpInstance; public: - static MainWindow *instance(bool debug = false); + static MainWindow *instance(); void setUpMainWindow(threadData_t *threadData); - bool isDebug() {return mDebug;} + bool isDebug() const {return mDebug;} + void setDebug(bool debug) {mDebug = debug;} + bool isTestsuiteRunning() const {return mTestsuiteRunning;} + void setTestsuiteRunning(bool testsuiteRunning) {mTestsuiteRunning = testsuiteRunning;} OMCProxy* getOMCProxy() {return mpOMCProxy;} void setExitApplicationStatus(bool status) {mExitApplicationStatus = status;} bool getExitApplicationStatus() {return mExitApplicationStatus;} @@ -252,6 +255,7 @@ class MainWindow : public QMainWindow QList mFMUDirectoriesList; private: bool mDebug; + bool mTestsuiteRunning; OMCProxy *mpOMCProxy; bool mExitApplicationStatus; int mNumberOfProcessors; diff --git a/OMEdit/OMEdit/OMEditGUI/Makefile.omdev.mingw b/OMEdit/OMEditLIB/Makefile.omdev.mingw similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Makefile.omdev.mingw rename to OMEdit/OMEditLIB/Makefile.omdev.mingw diff --git a/OMEdit/OMEdit/OMEditGUI/Makefile.unix.in b/OMEdit/OMEditLIB/Makefile.unix.in similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Makefile.unix.in rename to OMEdit/OMEditLIB/Makefile.unix.in diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/CoOrdinateSystem.cpp b/OMEdit/OMEditLIB/Modeling/CoOrdinateSystem.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/CoOrdinateSystem.cpp rename to OMEdit/OMEditLIB/Modeling/CoOrdinateSystem.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/CoOrdinateSystem.h b/OMEdit/OMEditLIB/Modeling/CoOrdinateSystem.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/CoOrdinateSystem.h rename to OMEdit/OMEditLIB/Modeling/CoOrdinateSystem.h diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/Commands.cpp b/OMEdit/OMEditLIB/Modeling/Commands.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/Commands.cpp rename to OMEdit/OMEditLIB/Modeling/Commands.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/Commands.h b/OMEdit/OMEditLIB/Modeling/Commands.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/Commands.h rename to OMEdit/OMEditLIB/Modeling/Commands.h diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/DocumentationWidget.cpp b/OMEdit/OMEditLIB/Modeling/DocumentationWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/DocumentationWidget.cpp rename to OMEdit/OMEditLIB/Modeling/DocumentationWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/DocumentationWidget.h b/OMEdit/OMEditLIB/Modeling/DocumentationWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/DocumentationWidget.h rename to OMEdit/OMEditLIB/Modeling/DocumentationWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/FunctionArgumentDialog.cpp b/OMEdit/OMEditLIB/Modeling/FunctionArgumentDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/FunctionArgumentDialog.cpp rename to OMEdit/OMEditLIB/Modeling/FunctionArgumentDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/FunctionArgumentDialog.h b/OMEdit/OMEditLIB/Modeling/FunctionArgumentDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/FunctionArgumentDialog.h rename to OMEdit/OMEditLIB/Modeling/FunctionArgumentDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/ItemDelegate.cpp b/OMEdit/OMEditLIB/Modeling/ItemDelegate.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/ItemDelegate.cpp rename to OMEdit/OMEditLIB/Modeling/ItemDelegate.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/ItemDelegate.h b/OMEdit/OMEditLIB/Modeling/ItemDelegate.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/ItemDelegate.h rename to OMEdit/OMEditLIB/Modeling/ItemDelegate.h diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditLIB/Modeling/LibraryTreeWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp rename to OMEdit/OMEditLIB/Modeling/LibraryTreeWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h b/OMEdit/OMEditLIB/Modeling/LibraryTreeWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h rename to OMEdit/OMEditLIB/Modeling/LibraryTreeWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/MessagesWidget.cpp b/OMEdit/OMEditLIB/Modeling/MessagesWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/MessagesWidget.cpp rename to OMEdit/OMEditLIB/Modeling/MessagesWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/MessagesWidget.h b/OMEdit/OMEditLIB/Modeling/MessagesWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/MessagesWidget.h rename to OMEdit/OMEditLIB/Modeling/MessagesWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp rename to OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.h b/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.h rename to OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.h diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp b/OMEdit/OMEditLIB/Modeling/ModelicaClassDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp rename to OMEdit/OMEditLIB/Modeling/ModelicaClassDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.h b/OMEdit/OMEditLIB/Modeling/ModelicaClassDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.h rename to OMEdit/OMEditLIB/Modeling/ModelicaClassDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditLIB/OMC/OMCProxy.cpp similarity index 98% rename from OMEdit/OMEdit/OMEditGUI/OMC/OMCProxy.cpp rename to OMEdit/OMEditLIB/OMC/OMCProxy.cpp index 8c65f3bc660..1d16c6f0653 100644 --- a/OMEdit/OMEdit/OMEditGUI/OMC/OMCProxy.cpp +++ b/OMEdit/OMEditLIB/OMC/OMCProxy.cpp @@ -660,33 +660,37 @@ QString OMCProxy::getVersion(QString className) */ void OMCProxy::loadSystemLibraries() { - QSettings *pSettings = Utilities::getApplicationSettings(); - bool forceModelicaLoad = true; - if (pSettings->contains("forceModelicaLoad")) { - forceModelicaLoad = pSettings->value("forceModelicaLoad").toBool(); - } - pSettings->beginGroup("libraries"); - QStringList libraries = pSettings->childKeys(); - pSettings->endGroup(); - /* - Only force loading of Modelica & ModelicaReference if user is using OMEdit for the first time. - Later user must use the libraries options dialog. - */ - if (forceModelicaLoad) { - if (!pSettings->contains("libraries/Modelica")) { - pSettings->setValue("libraries/Modelica","default"); - libraries.prepend("Modelica"); + if (MainWindow::instance()->isTestsuiteRunning()) { + loadModel("Modelica", "default"); + loadModel("ModelicaReference", "default"); + } else { + bool forceModelicaLoad = true; + QSettings *pSettings = Utilities::getApplicationSettings(); + if (pSettings->contains("forceModelicaLoad")) { + forceModelicaLoad = pSettings->value("forceModelicaLoad").toBool(); } - if (!pSettings->contains("libraries/ModelicaReference")) { - pSettings->setValue("libraries/ModelicaReference","default"); - libraries.prepend("ModelicaReference"); + pSettings->beginGroup("libraries"); + QStringList libraries = pSettings->childKeys(); + pSettings->endGroup(); + /* Only force loading of Modelica & ModelicaReference if user is using OMEdit for the first time. + * Later user must use the libraries options dialog. + */ + if (forceModelicaLoad) { + if (!pSettings->contains("libraries/Modelica")) { + pSettings->setValue("libraries/Modelica","default"); + libraries.prepend("Modelica"); + } + if (!pSettings->contains("libraries/ModelicaReference")) { + pSettings->setValue("libraries/ModelicaReference","default"); + libraries.prepend("ModelicaReference"); + } } + foreach (QString lib, libraries) { + QString version = pSettings->value("libraries/" + lib).toString(); + loadModel(lib, version); + } + OptionsDialog::instance()->readLibrariesSettings(); } - foreach (QString lib, libraries) { - QString version = pSettings->value("libraries/" + lib).toString(); - loadModel(lib, version); - } - OptionsDialog::instance()->readLibrariesSettings(); } /*! diff --git a/OMEdit/OMEdit/OMEditGUI/OMC/OMCProxy.h b/OMEdit/OMEditLIB/OMC/OMCProxy.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMC/OMCProxy.h rename to OMEdit/OMEditLIB/OMC/OMCProxy.h diff --git a/OMEdit/OMEdit/OMEditGUI/OMEditApplication.cpp b/OMEdit/OMEditLIB/OMEditApplication.cpp similarity index 92% rename from OMEdit/OMEdit/OMEditGUI/OMEditApplication.cpp rename to OMEdit/OMEditLIB/OMEditApplication.cpp index f269e041ee4..0e4ccff1f23 100644 --- a/OMEdit/OMEdit/OMEditGUI/OMEditApplication.cpp +++ b/OMEdit/OMEditLIB/OMEditApplication.cpp @@ -36,9 +36,6 @@ #include "Util/Helper.h" #include "MainWindow.h" #include "Modeling/LibraryTreeWidget.h" -#ifndef WIN32 -#include "omc_config.h" -#endif #include #include @@ -53,7 +50,7 @@ * \param argv * \param threadData */ -OMEditApplication::OMEditApplication(int &argc, char **argv, threadData_t* threadData) +OMEditApplication::OMEditApplication(int &argc, char **argv, threadData_t* threadData, bool testsuiteRunning) : QApplication(argc, argv) { // set the stylesheet @@ -105,7 +102,9 @@ OMEditApplication::OMEditApplication(int &argc, char **argv, threadData_t* threa QPixmap pixmap(":/Resources/icons/omedit_splashscreen.png"); SplashScreen *pSplashScreen = SplashScreen::instance(); pSplashScreen->setPixmap(pixmap); - pSplashScreen->show(); + if (!testsuiteRunning) { + pSplashScreen->show(); + } Helper::initHelperVariables(); /* Force C-style doubles */ setlocale(LC_NUMERIC, "C"); @@ -113,7 +112,7 @@ OMEditApplication::OMEditApplication(int &argc, char **argv, threadData_t* threa bool debug = false; QString fileName = ""; QStringList fileNames; - if (arguments().size() > 1) { + if (arguments().size() > 1 && !testsuiteRunning) { for (int i = 1; i < arguments().size(); i++) { if (strncmp(arguments().at(i).toUtf8().constData(), "--Debug=",8) == 0) { QString debugArg = arguments().at(i); @@ -143,7 +142,9 @@ OMEditApplication::OMEditApplication(int &argc, char **argv, threadData_t* threa } } // MainWindow Initialization - MainWindow *pMainwindow = MainWindow::instance(debug); + MainWindow *pMainwindow = MainWindow::instance(); + pMainwindow->setDebug(debug); + pMainwindow->setTestsuiteRunning(testsuiteRunning); pMainwindow->setUpMainWindow(threadData); if (pMainwindow->getExitApplicationStatus()) { // if there is some issue in running the application. quit(); @@ -154,14 +155,18 @@ OMEditApplication::OMEditApplication(int &argc, char **argv, threadData_t* threa pMainwindow->getLibraryWidget()->openFile(fileName); } // open the files recieved by QFileOpenEvent - foreach (QString fileToOpen, mFilesToOpenList) { - pMainwindow->getLibraryWidget()->openFile(fileToOpen); + if (!testsuiteRunning) { + foreach (QString fileToOpen, mFilesToOpenList) { + pMainwindow->getLibraryWidget()->openFile(fileToOpen); + } } - // finally show the main window - pMainwindow->show(); - // hide the splash screen - pSplashScreen->finish(pMainwindow); + if (!testsuiteRunning) { + // finally show the main window + pMainwindow->show(); + // hide the splash screen + SplashScreen::instance()->finish(pMainwindow); + } } /*! diff --git a/OMEdit/OMEdit/OMEditGUI/OMEditApplication.h b/OMEdit/OMEditLIB/OMEditApplication.h similarity index 94% rename from OMEdit/OMEdit/OMEditGUI/OMEditApplication.h rename to OMEdit/OMEditLIB/OMEditApplication.h index 4410e7acb91..2210e6be440 100644 --- a/OMEdit/OMEdit/OMEditGUI/OMEditApplication.h +++ b/OMEdit/OMEditLIB/OMEditApplication.h @@ -46,7 +46,7 @@ extern "C" { class OMEditApplication : public QApplication { public: - OMEditApplication(int& argc, char**argv, threadData_t *threadData); + OMEditApplication(int &argc, char**argv, threadData_t *threadData, bool testsuiteRunning = false); private: QStringList mFilesToOpenList; protected: diff --git a/OMEdit/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditLIB/OMEditLIB.pro similarity index 74% rename from OMEdit/OMEdit/OMEditGUI/OMEditGUI.pro rename to OMEdit/OMEditLIB/OMEditLIB.pro index fa3be4cb734..de4bfd41de7 100644 --- a/OMEdit/OMEdit/OMEditGUI/OMEditGUI.pro +++ b/OMEdit/OMEditLIB/OMEditLIB.pro @@ -33,6 +33,10 @@ greaterThan(QT_MAJOR_VERSION, 4) { QT += printsupport widgets webkitwidgets concurrent } +TARGET = OMEdit +TEMPLATE = lib +CONFIG += staticlib + TRANSLATIONS = Resources/nls/OMEdit_de.ts \ Resources/nls/OMEdit_es.ts \ Resources/nls/OMEdit_fr.ts \ @@ -43,9 +47,6 @@ TRANSLATIONS = Resources/nls/OMEdit_de.ts \ Resources/nls/OMEdit_sv.ts \ Resources/nls/OMEdit_zh_CN.ts -TARGET = OMEdit -TEMPLATE = app - # This is very evil, lupdate just look for SOURCES variable and creates translations. This section is not compiled at all :) evil_hack_to_fool_lupdate { SOURCES += ../../../OMPlot/OMPlotGUI/*.cpp @@ -53,83 +54,31 @@ evil_hack_to_fool_lupdate { # Windows libraries and includes win32 { - OPENMODELICAHOME = $$(OPENMODELICAHOME) - # define used for OpenModelica C-API - DEFINES += IMPORT_INTO=1 - # win32 vs. win64 - contains(QT_ARCH, i386) { # 32-bit - QMAKE_LFLAGS += -Wl,--stack,16777216,--enable-auto-import,--large-address-aware - } else { # 64-bit - QMAKE_LFLAGS += -Wl,--stack,33554432,--enable-auto-import - } - # release vs debug - CONFIG(release, debug|release) { # release - # required for backtrace - # In order to get the stack trace in Windows we must add -g flag. Qt automatically adds the -O2 flag for optimization. - # We should also unset the QMAKE_LFLAGS_RELEASE define because it is defined as QMAKE_LFLAGS_RELEASE = -Wl,-s in qmake.conf file for MinGW - # -s will remove all symbol table and relocation information from the executable. - QMAKE_CXXFLAGS += -g -DUA_DYNAMIC_LINKING - QMAKE_LFLAGS_RELEASE = - # win32 vs. win64 - contains(QT_ARCH, i386) { # 32-bit - LIBS += -L$$(OMDEV)/tools/msys/mingw32/lib/binutils -L$$(OMDEV)/tools/msys/mingw32/bin -L$$(OMDEV)/tools/msys/mingw32/lib - } else { # 64-bit - LIBS += -L$$(OMDEV)/tools/msys/mingw64/lib/binutils -L$$(OMDEV)/tools/msys/mingw64/bin -L$$(OMDEV)/tools/msys/mingw64/lib - } - LIBS += -limagehlp -lbfd -lintl -liberty -llibosg.dll -llibosgViewer.dll -llibOpenThreads.dll -llibosgDB.dll -llibosgGA.dll - } else { # debug - contains(QT_ARCH, i386) { # 32-bit - LIBS += -L$$(OMDEV)/tools/msys/mingw32/lib - } else { # 64-bit - LIBS += -L$$(OMDEV)/tools/msys/mingw64/lib - } - LIBS += -llibosgd.dll -llibosgViewerd.dll -llibOpenThreadsd.dll -llibosgDBd.dll -llibosgGAd.dll - } - LIBS += -L../OMEditGUI/Debugger/Parser -lGDBMIParser \ - -L$$(OMBUILDDIR)/lib/omc -lomantlr3 -lOMPlot -lomqwt -lomopcua \ - -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib -lModelicaExternalC -lomcgc -lpthread -lshlwapi \ - -lws2_32 \ - -L$$(OMBUILDDIR)/bin -lOMSimulator -lqjson - - INCLUDEPATH += $$(OMBUILDDIR)/include \ - $$(OMBUILDDIR)/include/omplot \ - $$(OMBUILDDIR)/include/omplot/qwt \ - $$(OMBUILDDIR)/include/omc/antlr3 \ - $$OPENMODELICAHOME/include/omc/scripting-API \ - $$(OMBUILDDIR)/include/omc/c \ - $$OPENMODELICAHOME/include/omc/c/util \ - $$OPENMODELICAHOME/include/omc/fmil \ - ../../qjson/build/include + OPENMODELICAHOME = $$(OMBUILDDIR) + host_short = - RC_FILE = rc_omedit.rc CONFIG += osg } else { # Unix libraries and includes - include(OMEdit.config) - # required for backtrace - # In order to get the stack trace in Windows we must add -g flag. Qt automatically adds the -O2 flag for optimization. - # We should also unset the QMAKE_LFLAGS_RELEASE define because it is defined as QMAKE_LFLAGS_RELEASE = -Wl,-s in qmake.conf file for MinGW - # -s will remove all symbol table and relocation information from the executable. - # On unix we use backtrace of execinfo.h which requires -rdynamic - # The symbol names may be unavailable without the use of special linker - # options. For systems using the GNU linker, it is necessary to use - # the -rdynamic linker option. Note that names of "static" functions - # are not exposed, and won't be available in the backtrace. - CONFIG(release, debug|release) { - QMAKE_CXXFLAGS += -g - QMAKE_LFLAGS_RELEASE = -rdynamic - } - equals(QT_ARCH, i386)|equals(QT_ARCH, i486)|equals(QT_ARCH, i586)|equals(QT_ARCH, i686) { # 32-bit - LIBS += -latomic -lboost_atomic - } + include(OMEditLIB.unix.config.pri) } +INCLUDEPATH += ../ \ + $$OPENMODELICAHOME/include \ + $$OPENMODELICAHOME/include/omplot \ + $$OPENMODELICAHOME/include/omplot/qwt \ + $$OPENMODELICAHOME/include/$$host_short/omc/antlr3 \ + $$OPENMODELICAHOME/include/omc/scripting-API \ + $$OPENMODELICAHOME/include/omc/c \ + $$OPENMODELICAHOME/include/omc/c/util \ + $$OPENMODELICAHOME/include/omc/fmil \ + ../qjson/build/include + # Don't show the warnings from included headers. for (path, INCLUDEPATH) { QMAKE_CXXFLAGS += -isystem $${path} } -SOURCES += main.cpp \ - Util/Helper.cpp \ +SOURCES += Util/Helper.cpp \ Util/Utilities.cpp \ Util/StringHandler.cpp \ MainWindow.cpp \ @@ -374,11 +323,11 @@ RESOURCES += resource_omedit.qrc DESTDIR = ../bin -UI_DIR = ../generatedfiles/ui +UI_DIR = generatedfiles/ui -MOC_DIR = ../generatedfiles/moc +MOC_DIR = generatedfiles/moc -RCC_DIR = ../generatedfiles/rcc +RCC_DIR = generatedfiles/rcc ICON = Resources/icons/omedit.icns diff --git a/OMEdit/OMEditLIB/OMEditLIB.unix.config.pri.in b/OMEdit/OMEditLIB/OMEditLIB.unix.config.pri.in new file mode 100644 index 00000000000..3d1a42527af --- /dev/null +++ b/OMEdit/OMEditLIB/OMEditLIB.unix.config.pri.in @@ -0,0 +1,17 @@ +# @author Martin Sjölund + +QMAKE_CC = @CC@ +QMAKE_CXX = @CXX@ +QMAKE_LINK = @CXX@ + +OPENMODELICAHOME = @OPENMODELICAHOME@ +host_short = @host_short@ + +QMAKE_CXXFLAGS_RELEASE -= -O1 +QMAKE_CXXFLAGS_RELEASE -= -O2 + +QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@ +QMAKE_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ +QMAKE_LFLAGS += @LDFLAGS@ + +@QMAKE_CONFIG_OSG@ diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/BusDialog.cpp b/OMEdit/OMEditLIB/OMS/BusDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/BusDialog.cpp rename to OMEdit/OMEditLIB/OMS/BusDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/BusDialog.h b/OMEdit/OMEditLIB/OMS/BusDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/BusDialog.h rename to OMEdit/OMEditLIB/OMS/BusDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/ElementPropertiesDialog.cpp b/OMEdit/OMEditLIB/OMS/ElementPropertiesDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/ElementPropertiesDialog.cpp rename to OMEdit/OMEditLIB/OMS/ElementPropertiesDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/ElementPropertiesDialog.h b/OMEdit/OMEditLIB/OMS/ElementPropertiesDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/ElementPropertiesDialog.h rename to OMEdit/OMEditLIB/OMS/ElementPropertiesDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/InstantiateDialog.cpp b/OMEdit/OMEditLIB/OMS/InstantiateDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/InstantiateDialog.cpp rename to OMEdit/OMEditLIB/OMS/InstantiateDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/InstantiateDialog.h b/OMEdit/OMEditLIB/OMS/InstantiateDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/InstantiateDialog.h rename to OMEdit/OMEditLIB/OMS/InstantiateDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/ModelDialog.cpp b/OMEdit/OMEditLIB/OMS/ModelDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/ModelDialog.cpp rename to OMEdit/OMEditLIB/OMS/ModelDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/ModelDialog.h b/OMEdit/OMEditLIB/OMS/ModelDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/ModelDialog.h rename to OMEdit/OMEditLIB/OMS/ModelDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/OMSProxy.cpp b/OMEdit/OMEditLIB/OMS/OMSProxy.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/OMSProxy.cpp rename to OMEdit/OMEditLIB/OMS/OMSProxy.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/OMSProxy.h b/OMEdit/OMEditLIB/OMS/OMSProxy.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/OMSProxy.h rename to OMEdit/OMEditLIB/OMS/OMSProxy.h diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/OMSSimulationDialog.cpp b/OMEdit/OMEditLIB/OMS/OMSSimulationDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/OMSSimulationDialog.cpp rename to OMEdit/OMEditLIB/OMS/OMSSimulationDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/OMSSimulationDialog.h b/OMEdit/OMEditLIB/OMS/OMSSimulationDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/OMSSimulationDialog.h rename to OMEdit/OMEditLIB/OMS/OMSSimulationDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/OMSSimulationOptions.h b/OMEdit/OMEditLIB/OMS/OMSSimulationOptions.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/OMSSimulationOptions.h rename to OMEdit/OMEditLIB/OMS/OMSSimulationOptions.h diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/OMSSimulationOutputWidget.cpp b/OMEdit/OMEditLIB/OMS/OMSSimulationOutputWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/OMSSimulationOutputWidget.cpp rename to OMEdit/OMEditLIB/OMS/OMSSimulationOutputWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/OMSSimulationOutputWidget.h b/OMEdit/OMEditLIB/OMS/OMSSimulationOutputWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/OMSSimulationOutputWidget.h rename to OMEdit/OMEditLIB/OMS/OMSSimulationOutputWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/SystemSimulationInformationDialog.cpp b/OMEdit/OMEditLIB/OMS/SystemSimulationInformationDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/SystemSimulationInformationDialog.cpp rename to OMEdit/OMEditLIB/OMS/SystemSimulationInformationDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/OMS/SystemSimulationInformationDialog.h b/OMEdit/OMEditLIB/OMS/SystemSimulationInformationDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/OMS/SystemSimulationInformationDialog.h rename to OMEdit/OMEditLIB/OMS/SystemSimulationInformationDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Options/NotificationsDialog.cpp b/OMEdit/OMEditLIB/Options/NotificationsDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Options/NotificationsDialog.cpp rename to OMEdit/OMEditLIB/Options/NotificationsDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Options/NotificationsDialog.h b/OMEdit/OMEditLIB/Options/NotificationsDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Options/NotificationsDialog.h rename to OMEdit/OMEditLIB/Options/NotificationsDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Options/OptionsDialog.cpp b/OMEdit/OMEditLIB/Options/OptionsDialog.cpp similarity index 99% rename from OMEdit/OMEdit/OMEditGUI/Options/OptionsDialog.cpp rename to OMEdit/OMEditLIB/Options/OptionsDialog.cpp index 916db97c5dd..eef183e2dca 100644 --- a/OMEdit/OMEdit/OMEditGUI/Options/OptionsDialog.cpp +++ b/OMEdit/OMEditLIB/Options/OptionsDialog.cpp @@ -115,8 +115,11 @@ OptionsDialog::OptionsDialog(QWidget *pParent) mpTLMPage = new TLMPage(this); mpOMSimulatorPage = new OMSimulatorPage(this); mpTraceabilityPage = new TraceabilityPage(this); - // get the settings - readSettings(); + // Get the settings. + // Don't read the settings in case we are running the testsuite. We want default OMEdit. + if (!MainWindow::instance()->isTestsuiteRunning()) { + readSettings(); + } // set up the Options Dialog setUpDialog(); } diff --git a/OMEdit/OMEdit/OMEditGUI/Options/OptionsDialog.h b/OMEdit/OMEditLIB/Options/OptionsDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Options/OptionsDialog.h rename to OMEdit/OMEditLIB/Options/OptionsDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Plotting/DiagramWindow.cpp b/OMEdit/OMEditLIB/Plotting/DiagramWindow.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Plotting/DiagramWindow.cpp rename to OMEdit/OMEditLIB/Plotting/DiagramWindow.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Plotting/DiagramWindow.h b/OMEdit/OMEditLIB/Plotting/DiagramWindow.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Plotting/DiagramWindow.h rename to OMEdit/OMEditLIB/Plotting/DiagramWindow.h diff --git a/OMEdit/OMEdit/OMEditGUI/Plotting/PlotWindowContainer.cpp b/OMEdit/OMEditLIB/Plotting/PlotWindowContainer.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Plotting/PlotWindowContainer.cpp rename to OMEdit/OMEditLIB/Plotting/PlotWindowContainer.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Plotting/PlotWindowContainer.h b/OMEdit/OMEditLIB/Plotting/PlotWindowContainer.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Plotting/PlotWindowContainer.h rename to OMEdit/OMEditLIB/Plotting/PlotWindowContainer.h diff --git a/OMEdit/OMEdit/OMEditGUI/Plotting/VariablesWidget.cpp b/OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Plotting/VariablesWidget.cpp rename to OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Plotting/VariablesWidget.h b/OMEdit/OMEditLIB/Plotting/VariablesWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Plotting/VariablesWidget.h rename to OMEdit/OMEditLIB/Plotting/VariablesWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/XMLSchema/tlmModelDescription.xsd b/OMEdit/OMEditLIB/Resources/XMLSchema/tlmModelDescription.xsd similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/XMLSchema/tlmModelDescription.xsd rename to OMEdit/OMEditLIB/Resources/XMLSchema/tlmModelDescription.xsd diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/bitmaps/check.png b/OMEdit/OMEditLIB/Resources/bitmaps/check.png similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/bitmaps/check.png rename to OMEdit/OMEditLIB/Resources/bitmaps/check.png diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/css/stylesheet.qss b/OMEdit/OMEditLIB/Resources/css/stylesheet.qss similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/css/stylesheet.qss rename to OMEdit/OMEditLIB/Resources/css/stylesheet.qss diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/add-connector.svg b/OMEdit/OMEditLIB/Resources/icons/add-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/add-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/add-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/add-icon.svg b/OMEdit/OMEditLIB/Resources/icons/add-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/add-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/add-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/add-system.svg b/OMEdit/OMEditLIB/Resources/icons/add-system.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/add-system.svg rename to OMEdit/OMEditLIB/Resources/icons/add-system.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/align-center.svg b/OMEdit/OMEditLIB/Resources/icons/align-center.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/align-center.svg rename to OMEdit/OMEditLIB/Resources/icons/align-center.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/align-interfaces.svg b/OMEdit/OMEditLIB/Resources/icons/align-interfaces.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/align-interfaces.svg rename to OMEdit/OMEditLIB/Resources/icons/align-interfaces.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/align-left.svg b/OMEdit/OMEditLIB/Resources/icons/align-left.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/align-left.svg rename to OMEdit/OMEditLIB/Resources/icons/align-left.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/align-right.svg b/OMEdit/OMEditLIB/Resources/icons/align-right.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/align-right.svg rename to OMEdit/OMEditLIB/Resources/icons/align-right.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/animation.svg b/OMEdit/OMEditLIB/Resources/icons/animation.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/animation.svg rename to OMEdit/OMEditLIB/Resources/icons/animation.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/array-parametric-plot-window.svg b/OMEdit/OMEditLIB/Resources/icons/array-parametric-plot-window.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/array-parametric-plot-window.svg rename to OMEdit/OMEditLIB/Resources/icons/array-parametric-plot-window.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/array-plot-window.svg b/OMEdit/OMEditLIB/Resources/icons/array-plot-window.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/array-plot-window.svg rename to OMEdit/OMEditLIB/Resources/icons/array-plot-window.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-end-fill.svg b/OMEdit/OMEditLIB/Resources/icons/arrow-end-fill.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-end-fill.svg rename to OMEdit/OMEditLIB/Resources/icons/arrow-end-fill.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-end-open-half.svg b/OMEdit/OMEditLIB/Resources/icons/arrow-end-open-half.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-end-open-half.svg rename to OMEdit/OMEditLIB/Resources/icons/arrow-end-open-half.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-end-open.svg b/OMEdit/OMEditLIB/Resources/icons/arrow-end-open.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-end-open.svg rename to OMEdit/OMEditLIB/Resources/icons/arrow-end-open.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-start-fill.svg b/OMEdit/OMEditLIB/Resources/icons/arrow-start-fill.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-start-fill.svg rename to OMEdit/OMEditLIB/Resources/icons/arrow-start-fill.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-start-open-half.svg b/OMEdit/OMEditLIB/Resources/icons/arrow-start-open-half.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-start-open-half.svg rename to OMEdit/OMEditLIB/Resources/icons/arrow-start-open-half.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-start-open.svg b/OMEdit/OMEditLIB/Resources/icons/arrow-start-open.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/arrow-start-open.svg rename to OMEdit/OMEditLIB/Resources/icons/arrow-start-open.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/background-color-icon.svg b/OMEdit/OMEditLIB/Resources/icons/background-color-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/background-color-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/background-color-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/bitmap-delete.svg b/OMEdit/OMEditLIB/Resources/icons/bitmap-delete.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/bitmap-delete.svg rename to OMEdit/OMEditLIB/Resources/icons/bitmap-delete.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/bitmap-shape.svg b/OMEdit/OMEditLIB/Resources/icons/bitmap-shape.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/bitmap-shape.svg rename to OMEdit/OMEditLIB/Resources/icons/bitmap-shape.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/block-icon.svg b/OMEdit/OMEditLIB/Resources/icons/block-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/block-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/block-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/bold-icon.svg b/OMEdit/OMEditLIB/Resources/icons/bold-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/bold-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/bold-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/boolean-input-connector.svg b/OMEdit/OMEditLIB/Resources/icons/boolean-input-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/boolean-input-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/boolean-input-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/boolean-output-connector.svg b/OMEdit/OMEditLIB/Resources/icons/boolean-output-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/boolean-output-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/boolean-output-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/bottom.svg b/OMEdit/OMEditLIB/Resources/icons/bottom.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/bottom.svg rename to OMEdit/OMEditLIB/Resources/icons/bottom.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/breakpoint_disabled.svg b/OMEdit/OMEditLIB/Resources/icons/breakpoint_disabled.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/breakpoint_disabled.svg rename to OMEdit/OMEditLIB/Resources/icons/breakpoint_disabled.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/breakpoint_enabled.svg b/OMEdit/OMEditLIB/Resources/icons/breakpoint_enabled.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/breakpoint_enabled.svg rename to OMEdit/OMEditLIB/Resources/icons/breakpoint_enabled.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/bring-forward.svg b/OMEdit/OMEditLIB/Resources/icons/bring-forward.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/bring-forward.svg rename to OMEdit/OMEditLIB/Resources/icons/bring-forward.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/bring-to-front.svg b/OMEdit/OMEditLIB/Resources/icons/bring-to-front.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/bring-to-front.svg rename to OMEdit/OMEditLIB/Resources/icons/bring-to-front.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/bullet-list.svg b/OMEdit/OMEditLIB/Resources/icons/bullet-list.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/bullet-list.svg rename to OMEdit/OMEditLIB/Resources/icons/bullet-list.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/bus-connector.svg b/OMEdit/OMEditLIB/Resources/icons/bus-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/bus-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/bus-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/bus.svg b/OMEdit/OMEditLIB/Resources/icons/bus.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/bus.svg rename to OMEdit/OMEditLIB/Resources/icons/bus.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/changeColor.svg b/OMEdit/OMEditLIB/Resources/icons/changeColor.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/changeColor.svg rename to OMEdit/OMEditLIB/Resources/icons/changeColor.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/check-all.svg b/OMEdit/OMEditLIB/Resources/icons/check-all.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/check-all.svg rename to OMEdit/OMEditLIB/Resources/icons/check-all.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/check.svg b/OMEdit/OMEditLIB/Resources/icons/check.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/check.svg rename to OMEdit/OMEditLIB/Resources/icons/check.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/checkered.svg b/OMEdit/OMEditLIB/Resources/icons/checkered.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/checkered.svg rename to OMEdit/OMEditLIB/Resources/icons/checkered.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/class-icon.svg b/OMEdit/OMEditLIB/Resources/icons/class-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/class-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/class-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/clear.svg b/OMEdit/OMEditLIB/Resources/icons/clear.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/clear.svg rename to OMEdit/OMEditLIB/Resources/icons/clear.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/completerAnnotation.svg b/OMEdit/OMEditLIB/Resources/icons/completerAnnotation.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/completerAnnotation.svg rename to OMEdit/OMEditLIB/Resources/icons/completerAnnotation.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/completerClass.svg b/OMEdit/OMEditLIB/Resources/icons/completerClass.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/completerClass.svg rename to OMEdit/OMEditLIB/Resources/icons/completerClass.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/completerCodeSnippets.svg b/OMEdit/OMEditLIB/Resources/icons/completerCodeSnippets.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/completerCodeSnippets.svg rename to OMEdit/OMEditLIB/Resources/icons/completerCodeSnippets.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/completerComponent.svg b/OMEdit/OMEditLIB/Resources/icons/completerComponent.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/completerComponent.svg rename to OMEdit/OMEditLIB/Resources/icons/completerComponent.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/completerType.svg b/OMEdit/OMEditLIB/Resources/icons/completerType.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/completerType.svg rename to OMEdit/OMEditLIB/Resources/icons/completerType.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/completerkeyword.svg b/OMEdit/OMEditLIB/Resources/icons/completerkeyword.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/completerkeyword.svg rename to OMEdit/OMEditLIB/Resources/icons/completerkeyword.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/connect-mode.svg b/OMEdit/OMEditLIB/Resources/icons/connect-mode.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/connect-mode.svg rename to OMEdit/OMEditLIB/Resources/icons/connect-mode.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/connector-icon.svg b/OMEdit/OMEditLIB/Resources/icons/connector-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/connector-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/connector-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/console.svg b/OMEdit/OMEditLIB/Resources/icons/console.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/console.svg rename to OMEdit/OMEditLIB/Resources/icons/console.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/control-panel.svg b/OMEdit/OMEditLIB/Resources/icons/control-panel.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/control-panel.svg rename to OMEdit/OMEditLIB/Resources/icons/control-panel.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/copy.svg b/OMEdit/OMEditLIB/Resources/icons/copy.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/copy.svg rename to OMEdit/OMEditLIB/Resources/icons/copy.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/csv.svg b/OMEdit/OMEditLIB/Resources/icons/csv.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/csv.svg rename to OMEdit/OMEditLIB/Resources/icons/csv.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/cut.svg b/OMEdit/OMEditLIB/Resources/icons/cut.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/cut.svg rename to OMEdit/OMEditLIB/Resources/icons/cut.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/debugger.svg b/OMEdit/OMEditLIB/Resources/icons/debugger.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/debugger.svg rename to OMEdit/OMEditLIB/Resources/icons/debugger.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/decrease-indent.svg b/OMEdit/OMEditLIB/Resources/icons/decrease-indent.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/decrease-indent.svg rename to OMEdit/OMEditLIB/Resources/icons/decrease-indent.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/delete.svg b/OMEdit/OMEditLIB/Resources/icons/delete.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/delete.svg rename to OMEdit/OMEditLIB/Resources/icons/delete.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/down.svg b/OMEdit/OMEditLIB/Resources/icons/down.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/down.svg rename to OMEdit/OMEditLIB/Resources/icons/down.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/duplicate.svg b/OMEdit/OMEditLIB/Resources/icons/duplicate.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/duplicate.svg rename to OMEdit/OMEditLIB/Resources/icons/duplicate.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/edit-icon.svg b/OMEdit/OMEditLIB/Resources/icons/edit-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/edit-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/edit-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/edit-info-header.svg b/OMEdit/OMEditLIB/Resources/icons/edit-info-header.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/edit-info-header.svg rename to OMEdit/OMEditLIB/Resources/icons/edit-info-header.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/edit-info.svg b/OMEdit/OMEditLIB/Resources/icons/edit-info.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/edit-info.svg rename to OMEdit/OMEditLIB/Resources/icons/edit-info.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/edit-revisions.svg b/OMEdit/OMEditLIB/Resources/icons/edit-revisions.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/edit-revisions.svg rename to OMEdit/OMEditLIB/Resources/icons/edit-revisions.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/ellipse-shape.svg b/OMEdit/OMEditLIB/Resources/icons/ellipse-shape.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/ellipse-shape.svg rename to OMEdit/OMEditLIB/Resources/icons/ellipse-shape.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/equational-debugger.svg b/OMEdit/OMEditLIB/Resources/icons/equational-debugger.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/equational-debugger.svg rename to OMEdit/OMEditLIB/Resources/icons/equational-debugger.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/exit.svg b/OMEdit/OMEditLIB/Resources/icons/exit.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/exit.svg rename to OMEdit/OMEditLIB/Resources/icons/exit.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/export-fmu.svg b/OMEdit/OMEditLIB/Resources/icons/export-fmu.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/export-fmu.svg rename to OMEdit/OMEditLIB/Resources/icons/export-fmu.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/export-omnotebook.svg b/OMEdit/OMEditLIB/Resources/icons/export-omnotebook.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/export-omnotebook.svg rename to OMEdit/OMEditLIB/Resources/icons/export-omnotebook.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/export-variables.svg b/OMEdit/OMEditLIB/Resources/icons/export-variables.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/export-variables.svg rename to OMEdit/OMEditLIB/Resources/icons/export-variables.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/export-xml.svg b/OMEdit/OMEditLIB/Resources/icons/export-xml.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/export-xml.svg rename to OMEdit/OMEditLIB/Resources/icons/export-xml.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-backward.svg b/OMEdit/OMEditLIB/Resources/icons/fill-backward.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-backward.svg rename to OMEdit/OMEditLIB/Resources/icons/fill-backward.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-cross-diagnol.svg b/OMEdit/OMEditLIB/Resources/icons/fill-cross-diagnol.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-cross-diagnol.svg rename to OMEdit/OMEditLIB/Resources/icons/fill-cross-diagnol.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-cross.svg b/OMEdit/OMEditLIB/Resources/icons/fill-cross.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-cross.svg rename to OMEdit/OMEditLIB/Resources/icons/fill-cross.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-forward.svg b/OMEdit/OMEditLIB/Resources/icons/fill-forward.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-forward.svg rename to OMEdit/OMEditLIB/Resources/icons/fill-forward.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-horizontal-cylinder.svg b/OMEdit/OMEditLIB/Resources/icons/fill-horizontal-cylinder.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-horizontal-cylinder.svg rename to OMEdit/OMEditLIB/Resources/icons/fill-horizontal-cylinder.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-horizontal.svg b/OMEdit/OMEditLIB/Resources/icons/fill-horizontal.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-horizontal.svg rename to OMEdit/OMEditLIB/Resources/icons/fill-horizontal.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-none.svg b/OMEdit/OMEditLIB/Resources/icons/fill-none.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-none.svg rename to OMEdit/OMEditLIB/Resources/icons/fill-none.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-solid.svg b/OMEdit/OMEditLIB/Resources/icons/fill-solid.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-solid.svg rename to OMEdit/OMEditLIB/Resources/icons/fill-solid.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-sphere.svg b/OMEdit/OMEditLIB/Resources/icons/fill-sphere.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-sphere.svg rename to OMEdit/OMEditLIB/Resources/icons/fill-sphere.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-vertical-cylinder.svg b/OMEdit/OMEditLIB/Resources/icons/fill-vertical-cylinder.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-vertical-cylinder.svg rename to OMEdit/OMEditLIB/Resources/icons/fill-vertical-cylinder.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-vertical.svg b/OMEdit/OMEditLIB/Resources/icons/fill-vertical.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fill-vertical.svg rename to OMEdit/OMEditLIB/Resources/icons/fill-vertical.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fillstyle.svg b/OMEdit/OMEditLIB/Resources/icons/fillstyle.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fillstyle.svg rename to OMEdit/OMEditLIB/Resources/icons/fillstyle.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/flatmodel.svg b/OMEdit/OMEditLIB/Resources/icons/flatmodel.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/flatmodel.svg rename to OMEdit/OMEditLIB/Resources/icons/flatmodel.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/flip-horizontal.svg b/OMEdit/OMEditLIB/Resources/icons/flip-horizontal.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/flip-horizontal.svg rename to OMEdit/OMEditLIB/Resources/icons/flip-horizontal.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/flip-vertical.svg b/OMEdit/OMEditLIB/Resources/icons/flip-vertical.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/flip-vertical.svg rename to OMEdit/OMEditLIB/Resources/icons/flip-vertical.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fmi.svg b/OMEdit/OMEditLIB/Resources/icons/fmi.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fmi.svg rename to OMEdit/OMEditLIB/Resources/icons/fmi.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/fmu-icon.svg b/OMEdit/OMEditLIB/Resources/icons/fmu-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/fmu-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/fmu-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/function-icon.svg b/OMEdit/OMEditLIB/Resources/icons/function-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/function-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/function-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/general.svg b/OMEdit/OMEditLIB/Resources/icons/general.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/general.svg rename to OMEdit/OMEditLIB/Resources/icons/general.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/grid.svg b/OMEdit/OMEditLIB/Resources/icons/grid.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/grid.svg rename to OMEdit/OMEditLIB/Resources/icons/grid.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/import-fmu.svg b/OMEdit/OMEditLIB/Resources/icons/import-fmu.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/import-fmu.svg rename to OMEdit/OMEditLIB/Resources/icons/import-fmu.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/import-omnotebook.svg b/OMEdit/OMEditLIB/Resources/icons/import-omnotebook.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/import-omnotebook.svg rename to OMEdit/OMEditLIB/Resources/icons/import-omnotebook.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/import-tlmmodel.svg b/OMEdit/OMEditLIB/Resources/icons/import-tlmmodel.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/import-tlmmodel.svg rename to OMEdit/OMEditLIB/Resources/icons/import-tlmmodel.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/increase-indent.svg b/OMEdit/OMEditLIB/Resources/icons/increase-indent.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/increase-indent.svg rename to OMEdit/OMEditLIB/Resources/icons/increase-indent.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/info-icon.svg b/OMEdit/OMEditLIB/Resources/icons/info-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/info-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/info-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/initialize.svg b/OMEdit/OMEditLIB/Resources/icons/initialize.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/initialize.svg rename to OMEdit/OMEditLIB/Resources/icons/initialize.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/instantiate.svg b/OMEdit/OMEditLIB/Resources/icons/instantiate.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/instantiate.svg rename to OMEdit/OMEditLIB/Resources/icons/instantiate.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/integer-input-connector.svg b/OMEdit/OMEditLIB/Resources/icons/integer-input-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/integer-input-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/integer-input-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/integer-output-connector.svg b/OMEdit/OMEditLIB/Resources/icons/integer-output-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/integer-output-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/integer-output-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/interaction.svg b/OMEdit/OMEditLIB/Resources/icons/interaction.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/interaction.svg rename to OMEdit/OMEditLIB/Resources/icons/interaction.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/interface-data.svg b/OMEdit/OMEditLIB/Resources/icons/interface-data.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/interface-data.svg rename to OMEdit/OMEditLIB/Resources/icons/interface-data.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/interrupt.svg b/OMEdit/OMEditLIB/Resources/icons/interrupt.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/interrupt.svg rename to OMEdit/OMEditLIB/Resources/icons/interrupt.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/invisible.svg b/OMEdit/OMEditLIB/Resources/icons/invisible.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/invisible.svg rename to OMEdit/OMEditLIB/Resources/icons/invisible.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/italic-icon.svg b/OMEdit/OMEditLIB/Resources/icons/italic-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/italic-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/italic-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/justify.svg b/OMEdit/OMEditLIB/Resources/icons/justify.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/justify.svg rename to OMEdit/OMEditLIB/Resources/icons/justify.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/libraries.svg b/OMEdit/OMEditLIB/Resources/icons/libraries.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/libraries.svg rename to OMEdit/OMEditLIB/Resources/icons/libraries.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/line-dash-dot-dot.svg b/OMEdit/OMEditLIB/Resources/icons/line-dash-dot-dot.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/line-dash-dot-dot.svg rename to OMEdit/OMEditLIB/Resources/icons/line-dash-dot-dot.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/line-dash-dot.svg b/OMEdit/OMEditLIB/Resources/icons/line-dash-dot.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/line-dash-dot.svg rename to OMEdit/OMEditLIB/Resources/icons/line-dash-dot.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/line-dash.svg b/OMEdit/OMEditLIB/Resources/icons/line-dash.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/line-dash.svg rename to OMEdit/OMEditLIB/Resources/icons/line-dash.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/line-dot.svg b/OMEdit/OMEditLIB/Resources/icons/line-dot.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/line-dot.svg rename to OMEdit/OMEditLIB/Resources/icons/line-dot.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/line-none.svg b/OMEdit/OMEditLIB/Resources/icons/line-none.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/line-none.svg rename to OMEdit/OMEditLIB/Resources/icons/line-none.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/line-shape.svg b/OMEdit/OMEditLIB/Resources/icons/line-shape.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/line-shape.svg rename to OMEdit/OMEditLIB/Resources/icons/line-shape.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/line-solid.svg b/OMEdit/OMEditLIB/Resources/icons/line-solid.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/line-solid.svg rename to OMEdit/OMEditLIB/Resources/icons/line-solid.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/linestyle.svg b/OMEdit/OMEditLIB/Resources/icons/linestyle.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/linestyle.svg rename to OMEdit/OMEditLIB/Resources/icons/linestyle.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/link-external.svg b/OMEdit/OMEditLIB/Resources/icons/link-external.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/link-external.svg rename to OMEdit/OMEditLIB/Resources/icons/link-external.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/link.svg b/OMEdit/OMEditLIB/Resources/icons/link.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/link.svg rename to OMEdit/OMEditLIB/Resources/icons/link.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/lock.svg b/OMEdit/OMEditLIB/Resources/icons/lock.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/lock.svg rename to OMEdit/OMEditLIB/Resources/icons/lock.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/mat.svg b/OMEdit/OMEditLIB/Resources/icons/mat.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/mat.svg rename to OMEdit/OMEditLIB/Resources/icons/mat.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/messages.svg b/OMEdit/OMEditLIB/Resources/icons/messages.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/messages.svg rename to OMEdit/OMEditLIB/Resources/icons/messages.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/model-icon.svg b/OMEdit/OMEditLIB/Resources/icons/model-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/model-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/model-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/model.svg b/OMEdit/OMEditLIB/Resources/icons/model.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/model.svg rename to OMEdit/OMEditLIB/Resources/icons/model.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/modeling.png b/OMEdit/OMEditLIB/Resources/icons/modeling.png similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/modeling.png rename to OMEdit/OMEditLIB/Resources/icons/modeling.png diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/modeltext.svg b/OMEdit/OMEditLIB/Resources/icons/modeltext.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/modeltext.svg rename to OMEdit/OMEditLIB/Resources/icons/modeltext.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/new.svg b/OMEdit/OMEditLIB/Resources/icons/new.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/new.svg rename to OMEdit/OMEditLIB/Resources/icons/new.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/next.svg b/OMEdit/OMEditLIB/Resources/icons/next.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/next.svg rename to OMEdit/OMEditLIB/Resources/icons/next.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/notificationicon.svg b/OMEdit/OMEditLIB/Resources/icons/notificationicon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/notificationicon.svg rename to OMEdit/OMEditLIB/Resources/icons/notificationicon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/numbered-list.svg b/OMEdit/OMEditLIB/Resources/icons/numbered-list.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/numbered-list.svg rename to OMEdit/OMEditLIB/Resources/icons/numbered-list.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/omedit.icns b/OMEdit/OMEditLIB/Resources/icons/omedit.icns similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/omedit.icns rename to OMEdit/OMEditLIB/Resources/icons/omedit.icns diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/omedit.ico b/OMEdit/OMEditLIB/Resources/icons/omedit.ico similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/omedit.ico rename to OMEdit/OMEditLIB/Resources/icons/omedit.ico diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/omedit.png b/OMEdit/OMEditLIB/Resources/icons/omedit.png similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/omedit.png rename to OMEdit/OMEditLIB/Resources/icons/omedit.png diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/omedit_splashscreen.png b/OMEdit/OMEditLIB/Resources/icons/omedit_splashscreen.png similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/omedit_splashscreen.png rename to OMEdit/OMEditLIB/Resources/icons/omedit_splashscreen.png diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/omplot.png b/OMEdit/OMEditLIB/Resources/icons/omplot.png similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/omplot.png rename to OMEdit/OMEditLIB/Resources/icons/omplot.png diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/omshell.svg b/OMEdit/OMEditLIB/Resources/icons/omshell.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/omshell.svg rename to OMEdit/OMEditLIB/Resources/icons/omshell.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/open.svg b/OMEdit/OMEditLIB/Resources/icons/open.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/open.svg rename to OMEdit/OMEditLIB/Resources/icons/open.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/optimization-icon.svg b/OMEdit/OMEditLIB/Resources/icons/optimization-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/optimization-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/optimization-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/options.svg b/OMEdit/OMEditLIB/Resources/icons/options.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/options.svg rename to OMEdit/OMEditLIB/Resources/icons/options.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/order.svg b/OMEdit/OMEditLIB/Resources/icons/order.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/order.svg rename to OMEdit/OMEditLIB/Resources/icons/order.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/package-icon.svg b/OMEdit/OMEditLIB/Resources/icons/package-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/package-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/package-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/parametric-plot-window.svg b/OMEdit/OMEditLIB/Resources/icons/parametric-plot-window.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/parametric-plot-window.svg rename to OMEdit/OMEditLIB/Resources/icons/parametric-plot-window.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/paste.svg b/OMEdit/OMEditLIB/Resources/icons/paste.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/paste.svg rename to OMEdit/OMEditLIB/Resources/icons/paste.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/pause.svg b/OMEdit/OMEditLIB/Resources/icons/pause.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/pause.svg rename to OMEdit/OMEditLIB/Resources/icons/pause.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/perspective0.svg b/OMEdit/OMEditLIB/Resources/icons/perspective0.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/perspective0.svg rename to OMEdit/OMEditLIB/Resources/icons/perspective0.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/perspective1.svg b/OMEdit/OMEditLIB/Resources/icons/perspective1.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/perspective1.svg rename to OMEdit/OMEditLIB/Resources/icons/perspective1.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/perspective2.svg b/OMEdit/OMEditLIB/Resources/icons/perspective2.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/perspective2.svg rename to OMEdit/OMEditLIB/Resources/icons/perspective2.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/perspective3.svg b/OMEdit/OMEditLIB/Resources/icons/perspective3.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/perspective3.svg rename to OMEdit/OMEditLIB/Resources/icons/perspective3.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/play_animation.svg b/OMEdit/OMEditLIB/Resources/icons/play_animation.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/play_animation.svg rename to OMEdit/OMEditLIB/Resources/icons/play_animation.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/plot-window.svg b/OMEdit/OMEditLIB/Resources/icons/plot-window.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/plot-window.svg rename to OMEdit/OMEditLIB/Resources/icons/plot-window.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/plt.svg b/OMEdit/OMEditLIB/Resources/icons/plt.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/plt.svg rename to OMEdit/OMEditLIB/Resources/icons/plt.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/polygon-shape.svg b/OMEdit/OMEditLIB/Resources/icons/polygon-shape.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/polygon-shape.svg rename to OMEdit/OMEditLIB/Resources/icons/polygon-shape.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/previous.svg b/OMEdit/OMEditLIB/Resources/icons/previous.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/previous.svg rename to OMEdit/OMEditLIB/Resources/icons/previous.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/print.svg b/OMEdit/OMEditLIB/Resources/icons/print.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/print.svg rename to OMEdit/OMEditLIB/Resources/icons/print.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/quit.svg b/OMEdit/OMEditLIB/Resources/icons/quit.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/quit.svg rename to OMEdit/OMEditLIB/Resources/icons/quit.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/re-simulate.svg b/OMEdit/OMEditLIB/Resources/icons/re-simulate.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/re-simulate.svg rename to OMEdit/OMEditLIB/Resources/icons/re-simulate.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/re-simulation-center.svg b/OMEdit/OMEditLIB/Resources/icons/re-simulation-center.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/re-simulation-center.svg rename to OMEdit/OMEditLIB/Resources/icons/re-simulation-center.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/real-input-connector.svg b/OMEdit/OMEditLIB/Resources/icons/real-input-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/real-input-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/real-input-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/real-output-connector.svg b/OMEdit/OMEditLIB/Resources/icons/real-output-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/real-output-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/real-output-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/record-icon.svg b/OMEdit/OMEditLIB/Resources/icons/record-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/record-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/record-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/rectangle-shape.svg b/OMEdit/OMEditLIB/Resources/icons/rectangle-shape.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/rectangle-shape.svg rename to OMEdit/OMEditLIB/Resources/icons/rectangle-shape.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/redo.svg b/OMEdit/OMEditLIB/Resources/icons/redo.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/redo.svg rename to OMEdit/OMEditLIB/Resources/icons/redo.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/refresh.svg b/OMEdit/OMEditLIB/Resources/icons/refresh.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/refresh.svg rename to OMEdit/OMEditLIB/Resources/icons/refresh.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/resume.svg b/OMEdit/OMEditLIB/Resources/icons/resume.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/resume.svg rename to OMEdit/OMEditLIB/Resources/icons/resume.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/rotateCameraLeft.svg b/OMEdit/OMEditLIB/Resources/icons/rotateCameraLeft.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/rotateCameraLeft.svg rename to OMEdit/OMEditLIB/Resources/icons/rotateCameraLeft.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/rotateCameraRight.svg b/OMEdit/OMEditLIB/Resources/icons/rotateCameraRight.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/rotateCameraRight.svg rename to OMEdit/OMEditLIB/Resources/icons/rotateCameraRight.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/rotateanticlockwise.svg b/OMEdit/OMEditLIB/Resources/icons/rotateanticlockwise.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/rotateanticlockwise.svg rename to OMEdit/OMEditLIB/Resources/icons/rotateanticlockwise.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/rotateclockwise.svg b/OMEdit/OMEditLIB/Resources/icons/rotateclockwise.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/rotateclockwise.svg rename to OMEdit/OMEditLIB/Resources/icons/rotateclockwise.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/save.svg b/OMEdit/OMEditLIB/Resources/icons/save.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/save.svg rename to OMEdit/OMEditLIB/Resources/icons/save.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/saveall.svg b/OMEdit/OMEditLIB/Resources/icons/saveall.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/saveall.svg rename to OMEdit/OMEditLIB/Resources/icons/saveall.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/saveas.svg b/OMEdit/OMEditLIB/Resources/icons/saveas.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/saveas.svg rename to OMEdit/OMEditLIB/Resources/icons/saveas.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/sc-system-icon.svg b/OMEdit/OMEditLIB/Resources/icons/sc-system-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/sc-system-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/sc-system-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/send-backward.svg b/OMEdit/OMEditLIB/Resources/icons/send-backward.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/send-backward.svg rename to OMEdit/OMEditLIB/Resources/icons/send-backward.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/send-to-back.svg b/OMEdit/OMEditLIB/Resources/icons/send-to-back.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/send-to-back.svg rename to OMEdit/OMEditLIB/Resources/icons/send-to-back.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/simulate-animation.svg b/OMEdit/OMEditLIB/Resources/icons/simulate-animation.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/simulate-animation.svg rename to OMEdit/OMEditLIB/Resources/icons/simulate-animation.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/simulate-debug.svg b/OMEdit/OMEditLIB/Resources/icons/simulate-debug.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/simulate-debug.svg rename to OMEdit/OMEditLIB/Resources/icons/simulate-debug.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/simulate-equation.svg b/OMEdit/OMEditLIB/Resources/icons/simulate-equation.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/simulate-equation.svg rename to OMEdit/OMEditLIB/Resources/icons/simulate-equation.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/simulate.svg b/OMEdit/OMEditLIB/Resources/icons/simulate.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/simulate.svg rename to OMEdit/OMEditLIB/Resources/icons/simulate.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/simulation-center.svg b/OMEdit/OMEditLIB/Resources/icons/simulation-center.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/simulation-center.svg rename to OMEdit/OMEditLIB/Resources/icons/simulation-center.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/simulation-parameters.svg b/OMEdit/OMEditLIB/Resources/icons/simulation-parameters.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/simulation-parameters.svg rename to OMEdit/OMEditLIB/Resources/icons/simulation-parameters.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/step-into.svg b/OMEdit/OMEditLIB/Resources/icons/step-into.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/step-into.svg rename to OMEdit/OMEditLIB/Resources/icons/step-into.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/step-over.svg b/OMEdit/OMEditLIB/Resources/icons/step-over.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/step-over.svg rename to OMEdit/OMEditLIB/Resources/icons/step-over.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/step-return.svg b/OMEdit/OMEditLIB/Resources/icons/step-return.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/step-return.svg rename to OMEdit/OMEditLIB/Resources/icons/step-return.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/strikethrough-icon.svg b/OMEdit/OMEditLIB/Resources/icons/strikethrough-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/strikethrough-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/strikethrough-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/subscript-icon.svg b/OMEdit/OMEditLIB/Resources/icons/subscript-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/subscript-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/subscript-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/superscript-icon.svg b/OMEdit/OMEditLIB/Resources/icons/superscript-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/superscript-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/superscript-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/switch.svg b/OMEdit/OMEditLIB/Resources/icons/switch.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/switch.svg rename to OMEdit/OMEditLIB/Resources/icons/switch.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/text-color-icon.svg b/OMEdit/OMEditLIB/Resources/icons/text-color-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/text-color-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/text-color-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/text-shape.svg b/OMEdit/OMEditLIB/Resources/icons/text-shape.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/text-shape.svg rename to OMEdit/OMEditLIB/Resources/icons/text-shape.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/texture.svg b/OMEdit/OMEditLIB/Resources/icons/texture.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/texture.svg rename to OMEdit/OMEditLIB/Resources/icons/texture.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-bus.svg b/OMEdit/OMEditLIB/Resources/icons/tlm-bus.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-bus.svg rename to OMEdit/OMEditLIB/Resources/icons/tlm-bus.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-electric-bus-connector.svg b/OMEdit/OMEditLIB/Resources/icons/tlm-electric-bus-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-electric-bus-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/tlm-electric-bus-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-hydraulic-bus-connector.svg b/OMEdit/OMEditLIB/Resources/icons/tlm-hydraulic-bus-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-hydraulic-bus-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/tlm-hydraulic-bus-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-icon.svg b/OMEdit/OMEditLIB/Resources/icons/tlm-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/tlm-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-input-bus-connector.svg b/OMEdit/OMEditLIB/Resources/icons/tlm-input-bus-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-input-bus-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/tlm-input-bus-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-mechanical-bus-connector.svg b/OMEdit/OMEditLIB/Resources/icons/tlm-mechanical-bus-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-mechanical-bus-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/tlm-mechanical-bus-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-output-bus-connector.svg b/OMEdit/OMEditLIB/Resources/icons/tlm-output-bus-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-output-bus-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/tlm-output-bus-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-rotational-bus-connector.svg b/OMEdit/OMEditLIB/Resources/icons/tlm-rotational-bus-connector.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-rotational-bus-connector.svg rename to OMEdit/OMEditLIB/Resources/icons/tlm-rotational-bus-connector.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-simulate.svg b/OMEdit/OMEditLIB/Resources/icons/tlm-simulate.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-simulate.svg rename to OMEdit/OMEditLIB/Resources/icons/tlm-simulate.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-system-icon.svg b/OMEdit/OMEditLIB/Resources/icons/tlm-system-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/tlm-system-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/tlm-system-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/top.svg b/OMEdit/OMEditLIB/Resources/icons/top.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/top.svg rename to OMEdit/OMEditLIB/Resources/icons/top.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/traceability.svg b/OMEdit/OMEditLIB/Resources/icons/traceability.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/traceability.svg rename to OMEdit/OMEditLIB/Resources/icons/traceability.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/transition-mode.svg b/OMEdit/OMEditLIB/Resources/icons/transition-mode.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/transition-mode.svg rename to OMEdit/OMEditLIB/Resources/icons/transition-mode.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/transparency.svg b/OMEdit/OMEditLIB/Resources/icons/transparency.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/transparency.svg rename to OMEdit/OMEditLIB/Resources/icons/transparency.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/txt.svg b/OMEdit/OMEditLIB/Resources/icons/txt.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/txt.svg rename to OMEdit/OMEditLIB/Resources/icons/txt.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/type-icon.svg b/OMEdit/OMEditLIB/Resources/icons/type-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/type-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/type-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/underline-icon.svg b/OMEdit/OMEditLIB/Resources/icons/underline-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/underline-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/underline-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/undo.svg b/OMEdit/OMEditLIB/Resources/icons/undo.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/undo.svg rename to OMEdit/OMEditLIB/Resources/icons/undo.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/unlink.svg b/OMEdit/OMEditLIB/Resources/icons/unlink.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/unlink.svg rename to OMEdit/OMEditLIB/Resources/icons/unlink.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/unlock.svg b/OMEdit/OMEditLIB/Resources/icons/unlock.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/unlock.svg rename to OMEdit/OMEditLIB/Resources/icons/unlock.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/up.svg b/OMEdit/OMEditLIB/Resources/icons/up.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/up.svg rename to OMEdit/OMEditLIB/Resources/icons/up.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/update.svg b/OMEdit/OMEditLIB/Resources/icons/update.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/update.svg rename to OMEdit/OMEditLIB/Resources/icons/update.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/wc-system-icon.svg b/OMEdit/OMEditLIB/Resources/icons/wc-system-icon.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/wc-system-icon.svg rename to OMEdit/OMEditLIB/Resources/icons/wc-system-icon.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/zoomIn.svg b/OMEdit/OMEditLIB/Resources/icons/zoomIn.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/zoomIn.svg rename to OMEdit/OMEditLIB/Resources/icons/zoomIn.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/zoomOut.svg b/OMEdit/OMEditLIB/Resources/icons/zoomOut.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/zoomOut.svg rename to OMEdit/OMEditLIB/Resources/icons/zoomOut.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/icons/zoomReset.svg b/OMEdit/OMEditLIB/Resources/icons/zoomReset.svg similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/icons/zoomReset.svg rename to OMEdit/OMEditLIB/Resources/icons/zoomReset.svg diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_de.ts b/OMEdit/OMEditLIB/Resources/nls/OMEdit_de.ts similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_de.ts rename to OMEdit/OMEditLIB/Resources/nls/OMEdit_de.ts diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_es.ts b/OMEdit/OMEditLIB/Resources/nls/OMEdit_es.ts similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_es.ts rename to OMEdit/OMEditLIB/Resources/nls/OMEdit_es.ts diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_fr.ts b/OMEdit/OMEditLIB/Resources/nls/OMEdit_fr.ts similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_fr.ts rename to OMEdit/OMEditLIB/Resources/nls/OMEdit_fr.ts diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_it.ts b/OMEdit/OMEditLIB/Resources/nls/OMEdit_it.ts similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_it.ts rename to OMEdit/OMEditLIB/Resources/nls/OMEdit_it.ts diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_ja.ts b/OMEdit/OMEditLIB/Resources/nls/OMEdit_ja.ts similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_ja.ts rename to OMEdit/OMEditLIB/Resources/nls/OMEdit_ja.ts diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_ro.ts b/OMEdit/OMEditLIB/Resources/nls/OMEdit_ro.ts similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_ro.ts rename to OMEdit/OMEditLIB/Resources/nls/OMEdit_ro.ts diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_ru.ts b/OMEdit/OMEditLIB/Resources/nls/OMEdit_ru.ts similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_ru.ts rename to OMEdit/OMEditLIB/Resources/nls/OMEdit_ru.ts diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_sv.ts b/OMEdit/OMEditLIB/Resources/nls/OMEdit_sv.ts similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_sv.ts rename to OMEdit/OMEditLIB/Resources/nls/OMEdit_sv.ts diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_zh_CN.ts b/OMEdit/OMEditLIB/Resources/nls/OMEdit_zh_CN.ts similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/nls/OMEdit_zh_CN.ts rename to OMEdit/OMEditLIB/Resources/nls/OMEdit_zh_CN.ts diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/nls/README.md b/OMEdit/OMEditLIB/Resources/nls/README.md similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/nls/README.md rename to OMEdit/OMEditLIB/Resources/nls/README.md diff --git a/OMEdit/OMEdit/OMEditGUI/Resources/nls/tsupdate.bat b/OMEdit/OMEditLIB/Resources/nls/tsupdate.bat similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Resources/nls/tsupdate.bat rename to OMEdit/OMEditLIB/Resources/nls/tsupdate.bat diff --git a/OMEdit/OMEdit/OMEditGUI/Search/SearchWidget.cpp b/OMEdit/OMEditLIB/Search/SearchWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Search/SearchWidget.cpp rename to OMEdit/OMEditLIB/Search/SearchWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Search/SearchWidget.h b/OMEdit/OMEditLIB/Search/SearchWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Search/SearchWidget.h rename to OMEdit/OMEditLIB/Search/SearchWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/OpcUaClient.cpp b/OMEdit/OMEditLIB/Simulation/OpcUaClient.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/OpcUaClient.cpp rename to OMEdit/OMEditLIB/Simulation/OpcUaClient.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/OpcUaClient.h b/OMEdit/OMEditLIB/Simulation/OpcUaClient.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/OpcUaClient.h rename to OMEdit/OMEditLIB/Simulation/OpcUaClient.h diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp b/OMEdit/OMEditLIB/Simulation/SimulationDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp rename to OMEdit/OMEditLIB/Simulation/SimulationDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/SimulationDialog.h b/OMEdit/OMEditLIB/Simulation/SimulationDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/SimulationDialog.h rename to OMEdit/OMEditLIB/Simulation/SimulationDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/SimulationOptions.h b/OMEdit/OMEditLIB/Simulation/SimulationOptions.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/SimulationOptions.h rename to OMEdit/OMEditLIB/Simulation/SimulationOptions.h diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/SimulationOutputHandler.cpp b/OMEdit/OMEditLIB/Simulation/SimulationOutputHandler.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/SimulationOutputHandler.cpp rename to OMEdit/OMEditLIB/Simulation/SimulationOutputHandler.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/SimulationOutputHandler.h b/OMEdit/OMEditLIB/Simulation/SimulationOutputHandler.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/SimulationOutputHandler.h rename to OMEdit/OMEditLIB/Simulation/SimulationOutputHandler.h diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp b/OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp rename to OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.h b/OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.h rename to OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/SimulationProcessThread.cpp b/OMEdit/OMEditLIB/Simulation/SimulationProcessThread.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/SimulationProcessThread.cpp rename to OMEdit/OMEditLIB/Simulation/SimulationProcessThread.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/SimulationProcessThread.h b/OMEdit/OMEditLIB/Simulation/SimulationProcessThread.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/SimulationProcessThread.h rename to OMEdit/OMEditLIB/Simulation/SimulationProcessThread.h diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/TranslationFlagsWidget.cpp b/OMEdit/OMEditLIB/Simulation/TranslationFlagsWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/TranslationFlagsWidget.cpp rename to OMEdit/OMEditLIB/Simulation/TranslationFlagsWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Simulation/TranslationFlagsWidget.h b/OMEdit/OMEditLIB/Simulation/TranslationFlagsWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Simulation/TranslationFlagsWidget.h rename to OMEdit/OMEditLIB/Simulation/TranslationFlagsWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/TLM/FetchInterfaceDataDialog.cpp b/OMEdit/OMEditLIB/TLM/FetchInterfaceDataDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TLM/FetchInterfaceDataDialog.cpp rename to OMEdit/OMEditLIB/TLM/FetchInterfaceDataDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/TLM/FetchInterfaceDataDialog.h b/OMEdit/OMEditLIB/TLM/FetchInterfaceDataDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TLM/FetchInterfaceDataDialog.h rename to OMEdit/OMEditLIB/TLM/FetchInterfaceDataDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/TLM/FetchInterfaceDataThread.cpp b/OMEdit/OMEditLIB/TLM/FetchInterfaceDataThread.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TLM/FetchInterfaceDataThread.cpp rename to OMEdit/OMEditLIB/TLM/FetchInterfaceDataThread.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/TLM/FetchInterfaceDataThread.h b/OMEdit/OMEditLIB/TLM/FetchInterfaceDataThread.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TLM/FetchInterfaceDataThread.h rename to OMEdit/OMEditLIB/TLM/FetchInterfaceDataThread.h diff --git a/OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationDialog.cpp b/OMEdit/OMEditLIB/TLM/TLMCoSimulationDialog.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationDialog.cpp rename to OMEdit/OMEditLIB/TLM/TLMCoSimulationDialog.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationDialog.h b/OMEdit/OMEditLIB/TLM/TLMCoSimulationDialog.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationDialog.h rename to OMEdit/OMEditLIB/TLM/TLMCoSimulationDialog.h diff --git a/OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationOptions.h b/OMEdit/OMEditLIB/TLM/TLMCoSimulationOptions.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationOptions.h rename to OMEdit/OMEditLIB/TLM/TLMCoSimulationOptions.h diff --git a/OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationOutputWidget.cpp b/OMEdit/OMEditLIB/TLM/TLMCoSimulationOutputWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationOutputWidget.cpp rename to OMEdit/OMEditLIB/TLM/TLMCoSimulationOutputWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationOutputWidget.h b/OMEdit/OMEditLIB/TLM/TLMCoSimulationOutputWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationOutputWidget.h rename to OMEdit/OMEditLIB/TLM/TLMCoSimulationOutputWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationThread.cpp b/OMEdit/OMEditLIB/TLM/TLMCoSimulationThread.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationThread.cpp rename to OMEdit/OMEditLIB/TLM/TLMCoSimulationThread.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationThread.h b/OMEdit/OMEditLIB/TLM/TLMCoSimulationThread.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TLM/TLMCoSimulationThread.h rename to OMEdit/OMEditLIB/TLM/TLMCoSimulationThread.h diff --git a/OMEdit/OMEdit/OMEditGUI/Traceability/TraceabilityGraphViewWidget.cpp b/OMEdit/OMEditLIB/Traceability/TraceabilityGraphViewWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Traceability/TraceabilityGraphViewWidget.cpp rename to OMEdit/OMEditLIB/Traceability/TraceabilityGraphViewWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Traceability/TraceabilityGraphViewWidget.h b/OMEdit/OMEditLIB/Traceability/TraceabilityGraphViewWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Traceability/TraceabilityGraphViewWidget.h rename to OMEdit/OMEditLIB/Traceability/TraceabilityGraphViewWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/Traceability/TraceabilityInformationURI.cpp b/OMEdit/OMEditLIB/Traceability/TraceabilityInformationURI.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Traceability/TraceabilityInformationURI.cpp rename to OMEdit/OMEditLIB/Traceability/TraceabilityInformationURI.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Traceability/TraceabilityInformationURI.h b/OMEdit/OMEditLIB/Traceability/TraceabilityInformationURI.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Traceability/TraceabilityInformationURI.h rename to OMEdit/OMEditLIB/Traceability/TraceabilityInformationURI.h diff --git a/OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/OMDumpXML.cpp b/OMEdit/OMEditLIB/TransformationalDebugger/OMDumpXML.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/OMDumpXML.cpp rename to OMEdit/OMEditLIB/TransformationalDebugger/OMDumpXML.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/OMDumpXML.h b/OMEdit/OMEditLIB/TransformationalDebugger/OMDumpXML.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/OMDumpXML.h rename to OMEdit/OMEditLIB/TransformationalDebugger/OMDumpXML.h diff --git a/OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/TransformationsWidget.cpp b/OMEdit/OMEditLIB/TransformationalDebugger/TransformationsWidget.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/TransformationsWidget.cpp rename to OMEdit/OMEditLIB/TransformationalDebugger/TransformationsWidget.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/TransformationsWidget.h b/OMEdit/OMEditLIB/TransformationalDebugger/TransformationsWidget.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/TransformationsWidget.h rename to OMEdit/OMEditLIB/TransformationalDebugger/TransformationsWidget.h diff --git a/OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/diff_match_patch.cpp b/OMEdit/OMEditLIB/TransformationalDebugger/diff_match_patch.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/diff_match_patch.cpp rename to OMEdit/OMEditLIB/TransformationalDebugger/diff_match_patch.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/diff_match_patch.h b/OMEdit/OMEditLIB/TransformationalDebugger/diff_match_patch.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/TransformationalDebugger/diff_match_patch.h rename to OMEdit/OMEditLIB/TransformationalDebugger/diff_match_patch.h diff --git a/OMEdit/OMEdit/OMEditGUI/Util/Helper.cpp b/OMEdit/OMEditLIB/Util/Helper.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Util/Helper.cpp rename to OMEdit/OMEditLIB/Util/Helper.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Util/Helper.h b/OMEdit/OMEditLIB/Util/Helper.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Util/Helper.h rename to OMEdit/OMEditLIB/Util/Helper.h diff --git a/OMEdit/OMEdit/OMEditGUI/Util/ResourceCache.cpp b/OMEdit/OMEditLIB/Util/ResourceCache.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Util/ResourceCache.cpp rename to OMEdit/OMEditLIB/Util/ResourceCache.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Util/ResourceCache.h b/OMEdit/OMEditLIB/Util/ResourceCache.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Util/ResourceCache.h rename to OMEdit/OMEditLIB/Util/ResourceCache.h diff --git a/OMEdit/OMEdit/OMEditGUI/Util/StringHandler.cpp b/OMEdit/OMEditLIB/Util/StringHandler.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Util/StringHandler.cpp rename to OMEdit/OMEditLIB/Util/StringHandler.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Util/StringHandler.h b/OMEdit/OMEditLIB/Util/StringHandler.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Util/StringHandler.h rename to OMEdit/OMEditLIB/Util/StringHandler.h diff --git a/OMEdit/OMEdit/OMEditGUI/Util/Utilities.cpp b/OMEdit/OMEditLIB/Util/Utilities.cpp similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Util/Utilities.cpp rename to OMEdit/OMEditLIB/Util/Utilities.cpp diff --git a/OMEdit/OMEdit/OMEditGUI/Util/Utilities.h b/OMEdit/OMEditLIB/Util/Utilities.h similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/Util/Utilities.h rename to OMEdit/OMEditLIB/Util/Utilities.h diff --git a/OMEdit/OMEdit/OMEditGUI/resource_omedit.qrc b/OMEdit/OMEditLIB/resource_omedit.qrc similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/resource_omedit.qrc rename to OMEdit/OMEditLIB/resource_omedit.qrc diff --git a/OMEdit/Testsuite/BrowseElectricalAnalogBasic/BrowseElectricalAnalogBasic.pro b/OMEdit/Testsuite/BrowseElectricalAnalogBasic/BrowseElectricalAnalogBasic.pro new file mode 100644 index 00000000000..6444b557a6f --- /dev/null +++ b/OMEdit/Testsuite/BrowseElectricalAnalogBasic/BrowseElectricalAnalogBasic.pro @@ -0,0 +1,39 @@ +# + # This file is part of OpenModelica. + # + # Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + # c/o Linköpings universitet, Department of Computer and Information Science, + # SE-58183 Linköping, Sweden. + # + # All rights reserved. + # + # THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + # THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + # ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE + # OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE. + # + # The OpenModelica software and the Open Source Modelica + # Consortium (OSMC) Public License (OSMC-PL) are obtained + # from OSMC, either from the above address, + # from the URLs: http://www.ida.liu.se/projects/OpenModelica or + # http://www.openmodelica.org, and in the OpenModelica distribution. + # GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + # + # This program is distributed WITHOUT ANY WARRANTY; without + # even the implied warranty of MERCHANTABILITY or FITNESS + # FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + # IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + # + # See the full OSMC Public License conditions for more details. + # + #/ + +include(../Common/Testsuite.pri) + +TARGET = BrowseElectricalAnalogBasic + +SOURCES += ../Common/Util.cpp \ + Test.cpp + +HEADERS += ../Common/Util.h \ + Test.h diff --git a/OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.cpp b/OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.cpp new file mode 100644 index 00000000000..25693cfc4ca --- /dev/null +++ b/OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.cpp @@ -0,0 +1,56 @@ +/* + * This file is part of OpenModelica. + * + * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + * c/o Linköpings universitet, Department of Computer and Information Science, + * SE-58183 Linköping, Sweden. + * + * All rights reserved. + * + * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES + * RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, + * ACCORDING TO RECIPIENTS CHOICE. + * + * The OpenModelica software and the Open Source Modelica + * Consortium (OSMC) Public License (OSMC-PL) are obtained + * from OSMC, either from the above address, + * from the URLs: http://www.ida.liu.se/projects/OpenModelica or + * http://www.openmodelica.org, and in the OpenModelica distribution. + * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + * + * This program is distributed WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + * + * See the full OSMC Public License conditions for more details. + * + */ +/* + * @author Adeel Asghar + */ + +#include "Test.h" +#include "Util.h" +#include "OMEditApplication.h" +#include "MainWindow.h" +#include "Modeling/LibraryTreeWidget.h" + +#define GC_THREADS +extern "C" { +#include "meta/meta_modelica.h" +} + +#include + +OMEDITTEST_MAIN(Test) + +void Test::testcase() +{ + if (!Util::expandLibraryTreeItemParentHierarchy(MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem("Modelica.Electrical.Analog.Basic"))) { + QFAIL(""); + } + MainWindow::instance()->close(); +} diff --git a/OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.h b/OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.h new file mode 100644 index 00000000000..e297fb2efdd --- /dev/null +++ b/OMEdit/Testsuite/BrowseElectricalAnalogBasic/Test.h @@ -0,0 +1,48 @@ +/* + * This file is part of OpenModelica. + * + * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + * c/o Linköpings universitet, Department of Computer and Information Science, + * SE-58183 Linköping, Sweden. + * + * All rights reserved. + * + * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES + * RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, + * ACCORDING TO RECIPIENTS CHOICE. + * + * The OpenModelica software and the Open Source Modelica + * Consortium (OSMC) Public License (OSMC-PL) are obtained + * from OSMC, either from the above address, + * from the URLs: http://www.ida.liu.se/projects/OpenModelica or + * http://www.openmodelica.org, and in the OpenModelica distribution. + * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + * + * This program is distributed WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + * + * See the full OSMC Public License conditions for more details. + * + */ +/* + * @author Adeel Asghar + */ + +#ifndef TESTGUI_H +#define TESTGUI_H + +#include + +class Test: public QObject +{ + Q_OBJECT + +private slots: + void testcase(); +}; + +#endif // TESTGUI_H diff --git a/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/BrowseMediaAirReferenceMoistAir.pro b/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/BrowseMediaAirReferenceMoistAir.pro new file mode 100644 index 00000000000..f6c6d410495 --- /dev/null +++ b/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/BrowseMediaAirReferenceMoistAir.pro @@ -0,0 +1,39 @@ +# + # This file is part of OpenModelica. + # + # Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + # c/o Linköpings universitet, Department of Computer and Information Science, + # SE-58183 Linköping, Sweden. + # + # All rights reserved. + # + # THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + # THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + # ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE + # OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE. + # + # The OpenModelica software and the Open Source Modelica + # Consortium (OSMC) Public License (OSMC-PL) are obtained + # from OSMC, either from the above address, + # from the URLs: http://www.ida.liu.se/projects/OpenModelica or + # http://www.openmodelica.org, and in the OpenModelica distribution. + # GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + # + # This program is distributed WITHOUT ANY WARRANTY; without + # even the implied warranty of MERCHANTABILITY or FITNESS + # FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + # IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + # + # See the full OSMC Public License conditions for more details. + # + #/ + +include(../Common/Testsuite.pri) + +TARGET = BrowseMediaAirReferenceMoistAir + +SOURCES += ../Common/Util.cpp \ + Test.cpp + +HEADERS += ../Common/Util.h \ + Test.h diff --git a/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.cpp b/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.cpp new file mode 100644 index 00000000000..fc0e0254d2a --- /dev/null +++ b/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.cpp @@ -0,0 +1,57 @@ +/* + * This file is part of OpenModelica. + * + * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + * c/o Linköpings universitet, Department of Computer and Information Science, + * SE-58183 Linköping, Sweden. + * + * All rights reserved. + * + * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES + * RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, + * ACCORDING TO RECIPIENTS CHOICE. + * + * The OpenModelica software and the Open Source Modelica + * Consortium (OSMC) Public License (OSMC-PL) are obtained + * from OSMC, either from the above address, + * from the URLs: http://www.ida.liu.se/projects/OpenModelica or + * http://www.openmodelica.org, and in the OpenModelica distribution. + * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + * + * This program is distributed WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + * + * See the full OSMC Public License conditions for more details. + * + */ +/* + * @author Adeel Asghar + */ + +#include "Test.h" +#include "Util.h" +#include "OMEditApplication.h" +#include "MainWindow.h" +#include "Modeling/LibraryTreeWidget.h" + +#define GC_THREADS +extern "C" { +#include "meta/meta_modelica.h" +} + +#include + +OMEDITTEST_MAIN(Test) + +void Test::testcase() +{ + QSKIP("Enable this testcase by removing this line once the ticket#5669 (https://trac.openmodelica.org/OpenModelica/ticket/5669) is fixed."); + if (!Util::expandLibraryTreeItemParentHierarchy(MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem("Modelica.Electrical.Analog.Examples"))) { + QFAIL(""); + } + MainWindow::instance()->close(); +} diff --git a/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.h b/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.h new file mode 100644 index 00000000000..e297fb2efdd --- /dev/null +++ b/OMEdit/Testsuite/BrowseMediaAirReferenceMoistAir/Test.h @@ -0,0 +1,48 @@ +/* + * This file is part of OpenModelica. + * + * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + * c/o Linköpings universitet, Department of Computer and Information Science, + * SE-58183 Linköping, Sweden. + * + * All rights reserved. + * + * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES + * RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, + * ACCORDING TO RECIPIENTS CHOICE. + * + * The OpenModelica software and the Open Source Modelica + * Consortium (OSMC) Public License (OSMC-PL) are obtained + * from OSMC, either from the above address, + * from the URLs: http://www.ida.liu.se/projects/OpenModelica or + * http://www.openmodelica.org, and in the OpenModelica distribution. + * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + * + * This program is distributed WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + * + * See the full OSMC Public License conditions for more details. + * + */ +/* + * @author Adeel Asghar + */ + +#ifndef TESTGUI_H +#define TESTGUI_H + +#include + +class Test: public QObject +{ + Q_OBJECT + +private slots: + void testcase(); +}; + +#endif // TESTGUI_H diff --git a/OMEdit/Testsuite/Common/Testsuite.pri b/OMEdit/Testsuite/Common/Testsuite.pri new file mode 100644 index 00000000000..53fadcf0252 --- /dev/null +++ b/OMEdit/Testsuite/Common/Testsuite.pri @@ -0,0 +1,62 @@ +# + # This file is part of OpenModelica. + # + # Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + # c/o Linköpings universitet, Department of Computer and Information Science, + # SE-58183 Linköping, Sweden. + # + # All rights reserved. + # + # THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + # THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + # ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE + # OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE. + # + # The OpenModelica software and the Open Source Modelica + # Consortium (OSMC) Public License (OSMC-PL) are obtained + # from OSMC, either from the above address, + # from the URLs: http://www.ida.liu.se/projects/OpenModelica or + # http://www.openmodelica.org, and in the OpenModelica distribution. + # GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + # + # This program is distributed WITHOUT ANY WARRANTY; without + # even the implied warranty of MERCHANTABILITY or FITNESS + # FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + # IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + # + # See the full OSMC Public License conditions for more details. + # + #/ + +QT += network core gui webkit xml xmlpatterns svg opengl testlib +greaterThan(QT_MAJOR_VERSION, 4) { + QT += printsupport widgets webkitwidgets concurrent +} + +LIBS += -L../../bin -lOMEdit + +OMEDIT_ROOT = ../../ + +# Windows libraries and includes +win32 { + include(../../OMEditGUI/OMEditGUI.win.config.pri) +} else { # Unix libraries and includes + include(../../OMEditGUI/OMEditGUI.unix.config.pri) +} + +INCLUDEPATH += ../../ \ + ../../OMEditLIB \ + ../Common \ + $$OPENMODELICAHOME/include \ + $$OPENMODELICAHOME/include/omc/c \ + $$OPENMODELICAHOME/include/omc/scripting-API + +# Don't show the warnings from included headers. +for (path, INCLUDEPATH) { + QMAKE_CXXFLAGS += -isystem $${path} +} + +DESTDIR = ../../bin/tests + +MOC_DIR = generatedfiles/moc + diff --git a/OMEdit/Testsuite/Common/Util.cpp b/OMEdit/Testsuite/Common/Util.cpp new file mode 100644 index 00000000000..0d13fbbeef2 --- /dev/null +++ b/OMEdit/Testsuite/Common/Util.cpp @@ -0,0 +1,51 @@ +/* + * This file is part of OpenModelica. + * + * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + * c/o Linköpings universitet, Department of Computer and Information Science, + * SE-58183 Linköping, Sweden. + * + * All rights reserved. + * + * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES + * RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, + * ACCORDING TO RECIPIENTS CHOICE. + * + * The OpenModelica software and the Open Source Modelica + * Consortium (OSMC) Public License (OSMC-PL) are obtained + * from OSMC, either from the above address, + * from the URLs: http://www.ida.liu.se/projects/OpenModelica or + * http://www.openmodelica.org, and in the OpenModelica distribution. + * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + * + * This program is distributed WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + * + * See the full OSMC Public License conditions for more details. + * + */ +/* + * @author Adeel Asghar + */ + +#include "Util.h" +#include "Modeling/LibraryTreeWidget.h" + +bool Util::expandLibraryTreeItemParentHierarchy(const LibraryTreeItem *pLibraryTreeItem) +{ + if (pLibraryTreeItem) { + if (pLibraryTreeItem->parent() != MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->getRootLibraryTreeItem()) { + expandLibraryTreeItemParentHierarchy(pLibraryTreeItem->parent()); + } + QModelIndex modelIndex = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel()->libraryTreeItemIndex(pLibraryTreeItem); + QModelIndex proxyIndex = MainWindow::instance()->getLibraryWidget()->getLibraryTreeProxyModel()->mapFromSource(modelIndex); + MainWindow::instance()->getLibraryWidget()->getLibraryTreeView()->expand(proxyIndex); + return true; + } else { + return false; + } +} diff --git a/OMEdit/Testsuite/Common/Util.h b/OMEdit/Testsuite/Common/Util.h new file mode 100644 index 00000000000..65ebe295374 --- /dev/null +++ b/OMEdit/Testsuite/Common/Util.h @@ -0,0 +1,71 @@ +/* + * This file is part of OpenModelica. + * + * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + * c/o Linköpings universitet, Department of Computer and Information Science, + * SE-58183 Linköping, Sweden. + * + * All rights reserved. + * + * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES + * RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, + * ACCORDING TO RECIPIENTS CHOICE. + * + * The OpenModelica software and the Open Source Modelica + * Consortium (OSMC) Public License (OSMC-PL) are obtained + * from OSMC, either from the above address, + * from the URLs: http://www.ida.liu.se/projects/OpenModelica or + * http://www.openmodelica.org, and in the OpenModelica distribution. + * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + * + * This program is distributed WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + * + * See the full OSMC Public License conditions for more details. + * + */ +/* + * @author Adeel Asghar + */ + +#ifndef UTIL_H +#define UTIL_H + +#define OMEDITTEST_MAIN(TestObject) \ +static int execution_failed() \ +{ \ + fflush(NULL); \ + fprintf(stderr, "Execution failed!\n"); \ + fflush(NULL); \ + exit(1); \ +} \ +QT_BEGIN_NAMESPACE \ +QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \ +QT_END_NAMESPACE \ +int main(int argc, char *argv[]) \ +{ \ + MMC_INIT(); \ + MMC_TRY_TOP() \ + Q_INIT_RESOURCE(resource_omedit); \ + OMEditApplication app(argc, argv, threadData, true); \ + app.setAttribute(Qt::AA_Use96Dpi, true); \ + QTEST_DISABLE_KEYPAD_NAVIGATION \ + QTEST_ADD_GPU_BLACKLIST_SUPPORT \ + TestObject tc; \ + QTEST_SET_MAIN_SOURCE_PATH \ + return QTest::qExec(&tc,argc, argv); \ + MMC_CATCH_TOP(execution_failed()); \ +} + +class LibraryTreeItem; +namespace Util { + + bool expandLibraryTreeItemParentHierarchy(const LibraryTreeItem *pLibraryTreeItem); + +} // namespace Util + +#endif // UTIL_H diff --git a/OMEdit/Testsuite/Makefile.omdev.mingw b/OMEdit/Testsuite/Makefile.omdev.mingw new file mode 100644 index 00000000000..bbcd4d8dce8 --- /dev/null +++ b/OMEdit/Testsuite/Makefile.omdev.mingw @@ -0,0 +1,34 @@ +ifeq ($(OMBUILDDIR),) +$(error OMBUILDDIR variable is not set.) +endif + +all: testsuite + +QMAKE=qmake +CC = gcc +EXE=.exe + +ifeq (gcc,$(findstring gcc,$(CC))) + override CFLAGS +=-falign-functions -fstack-protector-all +endif + +builddir_bin=$(OMBUILDDIR)/bin + +testsuite: mkbuilddirs install + cp -puf ../../common/pre-commit.sh $(shell git rev-parse --git-dir)/hooks/pre-commit + +mkbuilddirs: + mkdir -p $(builddir_bin) + +install: build + cp -p ../bin/tests/*$(EXE) $(builddir_bin) + +build: Makefile + $(MAKE) -f Makefile + +Makefile: Testsuite.pro + $(QMAKE) -r "CONFIG+=release" + +clean: + test ! -f Makefile || $(MAKE) -f Makefile clean + rm -rf ../bin/tests Makefile diff --git a/OMEdit/Testsuite/Makefile.unix.in b/OMEdit/Testsuite/Makefile.unix.in new file mode 100644 index 00000000000..482e37557ca --- /dev/null +++ b/OMEdit/Testsuite/Makefile.unix.in @@ -0,0 +1,32 @@ +all: testsuite + +QMAKE=@QMAKE@ + +install: build + cp -p ../bin/tests/* @OMBUILDDIR@/bin + +build: Makefile OMEditGUI.unix.config.pri + $(MAKE) -f Makefile + +Makefile: Testsuite.pro OMEditGUI.unix.config.pri + @test ! -f $@ || rm $@ + $(QMAKE) -r +OMEditGUI.unix.config.pri: ../OMEditGUI/OMEditGUI.unix.config.pri.in + (cd @top_builddir@ && ./config.status) + +mkbuilddirs: + mkdir -p @OMBUILDDIR@/bin + +testsuite: mkbuilddirs install + +clean: + test ! -f Makefile || $(MAKE) -f Makefile clean + rm -rf ../bin/tests Makefile + +distclean: clean + rm -rf Makefile.unix + +config.status: configure + ./config.status -recheck +configure: configure.ac ../common/m4/corba.m4 ../common/m4/omhome.m4 ../common/m4/qmake.m4 + autoconf diff --git a/OMEdit/Testsuite/Testsuite.pro b/OMEdit/Testsuite/Testsuite.pro new file mode 100644 index 00000000000..336f12d0163 --- /dev/null +++ b/OMEdit/Testsuite/Testsuite.pro @@ -0,0 +1,35 @@ +# + # This file is part of OpenModelica. + # + # Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC), + # c/o Linköpings universitet, Department of Computer and Information Science, + # SE-58183 Linköping, Sweden. + # + # All rights reserved. + # + # THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR + # THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2. + # ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE + # OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE. + # + # The OpenModelica software and the Open Source Modelica + # Consortium (OSMC) Public License (OSMC-PL) are obtained + # from OSMC, either from the above address, + # from the URLs: http://www.ida.liu.se/projects/OpenModelica or + # http://www.openmodelica.org, and in the OpenModelica distribution. + # GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html. + # + # This program is distributed WITHOUT ANY WARRANTY; without + # even the implied warranty of MERCHANTABILITY or FITNESS + # FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH + # IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL. + # + # See the full OSMC Public License conditions for more details. + # + #/ + +TEMPLATE = subdirs + +SUBDIRS = BrowseElectricalAnalogBasic \ + BrowseMediaAirReferenceMoistAir + diff --git a/OMEdit/configure.ac b/OMEdit/configure.ac index 13cb3187395..e36240b651c 100644 --- a/OMEdit/configure.ac +++ b/OMEdit/configure.ac @@ -152,7 +152,7 @@ exit(1); ) -for flag in -Wno-clobbered -Wno-unused-variable -Wno-unused-function -Wno-unused-parameter; do +for flag in -Wno-clobbered; do OLD_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $flag -Werror" AC_TRY_LINK([], [return 0;], [CXXFLAGS="$OLD_CXXFLAGS $flag"],[CXXFLAGS="$OLD_CXXFLAGS"]) @@ -170,4 +170,4 @@ fi m4_include([common/m4/semver.m4]) SOURCE_REVISION="$SOURCE_REVISION$NON_FREE_VERSION" -AC_OUTPUT(Makefile OMEdit/OMEditGUI/Makefile.unix OMEdit/OMEditGUI/OMEdit.config OMEdit/OMEditGUI/Debugger/Parser/Makefile.unix OMEdit/OMEditGUI/Debugger/Parser/Makefile.lib.unix OMEdit/OMEditGUI/omc_config.h) +AC_OUTPUT(Makefile.unix omc_config.h OMEditLIB/OMEditLIB.unix.config.pri OMEditLIB/Debugger/Parser/Makefile.unix OMEditLIB/Debugger/Parser/Makefile.lib.unix OMEditGUI/OMEditGUI.unix.config.pri Testsuite/Makefile.unix) diff --git a/OMEdit/OMEdit/OMEditGUI/omc_config.h.in b/OMEdit/omc_config.h.in similarity index 100% rename from OMEdit/OMEdit/OMEditGUI/omc_config.h.in rename to OMEdit/omc_config.h.in diff --git a/doc/UsersGuide/Makefile b/doc/UsersGuide/Makefile index 79f5f47e413..10db8c90933 100644 --- a/doc/UsersGuide/Makefile +++ b/doc/UsersGuide/Makefile @@ -244,7 +244,7 @@ OMOPTIM_ICONS=$(OMOPTIM_ICONS_BASE:%=source/media/omoptim-icons/%) all-dep: $(ALLDEP) source/media/mathematica-notebooks.pdf source/media/mdt-create-project.pdf source/media/mdt-build-prompt.pdf source/simoptions.inc source/omchelptext.rst source/tracreleases.rst -source/media/omedit-icons/%.svg: $(OPENMODELICA_ROOT)/OMEdit/OMEdit/OMEditGUI/Resources/icons/%.svg +source/media/omedit-icons/%.svg: $(OPENMODELICA_ROOT)/OMEdit/OMEditLIB/Resources/icons/%.svg @mkdir -p source/media/omedit-icons cp -a "$<" "$@" diff --git a/doc/UsersGuide/source/omedit.rst b/doc/UsersGuide/source/omedit.rst index f9a1d506066..8e61d7c59d5 100644 --- a/doc/UsersGuide/source/omedit.rst +++ b/doc/UsersGuide/source/omedit.rst @@ -703,7 +703,7 @@ Diagram Window Shows the active ModelWidget as a read only diagram. You can only have one Diagram Window. To show it click on Diagram Window toolbar button (|diagram-window|). -.. |diagram-window| image:: ../../../OMEdit/OMEdit/OMEditGUI/Resources/icons/modeling.* +.. |diagram-window| image:: ../../../OMEdit/OMEditLIB/Resources/icons/modeling.* :alt: OMEdit Diagram Window Icon :height: 14pt