From 5c5bcedaaa4c85340ea31027210105f97f85a0c0 Mon Sep 17 00:00:00 2001 From: Smok1e Date: Tue, 9 Jan 2024 22:13:34 +0300 Subject: [PATCH] Renamed /Pictures to /Wallpapers and all corresponding constants in the system --- Applications/Finder.app/Main.lua | 2 +- Applications/Picture View.app/Main.lua | 2 +- Installer/Files.cfg | 25 +++++++++++++----------- Libraries/Paths.lua | 2 +- Libraries/System.lua | 2 +- {Pictures => Wallpapers}/AhsokaTano.pic | Bin {Pictures => Wallpapers}/Block.pic | Bin {Pictures => Wallpapers}/Ciri.pic | Bin {Pictures => Wallpapers}/Flight.lua | 0 {Pictures => Wallpapers}/Girl.pic | Bin {Pictures => Wallpapers}/Logic.pic | Bin {Pictures => Wallpapers}/Mystery.pic | Bin {Pictures => Wallpapers}/Nettle.pic | Bin {Pictures => Wallpapers}/Raspberry.pic | Bin {Pictures => Wallpapers}/Road.pic | Bin {Pictures => Wallpapers}/Space.pic | Bin 16 files changed, 18 insertions(+), 15 deletions(-) rename {Pictures => Wallpapers}/AhsokaTano.pic (100%) mode change 100755 => 100644 rename {Pictures => Wallpapers}/Block.pic (100%) mode change 100755 => 100644 rename {Pictures => Wallpapers}/Ciri.pic (100%) mode change 100755 => 100644 rename {Pictures => Wallpapers}/Flight.lua (100%) rename {Pictures => Wallpapers}/Girl.pic (100%) mode change 100755 => 100644 rename {Pictures => Wallpapers}/Logic.pic (100%) rename {Pictures => Wallpapers}/Mystery.pic (100%) mode change 100755 => 100644 rename {Pictures => Wallpapers}/Nettle.pic (100%) mode change 100755 => 100644 rename {Pictures => Wallpapers}/Raspberry.pic (100%) mode change 100755 => 100644 rename {Pictures => Wallpapers}/Road.pic (100%) rename {Pictures => Wallpapers}/Space.pic (100%) mode change 100755 => 100644 diff --git a/Applications/Finder.app/Main.lua b/Applications/Finder.app/Main.lua index 02a15be4..a38d1221 100644 --- a/Applications/Finder.app/Main.lua +++ b/Applications/Finder.app/Main.lua @@ -22,7 +22,7 @@ local config = { { name = "Root", path = "/" }, { name = "Desktop", path = paths.user.desktop }, { name = "Applications", path = paths.system.applications }, - { name = "Pictures", path = paths.system.pictures }, + { name = "Wallpapers", path = paths.system.wallpapers }, { name = "Libraries", path = paths.system.libraries }, { name = "User", path = paths.user.home }, { name = "Trash", path = paths.user.trash }, diff --git a/Applications/Picture View.app/Main.lua b/Applications/Picture View.app/Main.lua index 79a6c80f..b8ca3bb8 100644 --- a/Applications/Picture View.app/Main.lua +++ b/Applications/Picture View.app/Main.lua @@ -10,7 +10,7 @@ local localization = system.getCurrentScriptLocalization() local args, options = system.parseArguments(...) local iconsPath = fs.path(system.getCurrentScript()) .. "Icons/" -local currentDir, files = ((options.o or options.open) and args[1] and fs.exists(args[1])) and fs.path(args[1]) or paths.system.pictures +local currentDir, files = ((options.o or options.open) and args[1] and fs.exists(args[1])) and fs.path(args[1]) or paths.system.wallpapers local fileIndex = 1 local loadedImage, title diff --git a/Installer/Files.cfg b/Installer/Files.cfg index 736bd155..49511c46 100644 --- a/Installer/Files.cfg +++ b/Installer/Files.cfg @@ -674,17 +674,20 @@ "Applications/Pioneer.app/Images/Knob8.pic" }, wallpapers = { - "Pictures/AhsokaTano.pic", - "Pictures/Block.pic", - "Pictures/Ciri.pic", - "Pictures/Girl.pic", - "Pictures/Mystery.pic", - "Pictures/Nettle.pic", - "Pictures/Raspberry.pic", - "Pictures/Road.pic", - "Pictures/Space.pic", - "Pictures/Flight.lua", - "Pictures/Logic.pic" + -- Pictures + "Wallpapers/AhsokaTano.pic", + "Wallpapers/Block.pic", + "Wallpapers/Ciri.pic", + "Wallpapers/Girl.pic", + "Wallpapers/Mystery.pic", + "Wallpapers/Nettle.pic", + "Wallpapers/Raspberry.pic", + "Wallpapers/Road.pic", + "Wallpapers/Space.pic", + "Wallpapers/Logic.pic", + + -- Scripts + "Wallpapers/Flight.lua" }, screensavers = { "Screensavers/Space.lua", diff --git a/Libraries/Paths.lua b/Libraries/Paths.lua index fe77ca04..855be10b 100755 --- a/Libraries/Paths.lua +++ b/Libraries/Paths.lua @@ -10,7 +10,7 @@ paths.system.localizations = "/Localizations/" paths.system.extensions = "/Extensions/" paths.system.mounts = "/Mounts/" paths.system.temporary = "/Temporary/" -paths.system.pictures = "/Pictures/" +paths.system.wallpapers = "/Wallpapers/" paths.system.screensavers = "/Screensavers/" paths.system.users = "/Users/" paths.system.versions = "/Versions.cfg" diff --git a/Libraries/System.lua b/Libraries/System.lua index d3205ddb..d5302a4d 100755 --- a/Libraries/System.lua +++ b/Libraries/System.lua @@ -86,7 +86,7 @@ function system.getDefaultUserSettings() interfaceScreenAddress = nil, interfaceWallpaperEnabled = false, - interfaceWallpaperPath = paths.system.pictures .. "Flight.lua", + interfaceWallpaperPath = paths.system.wallpapers .. "Flight.lua", interfaceWallpaperMode = 1, interfaceWallpaperBrightness = 0.9, diff --git a/Pictures/AhsokaTano.pic b/Wallpapers/AhsokaTano.pic old mode 100755 new mode 100644 similarity index 100% rename from Pictures/AhsokaTano.pic rename to Wallpapers/AhsokaTano.pic diff --git a/Pictures/Block.pic b/Wallpapers/Block.pic old mode 100755 new mode 100644 similarity index 100% rename from Pictures/Block.pic rename to Wallpapers/Block.pic diff --git a/Pictures/Ciri.pic b/Wallpapers/Ciri.pic old mode 100755 new mode 100644 similarity index 100% rename from Pictures/Ciri.pic rename to Wallpapers/Ciri.pic diff --git a/Pictures/Flight.lua b/Wallpapers/Flight.lua similarity index 100% rename from Pictures/Flight.lua rename to Wallpapers/Flight.lua diff --git a/Pictures/Girl.pic b/Wallpapers/Girl.pic old mode 100755 new mode 100644 similarity index 100% rename from Pictures/Girl.pic rename to Wallpapers/Girl.pic diff --git a/Pictures/Logic.pic b/Wallpapers/Logic.pic similarity index 100% rename from Pictures/Logic.pic rename to Wallpapers/Logic.pic diff --git a/Pictures/Mystery.pic b/Wallpapers/Mystery.pic old mode 100755 new mode 100644 similarity index 100% rename from Pictures/Mystery.pic rename to Wallpapers/Mystery.pic diff --git a/Pictures/Nettle.pic b/Wallpapers/Nettle.pic old mode 100755 new mode 100644 similarity index 100% rename from Pictures/Nettle.pic rename to Wallpapers/Nettle.pic diff --git a/Pictures/Raspberry.pic b/Wallpapers/Raspberry.pic old mode 100755 new mode 100644 similarity index 100% rename from Pictures/Raspberry.pic rename to Wallpapers/Raspberry.pic diff --git a/Pictures/Road.pic b/Wallpapers/Road.pic similarity index 100% rename from Pictures/Road.pic rename to Wallpapers/Road.pic diff --git a/Pictures/Space.pic b/Wallpapers/Space.pic old mode 100755 new mode 100644 similarity index 100% rename from Pictures/Space.pic rename to Wallpapers/Space.pic