Diffusion GCompris c1771f379fd2

added command-controller but creates errors
c1771f379fd2
Actions

Authored by echarruau on Jan 16 2020, 2:58 PM.

Description

added command-controller but creates errors

Details

Committed

echarruau

Jan 16 2020, 2:58 PM

Parents

R2:3cb2fb9ee877: removed qml modules

Branches

Unknown

Tags

Unknown

echarruau committed R2:c1771f379fd2: added command-controller but creates errors (authored by echarruau).Jan 16 2020, 2:58 PM

Changes (36)

		Path
D		D26107.diff
D		D26176.diff
D		D26186.diff
D		D26186.vs72082.id72109.diff
D		D26196.diff
D		D26252.diff
D		D26260.diff
M		src/activities/server/components/CommandBar.qml
M		src/activities/server/components/CommandButton.qml
M		src/activities/server/views/CreateClientView.qml
D		src/activities/smallnumbers/resource/4
D		src/activities/smallnumbers/resource/4/Data.qml
D		src/activities/smallnumbers/resource/5
D		src/activities/smallnumbers/resource/5/Data.qml
D		src/activities/smallnumbers/resource/6
V		src/activities/{smallnumbers/resource/6 → smallnumbers2/resource/4}/Data.qml
D		src/activities/smallnumbers/resource/7
P		src/activities/smallnumbers/resource/7/Data.qml Deleted after being copied to multiple locations: src/activities/smallnumbers2/resource/5/Data.qml src/activities/smallnumbers2/resource/6/Data.qml src/activities/smallnumbers2/resource/7/Data.qml
A	(dir)	src/activities/smallnumbers2/resource/4/
V		src/activities/{smallnumbers2/resource/4 ← smallnumbers/resource/6}/Data.qml
A	(dir)	src/activities/smallnumbers2/resource/5/
P		src/activities/smallnumbers2/resource/5/Data.qml Copied from src/activities/smallnumbers/resource/7/Data.qml
A	(dir)	src/activities/smallnumbers2/resource/6/
P		src/activities/smallnumbers2/resource/6/Data.qml Copied from src/activities/smallnumbers/resource/7/Data.qml
A	(dir)	src/activities/smallnumbers2/resource/7/
V		src/activities/{smallnumbers2 ← smallnumbers}/resource/7/Data.qml
M		src/core/CMakeLists.txt
M		src/core/main.cpp
P		src/core/serverMasterController/cm-lib_global.h Copied from src/core/serverMasterController/controllers/cm-lib_global.h
D		src/core/serverMasterController/commands
V		src/core/serverMasterController/{commands → framework}/command.cpp
V		src/core/serverMasterController/{commands → framework}/command.h
M		src/core/serverMasterController/controllers/command-controller.h
A	(dir)	src/core/serverMasterController/framework/
V		src/core/serverMasterController/{framework ← commands}/command.cpp
V		src/core/serverMasterController/{framework ← commands}/command.h