diff --git a/Installer/Files.cfg b/Installer/Files.cfg index 49511c46..5a4691b6 100644 --- a/Installer/Files.cfg +++ b/Installer/Files.cfg @@ -674,28 +674,26 @@ "Applications/Pioneer.app/Images/Knob8.pic" }, wallpapers = { - -- 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", + "Wallpapers/Lines.wlp/Main.lua", - -- Scripts - "Wallpapers/Flight.lua" - }, - screensavers = { - "Screensavers/Space.lua", - "Screensavers/Matrix.lua", - "Screensavers/Mandala.lua", - "Screensavers/Clock.lua", - "Screensavers/Lines.lua", - "Screensavers/XCOM.lua", - "Screensavers/NyanCat.lua" + "Wallpapers/Solid color.wlp/Main.lua", + + "Wallpapers/Stars.wlp/Main.lua" + + "Wallpapers/Static picture.wlp/Main.lua", + "Wallpapers/Static picture.wlp/Pictures/Ciri.pic", + "Wallpapers/Static picture.wlp/Pictures/Girl.pic", + "Wallpapers/Static picture.wlp/Pictures/Jellyfish.pic", + "Wallpapers/Static picture.wlp/Pictures/LikeOS.pic", + "Wallpapers/Static picture.wlp/Pictures/Mayonnaise.pic", + "Wallpapers/Static picture.wlp/Pictures/Mystery.pic", + "Wallpapers/Static picture.wlp/Pictures/Nettle.pic", + "Wallpapers/Static picture.wlp/Pictures/Raspberry.pic", + "Wallpapers/Static picture.wlp/Pictures/Road.pic", + "Wallpapers/Static picture.wlp/Pictures/Space.pic", + "Wallpapers/Static picture.wlp/Pictures/Strawberry.pic", + "Wallpapers/Static picture.wlp/Pictures/Windows 10.pic", + "Wallpapers/Static picture.wlp/Pictures/Windows 11.pic", + "Wallpapers/Static picture.wlp/Pictures/Windows XP.pic" } } \ No newline at end of file diff --git a/Installer/Main.lua b/Installer/Main.lua index 191d86f3..57d9c76a 100644 --- a/Installer/Main.lua +++ b/Installer/Main.lua @@ -308,7 +308,6 @@ local usernamePasswordText = GUI.text(1, 1, 0xCC0040, "") local withoutPasswordSwitchAndLabel = newSwitchAndLabel(30, 0x66DB80, "", false) local wallpapersSwitchAndLabel = newSwitchAndLabel(30, 0xFF4980, "", true) -local screensaversSwitchAndLabel = newSwitchAndLabel(30, 0xFFB600, "", true) local applicationsSwitchAndLabel = newSwitchAndLabel(30, 0x33DB80, "", true) local localizationsSwitchAndLabel = newSwitchAndLabel(30, 0x33B6FF, "", true) @@ -326,7 +325,6 @@ for i = 1, #files.localizations do passwordSubmitInput.placeholderText = localization.submitPassword withoutPasswordSwitchAndLabel.label.text = localization.withoutPassword wallpapersSwitchAndLabel.label.text = localization.wallpapers - screensaversSwitchAndLabel.label.text = localization.screensavers applicationsSwitchAndLabel.label.text = localization.applications localizationsSwitchAndLabel.label.text = localization.languages acceptSwitchAndLabel.label.text = localization.accept @@ -519,7 +517,6 @@ addStage(function() addTitle(0x696969, localization.customize) layout:addChild(wallpapersSwitchAndLabel) - layout:addChild(screensaversSwitchAndLabel) layout:addChild(applicationsSwitchAndLabel) layout:addChild(localizationsSwitchAndLabel) end) @@ -563,8 +560,7 @@ addStage(function() usernameInput.text, localizationComboBox:getItem(localizationComboBox.selectedItem).text, not withoutPasswordSwitchAndLabel.switch.state and passwordInput.text or nil, - wallpapersSwitchAndLabel.switch.state, - screensaversSwitchAndLabel.switch.state + wallpapersSwitchAndLabel.switch.state ) end) @@ -618,7 +614,6 @@ addStage(function() addToList(true, "localizations") addToList(applicationsSwitchAndLabel.switch.state, "optional") addToList(wallpapersSwitchAndLabel.switch.state, "wallpapers") - addToList(screensaversSwitchAndLabel.switch.state, "screensavers") -- Downloading files from created list local versions, path, id, version, shortcut = {} diff --git a/Wallpapers/Static picture.wlp/Pictures/Mojave.pic b/Wallpapers/Static picture.wlp/Pictures/Mojave.pic deleted file mode 100644 index 6bebb0de..00000000 Binary files a/Wallpapers/Static picture.wlp/Pictures/Mojave.pic and /dev/null differ