T22789-FixesPluginEchoTrack' into…
10426dbc28bb
Actions

Description

Merge remote-tracking branch 'remotes/origin/T22789-FixesPluginEchoTrack' into personal/franza/2017-04-Demo-BasedOnDarkStyleBranch

Conflicts:
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.ui

Details

Provenance

franza	Authored on May 5 2017, 4:38 PM
franza	Pushed on May 5 2017, 4:51 PM

Parents

rMITK17769a1023bb: Disabled progress bar in tracking toolbox because it caused a crash
rMITK599df7009d7b: Merge remote-tracking branch 'remotes/origin/T22789-FixesPluginEchoTrack' into…

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK10426dbc28bb: Merge remote-tracking branch 'remotes/origin/T22789-FixesPluginEchoTrack' into… (authored by franza).May 5 2017, 4:38 PM

Merged Changes

17769a1023bb Disabled progress bar in tracking toolbox because it caused a crash
Author
franza
Browse Repository
No Builds
No Audits
7553062f6c5b made UI elements invisible when not used
Author
franza
Browse Repository
No Builds
No Audits
590d6b68dbfc unified alignment: left-justified / corrected typo in UI
Author
franza
Browse Repository
No Builds
No Audits
0b4dcf49d844 converted Qt tool box to stacked widget (looks better)
Author
franza
Browse Repository
No Builds
No Audits
95d7a364b4e1 fixed cmake warnings
Author
franza
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

Plugins/

org.mitk.gui.qt.igt.app.echotrack/

CMakeLists.txt

src/

internal/

NavigationStepWidgets/

QmitkUSNavigationStepCombinedModality.ui

QmitkUSNavigationStepPunctuationIntervention.cpp

QmitkUSNavigationStepZoneMarking.cpp

QmitkUSNavigationStepZoneMarking.h

QmitkUSNavigationStepZoneMarking.ui

SettingsWidgets/

QmitkUSNavigationCombinedSettingsWidget.ui

USNavigationMarkerPlacement.cpp

Widgets/

QmitkUSNavigationProcessWidget.cpp

QmitkUSNavigationProcessWidget.ui

org_mbi_gui_qt_usnavigation_Activator.cpp

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

rMITK10426dbc28bb

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepCombinedModality.ui

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.h

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.ui

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/SettingsWidgets/QmitkUSNavigationCombinedSettingsWidget.ui

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.ui

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/org_mbi_gui_qt_usnavigation_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Merge remote-tracking branch 'remotes/origin/T22789-FixesPluginEchoTrack' into…10426dbc28bbActions

Description

Details

Event Timeline

Merged Changes

Changes (12)

rMITK10426dbc28bb

Plugins/org.mitk.gui.qt.igt.app.echotrack/CMakeLists.txt

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepCombinedModality.ui

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.h

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepZoneMarking.ui

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/SettingsWidgets/QmitkUSNavigationCombinedSettingsWidget.ui

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.ui

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/org_mbi_gui_qt_usnavigation_Activator.cpp

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Merge remote-tracking branch 'remotes/origin/T22789-FixesPluginEchoTrack' into…
10426dbc28bb
Actions