Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ArmarXGui
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

0363d1d5

Commit 0363d1d5 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'ScenarioManagerFixes' into 'master'

Added favourite opened Scenarios



See merge request !20

parents a5101b17 df9e4bf5

No related branches found

No related tags found

1 merge request!20Added favourite opened Scenarios

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.cpp 105 additions, 3 deletions

...ins/ScenarioManager/controller/openscenariocontroller.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.h 4 additions, 0 deletions

...ugins/ScenarioManager/controller/openscenariocontroller.h
source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp 12 additions, 0 deletions

...arXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenariomodel.cpp 1 addition, 0 deletions

...Gui/gui-plugins/ScenarioManager/gui/openscenariomodel.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp 1 addition, 1 deletion

...XGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp

with 123 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment