Page MenuHomePhabricator
Files F1247

bug-19133-git.diff
Public
Actions

Authored By
• hettich
Jul 15 2015, 5:06 PM
Size
18 KB
Referenced Files
None
Subscribers
None

bug-19133-git.diff
View Options

diff --git a/Documentation/Doxygen/3-DeveloperManual/Concepts/Persistence.dox b/Documentation/Doxygen/3-DeveloperManual/Concepts/Persistence.dox
index 4c7d850..7ab231e 100644
--- a/Documentation/Doxygen/3-DeveloperManual/Concepts/Persistence.dox
+++ b/Documentation/Doxygen/3-DeveloperManual/Concepts/Persistence.dox
@@ -57,7 +57,7 @@ However, integration into a MITK scene file is not possible with Qt::settings.
\section PersistenceBlueberry Persistence Features of Blueberry
-In blueberry, the view states can be saved and restored which is described here: <a href="http://mitk.org/Article_Save_and_Restore_your_View_State">MITK.org: Save and Restore your View State</a>. Additionally, there is a possibility to make the preferences of a view persistent, which is documented in the <a href="http://docs.mitk.org/nightly-qt4/structberry_1_1IPreferencesService.html">class API documentation of the persistence service</a>.
+In blueberry, the view states can be saved and restored which is described here: <a href="http://mitk.org/Article_Save_and_Restore_your_View_State">MITK.org: Save and Restore your View State</a>. Additionally, there is a possibility to make the preferences of a view persistent, which is documented in the <a href="http://docs.mitk.org/nightly/structberry_1_1IPreferencesService.html">class API documentation of the persistence service</a>.
\section PersistenceConfigurationService Configuration Service
diff --git a/Examples/BlueBerryExampleLauncher/Configurations/CustomViewer.cmake b/Examples/BlueBerryExampleLauncher/Configurations/CustomViewer.cmake
index 3ae3186..8341577 100644
--- a/Examples/BlueBerryExampleLauncher/Configurations/CustomViewer.cmake
+++ b/Examples/BlueBerryExampleLauncher/Configurations/CustomViewer.cmake
@@ -19,5 +19,5 @@ Spoken in BlueBerry terms, the following features are provided:
<li> GUI Customization using Qt-Stylesheets </li>
</ul>
-See the main <a href=\"http://docs.mitk.org/nightly-qt4/BlueBerryExampleCustomViewer.html\">documentation</a> for details."
+See the main <a href=\"http://docs.mitk.org/nightly/BlueBerryExampleCustomViewer.html\">documentation</a> for details."
)
diff --git a/Examples/BlueBerryExampleLauncher/Configurations/ExtensionPointDefinition.cmake b/Examples/BlueBerryExampleLauncher/Configurations/ExtensionPointDefinition.cmake
index e149398..aa56919 100644
--- a/Examples/BlueBerryExampleLauncher/Configurations/ExtensionPointDefinition.cmake
+++ b/Examples/BlueBerryExampleLauncher/Configurations/ExtensionPointDefinition.cmake
@@ -15,5 +15,5 @@ The following features are demonstrated:
<li> collecting extensions for an extension point </li>
</ul>
-See the main <a href=\"http://docs.mitk.org/nightly-qt4/BlueBerryExampleExtensionPoint.html\">documentation</a> for details."
+See the main <a href=\"http://docs.mitk.org/nightly/BlueBerryExampleExtensionPoint.html\">documentation</a> for details."
)
diff --git a/Examples/BlueBerryExampleLauncher/Configurations/MinimalApplication.cmake b/Examples/BlueBerryExampleLauncher/Configurations/MinimalApplication.cmake
index b7fd86a..d6d30ed 100644
--- a/Examples/BlueBerryExampleLauncher/Configurations/MinimalApplication.cmake
+++ b/Examples/BlueBerryExampleLauncher/Configurations/MinimalApplication.cmake
@@ -13,5 +13,5 @@ The following features are demonstrated:
<li> creating a perspective </li>
</ul>
-See the main <a href=\"http://docs.mitk.org/nightly-qt4/BlueBerryExampleMinimalApplication.html\">documentation</a> for details."
+See the main <a href=\"http://docs.mitk.org/nightly/BlueBerryExampleMinimalApplication.html\">documentation</a> for details."
)
diff --git a/Examples/BlueBerryExampleLauncher/Configurations/MultiplePerspectives.cmake b/Examples/BlueBerryExampleLauncher/Configurations/MultiplePerspectives.cmake
index d283478..f7d468b 100644
--- a/Examples/BlueBerryExampleLauncher/Configurations/MultiplePerspectives.cmake
+++ b/Examples/BlueBerryExampleLauncher/Configurations/MultiplePerspectives.cmake
@@ -16,5 +16,5 @@ The following features are demonstrated:
<li> setting an initial size </li>
</ul>
-See the main <a href=\"http://docs.mitk.org/nightly-qt4/BlueBerryExampleMultiplePerspectives.html\">documentation</a> for details."
+See the main <a href=\"http://docs.mitk.org/nightly/BlueBerryExampleMultiplePerspectives.html\">documentation</a> for details."
)
diff --git a/Examples/BlueBerryExampleLauncher/Configurations/SelectionServiceMITK.cmake b/Examples/BlueBerryExampleLauncher/Configurations/SelectionServiceMITK.cmake
index 25bf1cd..aecc709 100644
--- a/Examples/BlueBerryExampleLauncher/Configurations/SelectionServiceMITK.cmake
+++ b/Examples/BlueBerryExampleLauncher/Configurations/SelectionServiceMITK.cmake
@@ -15,5 +15,5 @@ The following features are demonstrated:
<li> reimplementation of the selection listener method </li>
</ul>
-See the main <a href=\"http://docs.mitk.org/nightly-qt4/BlueBerrySelectionServiceIntro.html\">documentation</a> for details."
+See the main <a href=\"http://docs.mitk.org/nightly/BlueBerrySelectionServiceIntro.html\">documentation</a> for details."
)
diff --git a/Examples/BlueBerryExampleLauncher/Configurations/SelectionServiceQT.cmake b/Examples/BlueBerryExampleLauncher/Configurations/SelectionServiceQT.cmake
index be590a1..8ec723b 100644
--- a/Examples/BlueBerryExampleLauncher/Configurations/SelectionServiceQT.cmake
+++ b/Examples/BlueBerryExampleLauncher/Configurations/SelectionServiceQT.cmake
@@ -14,5 +14,5 @@ The following features are demonstrated:
<li> selection listener implementation </li>
</ul>
-See the main <a href=\"http://docs.mitk.org/nightly-qt4/BlueBerrySelectionServiceIntro.html\">documentation</a> for details."
+See the main <a href=\"http://docs.mitk.org/nightly/BlueBerrySelectionServiceIntro.html\">documentation</a> for details."
)
diff --git a/Modules/Core/resource/Interactions/Legacy/DisplayConfigMITKTools.xml b/Modules/Core/resource/Interactions/Legacy/DisplayConfigMITKTools.xml
index df1a4ad..4836b9b 100644
--- a/Modules/Core/resource/Interactions/Legacy/DisplayConfigMITKTools.xml
+++ b/Modules/Core/resource/Interactions/Legacy/DisplayConfigMITKTools.xml
@@ -6,7 +6,7 @@
So if an action here conflicts with you tool you can comment out this section.
! Alternatively you can also just change the event description, so that the actions are triggered by different mouse/key events
during Tool use. !
- Refer to 'How to create a Config-File' http://docs.mitk.org/nightly-qt4/Step10Page.html for details.
+ Refer to 'How to create a Config-File' http://docs.mitk.org/nightly/Step10Page.html for details.
* - middle mouse button : panning
* - right mouse button : zooming
diff --git a/Modules/DiffusionImaging/MiniApps/Registration.cpp b/Modules/DiffusionImaging/MiniApps/Registration.cpp
index e21698d..43a9f77 100644
--- a/Modules/DiffusionImaging/MiniApps/Registration.cpp
+++ b/Modules/DiffusionImaging/MiniApps/Registration.cpp
@@ -230,7 +230,7 @@ int main( int argc, char* argv[] )
parser.setTitle("Folder Registration");
parser.setCategory("Preprocessing Tools");
- parser.setDescription("For detail description see http://docs.mitk.org/nightly-qt4/DiffusionMiniApps.html");
+ parser.setDescription("For detail description see http://docs.mitk.org/nightly/DiffusionMiniApps.html");
parser.setContributor("MBI");
// Add command line argument names
diff --git a/Modules/QtWidgetsExt/src/QmitkAboutDialogGUI.ui b/Modules/QtWidgetsExt/src/QmitkAboutDialogGUI.ui
index bc34b3f..4060960 100644
--- a/Modules/QtWidgetsExt/src/QmitkAboutDialogGUI.ui
+++ b/Modules/QtWidgetsExt/src/QmitkAboutDialogGUI.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>534</width>
- <height>421</height>
+ <width>480</width>
+ <height>480</height>
</rect>
</property>
<property name="windowTitle">
@@ -122,8 +122,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
- <width>514</width>
- <height>236</height>
+ <width>460</width>
+ <height>263</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
@@ -133,20 +133,20 @@ p, li { white-space: pre-wrap; }
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:600;&quot;&gt;General Information&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;MITK [1] has been developed by the Division of Medical and Biological Informatics of the German Cancer Research Center (DKFZ) [2].&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;[1] &lt;a href=&quot;http://www.mitk.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.mitk.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;[2] &lt;a href=&quot;http://www.dkfz.de/en/mbi/index.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.dkfz.de/en/mbi/index.php&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;To contact the MITK team, see &lt;a href=&quot;http://www.mitk.org/wiki/Contact&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.mitk.org/wiki/Contact&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;Third Party Libraries&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://docs.mitk.org/nightly-qt4/thirdpartylibs.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://docs.mitk.org/nightly-qt4/thirdpartylibs.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Sans Narrow'; font-size:12pt; font-weight:600; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:10pt;&quot;&gt;General Information&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt; font-weight:400;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400;&quot;&gt;MITK [1] has been developed by the Division of Medical and Biological Informatics of the German Cancer Research Center (DKFZ) [2].&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400;&quot;&gt;[1] &lt;/span&gt;&lt;a href=&quot;http://www.mitk.org/&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.mitk.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400;&quot;&gt;[2] &lt;/span&gt;&lt;a href=&quot;http://www.dkfz.de/en/mbi/index.php&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.dkfz.de/en/mbi/index.php&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400;&quot;&gt;To contact the MITK team, see &lt;/span&gt;&lt;a href=&quot;http://www.mitk.org/wiki/Contact&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.mitk.org/wiki/Contact&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt; font-weight:400;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:10pt;&quot;&gt;Third Party Libraries&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://docs.mitk.org/nightly/thirdpartylibs.html&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; text-decoration: underline; color:#0000ff;&quot;&gt;http://docs.mitk.org/nightly/thirdpartylibs.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
diff --git a/Plugins/org.mitk.gui.qt.extapplication/documentation/UserManual/QmitkMITKWorkbenchUserManual.dox b/Plugins/org.mitk.gui.qt.extapplication/documentation/UserManual/QmitkMITKWorkbenchUserManual.dox
index 1854351..186ad10 100644
--- a/Plugins/org.mitk.gui.qt.extapplication/documentation/UserManual/QmitkMITKWorkbenchUserManual.dox
+++ b/Plugins/org.mitk.gui.qt.extapplication/documentation/UserManual/QmitkMITKWorkbenchUserManual.dox
@@ -5,12 +5,12 @@
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.
+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.
-<a href="http://docs.mitk.org/nightly-qt4/PluginListPage.html">Nightly online documentation</a>
+<a href="http://docs.mitk.org/nightly/PluginListPage.html">Nightly online documentation</a>
-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.
+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 .

File Metadata

Mime Type
text/plain
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1206
Default Alt Text
bug-19133-git.diff (18 KB)

Event Timeline

• hettich added a comment.Jul 15 2015, 5:06 PM

git diff of my bugfix

MITK · MIC · IMSY · DKFZ