diff --git a/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp b/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp
index 8e34174856..b2efd6b834 100644
--- a/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp
@@ -1,194 +1,194 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 
 // Blueberry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 #include <berryUIException.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIPreferencesService.h>
 #include <berryIPartListener.h>
 #include <mitkGlobalInteraction.h>
 #include <mitkDataStorageEditorInput.h>
 #include "berryFileEditorInput.h"
 
 // Qmitk
 #include "QmitkDicomEditor.h"
 #include "mitkPluginActivator.h"
 #include <mitkDicomSeriesReader.h>
 
 //#include "mitkProgressBar.h"
 
 // Qt
 #include <QCheckBox>
 #include <QMessageBox>
 #include <QWidget>
 
 #include <QtSql>
 #include <QSqlDatabase>
 #include <QtCore/QVariant>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QGridLayout>
 #include <QtGui/QHeaderView>
 #include <QtGui/QPushButton>
 #include <QtGui/QTextEdit>
 #include <QtGui/QWidget>
 
 //CTK
 #include <ctkDICOMModel.h>
 #include <ctkDICOMAppWidget.h>
 #include <ctkDICOMQueryWidget.h>
 #include <ctkFileDialog.h>
 #include <ctkDICOMQueryRetrieveWidget.h>
 
 
 const std::string QmitkDicomEditor::EDITOR_ID = "org.mitk.editors.dicomeditor";
 
 
 QmitkDicomEditor::QmitkDicomEditor()
 : m_Thread(new QThread())
 , m_DicomDirectoryListener(new QmitkDicomDirectoryListener())
 {
 }
 
 QmitkDicomEditor::~QmitkDicomEditor()
 {
     m_Thread->terminate();
     delete m_Handler;
     delete m_Publisher;
     delete m_StoreSCPLauncher;
     delete m_Thread;
     delete m_DicomDirectoryListener;
 }
 
 void QmitkDicomEditor::CreateQtPartControl(QWidget *parent )
 {   
     m_Controls.setupUi( parent );
     TestHandler();
     SetupDefaults();
 
     connect(m_Controls.externalDataWidget,SIGNAL(SignalAddDicomData(const QString&)),m_Controls.internalDataWidget,SLOT(StartDicomImport(const QString&)));
     connect(m_Controls.externalDataWidget,SIGNAL(SignalAddDicomData(const QStringList&)),m_Controls.internalDataWidget,SLOT(StartDicomImport(const QStringList&)));
     connect(m_Controls.externalDataWidget,SIGNAL(SignalDicomToDataManager(const QStringList&)),this,SLOT(OnViewButtonAddToDataManager(const QStringList&)));
     connect(m_Controls.externalDataWidget,SIGNAL(SignalChangePage(int)), this, SLOT(OnChangePage(int)));
 
     connect(m_Controls.internalDataWidget,SIGNAL(FinishedImport(const QString&)),this,SLOT(OnDicomImportFinished(const QString&)));
     connect(m_Controls.internalDataWidget,SIGNAL(FinishedImport(const QStringList&)),this,SLOT(OnDicomImportFinished(const QStringList&)));
     connect(m_Controls.internalDataWidget,SIGNAL(SignalDicomToDataManager(const QStringList&)),this,SLOT(OnViewButtonAddToDataManager(const QStringList&)));
-    
+
     connect(m_Controls.CDButton, SIGNAL(clicked()), m_Controls.externalDataWidget, SLOT(OnFolderCDImport()));
     connect(m_Controls.FolderButton, SIGNAL(clicked()), m_Controls.externalDataWidget, SLOT(OnFolderCDImport()));
     connect(m_Controls.QueryRetrieveButton, SIGNAL(clicked()), this, SLOT(OnQueryRetrieve()));
     connect(m_Controls.LocalStorageButton, SIGNAL(clicked()), this, SLOT(OnLocalStorage()));    
 }
 
 void QmitkDicomEditor::Init(berry::IEditorSite::Pointer site, berry::IEditorInput::Pointer input)
 {
     this->SetSite(site);
     this->SetInput(input);
 }
 
 void QmitkDicomEditor::SetFocus()
 {
 }
 
 berry::IPartListener::Events::Types QmitkDicomEditor::GetPartEventTypes() const
 {
     return Events::CLOSED | Events::HIDDEN | Events::VISIBLE;
 }
 
 void QmitkDicomEditor::OnQueryRetrieve()
 {
     OnChangePage(2);
 }
 
 void QmitkDicomEditor::OnLocalStorage()
 {
     OnChangePage(0);
 }
 
 void QmitkDicomEditor::OnChangePage(int page)
 {
     try{
         m_Controls.stackedWidget->setCurrentIndex(page);
     }catch(std::exception e){
         MITK_ERROR <<"error: "<< e.what();
         return;
     }
 }
 
 void QmitkDicomEditor::OnDicomImportFinished(const QString& path)
 {
 }
 
 void QmitkDicomEditor::OnDicomImportFinished(const QStringList& path)
 {
 }
 
 void QmitkDicomEditor::StartDicomDirectoryListener(QString& directory)
 {   
     m_DicomDirectoryListener->SetDicomListenerDirectory(directory);
     connect(m_DicomDirectoryListener,SIGNAL(SignalAddDicomData(const QStringList&)),m_Controls.internalDataWidget,SLOT(StartDicomImport(const QStringList&)),Qt::DirectConnection);
     connect(m_Controls.internalDataWidget,SIGNAL(FinishedImport(const QStringList&)),m_DicomDirectoryListener,SLOT(OnDicomImportFinished(const QStringList&)),Qt::DirectConnection);
     m_DicomDirectoryListener->moveToThread(m_Thread);
     m_Thread->start();   
 }
 
 void QmitkDicomEditor::SetupDefaults()
 {
     QString pluginDirectory;
     mitk::PluginActivator::getContext()->getDataFile(pluginDirectory);
     pluginDirectory.append("/");
     QString databaseDirectory;
     //databaseDirectory.append(pluginDirectory);
     databaseDirectory.append(QString("C:/DicomDatabase"));
     QDir tmp(databaseDirectory);
     tmp.mkpath(databaseDirectory);
     m_Controls.internalDataWidget->SetDatabaseDirectory(databaseDirectory);
     QString listenerDirectory("C:/DICOMListenerDirectory");
     StartDicomDirectoryListener(listenerDirectory);
     QmitkStoreSCPLauncherBuilder builder;
     builder.AddPort()->AddTransferSyntax()->AddOtherNetworkOptions()->AddMode()->AddOutputDirectory(listenerDirectory);
     m_StoreSCPLauncher = new QmitkStoreSCPLauncher(&builder);
     m_StoreSCPLauncher->StartStoreSCP();
 }
 
 //TODO Remove
 void QmitkDicomEditor::TestHandler()
 {
       m_Handler = new DicomEventHandler();
       m_Handler->SubscribeSlots();
 }
 
 void QmitkDicomEditor::OnViewButtonAddToDataManager(const QStringList& eventProperties)
 {
     ctkDictionary properties;
     properties["PatientName"] = eventProperties.at(0);
     properties["StudyUID"] = eventProperties.at(1);
     properties["StudyName"] = eventProperties.at(2);
     properties["SeriesUID"] = eventProperties.at(3);
     properties["SeriesName"] = eventProperties.at(4);
     properties["Path"] = eventProperties.at(5);
 
     m_Publisher = new QmitkDicomDataEventPublisher();
     m_Publisher->PublishSignals(mitk::PluginActivator::getContext());
 
     m_Publisher->AddSeriesToDataManagerEvent(properties);
 }
\ No newline at end of file
diff --git a/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.h b/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.h
index a3afc90b90..a78de58c16 100644
--- a/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.h
+++ b/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.h
@@ -1,130 +1,130 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 
 #ifndef QmitkDicomEditor_h
 #define QmitkDicomEditor_h
 
 #include <berryISelectionListener.h>
 #include <berryQtEditorPart.h>
 #include <berryIPartListener.h>
 
-#include <mitkIDataStorageReference.h>
-#include <mitkIDataStorageService.h>
-#include <mitkDataStorageEditorInput.h>
+//#include <mitkIDataStorageReference.h>
+//#include <mitkIDataStorageService.h>
+//#include <mitkDataStorageEditorInput.h>
 
 #include "ui_QmitkDicomEditorControls.h"
 #include "QmitkDicomDirectoryListener.h"
 #include "QmitkStoreSCPLauncher.h"
 #include "QmitkStoreSCPLauncherBuilder.h"
 #include "DicomEventHandler.h"
 #include "QmitkDicomDataEventPublisher.h"
 
 #include <QTextEdit>
 #include <QModelIndex>
 #include <QString>
 #include <QStringList>
 #include <QThread.h>
 #include <QProcess>
 #include <QstringList>
 
 /*!
 \brief QmitkDicomEditor
 
 \warning  This class is not yet documented. Use "git blame" and ask the author to provide basic documentation.
 
 \sa QmitkFunctionality
 \ingroup ${plugin_target}_internal
 */
 class QmitkDicomEditor : public berry::QtEditorPart, virtual public berry::IPartListener
 {
     // this is needed for all Qt objects that should have a Qt meta-object
     // (everything that derives from QObject and wants to have signal/slots)
     Q_OBJECT
 
 public:
 
     berryObjectMacro(QmitkDicomEditor);
     static const std::string EDITOR_ID;
 
     QmitkDicomEditor();
     QmitkDicomEditor(const QmitkDicomEditor& other)
     {
         Q_UNUSED(other)
             throw std::runtime_error("Copy constructor not implemented");
     }
     virtual ~QmitkDicomEditor();
 
     void Init(berry::IEditorSite::Pointer site, berry::IEditorInput::Pointer input);
 
     void SetFocus();
     void DoSave() {}
     void DoSaveAs() {}
     bool IsDirty() const { return false; }
     bool IsSaveAsAllowed() const { return false; }
 
 signals:
 
 
     protected slots:
 
         /// \brief Called when import is finished
         void OnDicomImportFinished(const QString& path);
 
         /// \brief Called when import is finished
         void OnDicomImportFinished(const QStringList& path);
 
         /// \brief Called when Query Retrieve or Import Folder was clicked.
         void OnQueryRetrieve();
 
         /// \brief Called when LocalStorageButton was clicked.
         void OnLocalStorage();
 
         /// \brief Called when view button is clicked. Sends out an event for adding the current selected file to the mitkDataStorage.
         void OnViewButtonAddToDataManager(const QStringList& eventProperties);
 
         void StartDicomDirectoryListener(QString& directory);
 
         void OnChangePage(int);
         /// To be called when an entry of the tree list is collapsed
         //void OnTreeCollapsed(const QModelIndex& index);
 
         /// To be called when an entry of the tree list is expanded
         //void OnTreeExpanded(const QModelIndex& index);
 
         void TestHandler();
 
 protected:
 
     void CreateQtPartControl(QWidget *parent);
 
     void SetupDefaults();
 
     Events::Types GetPartEventTypes() const;
 
     Ui::QmitkDicomEditorControls m_Controls;
 
     QThread* m_Thread;
     QmitkDicomDirectoryListener* m_DicomDirectoryListener;
     QmitkStoreSCPLauncher* m_StoreSCPLauncher;
     DicomEventHandler* m_Handler;
     QmitkDicomDataEventPublisher* m_Publisher;
  
 };
 
 #endif // QmitkDicomEditor_h
 
diff --git a/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp b/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp
index e0ca82b064..75bc071408 100644
--- a/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp
+++ b/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp
@@ -1,187 +1,189 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$ 
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 // Qmitk
 #include "QmitkDicomLocalStorageWidget.h"
 #include <mitklogmacros.h>
 //#include <mitkProgressBar.h>
 // Qt
 #include <QMessageBox>
 #include <QModelIndex>
 #include <QMap>
 #include <QVariant>
+#include <mitkStatusBar.h>
+#include <mitkProgressBar.h>
 //#include "QmitkDicomDataEventPublisher.h"
 
 
 
 const std::string QmitkDicomLocalStorageWidget::Widget_ID = "org.mitk.Widgets.QmitkDicomLocalStorageWidget";
 
 QmitkDicomLocalStorageWidget::QmitkDicomLocalStorageWidget(QWidget *parent)
 :  m_Controls( 0 )
 ,m_LocalIndexer(new ctkDICOMIndexer())
 ,m_LocalModel(new ctkDICOMModel())
 {
     CreateQtPartControl(this);
 }
 
 QmitkDicomLocalStorageWidget::~QmitkDicomLocalStorageWidget()
 {
     m_LocalDatabase->closeDatabase();
     delete m_LocalDatabase;
     delete m_LocalIndexer;
     delete m_LocalModel;
     delete m_Controls;
 }
 
 void QmitkDicomLocalStorageWidget::CreateQtPartControl( QWidget *parent )
 {
     if ( !m_Controls )
     {
         m_Controls = new Ui::QmitkDicomLocalStorageWidgetControls;
         m_Controls->setupUi( parent );
         m_Controls->groupBox->setVisible(false);
         m_Controls->InternalDataTreeView->setSortingEnabled(true);
         m_Controls->InternalDataTreeView->setSelectionBehavior(QAbstractItemView::SelectRows);
         m_Controls->InternalDataTreeView->setModel(m_LocalModel);
         connect(m_Controls->deleteButton,SIGNAL(clicked()),this,SLOT(OnDeleteButtonClicked()));
         connect(m_Controls->CancelButton, SIGNAL(clicked()), this , SLOT(OnCancelButtonClicked()));
         connect(m_Controls->viewInternalDataButton, SIGNAL(clicked()), this , SLOT(OnViewButtonClicked()));
         connect(m_Controls->SearchOption, SIGNAL(parameterChanged()), this, SLOT(OnSearchParameterChanged()));
     }
 }
 
 void QmitkDicomLocalStorageWidget::StartDicomImport(const QString& dicomData)
 {
     if (m_Watcher.isRunning()){
         m_Watcher.waitForFinished();
     }
     m_Future = QtConcurrent::run(this,(void (QmitkDicomLocalStorageWidget::*)(const QString&)) &QmitkDicomLocalStorageWidget::AddDICOMData,dicomData);
     m_Watcher.setFuture(m_Future); 
 }
 
 void QmitkDicomLocalStorageWidget::StartDicomImport(const QStringList& dicomData)
 {
     if (m_Watcher.isRunning())
     {
         m_Watcher.waitForFinished();
     }
     m_Future = QtConcurrent::run(this,(void (QmitkDicomLocalStorageWidget::*)(const QStringList&)) &QmitkDicomLocalStorageWidget::AddDICOMData,dicomData);
     m_Watcher.setFuture(m_Future);
 }
 
 void QmitkDicomLocalStorageWidget::AddDICOMData(const QString& directory)
 {
     if(m_LocalDatabase->isOpen())
     {
         m_LocalIndexer->addDirectory(*m_LocalDatabase,directory,m_LocalDatabase->databaseDirectory());
     }
     m_LocalModel->setDatabase(m_LocalDatabase->database());
     emit FinishedImport(directory);
 }
 
 void QmitkDicomLocalStorageWidget::AddDICOMData(const QStringList& patientFiles)
 {
     if(m_LocalDatabase->isOpen())
     {
         QStringListIterator fileIterator(patientFiles);
         while(fileIterator.hasNext())
         {
             m_LocalIndexer->addFile(*m_LocalDatabase,fileIterator.next(),m_LocalDatabase->databaseDirectory());
         }
     }
     m_LocalModel->setDatabase(m_LocalDatabase->database());
     emit FinishedImport(patientFiles);
 }
 
 void QmitkDicomLocalStorageWidget::OnDeleteButtonClicked()
 {
     QModelIndex currentIndex = m_Controls->InternalDataTreeView->currentIndex();
     QString currentUID = m_LocalModel->data(currentIndex,ctkDICOMModel::UIDRole).toString();
     if(m_LocalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::SeriesType))
     {
         m_LocalDatabase->removeSeries(currentUID);
     }
     else if(m_LocalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::StudyType))
     {
         m_LocalDatabase->removeStudy(currentUID);
     }
     else if(m_LocalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::PatientType))
     {
         m_LocalDatabase->removePatient(currentUID);
     }
     m_LocalModel->reset();
 }
 
 void QmitkDicomLocalStorageWidget::OnCancelButtonClicked()
 {
     m_Watcher.cancel();
     m_Watcher.waitForFinished();
     m_LocalDatabase->closeDatabase();
 }
-//TODO
+
 void QmitkDicomLocalStorageWidget::OnViewButtonClicked()
 {
     QModelIndex currentIndex = m_Controls->InternalDataTreeView->currentIndex();
     if(m_LocalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::SeriesType))
     {
         QString seriesUID = m_LocalModel->data(currentIndex,ctkDICOMModel::UIDRole).toString();
         QString seriesName = m_LocalModel->data(currentIndex).toString();
         
         QModelIndex studyIndex = m_LocalModel->parent(currentIndex);
         QString studyUID = m_LocalModel->data(studyIndex,ctkDICOMModel::UIDRole).toString();
         QString studyName = m_LocalModel->data(studyIndex).toString();
 
         QModelIndex patientIndex = m_LocalModel->parent(studyIndex);
         QString patientName = m_LocalModel->data(patientIndex).toString();        
 
         QString filePath;
         filePath.append(m_LocalDatabase->databaseDirectory());
         filePath.append("/dicom/");
         filePath.append(studyUID);
         filePath.append("/");
         filePath.append(seriesUID);
         filePath.append("/");
 
         QStringList eventProperties;
         eventProperties << patientName << studyUID <<studyName << seriesUID << seriesName << filePath;
         MITK_INFO << filePath.toStdString();
         emit SignalDicomToDataManager(eventProperties);
     }
 }
 
 void QmitkDicomLocalStorageWidget::OnSearchParameterChanged()
 { 
     m_LocalModel->setDatabase(m_LocalDatabase->database(),m_Controls->SearchOption->parameters());
 }
 
 void QmitkDicomLocalStorageWidget::SetDatabaseDirectory(QString newDatatbaseDirectory)
 {
     QDir databaseDirecory = QDir(newDatatbaseDirectory);
     if(!databaseDirecory.exists())
     {
         databaseDirecory.mkpath(databaseDirecory.absolutePath());
     }
     QString newDatatbaseFile = databaseDirecory.absolutePath() + QString("/ctkDICOM.sql");
     this->SetDatabase(newDatatbaseFile);
 }
 
 void QmitkDicomLocalStorageWidget::SetDatabase(QString databaseFile)
 {
     m_LocalDatabase = new ctkDICOMDatabase(databaseFile);
     m_LocalModel->setEndLevel(ctkDICOMModel::SeriesType);
     m_LocalModel->setDatabase(m_LocalDatabase->database());
 }
\ No newline at end of file