Skip to content

Commit

Permalink
fix: print message prefixes being wrong
Browse files Browse the repository at this point in the history
  • Loading branch information
Lythium4848 committed Dec 31, 2023
1 parent 030be73 commit 5bbc057
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion lua/pixelui/core/cl_images.lua
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function PulsarUI.GetImage(url, callback, matSettings)
local protocol = url:match("^([%a]+://)")
local urlWithoutProtocol = url
if not protocol then
print("[PulsarUI UI] Trying to run PulsarUI.GetImage without URL protocol.")
print("[PulsarUI] Trying to run PulsarUI.GetImage without URL protocol.")
else
urlWithoutProtocol = string.gsub(url, protocol, "")
end
Expand Down
2 changes: 1 addition & 1 deletion lua/pixelui/core/cl_overrides.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function PulsarUI.CreateToggleableOverride(method, override, toggleGetter)
end
end

local overridePopupsCvar = CreateClientConVar("pixel_ui_override_popups", (PulsarUI.OverrideDermaMenus > 1) and "1" or "0", true, false, "Should the default derma popups be restyled with PulsarUI UI?", 0, 1)
local overridePopupsCvar = CreateClientConVar("pixel_ui_override_popups", (PulsarUI.OverrideDermaMenus > 1) and "1" or "0", true, false, "Should the default derma popups be restyled with PulsarUI?", 0, 1)
function PulsarUI.ShouldOverrideDermaPopups()
local overrideSetting = PulsarUI.OverrideDermaMenus

Expand Down
4 changes: 2 additions & 2 deletions lua/pixelui/elements/cl_frame.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ AccessorFunc(PANEL, "ImageURL", "ImageURL", FORCE_STRING)

function PANEL:SetImgurID(id)
assert(type(id) == "string", "bad argument #1 to SetImgurID, string expected, got " .. type(id))
print("[PulsarUI UI] PulsarUI.Frame:SetImgurID is deprecated, use PulsarUI.Frame:SetImageURL instead")
print("[PulsarUI] PulsarUI.Frame:SetImgurID is deprecated, use PulsarUI.Frame:SetImageURL instead")
self:SetImageURL("https://i.imgur.com/" .. id .. ".png")
self.ImgurID = id
end

function PANEL:GetImgurID()
print("[PulsarUI UI] PulsarUI.Frame:GetImgurID is deprecated, use PulsarUI.Frame:GetImageURL instead")
print("[PulsarUI] PulsarUI.Frame:GetImgurID is deprecated, use PulsarUI.Frame:GetImageURL instead")
return (self:GetImageURL() or ""):match("https://i.imgur.com/(.-).png")
end

Expand Down
10 changes: 5 additions & 5 deletions lua/pixelui/elements/cl_imgur_button.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@ AccessorFunc(PANEL, "ImgurSize", "ImgurSize", FORCE_NUMBER)

function PANEL:SetImgurID(id)
assert(type(id) == "string", "bad argument #1 to 'SetImgurID' (string expected, got " .. type(id))
print("[PulsarUI UI] PulsarUI.ImgurButton:SetImgurID is deprecated, use PulsarUI.ImageButton:SetImageURL instead.")
print("[PulsarUI] PulsarUI.ImgurButton:SetImgurID is deprecated, use PulsarUI.ImageButton:SetImageURL instead.")
self.ImgurID = id
self:SetImageURL("https://i.imgur.com/" .. id .. ".png")
end

function PANEL:GetImgurID()
print("[PulsarUI UI] PulsarUI.ImgurButton:GetImgurID is deprecated, use PulsarUI.ImageButton:GetImgurID instead.")
print("[PulsarUI] PulsarUI.ImgurButton:GetImgurID is deprecated, use PulsarUI.ImageButton:GetImgurID instead.")
return (self:GetImageURL() or ""):match("https://i.imgur.com/(.*).png")
end

function PANEL:SetImgurSize(size)
assert(type(size) == "number", "bad argument #1 to 'SetImgurSize' (number expected, got " .. type(size))
print("[PulsarUI UI] PulsarUI.ImgurButton:SetImgurSize is deprecated, use PulsarUI.ImageButton:SetImageSize instead.")
print("[PulsarUI] PulsarUI.ImgurButton:SetImgurSize is deprecated, use PulsarUI.ImageButton:SetImageSize instead.")
self.ImgurSize = size
self:SetImageSize(size, size)
end

function PANEL:GetImgurSize()
print("[PulsarUI UI] PulsarUI.ImgurButton:GetImgurSize is deprecated, use PulsarUI.ImageButton:GetImageSize instead.")
print("[PulsarUI] PulsarUI.ImgurButton:GetImgurSize is deprecated, use PulsarUI.ImageButton:GetImageSize instead.")
return self:GetImageSize()
end

function PANEL:Init()
print("[PulsarUI UI] PulsarUI.ImgurButton is deprecated, use PulsarUI.ImageButton instead.")
print("[PulsarUI] PulsarUI.ImgurButton is deprecated, use PulsarUI.ImageButton instead.")
end

vgui.Register("PulsarUI.ImgurButton", PANEL, "PulsarUI.ImageButton")
8 changes: 4 additions & 4 deletions lua/pixelui/elements/cl_navbar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ AccessorFunc(PANEL, "ImgurScale", "ImgurScale") -- Deprecated

function PANEL:SetImgurID(id)
self:SetImageURL("https://i.imgur.com/" .. id .. ".png")
print("[PulsarUI UI] PulsarUI.NavbarItem:SetImgurID is deprecated, use PulsarUI.NavbarItem:SetImageURL instead.")
print("[PulsarUI] PulsarUI.NavbarItem:SetImgurID is deprecated, use PulsarUI.NavbarItem:SetImageURL instead.")
self.ImgurID = id
end

function PANEL:GetImgurID()
print("[PulsarUI UI] PulsarUI.NavbarItem:GetImgurID is deprecated, use PulsarUI.NavbarItem:GetImageURL instead.")
print("[PulsarUI] PulsarUI.NavbarItem:GetImgurID is deprecated, use PulsarUI.NavbarItem:GetImageURL instead.")
return (self:GetImageURL() or ""):match("i.imgur.com/(.-).png")
end

function PANEL:SetImgurScale(scale)
self:SetImageScale(scale)
print("[PulsarUI UI] PulsarUI.NavbarItem:SetImgurScale is deprecated, use PulsarUI.NavbarItem:SetImageScale instead.")
print("[PulsarUI] PulsarUI.NavbarItem:SetImgurScale is deprecated, use PulsarUI.NavbarItem:SetImageScale instead.")
self.ImgurScale = scale
end

function PANEL:GetImgurScale()
print("[PulsarUI UI] PulsarUI.NavbarItem:GetImgurScale is deprecated, use PulsarUI.NavbarItem:GetImageScale instead.")
print("[PulsarUI] PulsarUI.NavbarItem:GetImgurScale is deprecated, use PulsarUI.NavbarItem:GetImageScale instead.")
return self:GetImageScale()
end

Expand Down
18 changes: 9 additions & 9 deletions lua/pixelui/elements/cl_sidebar.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--[[
PulsarUI UI - Copyright Notice
PulsarUI - Copyright Notice
© 2023 Thomas O'Sullivan - All rights reserved
This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -46,13 +46,13 @@ end

function PANEL:SetImgurID(id)
assert(type(id) == "string", "bad argument #1 to 'SetImgurID' (string expected, got " .. type(id) .. ")")
print("[PulsarUI UI] PulsarUI.SidebarItem:SetImgurID is deprecated, use PulsarUI.SidebarItem:SetImageURL instead")
print("[PulsarUI] PulsarUI.SidebarItem:SetImgurID is deprecated, use PulsarUI.SidebarItem:SetImageURL instead")
self:SetImageURL("https://i.imgur.com/" .. id .. ".png")
self.ImgurID = id
end

function PANEL:GetImgurID()
print("[PulsarUI UI] PulsarUI.SidebarItem:GetImgurID is deprecated, use PulsarUI.SidebarItem:GetImageURL instead")
print("[PulsarUI] PulsarUI.SidebarItem:GetImgurID is deprecated, use PulsarUI.SidebarItem:GetImageURL instead")
return (self:GetImageURL() or ""):match("https://i.imgur.com/(.-).png")
end

Expand Down Expand Up @@ -143,37 +143,37 @@ AccessorFunc(PANEL, "ImgurOffset", "ImgurOffset", FORCE_NUMBER) -- Deprecated

function PANEL:SetImgurID(id)
assert(type(id) == "string", "bad argument #1 to 'SetImgurID' (string expected, got " .. type(id) .. ")")
print("[PulsarUI UI] PulsarUI.Sidebar:SetImgurID is deprecated, use PulsarUI.Sidebar:SetImageURL instead")
print("[PulsarUI] PulsarUI.Sidebar:SetImgurID is deprecated, use PulsarUI.Sidebar:SetImageURL instead")
self:SetImageURL("https://i.imgur.com/" .. id .. ".png")
self.ImgurID = id
end

function PANEL:GetImgurID()
print("[PulsarUI UI] PulsarUI.Sidebar:GetImgurID is deprecated, use PulsarUI.Sidebar:GetImageURL instead")
print("[PulsarUI] PulsarUI.Sidebar:GetImgurID is deprecated, use PulsarUI.Sidebar:GetImageURL instead")
return (self:GetImageURL() or ""):match("https://i.imgur.com/(.-).png")
end

function PANEL:SetImgurScale(scale)
assert(type(scale) == "number", "bad argument #1 to 'SetImgurScale' (number expected, got " .. type(scale) .. ")")
print("[PulsarUI UI] PulsarUI.Sidebar:SetImgurScale is deprecated, use PulsarUI.Sidebar:SetImageScale instead")
print("[PulsarUI] PulsarUI.Sidebar:SetImgurScale is deprecated, use PulsarUI.Sidebar:SetImageScale instead")
self:SetImageScale(scale)
self.ImgurScale = scale
end

function PANEL:GetImgurScale()
print("[PulsarUI UI] PulsarUI.Sidebar:GetImgurScale is deprecated, use PulsarUI.Sidebar:GetImageScale instead")
print("[PulsarUI] PulsarUI.Sidebar:GetImgurScale is deprecated, use PulsarUI.Sidebar:GetImageScale instead")
return self:GetImageScale()
end

function PANEL:SetImgurOffset(offset)
assert(type(offset) == "number", "bad argument #1 to 'SetImgurOffset' (number expected, got " .. type(offset) .. ")")
print("[PulsarUI UI] PulsarUI.Sidebar:SetImgurOffset is deprecated, use PulsarUI.Sidebar:SetImageOffset instead")
print("[PulsarUI] PulsarUI.Sidebar:SetImgurOffset is deprecated, use PulsarUI.Sidebar:SetImageOffset instead")
self:SetImageOffset(offset)
self.ImgurOffset = offset
end

function PANEL:GetImgurOffset()
print("[PulsarUI UI] PulsarUI.Sidebar:GetImgurOffset is deprecated, use PulsarUI.Sidebar:GetImageOffset instead")
print("[PulsarUI] PulsarUI.Sidebar:GetImgurOffset is deprecated, use PulsarUI.Sidebar:GetImageOffset instead")
return self:GetImageOffset()
end

Expand Down
2 changes: 1 addition & 1 deletion lua/pixelui/elements/cl_text_button.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function PANEL:SetIcon(icon)

local imgurMatch = (icon or ""):match("^[a-zA-Z0-9]+$")
if imgurMatch then
print("[PulsarUI UI] Using imgur icons inside of PulsarUI.TextButton is deprecated.")
print("[PulsarUI] Using imgur icons inside of PulsarUI.TextButton is deprecated.")
icon = "https://i.imgur.com/" .. icon .. ".png"
end

Expand Down
4 changes: 2 additions & 2 deletions lua/pixelui/sh_config.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--[[
Should we override the default derma popups for the PulsarUI UI reskins?
Should we override the default derma popups for the PulsarUI reskins?
0 = No - forced off.
1 = No - but users can opt in via convar (pixel_ui_override_popups).
2 = Yes - but users must opt in via convar.
Expand All @@ -8,7 +8,7 @@
PulsarUI.OverrideDermaMenus = 0

--[[
Should we disable the PulsarUI UI Reskin of the notification?
Should we disable the PulsarUI Reskin of the notification?
]]
PulsarUI.DisableNotification = false

Expand Down

0 comments on commit 5bbc057

Please sign in to comment.