Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release ReaLauncher v2.5.3 #1269

Merged
merged 1 commit into from
Oct 8, 2023
Merged

Release ReaLauncher v2.5.3 #1269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 46 additions & 10 deletions Project Properties/solger_ReaLauncher.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
-- @description ReaLauncher
-- @author solger
-- @version 2.5.2
-- @changelog + Recent Projects: Bugfix for updating the list after using the 'remove entries' or 'clear list' functions
-- @version 2.5.3
-- @changelog
-- + General: Added right-click menu to Tabstrip as additional option to select another tab
-- + General: Fixed a listbox selection bug on mouseup events in Help and Options tab
-- + Project Templates: Updated the Reaper version number check to determine which template load logic is supported
-- @screenshot https://forum.cockos.com/showthread.php?t=208697
-- @about
-- # ReaLauncher
Expand Down Expand Up @@ -69,7 +72,7 @@ local ConfigFlags = {
-------------------------------------
local lib_path = reaper.GetExtState("Lokasenna_GUI", "lib_path_v2")
if not reaper.file_exists(lib_path .. "Core.lua") or not lib_path or lib_path == "" then
reaper.MB("Couldn't load the Lokasenna_GUI library.\n\n1) Please install 'Lokasenna's GUI library v2 for Lua', available on ReaPack\n\n2) Then run the 'Set Lokasenna_GUI v2 library path.lua' script in your Action List", "Whoops!", 0)
reaper.MB("Couldn't load Lokasenna_GUI library.\n\n1) Please install 'Lokasenna's GUI library v2 for Lua' via ReaPack\n\n2) Then run the 'Set Lokasenna_GUI v2 library path.lua' script in the Action List", "Whoops!", 0)
return
end

Expand Down Expand Up @@ -1639,7 +1642,7 @@ end

local function Global_ProjectTemplateLoadBase(template)
if template ~= nil then
if reaperversion ~= nil and #reaperversion > 1 and ((reaperversion:match("6.")) or reaperversion:match("5.99") or reaperversion:match("5.98[3-9]")) then
if RL.isNewTemplateLoadLogicSupported then
-- logic for Reaper versions 5.983 or higher
if RL.projectTemplateLoadMode == 1 then reaper.Main_openProject("template:" .. template) -- load as template
else reaper.Main_openProject(template) end -- open template file for editing
Expand Down Expand Up @@ -2778,6 +2781,7 @@ RL = {
dialogKeyMode = false,
fontSizes = { 30, 18, 14, 14, 14, 12 },
forceRescan = false,
isNewTemplateLoadLogicSupported = false,
keyInputActive = true,
lastFolderPath = "",
listboxFontSize = 14,
Expand Down Expand Up @@ -2818,6 +2822,18 @@ else
RL.minWidth, RL.minHeight = 420, 228
end

-- check if the Reaper version number is 5.983 or higher (where the new template load logic is supported)
if IsNotNullOrEmpty(reaperversion) then
local majorVersionNumber = reaperversion:match("[^.]+")
if tonumber(majorVersionNumber) and tonumber(majorVersionNumber) >= 6 then
RL.isNewTemplateLoadLogicSupported = true
elseif (reaperversion:match("5.99") or reaperversion:match("5.98[3-9]")) then
RL.isNewTemplateLoadLogicSupported = true
else
RL.isNewTemplateLoadLogicSupported = false
end
end

-- SWS block begin
if SWSinstalled then
-----------------------
Expand Down Expand Up @@ -2991,9 +3007,9 @@ GUI.Draw_Version = function()
GUI.color("txt")

if not GUI.version then return 0 end
str = "RL 2.5.2 | Lokasenna_GUI " .. GUI.version
str = "RL 2.5.3 | Lokasenna_GUI " .. GUI.version
str_w, str_h = gfx.measurestr(str)
if osversion:find("Win") then gfx.x = GUI.w - (238 * RL.scaleFactor) else gfx.x = GUI.w - (250 * RL.scaleFactor) end
if osversion:find("OSX") then gfx.x = GUI.w - (255 * RL.scaleFactor) else gfx.x = GUI.w - (260 * RL.scaleFactor) end
gfx.y = GUI.h - (15.5 * RL.scaleFactor)
gfx.drawstr(str)
end
Expand Down Expand Up @@ -3553,6 +3569,12 @@ local function RL_Draw_Main()
RL_SetFocusedTab(GUI.elms.main_tabs.state)
end
end
function GUI.elms.main_tabs:onmouser_down()
GUI.Tabs.onmouser_down(self)
gfx.x, gfx.y = gfx.mouse_x, gfx.mouse_y
local RMBmenu = gfx.showmenu(table.concat(MainLabels, "|"))
if RMBmenu >= 1 and RMBmenu <= #MainLabels then RL_SetFocusedTab(RMBmenu) end
end
else -- dropdown style
GUI.New("main_tabs", "Tabs", LayerIndex.Main, 0, 0, 95 * RL.scaleFactor, 20 * RL.scaleFactor, " , , , , , , , , , , , , , ", 16)
GUI.elms.main_tabs.col_tab_b = "elm_bg"
Expand Down Expand Up @@ -5927,12 +5949,21 @@ local function RL_Draw_TabOptions()
if RL.tabSelectorStyle == 2 then GUI.New("tab_options_listbox", "Listbox", LayerIndex.OptionsMenu, pad_left, listbox_top, 90 * RL.scaleFactor, listbox_h, OptionLabels, true)
else GUI.New("tab_options_listbox", "Listbox", LayerIndex.OptionsMenu, pad_left, pad_top, 85 * RL.scaleFactor, listbox_h, OptionLabels, true) end

GUI.elms.tab_options_listbox.multi = false

function GUI.elms.tab_options_listbox:onmousedown()
TabSelectionIndex[TabID.Options] = self:getitem(GUI.mouse.y)
reaper.SetExtState(appname, "window_optionfocus", tostring(TabSelectionIndex[TabID.Options]), 1)
RL_SetFocusedTab(TabID.Help + TabSelectionIndex[TabID.Options])
GUI.Listbox.onmousedown(self)
end

function GUI.elms.tab_options_listbox:onmouseup()
TabSelectionIndex[TabID.Options] = self:getitem(GUI.mouse.y)
reaper.SetExtState(appname, "window_optionfocus", tostring(TabSelectionIndex[TabID.Options]), 1)
RL_SetFocusedTab(TabID.Help + TabSelectionIndex[TabID.Options])
GUI.Listbox.onmouseup(self)
end

if RL.tabSelectorStyle == 2 then GUI.New("options_frame_top", "Frame", LayerIndex.Options, 0, listbox_top, GUI.w, 2 * RL.scaleFactor, false, true) end

Expand Down Expand Up @@ -6313,10 +6344,15 @@ local function RL_Draw_TabHelp()
reaper.SetExtState(appname, "window_helpfocus", tostring(selectedMenuIndex), 1)
end

function GUI.elms.tab_help_listbox:onmousedown()
GUI.Listbox.onmouseup(self)
RL_Draw_HelpFrames()
end
function GUI.elms.tab_help_listbox:onmousedown()
GUI.Listbox.onmousedown(self)
RL_Draw_HelpFrames()
end

function GUI.elms.tab_help_listbox:onmouseup()
GUI.Listbox.onmouseup(self)
RL_Draw_HelpFrames()
end

GUI.Val("tab_help_listbox", {[1] = true})
if reaper.GetExtState(appname, "window_helpfocus") ~= "" then GUI.Val("tab_help_listbox", {[tonumber(reaper.GetExtState(appname, "window_helpfocus"))] = true}) end
Expand Down
Loading