Merge commit 'f25f19e5' into dah

Conflicts:
	Libs/CommandLineModules/Core/ctkCmdLineModuleInstance.cpp
	Libs/CommandLineModules/Core/ctkCmdLineModuleInstance.h
	Libs/CommandLineModules/Testing/Modules/Tour/ctkCmdLineModuleTour.cpp

.gitattributes

@@ -1 +1,2 @@
 *.ts           text
+.git*          export-ignore

Applications/ctkCommandLineModuleExplorer/CMakeLists.txt

@@ -6,23 +6,47 @@ project(ctkCommandLineModuleExplorer)
 
 set(KIT_SRCS
   ctkCommandLineModuleExplorerMain.cpp
-  ctkCLModuleExplorerMainWindow.h
-  ctkCLModuleExplorerMainWindow.cpp
+  ctkCmdLineModuleExplorerConstants.cpp
+  ctkCmdLineModuleExplorerDirectorySettings.cpp
+  ctkCmdLineModuleExplorerGeneralModuleSettings.cpp
+  ctkCmdLineModuleExplorerMainWindow.h
+  ctkCmdLineModuleExplorerMainWindow.cpp
+  ctkCmdLineModuleExplorerModulesSettings.cpp
+  ctkCmdLineModuleExplorerOutputText.cpp
+  ctkCmdLineModuleExplorerProgressListWidget.cpp
+  ctkCmdLineModuleExplorerProgressWidget.cpp
+  ctkCmdLineModuleExplorerShowXmlAction.cpp
+  ctkCmdLineModuleExplorerTabList.cpp
+  ctkCmdLineModuleExplorerTreeWidget.cpp
+  ctkCmdLineModuleExplorerUtils.cpp
 )
 
 # Headers that should run through moc
 set(KIT_MOC_SRCS
-  ctkCLModuleExplorerMainWindow.h
+  ctkCmdLineModuleExplorerDirectorySettings.h
+  ctkCmdLineModuleExplorerGeneralModuleSettings.h
+  ctkCmdLineModuleExplorerMainWindow.h
+  ctkCmdLineModuleExplorerModulesSettings.h
+  ctkCmdLineModuleExplorerOutputText.h
+  ctkCmdLineModuleExplorerProgressListWidget.h
+  ctkCmdLineModuleExplorerProgressWidget.h
+  ctkCmdLineModuleExplorerShowXmlAction.h
+  ctkCmdLineModuleExplorerTabList.h
+  ctkCmdLineModuleExplorerTreeWidget.h
 )
 
 # UI files
 set(KIT_UI_FORMS
-  ctkCLModuleExplorerMainWindow.ui
+  ctkCmdLineModuleExplorerDirectorySettings.ui
+  ctkCmdLineModuleExplorerGeneralModuleSettings.ui
+  ctkCmdLineModuleExplorerMainWindow.ui
+  ctkCmdLineModuleExplorerModulesSettings.ui
+  ctkCmdLineModuleExplorerProgressWidget.ui
 )
 
 # Resources
 set(KIT_resources
-  resources/ctkCLModuleExplorer.qrc
+  resources/ctkCmdLineModuleExplorer.qrc
 )
 
 set(QT_USE_QTUITOOLS 1)

Applications/ctkCommandLineModuleExplorer/ctkCmdLineModuleExplorerConstants.cpp

@@ -0,0 +1,27 @@
+/*=============================================================================
+
+  Library: CTK
+
+  Copyright (c) German Cancer Research Center,
+    Division of Medical and Biological Informatics
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=============================================================================*/
+
+#include "ctkCmdLineModuleExplorerConstants.h"
+
+const QString ctkCmdLineModuleExplorerConstants::KEY_SEARCH_PATHS = "ModuleSearchPaths";
+const QString ctkCmdLineModuleExplorerConstants::KEY_REGISTERED_MODULES = "RegisteredModules";
+
+const QString ctkCmdLineModuleExplorerConstants::KEY_MAX_PARALLEL_MODULES = "MaxParallelModules";