Merge branch 'bug-13139-PropertyTreeView3'
4f788adb1a10
Actions

Description

Merge branch 'bug-13139-PropertyTreeView3'

Details

Provenance

Authored on Apr 3 2013, 6:14 PM

Parents

rMITK2057ace12a4e: Commented out OnPropertyDeleted().
rMITK5b5eadac5816: Merge branch 'bug-14879-many-filenames-in-the-plugins-documentation-folder…

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK4f788adb1a10: Merge branch 'bug-13139-PropertyTreeView3' (authored by kislinsk).Apr 3 2013, 6:14 PM

Merged Changes

2057ace12a4e Commented out OnPropertyDeleted().
Author
kislinsk
Browse Repository
No Builds
No Audits
09b38ff1ff7a Created final and clean merge branch.
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (56)

Path

Size

Packages

Modules/

mitkLoadPropertiesModule.cpp

mitkLoadPropertiesModule.h

mitkPropertiesActivator.cpp

mitkPropertyAliases.cpp

mitkPropertyAliases.h

mitkPropertyDescriptions.cpp

mitkPropertyDescriptions.h

mitkPropertyFilter.cpp

mitkPropertyFilter.h

mitkPropertyFilters.cpp

mitkPropertyFilters.h

QmitkExt/

Plugins/

org.mitk.gui.qt.datamanager/

files.cmake

O1: MITK Reviewer Group I

src/

internal/

QmitkLineEdit.cpp

O1: MITK Reviewer Group I

QmitkLineEdit.h

O1: MITK Reviewer Group I

QmitkPropertyTreeFilterProxyModel.cpp

O1: MITK Reviewer Group I

QmitkPropertyTreeFilterProxyModel.h

O1: MITK Reviewer Group I

QmitkPropertyTreeItem.cpp

O1: MITK Reviewer Group I

QmitkPropertyTreeItem.h

O1: MITK Reviewer Group I

QmitkPropertyTreeModel.cpp

O1: MITK Reviewer Group I

QmitkPropertyTreeModel.h

O1: MITK Reviewer Group I

QmitkPropertyTreeView.cpp

O1: MITK Reviewer Group I

QmitkPropertyTreeView.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.properties

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

manifest_headers.cmake

O1: MITK Reviewer Group I

plugin.xml

O1: MITK Reviewer Group I

resources

O1: MITK Reviewer Group I

src

O1: MITK Reviewer Group I

internal

O1: MITK Reviewer Group I

QmitkPropertiesPreferencePage.cpp

O1: MITK Reviewer Group I

QmitkPropertiesPreferencePage.h

O1: MITK Reviewer Group I

QmitkPropertiesPreferencePage.ui

O1: MITK Reviewer Group I

QmitkPropertyItem.cpp

O1: MITK Reviewer Group I

QmitkPropertyItemDelegate.cpp

O1: MITK Reviewer Group I

QmitkPropertyItemDelegate.h

O1: MITK Reviewer Group I

QmitkPropertyItemModel.cpp

O1: MITK Reviewer Group I

QmitkPropertyItemModel.h

O1: MITK Reviewer Group I

QmitkPropertyItemSortFilterProxyModel.cpp

O1: MITK Reviewer Group I

QmitkPropertyTreeView.cpp

O1: MITK Reviewer Group I

QmitkPropertyTreeView.h

O1: MITK Reviewer Group I

QmitkPropertyTreeView.ui

O1: MITK Reviewer Group I

mitkGetPropertyService.h

O1: MITK Reviewer Group I

org_mitk_gui_qt_properties_Activator.cpp

O1: MITK Reviewer Group I

org_mitk_gui_qt_properties_Activator.h

O1: MITK Reviewer Group I

	org.mitk.gui.qt.properties/
	org.mitk.gui.qt.datamanager/

resources/

	icon.png
	ShowDataInfo_48.png

O1: MITK Reviewer Group I

src/

internal/

	QmitkPropertyItem.h
	QmitkPropertyTreeItem.h

O1: MITK Reviewer Group I

	QmitkPropertyItemSortFilterProxyModel.h
	QmitkPropertyTreeFilterProxyModel.h

O1: MITK Reviewer Group I

rMITK4f788adb1a10

View Options

Modules/CMakeLists.txt

View Options

Modules/Properties/CMakeLists.txt

View Options

Modules/Properties/files.cmake

View Options

Modules/Properties/mitkLoadPropertiesModule.cpp

View Options

Modules/Properties/mitkLoadPropertiesModule.h

View Options

Modules/Properties/mitkPropertiesActivator.cpp

View Options

Modules/Properties/mitkPropertyAliases.cpp

View Options

Modules/Properties/mitkPropertyAliases.h

View Options

Modules/Properties/mitkPropertyDescriptions.cpp

View Options

Modules/Properties/mitkPropertyDescriptions.h

View Options

Modules/Properties/mitkPropertyFilter.cpp

View Options

Modules/Properties/mitkPropertyFilter.h

View Options

Modules/Properties/mitkPropertyFilters.cpp

View Options

Modules/Properties/mitkPropertyFilters.h

View Options

Modules/QmitkExt/QmitkLineEdit.cpp

View Options

Modules/QmitkExt/QmitkLineEdit.h

View Options

Modules/QmitkExt/files.cmake

View Options

Plugins/PluginList.cmake

View Options

Plugins/org.mitk.gui.qt.datamanager/files.cmake

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkLineEdit.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkLineEdit.h

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeFilterProxyModel.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeFilterProxyModel.h

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeItem.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeItem.h

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeModel.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeModel.h

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeView.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeView.h

View Options

Plugins/org.mitk.gui.qt.properties/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.properties/files.cmake

View Options

Plugins/org.mitk.gui.qt.properties/manifest_headers.cmake

View Options

Plugins/org.mitk.gui.qt.properties/plugin.xml

View Options

Plugins/org.mitk.gui.qt.properties/resources/icon.png

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.ui

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItem.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItem.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemDelegate.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemDelegate.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemModel.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemModel.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemSortFilterProxyModel.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemSortFilterProxyModel.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.ui

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/mitkGetPropertyService.h

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/org_mitk_gui_qt_properties_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/org_mitk_gui_qt_properties_Activator.h

Merge branch 'bug-13139-PropertyTreeView3'4f788adb1a10Actions

Description

Details

Event Timeline

Merged Changes

Changes (56)

rMITK4f788adb1a10

Modules/CMakeLists.txt

Modules/Properties/CMakeLists.txt

Modules/Properties/files.cmake

Modules/Properties/mitkLoadPropertiesModule.cpp

Modules/Properties/mitkLoadPropertiesModule.h

Modules/Properties/mitkPropertiesActivator.cpp

Modules/Properties/mitkPropertyAliases.cpp

Modules/Properties/mitkPropertyAliases.h

Modules/Properties/mitkPropertyDescriptions.cpp

Modules/Properties/mitkPropertyDescriptions.h

Modules/Properties/mitkPropertyFilter.cpp

Modules/Properties/mitkPropertyFilter.h

Modules/Properties/mitkPropertyFilters.cpp

Modules/Properties/mitkPropertyFilters.h

Modules/QmitkExt/QmitkLineEdit.cpp

Modules/QmitkExt/QmitkLineEdit.h

Modules/QmitkExt/files.cmake

Plugins/PluginList.cmake

Plugins/org.mitk.gui.qt.datamanager/files.cmake

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkLineEdit.cpp

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkLineEdit.h

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeFilterProxyModel.cpp

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeFilterProxyModel.h

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeItem.cpp

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeItem.h

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeModel.cpp

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeModel.h

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeView.cpp

Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyTreeView.h

Plugins/org.mitk.gui.qt.properties/CMakeLists.txt

Plugins/org.mitk.gui.qt.properties/files.cmake

Plugins/org.mitk.gui.qt.properties/manifest_headers.cmake

Plugins/org.mitk.gui.qt.properties/plugin.xml

Plugins/org.mitk.gui.qt.properties/resources/icon.png

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.cpp

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.h

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.ui

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItem.cpp

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItem.h

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemDelegate.cpp

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemDelegate.h

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemModel.cpp

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemModel.h

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemSortFilterProxyModel.cpp

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyItemSortFilterProxyModel.h

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.h

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.ui

Plugins/org.mitk.gui.qt.properties/src/internal/mitkGetPropertyService.h

Plugins/org.mitk.gui.qt.properties/src/internal/org_mitk_gui_qt_properties_Activator.cpp

Plugins/org.mitk.gui.qt.properties/src/internal/org_mitk_gui_qt_properties_Activator.h

Merge branch 'bug-13139-PropertyTreeView3'
4f788adb1a10
Actions