moved learn to framework

AVee · Apr 3, 2024 · b21e4df · b21e4df
1 parent 3073ae7
commit b21e4df
Show file tree

Hide file tree

Showing 29 changed files with 14 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,7 +73,6 @@ option(MUE_BUILD_VIDEOEXPORT_MODULE "Build videoexport module" OFF)
 option(MUE_BUILD_IMAGESEXPORT_MODULE "Build imagesexport module" ON)
 option(MUE_BUILD_INSPECTOR_MODULE "Build inspector module" ON)
 option(MUE_BUILD_INSTRUMENTSSCENE_MODULE "Build instruments scene module" ON)
-option(MUE_BUILD_LEARN_MODULE "Build learn module" ON)
 option(MUE_BUILD_NOTATION_MODULE "Build notation module" ON)
 option(MUE_BUILD_NOTATION_TESTS "Build notation tests" ON)
 option(MUE_BUILD_PALETTE_MODULE "Build palette module" ON)

diff --git a/SetupConfigure.cmake b/SetupConfigure.cmake
@@ -137,7 +137,7 @@ if(BUILD_CONFIGURE MATCHES "VTEST")
     set(MUE_BUILD_INSPECTOR_MODULE OFF)
     set(MUE_BUILD_INSTRUMENTSSCENE_MODULE OFF)
     set(MUSE_MODULE_LANGUAGES OFF)
-    set(MUE_BUILD_LEARN_MODULE OFF)
+    set(MUSE_MODULE_LEARN OFF)
     set(MUSE_MODULE_MULTIINSTANCES OFF)
     set(MUE_BUILD_PALETTE_MODULE OFF)
     set(MUE_BUILD_PLAYBACK_MODULE OFF)
@@ -176,7 +176,7 @@ if(BUILD_CONFIGURE MATCHES "UTEST")
     set(MUE_BUILD_INSPECTOR_MODULE OFF)
     set(MUE_BUILD_INSTRUMENTSSCENE_MODULE OFF)
     set(MUSE_MODULE_LANGUAGES OFF)
-    set(MUE_BUILD_LEARN_MODULE OFF)
+    set(MUSE_MODULE_LEARN OFF)
     set(MUSE_MODULE_MULTIINSTANCES OFF)
     set(MUE_BUILD_PALETTE_MODULE OFF)
     set(MUE_BUILD_PLAYBACK_MODULE OFF)
@@ -270,7 +270,6 @@ def_opt(MUE_BUILD_CONVERTER_MODULE ${MUE_BUILD_CONVERTER_MODULE})
 def_opt(MUE_BUILD_DIAGNOSTICS_MODULE ${MUE_BUILD_DIAGNOSTICS_MODULE})
 def_opt(MUE_BUILD_INSPECTOR_MODULE ${MUE_BUILD_INSPECTOR_MODULE})
 def_opt(MUE_BUILD_INSTRUMENTSSCENE_MODULE ${MUE_BUILD_INSTRUMENTSSCENE_MODULE})
-def_opt(MUE_BUILD_LEARN_MODULE ${MUE_BUILD_LEARN_MODULE})
 def_opt(MUE_BUILD_NOTATION_MODULE ${MUE_BUILD_NOTATION_MODULE})
 def_opt(MUE_BUILD_PALETTE_MODULE ${MUE_BUILD_PALETTE_MODULE})
 def_opt(MUE_BUILD_PLAYBACK_MODULE ${MUE_BUILD_PLAYBACK_MODULE})

diff --git a/build/cmake/muse_framework/DeclareOptions.cmake b/build/cmake/muse_framework/DeclareOptions.cmake
@@ -17,6 +17,7 @@ declare_muse_module_opt(DRAW ON)
 declare_muse_module_opt(EXTENSIONS ON)
 declare_muse_module_opt(GLOBAL ON)
 declare_muse_module_opt(LANGUAGES ON)
+declare_muse_module_opt(LEARN ON)
 declare_muse_module_opt(MIDI ON)
 declare_muse_module_opt(MPE ON)
 declare_muse_module_opt(MULTIINSTANCES ON)

diff --git a/build/cmake/muse_framework/Modules.cmake b/build/cmake/muse_framework/Modules.cmake
@@ -8,6 +8,7 @@ set(MUSE_FRAMEWORK_MODULES
     EXTENSIONS
     GLOBAL
     LANGUAGES
+    LEARN
     MIDI
     MPE
     MULTIINSTANCES

diff --git a/build/cmake/muse_framework/muse_framework_config.h.in b/build/cmake/muse_framework/muse_framework_config.h.in
@@ -37,6 +37,10 @@
 #cmakedefine MUSE_MODULE_LANGUAGES_TESTS 1
 #cmakedefine MUSE_MODULE_LANGUAGES_API 1
 
+#cmakedefine MUSE_MODULE_LEARN 1
+#cmakedefine MUSE_MODULE_LEARN_TESTS 1
+#cmakedefine MUSE_MODULE_LEARN_API 1
+
 #cmakedefine MUSE_MODULE_MIDI 1
 #cmakedefine MUSE_MODULE_MIDI_TESTS 1
 #cmakedefine MUSE_MODULE_MIDI_API 1

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -60,10 +60,6 @@ if (MUE_BUILD_INSTRUMENTSSCENE_MODULE)
     add_subdirectory(instrumentsscene)
 endif()
 
-if (MUE_BUILD_LEARN_MODULE)
-    add_subdirectory(learn)
-endif()
-
 if (MUE_BUILD_NOTATION_MODULE)
     add_subdirectory(notation)
 endif()

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -153,7 +153,7 @@
 #include "stubs/languages/languagesstubmodule.h"
 #endif
 
-#ifdef MUE_BUILD_LEARN_MODULE
+#ifdef MUSE_MODULE_LEARN
 #include "learn/learnmodule.h"
 #else
 #include "stubs/learn/learnmodule.h"

diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
@@ -68,6 +68,10 @@ if (MUSE_MODULE_LANGUAGES)
     add_subdirectory(languages)
 endif()
 
+if (MUSE_MODULE_LEARN)
+    add_subdirectory(learn)
+endif()
+
 if (MUSE_MODULE_EXTENSIONS)
     add_subdirectory(extensions)
 endif()

diff --git a/src/learn/CMakeLists.txt → src/framework/learn/CMakeLists.txt b/src/learn/CMakeLists.txt → src/framework/learn/CMakeLists.txt
diff --git a/src/learn/ilearnconfiguration.h → src/framework/learn/ilearnconfiguration.h b/src/learn/ilearnconfiguration.h → src/framework/learn/ilearnconfiguration.h
diff --git a/src/learn/ilearnservice.h → src/framework/learn/ilearnservice.h b/src/learn/ilearnservice.h → src/framework/learn/ilearnservice.h
diff --git a/src/learn/internal/learnconfiguration.cpp → ...ork/learn/internal/learnconfiguration.cpp b/src/learn/internal/learnconfiguration.cpp → ...ork/learn/internal/learnconfiguration.cpp
diff --git a/src/learn/internal/learnconfiguration.h → ...ework/learn/internal/learnconfiguration.h b/src/learn/internal/learnconfiguration.h → ...ework/learn/internal/learnconfiguration.h
diff --git a/src/learn/internal/learnservice.cpp → ...framework/learn/internal/learnservice.cpp b/src/learn/internal/learnservice.cpp → ...framework/learn/internal/learnservice.cpp
diff --git a/src/learn/internal/learnservice.h → src/framework/learn/internal/learnservice.h b/src/learn/internal/learnservice.h → src/framework/learn/internal/learnservice.h
diff --git a/src/learn/learn.qrc → src/framework/learn/learn.qrc b/src/learn/learn.qrc → src/framework/learn/learn.qrc
diff --git a/src/learn/learnerrors.h → src/framework/learn/learnerrors.h b/src/learn/learnerrors.h → src/framework/learn/learnerrors.h
diff --git a/src/learn/learnmodule.cpp → src/framework/learn/learnmodule.cpp b/src/learn/learnmodule.cpp → src/framework/learn/learnmodule.cpp
diff --git a/src/learn/learnmodule.h → src/framework/learn/learnmodule.h b/src/learn/learnmodule.h → src/framework/learn/learnmodule.h
diff --git a/src/learn/learntypes.h → src/framework/learn/learntypes.h b/src/learn/learntypes.h → src/framework/learn/learntypes.h
diff --git a/src/learn/qml/MuseScore/Learn/LearnPage.qml → ...k/learn/qml/MuseScore/Learn/LearnPage.qml b/src/learn/qml/MuseScore/Learn/LearnPage.qml → ...k/learn/qml/MuseScore/Learn/LearnPage.qml
diff --git a/.../MuseScore/Learn/internal/ClassesPage.qml → .../MuseScore/Learn/internal/ClassesPage.qml b/.../MuseScore/Learn/internal/ClassesPage.qml → .../MuseScore/Learn/internal/ClassesPage.qml
diff --git a/...qml/MuseScore/Learn/internal/Playlist.qml → ...qml/MuseScore/Learn/internal/Playlist.qml b/...qml/MuseScore/Learn/internal/Playlist.qml → ...qml/MuseScore/Learn/internal/Playlist.qml
diff --git a/...MuseScore/Learn/internal/PlaylistItem.qml → ...MuseScore/Learn/internal/PlaylistItem.qml b/...MuseScore/Learn/internal/PlaylistItem.qml → ...MuseScore/Learn/internal/PlaylistItem.qml
diff --git a/src/learn/qml/MuseScore/Learn/qmldir → ...ramework/learn/qml/MuseScore/Learn/qmldir b/src/learn/qml/MuseScore/Learn/qmldir → ...ramework/learn/qml/MuseScore/Learn/qmldir
diff --git a/...eScore/Learn/resources/marc_sabatella.JPG → ...eScore/Learn/resources/marc_sabatella.JPG b/...eScore/Learn/resources/marc_sabatella.JPG → ...eScore/Learn/resources/marc_sabatella.JPG
diff --git a/src/learn/view/learnpagemodel.cpp → src/framework/learn/view/learnpagemodel.cpp b/src/learn/view/learnpagemodel.cpp → src/framework/learn/view/learnpagemodel.cpp
diff --git a/src/learn/view/learnpagemodel.h → src/framework/learn/view/learnpagemodel.h b/src/learn/view/learnpagemodel.h → src/framework/learn/view/learnpagemodel.h
diff --git a/src/stubs/CMakeLists.txt b/src/stubs/CMakeLists.txt
@@ -40,7 +40,7 @@ if (NOT MUSE_MODULE_LANGUAGES)
     add_subdirectory(languages)
 endif()
 
-if (NOT MUE_BUILD_LEARN_MODULE)
+if (NOT MUSE_MODULE_LEARN)
     add_subdirectory(learn)
 endif()
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ set(MUSE_FRAMEWORK_MODULES @@
         EXTENSIONS
         GLOBAL
         LANGUAGES
+        LEARN
         MIDI
         MPE
         MULTIINSTANCES
@@ Expand Down @@