sws notes

gwatcha · Jun 15, 2024 · ec70f26 · ec70f26
1 parent afec575
commit ec70f26
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/internal/definitions/actions.lua b/internal/definitions/actions.lua
@@ -469,6 +469,7 @@ return {
     SaveItemSelection = "_SWS_SAVEALLSELITEMS1",
     SaveLoopSelection = "_SWS_SAVELOOP5",
     SaveProject = 40026,
+    SaveProjectAs = 40022,
     SaveProjectWithNewVersion = 41895,
     SaveTimeSelection = "_SWS_SAVETIME5",
     SaveTrackSelection = "_SWS_SAVESEL",
@@ -695,6 +696,7 @@ return {
     SetTrackInputToMatchFirstSelected = "_SWS_INPUTMATCH",
     TrackToggleSendToParent = "_SWS_TOGMPSEND",
     TrackToggleSolo = 40281,
+    TrackToggleSoloDefeat = 41199,
     TrackToggleMute = 40280,
     TrackWithNumber = custom.move.trackWithNumber,
     TrimItemLeftEdge = 41305,
@@ -758,4 +760,14 @@ return {
     ShowTransport = 40259,
     ShowVirtualMidiKeyboard = 40377,
     ShowWiringDiagram = 42031,
+    ShowNotesWindow = "_S&M_SHOW_NOTES_VIEW",
+    ShowNotesItem = "_S&M_ITEMNOTES",
+    ShowNotesTrack = "_S&M_TRACKNOTES",
+    ShowNotesProject = "_S&M_SHOWNOTESHELP",
+    ShowNotesGlobal = "_S&M_GLOBALNOTES",
+    ShowNotesMarkerNames = "_S&M_MKR_NAMES",
+    ShowNotesMarkerSubtitles = "_S&M_MKR_SUBTITLES",
+    ShowNotesRegionNames = "_S&M_RGN_NAMES",
+    ShowNotesRegionSubtitles = "_S&M_RGN_SUBTITLES",
+    SoloInFront = 40745,
 }
diff --git a/internal/definitions/bindings.lua b/internal/definitions/bindings.lua
@@ -130,7 +130,8 @@ local global = { -- applies both to main and midi
             ["x"] = "ToggleAutoCrossfade",
             ["e"] = "ToggleEnvelopePointsMoveWithItems",
             ["c"] = "CycleRippleEditMode",
-            ["f"] = "ResetFeedbackWindow",
+            f = "SoloInFront",
+            F = "ResetFeedbackWindow",
         } },
         ["i"] = { "+insert", {
             ["f"] = "InsertMediaFile",
@@ -145,6 +146,17 @@ local global = { -- applies both to main and midi
             ["4"] = "InsertTrackFromTemplateSlot4",
         } },
         ["<SPC>"] = { "+leader commands", {
+            N = "ShowNotesWindow",
+            n = { "+notes", {
+                i = "ShowNotesItem",
+                t = "ShowNotesTrack",
+                p = "ShowNotesProject",
+                g = "ShowNotesGlobal",
+                m = "ShowNotesMarkerNames",
+                M = "ShowNotesMarkerSubtitles",
+                r = "ShowNotesRegionNames",
+                R = "ShowNotesRegionSubtitles",
+            } },
             v = { "+view", {
                 [","] = "ShowPreferences",
                 ['"'] = "ShowSnapshotsWindow",
@@ -270,6 +282,7 @@ local global = { -- applies both to main and midi
             } },
             ["t"] = { "+track", {
                 ["s"] = "TrackToggleSolo",
+                S = "TrackToggleSoloDefeat",
                 ["m"] = "TrackToggleMute",
                 ["r"] = "RenameTrack",
                 ["n"] = "ResetTrackToNormal",
@@ -343,7 +356,7 @@ local global = { -- applies both to main and midi
                 ["g"] = "SetGridDivision",
                 ["r"] = "ResetControlDevices",
                 [","] = "ShowPreferences", -- remove in 2.1
-                ["S"] = "UnsoloAllItems",
+                ["S"] = "UnsoloAllTracks",
                 ["s"] = { "+show/hide", {
                     ["x"] = "ShowRoutingMatrix",       -- remove in 2.1
                     ["w"] = "ShowWiringDiagram",       -- remove in 2.1
@@ -372,21 +385,20 @@ local global = { -- applies both to main and midi
                 [","] = "ShowProjectSettings",
                 ["n"] = "NextTab",
                 ["p"] = "PrevTab",
-                ["s"] = "SaveProject",
+                s = "SaveProject",
+                S = "SaveProjectAs",
+                v = "SaveProjectWithNewVersion",
                 ["o"] = "OpenProject",
                 ["c"] = "NewProjectTab",
                 ["x"] = "CloseProject",
                 ["C"] = "CleanProjectDirectory",
-                ["S"] = "SaveProjectWithNewVersion",
                 ["t"] = { "+timebase", {
                     ["t"] = "SetProjectTimebaseToTime",
                     ["b"] = "SetProjectTimebaseToBeatsPos",
                     ["r"] = "SetProjectTimebaseToBeatsPosLengthAndRate",
                 } },
-                ["r"] = { "+render", {
-                    ["."] = "RenderProjectWithLastSetting",
-                    ["r"] = "RenderProject",
-                } },
+                r = "RenderProject",
+                R = "RenderProjectWithLastSetting",
             } },
         } },
     },