Skip to content

Commit eacebe5

Browse files
authored
added banners to settings to interface with the new apis
1 parent e3f8054 commit eacebe5

File tree

2 files changed

+82
-9
lines changed

2 files changed

+82
-9
lines changed

OSL Programs/apps/System/.Install_system.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
"path": "Origin/(A) System/User Applications",
229229
"name": "Settings.osl",
230230
"icon": "c #6fa6eb w 10 square 0 0 5 5 c #111 w 8 square 0 0 5 5 dot 0 0 c #777 w 4 line 0 6 0 -6 line -5 3 5 -3 line 5 3 -5 -3 w 11.5 dot 0 0 w 7 c #111 dot 0 0 w 5 c #6fa6eb dot 0 0",
231-
"version":"10.3"
231+
"version":"10.4"
232232
},
233233
{
234234
"url": "https://origin.mistium.com/OSL%20Programs/apps/System/Calculator.osl",

OSL Programs/apps/System/Settings.osl

Lines changed: 81 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,65 @@ def "account" (
723723
return
724724
)
725725

726+
if subcategory == "banners" (
727+
page_len = 0
728+
goto 0 frame.top - 110 + scroll_y
729+
square w 200 10 : c#prim
730+
c seco
731+
square 50 50 20
732+
if mouse_touching (
733+
cursor "pointer"
734+
if onclick (
735+
if user["sys.currency"] >= 10 (
736+
local url = "Paste the url of an image to use as your banner".ask()
737+
if url.startsWith("https://") (
738+
network "update" "banner" url
739+
) else if url == "" (
740+
say "Banner purchase aborted"
741+
) else (
742+
say "Url must start with https"
743+
)
744+
) else (
745+
say "You do not have enough credits for this"
746+
)
747+
)
748+
)
749+
c txtc
750+
icon "add" 1.5
751+
change_y 50
752+
centext "Add New Banner" 10
753+
change_y -100
754+
centext "Cost: 10 credits" 10
755+
change_y -20
756+
centext "You have " ++ user["sys.currency"] ++ " credits" 10
757+
758+
change_y -60
759+
if user["sys.banners"].len == 0 (
760+
centext "No previous banners" 10
761+
) else (
762+
centext "Previous 5 banners, switch to these for free" 10
763+
)
764+
change_y 100
765+
766+
banners = user["sys.banners"]
767+
y = y_position - (100 + (w / 6)) - 20
768+
769+
each banner banners (
770+
goto 0 y
771+
square w w / 3 10 : c#prim
772+
image banner w w / 3
773+
change w / 2 - 30 w / 6 - 30
774+
square 30 30 15 : c#prim
775+
if onclick (
776+
network "update" "banner" banner
777+
)
778+
icon "tick" 0.8 : c#txtc
779+
y -= w / 3 + 20
780+
)
781+
page_len = (w / 3 + 20) * banners.len + 250
782+
return
783+
)
784+
726785
if subcategory == "connections" (
727786
local links = user["sys.links"]
728787
if links.contains("github") and github_data == "Loading" (
@@ -767,9 +826,15 @@ def "account" (
767826
return
768827
)
769828

770-
goto 0 frame.top - 100 + scroll_y
771-
image user_icon.toStr() 120 120
772-
icon round_pfp 5.8 : c#window_colour
829+
goto 0 frame.top - (w / 6) - 10 + scroll_y
830+
square w w / 3 10 : c#prim
831+
effect "transparency" 70
832+
image user.banner w w / 3
833+
effect "clear"
834+
835+
local pfp_s = w / 3 - 30
836+
change_x w / -2 + (pfp_s / 2) + 15
837+
image user.pfp pfp_s pfp_s
773838
if timer - upload_time < 5 and current_pfp != "" (
774839
direction timer * 300
775840
icon "cutcircle 0 0 10 0 90" 1 : c#txtc
@@ -790,10 +855,18 @@ def "account" (
790855
)
791856
)
792857

793-
set_x 0 : chy#-100
794-
centext username 15 : c#txtc
858+
local pos = [x_position + (pfp_s / 2) + 30, y_position + 15]
859+
goto pos
860+
861+
text username ++ "\n" 15 : c#txtc
795862

796-
centext user.system + "Account" 10 : chy#-30
863+
text user.system + "Account" 10
864+
865+
loc -2 2 -70 -30 + scroll_y
866+
icon "edit" 0.8
867+
if onclick (
868+
subcategory = "Banners"
869+
)
797870

798871
if current_pfp != "" (
799872
image current_pfp 0 0
@@ -823,7 +896,7 @@ def "account" (
823896

824897
local bio_data = inputs.bio.join("\n")
825898

826-
goto w / -2 frame.top - 270 + scroll_y
899+
goto w / -2 frame.top - (w / 3) - 70 + scroll_y
827900
text "Bio (" ++ bio_data.len ++ "/200)" 10
828901

829902
if bio_data != user.bio (
@@ -1327,4 +1400,4 @@ if gotosubcategory != "" and mouse_down.not (
13271400
gotosubcategory = ""
13281401
)
13291402
window "show"
1330-
import "win-buttons"
1403+
import "win-buttons"

0 commit comments

Comments
 (0)