Merge branch 'T25056-Master-integration' Enable hotkeys preference page in…
2123fa1e494a
Actions

Description

Merge branch 'T25056-Master-integration' Enable hotkeys preference page in plugin.xml

Details

Provenance

kalali	Authored on Nov 29 2018, 4:58 PM
kalali	Pushed on Nov 29 2018, 5:31 PM

Parents

rMITK7836da9ac4ff: Merge remote-tracking branch 'origin/T25171-Hotkeys-preference-page-crash' into…
rMITKcbd1ccf538c8: Merge branch 'T25696-SuperfluousCOMMAND'

Branches

Unknown

Tags

Unknown

Event Timeline

kalali committed rMITK2123fa1e494a: Merge branch 'T25056-Master-integration' Enable hotkeys preference page in… (authored by kalali).Nov 29 2018, 5:26 PM

Merged Changes

7836da9ac4ff Merge remote-tracking branch 'origin/T25171-Hotkeys-preference-page-crash' into…
Author
kalali
Browse Repository
No Builds
No Audits
8de786a10547 Merge branch 'T25694-Enable-data-manager-hotkeys' into T25056-Master-integration
Author
kalali
Browse Repository
No Builds
No Audits
36dc69d97670 Remove needless classes
Author
kalali
Browse Repository
No Builds
No Audits
7f874e19ffe1 Add hotkeys preference page and key filter; make actions globally accessible
Author
kalali
Browse Repository
No Builds
No Audits
258e0e5ae890 Merge remote-tracking branch 'origin/T25643-Context-menu-actions-added-multiple…
Author
kalali
Browse Repository
No Builds
No Audits
190ff81df40b Apply changes of T23590 to the new decoupled context menu (actions)
Author
kalali
Browse Repository
No Builds
No Audits
b28e35f456af Merge branch 'T25056-Refactor-data-manager-context-menu' into T25056-Master…
Author
kalali
Browse Repository
No Builds
No Audits
3251a90f7e4f Temporary workaround to include only 'local' actions
Author
kalali
Browse Repository
No Builds
No Audits
310e97239fe1 Some refactoring
Author
kalali
Browse Repository
No Builds
No Audits
707ad8d88e7e Early return
Author
kalali
Browse Repository
No Builds
No Audits
a3d8181fc343 Make function non-virtual
Author
kalali
Browse Repository
No Builds
No Audits
d1b1edd1e3dd Force parent to be a QWidget
Author
kalali
Browse Repository
No Builds
No Audits
c06588fd30a4 Change the way QKeySequence is initialized to correctly capture key-modifiers.
Author
kalali
Browse Repository
No Builds
No Audits
677e2badb8fa Refactor data manager
Author
kalali
Browse Repository
No Builds
No Audits
0c8f0c7e0cc0 Move the info dialog
Author
kalali
Browse Repository
No Builds
No Audits
bc9bf349099c Remove the key filter due to non-existent action functions inside the data…
Author
kalali
Browse Repository
No Builds
No Audits
fe6c92bc6319 Move functionality to the WorkbenchUtil to make it accessible in the context…
Author
kalali
Browse Repository
No Builds
No Audits
dde37068f92d Refactor data manager; create action classes and data node context menu;
Author
kalali
Browse Repository
No Builds
No Audits

Changes (66)

Path

Size

Packages

Modules/

QtWidgets/

include/

QmitkNodeDescriptorManager.h

O3: MITK Reviewer Group II

src/

QmitkNodeDescriptorManager.cpp

O3: MITK Reviewer Group II

QtWidgetsExt/

include/

QmitkHotkeyLineEdit.h

O3: MITK Reviewer Group II

src/

QmitkHotkeyLineEdit.cpp

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.common/

src/

mitkWorkbenchUtil.cpp

O1: MITK Reviewer Group I

mitkWorkbenchUtil.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.application/

CMakeLists.txt

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

src/

QmitkAbstractDataNodeAction.cpp

O1: MITK Reviewer Group I

QmitkAbstractDataNodeAction.h

O1: MITK Reviewer Group I

QmitkDataNodeColorAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeColorAction.h

O1: MITK Reviewer Group I

QmitkDataNodeColorMapAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeColorMapAction.h

O1: MITK Reviewer Group I

QmitkDataNodeComponentAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeComponentAction.h

O1: MITK Reviewer Group I

QmitkDataNodeContextMenu.cpp

O1: MITK Reviewer Group I

QmitkDataNodeContextMenu.h

O1: MITK Reviewer Group I

QmitkDataNodeGlobalReinitAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeGlobalReinitAction.h

O1: MITK Reviewer Group I

QmitkDataNodeHideAllAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeHideAllAction.h

O1: MITK Reviewer Group I

QmitkDataNodeOpacityAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeOpacityAction.h

O1: MITK Reviewer Group I

QmitkDataNodeReinitAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeReinitAction.h

O1: MITK Reviewer Group I

QmitkDataNodeRemoveAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeRemoveAction.h

O1: MITK Reviewer Group I

QmitkDataNodeShowDetailsAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeShowDetailsAction.h

O1: MITK Reviewer Group I

QmitkDataNodeShowSelectedNodesAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeShowSelectedNodesAction.h

O1: MITK Reviewer Group I

QmitkDataNodeSurfaceRepresentationAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeSurfaceRepresentationAction.h

O1: MITK Reviewer Group I

QmitkDataNodeTextureInterpolationAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeTextureInterpolationAction.h

O1: MITK Reviewer Group I

QmitkDataNodeToggleVisibilityAction.cpp

O1: MITK Reviewer Group I

QmitkDataNodeToggleVisibilityAction.h

O1: MITK Reviewer Group I

QmitkFileOpenAction.cpp

O1: MITK Reviewer Group I

QmitkFileOpenAction.h

O1: MITK Reviewer Group I

QmitkFileSaveAction.cpp

O1: MITK Reviewer Group I

QmitkFileSaveAction.h

O1: MITK Reviewer Group I

internal/

QmitkGeneralPreferencePage.cpp

O1: MITK Reviewer Group I

QmitkGeneralPreferencePage.h

O1: MITK Reviewer Group I

QmitkInfoDialog.cpp

O1: MITK Reviewer Group I

QmitkInfoDialog.h

O1: MITK Reviewer Group I

	org.mitk.gui.qt.application/	src/
	org.mitk.gui.qt.datamanager/	src/

mitkIContextMenuAction.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.common/

src/

QmitkAbstractView.cpp

O1: MITK Reviewer Group I

QmitkAbstractView.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.datamanager/

files.cmake

O1: MITK Reviewer Group I

plugin.xml

O1: MITK Reviewer Group I

src/

QmitkDataManagerHotkeysPrefPage.cpp

O1: MITK Reviewer Group I

QmitkDataManagerHotkeysPrefPage.h

O1: MITK Reviewer Group I

QmitkDataManagerPreferencePage.cpp

O1: MITK Reviewer Group I

QmitkDataManagerPreferencePage.h

O1: MITK Reviewer Group I

QmitkDataManagerView.cpp

O1: MITK Reviewer Group I

QmitkDataManagerView.h

O1: MITK Reviewer Group I

internal/

QmitkDelKeyFilter.cpp

O1: MITK Reviewer Group I

QmitkDelKeyFilter.h

O1: MITK Reviewer Group I

QmitkInfoDialog.cpp

O1: MITK Reviewer Group I

QmitkInfoDialog.h

O1: MITK Reviewer Group I

QmitkNodeTableViewKeyFilter.cpp

O1: MITK Reviewer Group I

QmitkNodeTableViewKeyFilter.h

O1: MITK Reviewer Group I

mitkPluginActivator.cpp

O1: MITK Reviewer Group I

mitkIContextMenuAction.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.segmentation/

src/

internal/

QmitkSegmentationView.cpp

O1: MITK Reviewer Group I

rMITK2123fa1e494a

View Options

Modules/QtWidgets/include/QmitkNodeDescriptorManager.h

View Options

Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp

View Options

Modules/QtWidgetsExt/include/QmitkHotkeyLineEdit.h

View Options

Modules/QtWidgetsExt/src/QmitkHotkeyLineEdit.cpp

View Options

Plugins/org.mitk.gui.common/src/mitkWorkbenchUtil.cpp

View Options

Plugins/org.mitk.gui.common/src/mitkWorkbenchUtil.h

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkAbstractDataNodeAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkAbstractDataNodeAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeColorAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeColorAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeColorMapAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeColorMapAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeComponentAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeComponentAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeContextMenu.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeContextMenu.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeGlobalReinitAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeGlobalReinitAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeHideAllAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeHideAllAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeOpacityAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeOpacityAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeReinitAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeReinitAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeRemoveAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeRemoveAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeShowDetailsAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeShowDetailsAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeShowSelectedNodesAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeShowSelectedNodesAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeSurfaceRepresentationAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeSurfaceRepresentationAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeTextureInterpolationAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeTextureInterpolationAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeToggleVisibilityAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeToggleVisibilityAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkFileOpenAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkFileOpenAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkFileSaveAction.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/QmitkFileSaveAction.h

View Options

Plugins/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.h

View Options

Plugins/org.mitk.gui.qt.application/src/internal/QmitkInfoDialog.cpp

View Options

Plugins/org.mitk.gui.qt.application/src/internal/QmitkInfoDialog.h

View Options

Plugins/org.mitk.gui.qt.application/src/mitkIContextMenuAction.h

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.cpp

View Options

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.h

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.h

View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.h

View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.h

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.datamanager/src/mitkIContextMenuAction.h

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp

Merge branch 'T25056-Master-integration' Enable hotkeys preference page in…2123fa1e494aActions

Description

Details

Event Timeline

Merged Changes

Changes (66)

rMITK2123fa1e494a

Modules/QtWidgets/include/QmitkNodeDescriptorManager.h

Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp

Modules/QtWidgetsExt/include/QmitkHotkeyLineEdit.h

Modules/QtWidgetsExt/src/QmitkHotkeyLineEdit.cpp

Plugins/org.mitk.gui.common/src/mitkWorkbenchUtil.cpp

Plugins/org.mitk.gui.common/src/mitkWorkbenchUtil.h

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

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

Plugins/org.mitk.gui.qt.application/src/QmitkAbstractDataNodeAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkAbstractDataNodeAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeColorAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeColorAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeColorMapAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeColorMapAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeComponentAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeComponentAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeContextMenu.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeContextMenu.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeGlobalReinitAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeGlobalReinitAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeHideAllAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeHideAllAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeOpacityAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeOpacityAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeReinitAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeReinitAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeRemoveAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeRemoveAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeShowDetailsAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeShowDetailsAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeShowSelectedNodesAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeShowSelectedNodesAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeSurfaceRepresentationAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeSurfaceRepresentationAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeTextureInterpolationAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeTextureInterpolationAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeToggleVisibilityAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkDataNodeToggleVisibilityAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkFileOpenAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkFileOpenAction.h

Plugins/org.mitk.gui.qt.application/src/QmitkFileSaveAction.cpp

Plugins/org.mitk.gui.qt.application/src/QmitkFileSaveAction.h

Plugins/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.cpp

Plugins/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.h

Plugins/org.mitk.gui.qt.application/src/internal/QmitkInfoDialog.cpp

Plugins/org.mitk.gui.qt.application/src/internal/QmitkInfoDialog.h

Plugins/org.mitk.gui.qt.application/src/mitkIContextMenuAction.h

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.cpp

Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.h

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

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

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.cpp

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.h

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.cpp

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.h

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.h

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

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

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

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

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

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

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

Plugins/org.mitk.gui.qt.datamanager/src/mitkIContextMenuAction.h

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp

Merge branch 'T25056-Master-integration' Enable hotkeys preference page in…
2123fa1e494a
Actions