diff --git a/CMake/BuildConfigurations/Default.cmake b/CMake/BuildConfigurations/Default.cmake
index ef01ad8c05..5b46d0ac78 100644
--- a/CMake/BuildConfigurations/Default.cmake
+++ b/CMake/BuildConfigurations/Default.cmake
@@ -1,22 +1,23 @@
set(MITK_CONFIG_PACKAGES
ACVD
Qt5
BLUEBERRY
)
set(MITK_CONFIG_PLUGINS
+ org.mitk.gui.qt.mitkworkbench.intro
org.mitk.gui.qt.datamanager
org.mitk.gui.qt.stdmultiwidgeteditor
org.mitk.gui.qt.dicom
org.mitk.gui.qt.imagenavigator
org.mitk.gui.qt.measurementtoolbox
org.mitk.gui.qt.properties
org.mitk.gui.qt.segmentation
org.mitk.gui.qt.volumevisualization
org.mitk.planarfigure
org.mitk.gui.qt.moviemaker
org.mitk.gui.qt.pointsetinteraction
org.mitk.gui.qt.remeshing
org.mitk.gui.qt.viewnavigator
org.mitk.gui.qt.imagecropper
)
diff --git a/Plugins/PluginList.cmake b/Plugins/PluginList.cmake
index 5cf41c4112..493c30fb31 100644
--- a/Plugins/PluginList.cmake
+++ b/Plugins/PluginList.cmake
@@ -1,95 +1,96 @@
# Plug-ins must be ordered according to their dependencies
set(MITK_PLUGINS
org.blueberry.core.runtime:ON
org.blueberry.core.expressions:OFF
org.blueberry.core.commands:OFF
org.blueberry.core.jobs:OFF
org.blueberry.ui.qt:OFF
org.blueberry.ui.qt.help:ON
org.blueberry.ui.qt.log:ON
org.blueberry.ui.qt.objectinspector:OFF
org.mitk.core.services:ON
org.mitk.gui.common:ON
org.mitk.planarfigure:ON
org.mitk.core.ext:OFF
org.mitk.core.jobs:OFF
org.mitk.gui.qt.application:ON
org.mitk.gui.qt.ext:OFF
org.mitk.gui.qt.extapplication:OFF
+ org.mitk.gui.qt.mitkworkbench.intro:OFF
org.mitk.gui.qt.common:ON
org.mitk.gui.qt.stdmultiwidgeteditor:ON
org.mitk.gui.qt.mxnmultiwidgeteditor:OFF
org.mitk.gui.qt.common.legacy:OFF
org.mitk.gui.qt.cmdlinemodules:OFF
org.mitk.gui.qt.chartExample:OFF
org.mitk.gui.qt.datamanager:ON
org.mitk.gui.qt.datamanagerlight:OFF
org.mitk.gui.qt.datastorageviewertest:OFF
org.mitk.gui.qt.properties:ON
org.mitk.gui.qt.basicimageprocessing:OFF
org.mitk.gui.qt.dicom:OFF
org.mitk.gui.qt.dicominspector:OFF
org.mitk.gui.qt.dosevisualization:OFF
org.mitk.gui.qt.geometrytools:OFF
org.mitk.gui.qt.igtexamples:OFF
org.mitk.gui.qt.igttracking:OFF
org.mitk.gui.qt.lasercontrol:OFF
org.mitk.gui.qt.openigtlink:OFF
org.mitk.gui.qt.imagecropper:OFF
org.mitk.gui.qt.imagenavigator:ON
org.mitk.gui.qt.viewnavigator:OFF
org.mitk.gui.qt.materialeditor:OFF
org.mitk.gui.qt.measurementtoolbox:OFF
org.mitk.gui.qt.moviemaker:OFF
org.mitk.gui.qt.pointsetinteraction:OFF
org.mitk.gui.qt.pointsetinteractionmultispectrum:OFF
org.mitk.gui.qt.python:OFF
org.mitk.gui.qt.remeshing:OFF
org.mitk.gui.qt.segmentation:OFF
org.mitk.gui.qt.aicpregistration:OFF
org.mitk.gui.qt.renderwindowmanager:OFF
org.mitk.gui.qt.semanticrelations:OFF
org.mitk.gui.qt.toftutorial:OFF
org.mitk.gui.qt.tofutil:OFF
org.mitk.gui.qt.tubegraph:OFF
org.mitk.gui.qt.ugvisualization:OFF
org.mitk.gui.qt.photoacoustics.pausviewer:OFF
org.mitk.gui.qt.photoacoustics.pausmotioncompensation:OFF
org.mitk.gui.qt.photoacoustics.imageprocessing:OFF
org.mitk.gui.qt.photoacoustics.simulation:OFF
org.mitk.gui.qt.photoacoustics.spectralunmixing:OFF
org.mitk.gui.qt.ultrasound:OFF
org.mitk.gui.qt.volumevisualization:OFF
org.mitk.gui.qt.eventrecorder:OFF
org.mitk.gui.qt.xnat:OFF
org.mitk.gui.qt.igt.app.ultrasoundtrackingnavigation:OFF
org.mitk.gui.qt.spectrocamrecorder:OFF
org.mitk.gui.qt.classificationsegmentation:OFF
org.mitk.gui.qt.overlaymanager:OFF
org.mitk.gui.qt.igt.app.hummelprotocolmeasurements:OFF
org.mitk.gui.qt.multilabelsegmentation:OFF
org.mitk.matchpoint.core.helper:OFF
org.mitk.gui.qt.matchpoint.algorithm.browser:OFF
org.mitk.gui.qt.matchpoint.algorithm.control:OFF
org.mitk.gui.qt.matchpoint.mapper:OFF
org.mitk.gui.qt.matchpoint.framereg:OFF
org.mitk.gui.qt.matchpoint.visualizer:OFF
org.mitk.gui.qt.matchpoint.evaluator:OFF
org.mitk.gui.qt.matchpoint.manipulator:OFF
org.mitk.gui.qt.preprocessing.resampling:OFF
org.mitk.gui.qt.radiomics:OFF
org.mitk.gui.qt.cest:OFF
org.mitk.gui.qt.fit.demo:OFF
org.mitk.gui.qt.fit.inspector:OFF
org.mitk.gui.qt.fit.genericfitting:OFF
org.mitk.gui.qt.pharmacokinetics.mri:OFF
org.mitk.gui.qt.pharmacokinetics.pet:OFF
org.mitk.gui.qt.pharmacokinetics.simulation:OFF
org.mitk.gui.qt.pharmacokinetics.curvedescriptor:OFF
org.mitk.gui.qt.pharmacokinetics.concentration.mri:OFF
org.mitk.gui.qt.flowapplication:OFF
org.mitk.gui.qt.flow.segmentation:OFF
)
diff --git a/Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt b/Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt
index 370a532281..44c45b3f70 100644
--- a/Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt
+++ b/Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt
@@ -1,7 +1,6 @@
project(org_mitk_gui_qt_extapplication)
mitk_create_plugin(
EXPORT_DIRECTIVE MITK_QT_EXTAPP
EXPORTED_INCLUDE_SUFFIXES src
- PACKAGE_DEPENDS Qt5|WebEngineWidgets
)
diff --git a/Plugins/org.mitk.gui.qt.extapplication/files.cmake b/Plugins/org.mitk.gui.qt.extapplication/files.cmake
index 06abd0cab4..013a4c526d 100644
--- a/Plugins/org.mitk.gui.qt.extapplication/files.cmake
+++ b/Plugins/org.mitk.gui.qt.extapplication/files.cmake
@@ -1,52 +1,48 @@
set(SRC_CPP_FILES
)
set(INTERNAL_CPP_FILES
QmitkExtApplication.cpp
QmitkExtApplicationPlugin.cpp
QmitkExtAppWorkbenchAdvisor.cpp
- QmitkMitkWorkbenchIntroPart.cpp
perspectives/QmitkEditorPerspective.cpp
perspectives/QmitkExtDefaultPerspective.cpp
perspectives/QmitkVisualizationPerspective.cpp
)
set(MOC_H_FILES
src/internal/QmitkExtApplication.h
src/internal/QmitkExtApplicationPlugin.h
- src/internal/QmitkMitkWorkbenchIntroPart.h
src/internal/perspectives/QmitkEditorPerspective.h
src/internal/perspectives/QmitkExtDefaultPerspective.h
src/internal/perspectives/QmitkVisualizationPerspective.h
)
set(UI_FILES
- src/internal/perspectives/QmitkWelcomeScreenViewControls.ui
)
set(CACHED_RESOURCE_FILES
# list of resource files which can be used by the plug-in
# system without loading the plug-ins shared library,
# for example the icon used in the menu and tabs for the
# plug-in views in the workbench
plugin.xml
resources/icon_research.xpm
resources/perspectives/eye.png
resources/perspectives/viewer_icon.png
)
set(QRC_FILES
resources/QmitkExtApplication.qrc
-resources/welcome/QmitkWelcomeScreenView.qrc
)
set(CPP_FILES )
foreach(file ${SRC_CPP_FILES})
set(CPP_FILES ${CPP_FILES} src/${file})
endforeach(file ${SRC_CPP_FILES})
foreach(file ${INTERNAL_CPP_FILES})
set(CPP_FILES ${CPP_FILES} src/internal/${file})
endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Plugins/org.mitk.gui.qt.extapplication/plugin.xml b/Plugins/org.mitk.gui.qt.extapplication/plugin.xml
index 0f5a5bae80..9cca1295ad 100644
--- a/Plugins/org.mitk.gui.qt.extapplication/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.extapplication/plugin.xml
@@ -1,64 +1,51 @@
-
-
-
-
-
-
-
-
-
diff --git a/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.cpp b/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.cpp
index 00d6bc63e2..90740e0e6d 100644
--- a/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.cpp
+++ b/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.cpp
@@ -1,83 +1,81 @@
/*============================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.
============================================================================*/
#include "QmitkExtApplicationPlugin.h"
#include "perspectives/QmitkExtDefaultPerspective.h"
#include "perspectives/QmitkEditorPerspective.h"
#include "perspectives/QmitkVisualizationPerspective.h"
-#include "QmitkMitkWorkbenchIntroPart.h"
#include "QmitkExtApplication.h"
#include
#include
#include
#include
#include
#include
QmitkExtApplicationPlugin* QmitkExtApplicationPlugin::inst = nullptr;
QmitkExtApplicationPlugin::QmitkExtApplicationPlugin()
{
inst = this;
}
QmitkExtApplicationPlugin::~QmitkExtApplicationPlugin()
{
}
QmitkExtApplicationPlugin* QmitkExtApplicationPlugin::GetDefault()
{
return inst;
}
void QmitkExtApplicationPlugin::start(ctkPluginContext* context)
{
berry::AbstractUICTKPlugin::start(context);
this->context = context;
BERRY_REGISTER_EXTENSION_CLASS(QmitkExtDefaultPerspective, context);
BERRY_REGISTER_EXTENSION_CLASS(QmitkEditorPerspective, context);
- BERRY_REGISTER_EXTENSION_CLASS(QmitkMitkWorkbenchIntroPart, context);
BERRY_REGISTER_EXTENSION_CLASS(QmitkExtApplication, context);
BERRY_REGISTER_EXTENSION_CLASS(QmitkVisualizationPerspective, context);
ctkServiceReference cmRef = context->getServiceReference();
ctkConfigurationAdmin* configAdmin = nullptr;
if (cmRef)
{
configAdmin = context->getService(cmRef);
}
// Use the CTK Configuration Admin service to configure the BlueBerry help system
if (configAdmin)
{
ctkConfigurationPtr conf = configAdmin->getConfiguration("org.blueberry.services.help", QString());
ctkDictionary helpProps;
helpProps.insert("homePage", "qthelp://org.mitk.gui.qt.extapplication/bundle/index.html");
conf->update(helpProps);
context->ungetService(cmRef);
}
else
{
MITK_WARN << "Configuration Admin service unavailable, cannot set home page url.";
}
}
ctkPluginContext* QmitkExtApplicationPlugin::GetPluginContext() const
{
return context;
}
diff --git a/Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/CMakeLists.txt
similarity index 73%
copy from Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt
copy to Plugins/org.mitk.gui.qt.mitkworkbench.intro/CMakeLists.txt
index 370a532281..a5fe978856 100644
--- a/Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt
+++ b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/CMakeLists.txt
@@ -1,7 +1,7 @@
-project(org_mitk_gui_qt_extapplication)
+project(org_mitk_gui_qt_mitkworkbench_intro)
mitk_create_plugin(
EXPORT_DIRECTIVE MITK_QT_EXTAPP
EXPORTED_INCLUDE_SUFFIXES src
PACKAGE_DEPENDS Qt5|WebEngineWidgets
)
diff --git a/Plugins/org.mitk.gui.qt.mitkworkbench.intro/documentation/UserManual/QmitkMITKWorkbenchUserManual.dox b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/documentation/UserManual/QmitkMITKWorkbenchUserManual.dox
new file mode 100644
index 0000000000..2c34762cb5
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/documentation/UserManual/QmitkMITKWorkbenchUserManual.dox
@@ -0,0 +1,17 @@
+/**
+\page org_mitkworkbench Using The MITK Workbench
+
+\section QMitkMitkWorkbenchManualOverview What is the MITK Workbench
+
+The MITK Workbench is used by developers. As such the kind and number of views it contains is highly variable and dependent on the specific build. Typically it contains no special perspectives and whatever views the developer deemed desirable. Be aware, that it may contain views which are work in progress and may behave erratically.
+
+If you have been given such an executable by someone, please refer to the appropriate section of the online documentation for up to date usage information on any module.
+
+Nightly online documentation
+
+
+If you are using a nightly installer, the MITK Workbench will contain nearly all views available in MITK and as such most likely will seem confusing. Again the list of modules might be a good starting point if you want to have a rough idea of what could be of interest to you.
+
+For a basic guide to MITK see \ref MITKUserManualPage .
+
+*/
diff --git a/Plugins/org.mitk.gui.qt.mitkworkbench.intro/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/documentation/doxygen/modules.dox
new file mode 100644
index 0000000000..9ba2324dc5
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/documentation/doxygen/modules.dox
@@ -0,0 +1,16 @@
+/**
+ \defgroup org_mitk_gui_qt_mitkworkbench_welcome org.mitk.gui.qt.mitkworkbench.welcome
+ \ingroup MITKPlugins
+
+ \brief This plug-in is responsible for MITK Workbench welcome screen and alike.
+
+*/
+
+/**
+ \defgroup org_mitk_gui_qt_mitkworkbench_internal Internal
+ \ingroup org_mitk_gui_qt_mitkworkbench
+
+ \brief This subcategory includes the internal classes of the org.mitk.gui.qt.mitkworkbench.welcome plugin. Other
+ plugins must not rely on these classes. They contain implementation details and their interface
+ may change at any time. We mean it.
+*/
diff --git a/Plugins/org.mitk.gui.qt.mitkworkbench.intro/files.cmake b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/files.cmake
new file mode 100644
index 0000000000..fe593005bc
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/files.cmake
@@ -0,0 +1,39 @@
+set(SRC_CPP_FILES
+)
+
+set(INTERNAL_CPP_FILES
+ QmitkMitkWorkbenchIntroPlugin.cpp
+ QmitkMitkWorkbenchIntroPart.cpp
+)
+
+set(MOC_H_FILES
+ src/internal/QmitkMitkWorkbenchIntroPlugin.h
+ src/internal/QmitkMitkWorkbenchIntroPart.h
+)
+
+set(UI_FILES
+ src/internal/QmitkWelcomeScreenViewControls.ui
+)
+
+set(CACHED_RESOURCE_FILES
+# list of resource files which can be used by the plug-in
+# system without loading the plug-ins shared library,
+# for example the icon used in the menu and tabs for the
+# plug-in views in the workbench
+ plugin.xml
+)
+
+set(QRC_FILES
+resources/QmitkWelcomeScreenView.qrc
+)
+
+set(CPP_FILES )
+
+foreach(file ${SRC_CPP_FILES})
+ set(CPP_FILES ${CPP_FILES} src/${file})
+endforeach(file ${SRC_CPP_FILES})
+
+foreach(file ${INTERNAL_CPP_FILES})
+ set(CPP_FILES ${CPP_FILES} src/internal/${file})
+endforeach(file ${INTERNAL_CPP_FILES})
+
diff --git a/Plugins/org.mitk.gui.qt.mitkworkbench.intro/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/manifest_headers.cmake
new file mode 100644
index 0000000000..558878f25c
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/manifest_headers.cmake
@@ -0,0 +1,5 @@
+set(Plugin-Name "MITK Workbench Intro")
+set(Plugin-Version "1.0.0")
+set(Plugin-Vendor "German Cancer Research Center (DKFZ)")
+set(Plugin-ContactAddress "http://www.mitk.org")
+set(Require-Plugin org.mitk.gui.qt.extapplication)
diff --git a/Plugins/org.mitk.gui.qt.mitkworkbench.intro/plugin.xml b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/plugin.xml
new file mode 100644
index 0000000000..dda81a0406
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/plugin.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/QmitkWelcomeScreenView.qrc b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/QmitkWelcomeScreenView.qrc
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/QmitkWelcomeScreenView.qrc
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/QmitkWelcomeScreenView.qrc
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/WelcomePresentation.html b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/WelcomePresentation.html
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/WelcomePresentation.html
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/WelcomePresentation.html
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/print/paper.css b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/print/paper.css
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/print/paper.css
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/print/paper.css
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/print/pdf.css b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/print/pdf.css
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/print/pdf.css
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/print/pdf.css
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/reveal.css b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/reveal.css
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/reveal.css
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/reveal.css
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/reveal.scss b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/reveal.scss
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/reveal.scss
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/reveal.scss
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/theme/MITK.css b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/theme/MITK.css
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/theme/MITK.css
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/theme/MITK.css
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/theme/README.md b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/theme/README.md
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/theme/README.md
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/theme/README.md
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/theme/source/MITK.scss b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/theme/source/MITK.scss
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/css/theme/source/MITK.scss
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/css/theme/source/MITK.scss
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/function.js b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/function.js
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/function.js
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/function.js
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/Alt.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/Alt.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/Alt.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/Alt.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ArrowDown.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ArrowDown.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ArrowDown.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ArrowDown.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ArrowKeys.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ArrowKeys.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ArrowKeys.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ArrowKeys.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ControlArrows.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ControlArrows.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ControlArrows.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ControlArrows.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/DataManagerData.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/DataManagerData.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/DataManagerData.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/DataManagerData.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/DisplayAreaScan.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/DisplayAreaScan.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/DisplayAreaScan.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/DisplayAreaScan.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/DisplayAreaSmall.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/DisplayAreaSmall.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/DisplayAreaSmall.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/DisplayAreaSmall.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/DisplayWindowAxial.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/DisplayWindowAxial.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/DisplayWindowAxial.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/DisplayWindowAxial.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/DisplayWindowButtons.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/DisplayWindowButtons.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/DisplayWindowButtons.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/DisplayWindowButtons.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/Esc.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/Esc.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/Esc.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/Esc.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/HelpWelcome.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/HelpWelcome.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/HelpWelcome.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/HelpWelcome.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/IconDataManager.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/IconDataManager.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/IconDataManager.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/IconDataManager.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/IconHelp.svg b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/IconHelp.svg
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/IconHelp.svg
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/IconHelp.svg
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/IconImageNavigator.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/IconImageNavigator.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/IconImageNavigator.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/IconImageNavigator.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ImageNavigator.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ImageNavigator.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ImageNavigator.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ImageNavigator.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/LayoutList.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/LayoutList.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/LayoutList.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/LayoutList.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/Levelwindow.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/Levelwindow.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/Levelwindow.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/Levelwindow.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MITK.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MITK.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MITK.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MITK.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MITKArrow.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MITKArrow.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MITKArrow.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MITKArrow.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MITKArrow2.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MITKArrow2.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MITKArrow2.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MITKArrow2.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MITKPoint.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MITKPoint.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MITKPoint.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MITKPoint.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MousePointerClick.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MousePointerClick.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MousePointerClick.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MousePointerClick.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MouseTangoStyle.svg b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MouseTangoStyle.svg
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/MouseTangoStyle.svg
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/MouseTangoStyle.svg
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ScreenScanData.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ScreenScanData.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ScreenScanData.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ScreenScanData.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ScreenScanPlugins.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ScreenScanPlugins.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ScreenScanPlugins.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ScreenScanPlugins.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ScreenWithScan.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ScreenWithScan.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ScreenWithScan.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ScreenWithScan.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/Spacebar.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/Spacebar.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/Spacebar.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/Spacebar.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/Toolbar.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/Toolbar.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/Toolbar.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/Toolbar.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ToolbarLeft.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ToolbarLeft.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ToolbarLeft.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ToolbarLeft.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ToolbarRight.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ToolbarRight.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/ToolbarRight.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/ToolbarRight.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/WelcomePage.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/WelcomePage.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/images/welcome/WelcomePage.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/images/welcome/WelcomePage.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/js/reveal.js b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/js/reveal.js
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/js/reveal.js
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/js/reveal.js
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/lib/css/zenburn.css b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/lib/css/zenburn.css
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/lib/css/zenburn.css
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/lib/css/zenburn.css
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/lib/js/classList.js b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/lib/js/classList.js
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/lib/js/classList.js
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/lib/js/classList.js
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/lib/js/head.min.js b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/lib/js/head.min.js
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/lib/js/head.min.js
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/lib/js/head.min.js
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/lib/js/html5shiv.js b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/lib/js/html5shiv.js
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/lib/js/html5shiv.js
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/lib/js/html5shiv.js
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/mitkworkbenchwelcomeview.html b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/mitkworkbenchwelcomeview.html
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/mitkworkbenchwelcomeview.html
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/mitkworkbenchwelcomeview.html
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/WelcomeMITK.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/WelcomeMITK.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/WelcomeMITK.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/WelcomeMITK.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/background.jpg b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/background.jpg
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/background.jpg
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/background.jpg
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/button_mitk.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/button_mitk.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/button_mitk.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/button_mitk.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/button_mitka.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/button_mitka.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/button_mitka.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/button_mitka.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/experimental.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/experimental.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/experimental.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/experimental.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/popup_bg.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/popup_bg.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/popup_bg.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/popup_bg.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/popup_bg_bottom.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/popup_bg_bottom.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/popup_bg_bottom.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/popup_bg_bottom.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/popup_bg_middle.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/popup_bg_middle.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/popup_bg_middle.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/popup_bg_middle.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/popup_bg_top.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/popup_bg_top.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/popup_bg_top.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/popup_bg_top.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/popup_bttn_close.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/popup_bttn_close.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/popup_bttn_close.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/popup_bttn_close.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/shadow.png b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/shadow.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/pics/shadow.png
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/pics/shadow.png
diff --git a/Plugins/org.mitk.gui.qt.extapplication/resources/welcome/style.css b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/style.css
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/resources/welcome/style.css
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/resources/style.css
diff --git a/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkMitkWorkbenchIntroPart.cpp b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkMitkWorkbenchIntroPart.cpp
similarity index 90%
rename from Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkMitkWorkbenchIntroPart.cpp
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkMitkWorkbenchIntroPart.cpp
index c477eb1e96..6e0cd7f0b0 100644
--- a/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkMitkWorkbenchIntroPart.cpp
+++ b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkMitkWorkbenchIntroPart.cpp
@@ -1,220 +1,220 @@
/*============================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.
============================================================================*/
#include "QmitkMitkWorkbenchIntroPart.h"
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
-#include "QmitkExtApplicationPlugin.h"
+#include "QmitkMitkWorkbenchIntroPlugin.h"
#include "mitkDataStorageEditorInput.h"
#include
#include
#include
#include
class QmitkMitkWorkbenchIntroPart::Impl
{
public:
Impl()
: View(nullptr)
{
}
~Impl()
{
}
QWebEngineView* View;
private:
Impl(const Impl&);
Impl& operator=(const Impl&);
};
namespace
{
class QmitkWebEnginePage final : public QWebEnginePage
{
public:
explicit QmitkWebEnginePage(QmitkMitkWorkbenchIntroPart* introPart, QObject* parent = nullptr);
~QmitkWebEnginePage() override;
private:
bool acceptNavigationRequest(const QUrl& url, NavigationType type, bool isMainFrame) override;
QmitkMitkWorkbenchIntroPart* m_IntroPart;
};
QmitkWebEnginePage::QmitkWebEnginePage(QmitkMitkWorkbenchIntroPart* introPart, QObject* parent)
: QWebEnginePage(parent),
m_IntroPart(introPart)
{
}
QmitkWebEnginePage::~QmitkWebEnginePage()
{
}
bool QmitkWebEnginePage::acceptNavigationRequest(const QUrl& url, NavigationType, bool)
{
QString scheme = url.scheme();
if (scheme.contains("mitk"))
{
if (url.path().isEmpty())
return false;
if (url.host().contains("perspectives"))
{
QString id = url.path().simplified().replace("/", "");
auto introSite = m_IntroPart->GetIntroSite();
auto workbenchWindow = introSite->GetWorkbenchWindow();
auto workbench = workbenchWindow->GetWorkbench();
workbench->ShowPerspective(id, workbenchWindow);
- auto context = QmitkExtApplicationPlugin::GetDefault()->GetPluginContext();
+ auto context = QmitkMitkWorkbenchIntroPlugin::GetDefault()->GetPluginContext();
auto serviceReference = context->getServiceReference();
mitk::IDataStorageService* service = serviceReference
? context->getService(serviceReference)
: nullptr;
if (service)
{
berry::IEditorInput::Pointer editorInput(new mitk::DataStorageEditorInput(service->GetActiveDataStorage()));
auto page = introSite->GetPage();
auto editorPart = page->FindEditor(editorInput);
if (editorPart.IsNotNull())
page->Activate(editorPart);
}
}
}
else if (scheme.contains("http"))
{
QDesktopServices::openUrl(url);
}
else
{
return true;
}
return false;
}
}
QmitkMitkWorkbenchIntroPart::QmitkMitkWorkbenchIntroPart()
: m_Controls(nullptr),
m_Impl(new Impl)
{
- berry::IPreferences::Pointer workbenchPrefs = QmitkExtApplicationPlugin::GetDefault()->GetPreferencesService()->GetSystemPreferences();
+ berry::IPreferences::Pointer workbenchPrefs = QmitkMitkWorkbenchIntroPlugin::GetDefault()->GetPreferencesService()->GetSystemPreferences();
workbenchPrefs->PutBool(berry::WorkbenchPreferenceConstants::SHOW_INTRO, true);
workbenchPrefs->Flush();
}
QmitkMitkWorkbenchIntroPart::~QmitkMitkWorkbenchIntroPart()
{
// if the workbench is not closing (that means, welcome screen was closed explicitly), set "Show_intro" false
if (!this->GetIntroSite()->GetPage()->GetWorkbenchWindow()->GetWorkbench()->IsClosing())
{
- berry::IPreferences::Pointer workbenchPrefs = QmitkExtApplicationPlugin::GetDefault()->GetPreferencesService()->GetSystemPreferences();
+ berry::IPreferences::Pointer workbenchPrefs = QmitkMitkWorkbenchIntroPlugin::GetDefault()->GetPreferencesService()->GetSystemPreferences();
workbenchPrefs->PutBool(berry::WorkbenchPreferenceConstants::SHOW_INTRO, false);
workbenchPrefs->Flush();
}
else
{
- berry::IPreferences::Pointer workbenchPrefs = QmitkExtApplicationPlugin::GetDefault()->GetPreferencesService()->GetSystemPreferences();
+ berry::IPreferences::Pointer workbenchPrefs = QmitkMitkWorkbenchIntroPlugin::GetDefault()->GetPreferencesService()->GetSystemPreferences();
workbenchPrefs->PutBool(berry::WorkbenchPreferenceConstants::SHOW_INTRO, true);
workbenchPrefs->Flush();
}
// if workbench is not closing (Just welcome screen closing), open last used perspective
if (this->GetIntroSite()->GetPage()->GetPerspective()->GetId()
== "org.mitk.mitkworkbench.perspectives.editor" && !this->GetIntroSite()->GetPage()->GetWorkbenchWindow()->GetWorkbench()->IsClosing())
{
berry::IPerspectiveDescriptor::Pointer perspective = this->GetIntroSite()->GetWorkbenchWindow()->GetWorkbench()->GetPerspectiveRegistry()->FindPerspectiveWithId("org.mitk.mitkworkbench.perspectives.editor");
if (perspective)
{
this->GetIntroSite()->GetPage()->SetPerspective(perspective);
}
}
delete m_Impl;
}
void QmitkMitkWorkbenchIntroPart::CreateQtPartControl(QWidget* parent)
{
if (!m_Controls)
{
// create GUI widgets
m_Controls = new Ui::QmitkWelcomeScreenViewControls;
m_Controls->setupUi(parent);
// create a QWebView as well as a QWebPage and QWebFrame within the QWebview
m_Impl->View = new QWebEngineView(parent);
auto page = new QmitkWebEnginePage(this, parent);
m_Impl->View->setPage(page);
QUrl urlQtResource(QString("qrc:/org.mitk.gui.qt.welcomescreen/mitkworkbenchwelcomeview.html"), QUrl::TolerantMode );
m_Impl->View->load( urlQtResource );
// adds the webview as a widget
parent->layout()->addWidget(m_Impl->View);
this->CreateConnections();
}
}
void QmitkMitkWorkbenchIntroPart::CreateConnections()
{
}
void QmitkMitkWorkbenchIntroPart::StandbyStateChanged(bool /*standby*/)
{
}
void QmitkMitkWorkbenchIntroPart::SetFocus()
{
}
diff --git a/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkMitkWorkbenchIntroPart.h b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkMitkWorkbenchIntroPart.h
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkMitkWorkbenchIntroPart.h
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkMitkWorkbenchIntroPart.h
diff --git a/Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkMitkWorkbenchIntroPlugin.cpp b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkMitkWorkbenchIntroPlugin.cpp
new file mode 100644
index 0000000000..c38924e45c
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkMitkWorkbenchIntroPlugin.cpp
@@ -0,0 +1,53 @@
+/*============================================================================
+
+The Medical Imaging Interaction Toolkit (MITK)
+
+Copyright (c) German Cancer Research Center (DKFZ)
+All rights reserved.
+
+Use of this source code is governed by a 3-clause BSD license that can be
+found in the LICENSE file.
+
+============================================================================*/
+
+#include "QmitkMitkWorkbenchIntroPlugin.h"
+#include "QmitkMitkWorkbenchIntroPart.h"
+
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+
+QmitkMitkWorkbenchIntroPlugin* QmitkMitkWorkbenchIntroPlugin::inst = nullptr;
+
+QmitkMitkWorkbenchIntroPlugin::QmitkMitkWorkbenchIntroPlugin()
+{
+ inst = this;
+}
+
+QmitkMitkWorkbenchIntroPlugin::~QmitkMitkWorkbenchIntroPlugin()
+{
+}
+
+QmitkMitkWorkbenchIntroPlugin* QmitkMitkWorkbenchIntroPlugin::GetDefault()
+{
+ return inst;
+}
+
+void QmitkMitkWorkbenchIntroPlugin::start(ctkPluginContext* context)
+{
+ berry::AbstractUICTKPlugin::start(context);
+
+ this->context = context;
+
+ BERRY_REGISTER_EXTENSION_CLASS(QmitkMitkWorkbenchIntroPart, context);
+}
+
+ctkPluginContext* QmitkMitkWorkbenchIntroPlugin::GetPluginContext() const
+{
+ return context;
+}
diff --git a/Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkMitkWorkbenchIntroPlugin.h b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkMitkWorkbenchIntroPlugin.h
new file mode 100644
index 0000000000..3fab30c23b
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkMitkWorkbenchIntroPlugin.h
@@ -0,0 +1,47 @@
+/*============================================================================
+
+The Medical Imaging Interaction Toolkit (MITK)
+
+Copyright (c) German Cancer Research Center (DKFZ)
+All rights reserved.
+
+Use of this source code is governed by a 3-clause BSD license that can be
+found in the LICENSE file.
+
+============================================================================*/
+
+
+#ifndef QMITKMITKWORKBENCHINTROPLUGIN_H_
+#define QMITKMITKWORKBENCHINTROPLUGIN_H_
+
+#include
+
+#include
+
+class QmitkMitkWorkbenchIntroPlugin : public berry::AbstractUICTKPlugin
+{
+ Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_mitkworkbench_intro")
+ Q_INTERFACES(ctkPluginActivator)
+
+public:
+
+ QmitkMitkWorkbenchIntroPlugin();
+ ~QmitkMitkWorkbenchIntroPlugin() override;
+
+ static QmitkMitkWorkbenchIntroPlugin* GetDefault();
+
+ ctkPluginContext* GetPluginContext() const;
+
+ void start(ctkPluginContext*) override;
+
+ QString GetQtHelpCollectionFile() const;
+
+private:
+
+ static QmitkMitkWorkbenchIntroPlugin* inst;
+
+ ctkPluginContext* context;
+};
+
+#endif /* QMITKEXTAPPLICATIONPLUGIN_H_ */
diff --git a/Plugins/org.mitk.gui.qt.extapplication/src/internal/perspectives/QmitkWelcomeScreenViewControls.ui b/Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkWelcomeScreenViewControls.ui
similarity index 100%
rename from Plugins/org.mitk.gui.qt.extapplication/src/internal/perspectives/QmitkWelcomeScreenViewControls.ui
rename to Plugins/org.mitk.gui.qt.mitkworkbench.intro/src/internal/QmitkWelcomeScreenViewControls.ui