Shortcuts v2. Added presets

framework/CMakeLists.txt

@@ -113,12 +113,6 @@ if (MUSE_MODULE_RCONTROL)
     add_subdirectory(rcontrol)
 endif()
 
-if (MUSE_MODULE_SHORTCUTS_V2)
-    file(CREATE_LINK ${CMAKE_CURRENT_LIST_DIR}/shortcuts_v2 ${PROJECT_BINARY_DIR}/shortcuts SYMBOLIC)
-else()
-    file(REMOVE_RECURSE ${PROJECT_BINARY_DIR}/shortcuts)
-endif()
-
 if (MUSE_MODULE_SHORTCUTS)
     if (MUSE_MODULE_SHORTCUTS_V2)
         add_subdirectory(shortcuts_v2)

framework/shortcuts/ishortcutsconfiguration.h

@@ -19,6 +19,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+#pragma once
+
+#include "muse_framework_config.h"
+
+#ifdef MUSE_MODULE_SHORTCUTS_V2
+#include "../shortcuts_v2/ishortcutsconfiguration.h"
+#else
 
 #pragma once
 
@@ -41,3 +48,5 @@ class IShortcutsConfiguration : MODULE_GLOBAL_INTERFACE
     virtual io::path_t shortcutsAppDataPath() const = 0;
 };
 }
+
+#endif // MUSE_MODULE_SHORTCUTS_V2

framework/shortcuts/ishortcutscontroller.h

@@ -19,6 +19,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+#pragma once
+
+#include "muse_framework_config.h"
+
+#ifdef MUSE_MODULE_SHORTCUTS_V2
+#include "../shortcuts_v2/ishortcutscontroller.h"
+#else
+
 #ifndef MUSE_SHORTCUTS_ISHORTCUTSCONTROLLER_H
 #define MUSE_SHORTCUTS_ISHORTCUTSCONTROLLER_H
 
@@ -41,3 +49,5 @@ class IShortcutsController : MODULE_CONTEXT_INTERFACE
 }
 
 #endif // MUSE_SHORTCUTS_ISHORTCUTSCONTROLLER_H
+
+#endif // MUSE_MODULE_SHORTCUTS_V2

framework/shortcuts/ishortcutsregister.h

@@ -21,6 +21,14 @@
  */
 #pragma once
 
+#include "muse_framework_config.h"
+
+#ifdef MUSE_MODULE_SHORTCUTS_V2
+#include "../shortcuts_v2/ishortcutsregister.h"
+#else
+
+#pragma once
+
 #include "modularity/imoduleinterface.h"
 #include "shortcutstypes.h"
 #include "async/notification.h"
@@ -58,3 +66,5 @@ class IShortcutsRegister : MODULE_CONTEXT_INTERFACE
     virtual void reload(bool onlyDef = false) = 0;
 };
 }
+
+#endif // MUSE_MODULE_SHORTCUTS_V2

framework/shortcuts/shortcutcontext.h

@@ -19,6 +19,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+#pragma once
+
+#include "muse_framework_config.h"
+
+#ifdef MUSE_MODULE_SHORTCUTS_V2
+#include "../shortcuts_v2/shortcutcontext.h"
+#else
+
 #ifndef MUSE_SHORTCUTS_SHORTCUTCONTEXT_H
 #define MUSE_SHORTCUTS_SHORTCUTCONTEXT_H
 
@@ -51,3 +59,5 @@ class IShortcutContextPriority : MODULE_CONTEXT_INTERFACE
 }
 
 #endif // MUSE_SHORTCUTS_SHORTCUTCONTEXT_H
+
+#endif // MUSE_MODULE_SHORTCUTS_V2

framework/shortcuts/shortcutsmodule.h

@@ -19,6 +19,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+#pragma once
+
+#include "muse_framework_config.h"
+
+#ifdef MUSE_MODULE_SHORTCUTS_V2
+#include "../shortcuts_v2/shortcutsmodule.h"
+#else
 
 #pragma once
 
@@ -60,3 +67,5 @@ class ShortcutsContext : public modularity::IContextSetup
     std::shared_ptr<ShortcutsRegister> m_shortcutsRegister;
 };
 }
+
+#endif // MUSE_MODULE_SHORTCUTS_V2

framework/shortcuts/shortcutstypes.h

@@ -19,6 +19,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+#pragma once
+
+#include "muse_framework_config.h"
+
+#ifdef MUSE_MODULE_SHORTCUTS_V2
+#include "../shortcuts_v2/shortcutstypes.h"
+#else
 
 #pragma once
 
@@ -137,3 +144,5 @@ inline bool areContextPrioritiesEqual(const std::string& shortcutCtx1, const std
     return shortcutCtx1 == shortcutCtx2;
 }
 }
+
+#endif // MUSE_MODULE_SHORTCUTS_V2

framework/shortcuts_v2/CMakeLists.txt

@@ -51,3 +51,7 @@ target_link_libraries(muse_shortcuts PRIVATE Qt::Gui)
 if (MUSE_MODULE_SHORTCUTS_QML)
     add_subdirectory(qml/Muse/Shortcuts)
 endif()
+
+if (MUSE_MODULE_SHORTCUTS_TESTS)
+    add_subdirectory(tests)
+endif()

framework/shortcuts_v2/icommandshortcutsregister.h

@@ -22,8 +22,12 @@
 
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "modularity/imoduleinterface.h"
 #include "shortcutstypes.h"
+#include "async/channel.h"
 #include "async/notification.h"
 #include "types/ret.h"
 #include "io/path.h"
@@ -47,6 +51,16 @@ class ICommandShortcutsRegister : MODULE_GLOBAL_INTERFACE
     virtual Ret importFromFile(const io::path_t& filePath) = 0;
     virtual Ret exportToFile(const io::path_t& filePath) const = 0;
 
+    virtual std::vector<std::string> availablePresets() const = 0;
+
+    virtual std::string currentPresetName() const = 0;
+    virtual void setCurrentPresetName(const std::string& presetName) = 0;
+    virtual async::Channel<std::string> currentPresetNameChanged() const = 0;
+
+    virtual bool isPresetEdited(const std::string& presetName) const = 0;
+    virtual bool canDeletePreset(const std::string& presetName) const = 0;
+    virtual void deletePreset(const std::string& presetName) = 0;
+
     // for testflow tests
     virtual void reload(bool onlyDef = false) = 0;
 };