From 5cd9143e7cd4ca49bdf86c4b430c20077a452402 Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Thu, 18 Feb 2021 12:26:19 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A5=20[S/C/Celeste=20+=20docs]=20Renam?= =?UTF-8?q?e=20Caberto=20to=20Celeste?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docs/02-caberto-shell.md | 28 ++++++------- docs/04-observable.md | 2 +- docs/05-multiuser.md | 2 +- docs/09-glossary.md | 2 +- docs/images/{caberto => celeste}/appman.png | Bin docs/images/{caberto => celeste}/default.png | Bin docs/images/{caberto => celeste}/drawer.png | Bin docs/images/{caberto => celeste}/settings.png | Bin .../AppManager.aosapp/ASAppManager.rpy | 13 +++--- .../AppManager.aosapp/ASAppManagerView.rpy | 12 +++--- .../CelesteDE.rpy} | 38 +++++++++--------- .../Components/CelesteDrawer.rpy} | 18 ++++----- .../Components/CelesteLauncher.rpy} | 20 ++++----- .../Components/CelesteShellView.rpy} | 12 +++--- .../Components/CelesteTopBar.rpy} | 38 +++++++++--------- .../LICENSE.txt | 0 .../Resources/Iconset/1024.png | Bin .../Resources/Iconset/128.png | Bin .../Resources/Iconset/16.png | Bin .../Resources/Iconset/24.png | Bin .../Resources/Iconset/256.png | Bin .../Resources/Iconset/32.png | Bin .../Resources/Iconset/48.png | Bin .../Resources/Iconset/512.png | Bin .../Resources/Iconset/64.png | Bin .../Resources/app_mask.png | Bin .../Resources/app_mask.svg | 0 .../Resources/distributor_logo.png | Bin .../Resources/logoff.png | Bin .../Resources/settings.png | Bin .../Views/CelesteAccountSwitcher.rpy} | 9 ++--- .../Views/CelesteSettings.rpy} | 38 +++++++++--------- .../manifest.json | 2 +- game/script.rpy | 2 +- vanilla/main.html | 2 +- 36 files changed, 120 insertions(+), 120 deletions(-) rename docs/images/{caberto => celeste}/appman.png (100%) rename docs/images/{caberto => celeste}/default.png (100%) rename docs/images/{caberto => celeste}/drawer.png (100%) rename docs/images/{caberto => celeste}/settings.png (100%) rename game/System/CoreServices/{Caberto.aoscservice/CabertoDE.rpy => Celeste.aoscservice/CelesteDE.rpy} (88%) rename game/System/CoreServices/{Caberto.aoscservice/Components/CabertoDrawer.rpy => Celeste.aoscservice/Components/CelesteDrawer.rpy} (78%) rename game/System/CoreServices/{Caberto.aoscservice/Components/CabertoLauncher.rpy => Celeste.aoscservice/Components/CelesteLauncher.rpy} (68%) rename game/System/CoreServices/{Caberto.aoscservice/Components/CabertoShellView.rpy => Celeste.aoscservice/Components/CelesteShellView.rpy} (72%) rename game/System/CoreServices/{Caberto.aoscservice/Components/CabertoTopBar.rpy => Celeste.aoscservice/Components/CelesteTopBar.rpy} (59%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/LICENSE.txt (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/Iconset/1024.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/Iconset/128.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/Iconset/16.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/Iconset/24.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/Iconset/256.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/Iconset/32.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/Iconset/48.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/Iconset/512.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/Iconset/64.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/app_mask.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/app_mask.svg (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/distributor_logo.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/logoff.png (100%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/Resources/settings.png (100%) rename game/System/CoreServices/{Caberto.aoscservice/Views/CabertoAccountSwitcher.rpy => Celeste.aoscservice/Views/CelesteAccountSwitcher.rpy} (91%) rename game/System/CoreServices/{Caberto.aoscservice/Views/CabertoSettings.rpy => Celeste.aoscservice/Views/CelesteSettings.rpy} (54%) rename game/System/CoreServices/{Caberto.aoscservice => Celeste.aoscservice}/manifest.json (93%) diff --git a/README.md b/README.md index 3cf0c28..62e251e 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Candella is a fork of the [AliceOS framework](https://aliceos.app), a Ren'Py framework that provides an operating environment to visual novels. This operating environment includes utilities, classes, and other code that lets developers and players write and use apps designed for the system. -![Caberto Shell in Candella](./.github/release.png) +![Celeste Shell in Candella](./.github/release.png) ## Differences between AliceOS diff --git a/docs/02-caberto-shell.md b/docs/02-caberto-shell.md index ac437c7..c46cbbb 100644 --- a/docs/02-caberto-shell.md +++ b/docs/02-caberto-shell.md @@ -1,23 +1,23 @@ -# Caberto Shell +# Celeste Shell -The default desktop shell for Candella is **Caberto**. Caberto's interface is mainly inspired from the [Lomiri][lomiri] desktop environment and comes with per-user customizations. +The default desktop shell for Candella is **Celeste** (formerly known as Caberto Shell). Celeste's interface is mainly inspired from the [Lomiri][lomiri] desktop environment and comes with per-user customizations. !!! warning - Caberto is currently in a pre-release state and the documentation here may change as the project evolves. + Celeste is currently in a pre-release state and the documentation here may change as the project evolves. -![Default Caberto Shell desktop](./images/caberto/default.png) +![Default Celeste Shell desktop](./images/celeste/default.png) -## Using Caberto Shell +## Using Celeste Shell -There are two major components to Caberto Shell: the top bar and the launcher on the left-hand side of the screen. In the top bar, you can view the currently-running application's name, the current user, the time, and a few status indicators for settings and exiting the desktop. The launcher on the left displays favorite apps and provides the main entry point to access all apps. +There are two major components to Celeste Shell: the top bar and the launcher on the left-hand side of the screen. In the top bar, you can view the currently-running application's name, the current user, the time, and a few status indicators for settings and exiting the desktop. The launcher on the left displays favorite apps and provides the main entry point to access all apps. -![Caberto Shell drawer](./images/caberto/drawer.png) +![Celeste Shell drawer](./images/celeste/drawer.png) ### Customizing the desktop -Click on the gear in the top bar to open the Settings pane for Caberto Shell. Currently, the only setting available in this panel is the wallpaper selection. +Click on the gear in the top bar to open the Settings pane for Celeste Shell. Currently, the only setting available in this panel is the wallpaper selection. -![Caberto Shell settings](./images/caberto/settings.png) +![Celeste Shell settings](./images/celeste/settings.png) ### Switching users @@ -27,14 +27,14 @@ To switch the current user that's logged in to the system, click on the current The App Manager app provides access to pinning apps. Open the App Manager app, click on the app you want to pin from the left side, and then check the box labeled "Pin to launcher", next to the launch button. -![App Manager](./images/caberto/appman.png) +![App Manager](./images/celeste/appman.png) ## Available methods for developers -Caberto Shell provides some static methods that developers can use to get information present in Caberto Shell easily: +Celeste Shell provides some static methods that developers can use to get information present in Celeste Shell easily: -- `CabertoShell.get_all_applications()` returns all of the classes and instanced apps available to Candella. -- `CabertoShell.wallpapers()` returns a list containing the names of the wallpapers available to Caberto Shell. -- `CabertoShell.current_time()` returns a string that represents the current time on the system. +- `CelesteShell.get_all_applications()` returns all of the classes and instanced apps available to Candella. +- `CelesteShell.wallpapers()` returns a list containing the names of the wallpapers available to Celeste Shell. +- `CelesteShell.current_time()` returns a string that represents the current time on the system. [lomiri]: https://lomiri.com \ No newline at end of file diff --git a/docs/04-observable.md b/docs/04-observable.md index 822a333..014d652 100644 --- a/docs/04-observable.md +++ b/docs/04-observable.md @@ -8,7 +8,7 @@ Candella uses Observable in a few places: - In **AppKit**, all apps inherit the `CAObservable` class and can emit signals to observers. - In **ServiceKit**, core services inherit `CAObservable` and emit signals to observers. -- In **Caberto Shell**, the service listens for signal emissions and acts as an observer with a callback method. +- In **Celeste Shell**, the service listens for signal emissions and acts as an observer with a callback method. ## Logic diff --git a/docs/05-multiuser.md b/docs/05-multiuser.md index 9a7d95e..d675658 100644 --- a/docs/05-multiuser.md +++ b/docs/05-multiuser.md @@ -7,7 +7,7 @@ Multi-user support in Candella is provided by the Multiuser framework. This fram A user is defined by a username and is represented as the `CAUser` data class. In most cases, developers will not need to create an instance of this class as core services and applications will provide this automatically. - `CAUser.username` contains the username of the user. Usernames must be in lowercase with no spaces or special characters. -- `CAUser.display_name` contains the user-facing display name for the user. This display name is used by core services such as Caberto Shell to display the user's name. By default, this name defaults to the username. +- `CAUser.display_name` contains the user-facing display name for the user. This display name is used by core services such as Celeste Shell to display the user's name. By default, this name defaults to the username. `CAUser` provides methods for checking equality and string representation. diff --git a/docs/09-glossary.md b/docs/09-glossary.md index 23aded9..45145ba 100644 --- a/docs/09-glossary.md +++ b/docs/09-glossary.md @@ -32,7 +32,7 @@ If no arguments are passed in `load_glossary`, the app will default to the built ## Overriding the default glossary -If you need to override the default glossary with your own, you can change the `default_glossary` property of the `glossary` instance. This may be used in scenarios where you want the Glossary app to open your default glossary when the user opens it in a launcher like Caberto Shell. +If you need to override the default glossary with your own, you can change the `default_glossary` property of the `glossary` instance. This may be used in scenarios where you want the Glossary app to open your default glossary when the user opens it in a launcher like Celeste Shell. ```py glossary.default_glossary = "path/to/default_glossary.json" diff --git a/docs/images/caberto/appman.png b/docs/images/celeste/appman.png similarity index 100% rename from docs/images/caberto/appman.png rename to docs/images/celeste/appman.png diff --git a/docs/images/caberto/default.png b/docs/images/celeste/default.png similarity index 100% rename from docs/images/caberto/default.png rename to docs/images/celeste/default.png diff --git a/docs/images/caberto/drawer.png b/docs/images/celeste/drawer.png similarity index 100% rename from docs/images/caberto/drawer.png rename to docs/images/celeste/drawer.png diff --git a/docs/images/caberto/settings.png b/docs/images/celeste/settings.png similarity index 100% rename from docs/images/caberto/settings.png rename to docs/images/celeste/settings.png diff --git a/game/System/Applications/AppManager.aosapp/ASAppManager.rpy b/game/System/Applications/AppManager.aosapp/ASAppManager.rpy index a1e1de2..ea229c4 100644 --- a/game/System/Applications/AppManager.aosapp/ASAppManager.rpy +++ b/game/System/Applications/AppManager.aosapp/ASAppManager.rpy @@ -8,23 +8,24 @@ init 5 python: class ASAppManager(CAApplication): - + from store.CADeprecated import deprecated + def applicationWillLaunch(self): renpy.show_screen("ASAppManagerView") pass + @deprecated('21.02', renamed="CelesteShell.get_all_applications") def gather_applications(self): """Returns a list of all of the gathered applications.""" - clog.warn("ASAppManager.gather_applications is deprecated. Use CabertoShell.get_all_applications instead.") - return CabertoShell.get_all_applications() - + return CelesteShell.get_all_applications() + def get_app_name(self, app): if isinstance(app, CAApplication): return app.get_name() return app.bundleName - + def _pin_to_shell_dock(self, app_id): - """Prompt Caberto Shell to add/remove an app to/from the Dock.""" + """Prompt Celeste Shell to add/remove an app to/from the Dock.""" self.emit_signal("__appman_pin", app=app_id) def __init__(self): diff --git a/game/System/Applications/AppManager.aosapp/ASAppManagerView.rpy b/game/System/Applications/AppManager.aosapp/ASAppManagerView.rpy index ef48e51..5de4d60 100644 --- a/game/System/Applications/AppManager.aosapp/ASAppManagerView.rpy +++ b/game/System/Applications/AppManager.aosapp/ASAppManagerView.rpy @@ -10,7 +10,7 @@ screen ASAppManagerView(): style_prefix "ASInterface" python: - apps = CabertoShell.get_all_applications() + apps = CelesteShell.get_all_applications() default currentAppView = None @@ -67,17 +67,17 @@ screen ASAppManagerView(): style "ASAppManager_DetailedAppAuthor_text" text "Version [currentAppView.bundleVersion] ([currentAppView.bundleId])" null height 8 - + hbox: spacing 8 textbutton "Launch" action Function(currentAppView.applicationWillLaunch): style "ASInterfacePushButton" - + vbox: style_prefix "ASInterfaceCheckbox" textbutton "Pin to launcher" action Function(appman._pin_to_shell_dock, app_id=currentAppView.bundleId): - selected caberto.app_exists_in_current_launcher(currentAppView.bundleId) + selected celeste.app_exists_in_current_launcher(currentAppView.bundleId) null height 8 @@ -113,14 +113,14 @@ screen ASAppManagerView(): style "ASAppManager_text" else: text "This app doesn't require any permissions." - + screen ASAppManagerDetailButton(app): button action SetScreenVariable("currentAppView", app): ymaximum 56 xsize 300 has hbox: spacing 8 - + add app.icons[48] vbox: python: diff --git a/game/System/CoreServices/Caberto.aoscservice/CabertoDE.rpy b/game/System/CoreServices/Celeste.aoscservice/CelesteDE.rpy similarity index 88% rename from game/System/CoreServices/Caberto.aoscservice/CabertoDE.rpy rename to game/System/CoreServices/Celeste.aoscservice/CelesteDE.rpy index 5048da6..a753f3d 100644 --- a/game/System/CoreServices/Caberto.aoscservice/CabertoDE.rpy +++ b/game/System/CoreServices/Celeste.aoscservice/CelesteDE.rpy @@ -1,6 +1,6 @@ # -# CabertoDE.rpy -# Caberto Desktop Shell +# CelesteDE.rpy +# Celeste Desktop Shell # # (C) 2021 Marquis Kurt. All rights reserved. # @@ -17,15 +17,15 @@ init python: from os import listdir, path from time import gmtime, strftime - class CabertoShell(CACoreService): + class CelesteShell(CACoreService): _wallpaper = AS_LIBRARY_DIR + "Desktop Pictures/Candella.png" _dock = [] _drawer_open = False - _current_app_name = "Caberto Desktop" + _current_app_name = "Celeste Desktop" _acct_switcher_open = False def __init__(self): - CACoreService.__init__(self, AS_CORESERVICES_DIR + "Caberto.aoscservice/") + CACoreService.__init__(self, AS_CORESERVICES_DIR + "Celeste.aoscservice/") self._acct_mgr = CAAccountsService(self) self.settings = ServiceStorage(self) @@ -40,8 +40,8 @@ init python: self.settings.commit() self._wallpaper = self.settings.get_entry("wallpaper", raise_falsy=True) - apps = CabertoShell.get_all_applications() - for app in CabertoShell.get_all_applications(): + apps = CelesteShell.get_all_applications() + for app in CelesteShell.get_all_applications(): if not isinstance(app, CAApplication): clog.warn("%s cannot emit signals and will be ignored.", app.bundleName) continue @@ -87,13 +87,13 @@ init python: if transient: renpy.run( ShowTransient( - "CabertoShellView", wallpaper=self._wallpaper, + "CelesteShellView", wallpaper=self._wallpaper, apps=apps ) ) else: renpy.call_screen( - "CabertoShellView", wallpaper=self._wallpaper, + "CelesteShellView", wallpaper=self._wallpaper, apps=apps ) self.serviceDidLaunch() @@ -105,7 +105,7 @@ init python: Arguments: app_id (str): The bundle ID of the app to launch. """ - app_target = [app for app in CabertoShell.get_all_applications() if app.bundleId == app_id] + app_target = [app for app in CelesteShell.get_all_applications() if app.bundleId == app_id] if not app_target: clog.error("Failed to launch app '%s'", app_id) app = app_target[0] @@ -130,9 +130,9 @@ init python: self._drawer_open = not self._drawer_open if self._drawer_open: - renpy.run(ShowTransient("CabertoDrawer")) + renpy.run(ShowTransient("CelesteDrawer")) else: - renpy.run(Hide("CabertoDrawer")) + renpy.run(Hide("CelesteDrawer")) def start_acct_manager(self): """Call the account switcher dialog.""" @@ -146,7 +146,7 @@ init python: self._acct_switcher_open = True username = renpy.invoke_in_new_context( - renpy.call_screen, "CabertoAccountSwitcher", users=CAAccountsService.get_all_users() + renpy.call_screen, "CelesteAccountSwitcher", users=CAAccountsService.get_all_users() ) self._acct_switcher_open = False @@ -156,8 +156,8 @@ init python: self._acct_mgr.change_current_user(username) - renpy.run([Hide("CabertoShellView"), Hide("CabertoLauncher")]) - clog.debug("Reloading Caberto settings to current user.") + renpy.run([Hide("CelesteShellView"), Hide("CelesteLauncher")]) + clog.debug("Reloading Celeste settings to current user.") self._init_settings() self.launch(transient=True) @@ -184,7 +184,7 @@ init python: def _get_dock_apps(self, apps): """Returns the list of app objects that is in the dock.""" - return [app for app in CabertoShell.get_all_applications() if app.bundleId in apps] + return [app for app in CelesteShell.get_all_applications() if app.bundleId in apps] def _set_wallpaper(self, name): """Set the wallpaper and save the preference.""" @@ -197,7 +197,7 @@ init python: if "application_launched" in args: self._current_app_name = kwargs["name"] elif "application_terminated" in args: - self._current_app_name = "Caberto Desktop" + self._current_app_name = "Celeste Desktop" # Handle app pinning from the App Manager. elif "__appman_pin" in args: @@ -209,6 +209,6 @@ init python: self._dock.append(app_id) self.settings.set_entry("apps_list", self._dock) self.settings.commit() - renpy.run([Hide("CabertoShellView"), Function(self.launch, transient=True)]) + renpy.run([Hide("CelesteShellView"), Function(self.launch, transient=True)]) - caberto = CabertoShell() + celeste = CelesteShell() diff --git a/game/System/CoreServices/Caberto.aoscservice/Components/CabertoDrawer.rpy b/game/System/CoreServices/Celeste.aoscservice/Components/CelesteDrawer.rpy similarity index 78% rename from game/System/CoreServices/Caberto.aoscservice/Components/CabertoDrawer.rpy rename to game/System/CoreServices/Celeste.aoscservice/Components/CelesteDrawer.rpy index 09b6802..b679c51 100644 --- a/game/System/CoreServices/Caberto.aoscservice/Components/CabertoDrawer.rpy +++ b/game/System/CoreServices/Celeste.aoscservice/Components/CelesteDrawer.rpy @@ -1,6 +1,6 @@ # -# CabertoDrawer.rpy -# Caberto Desktop Shell +# CelesteDrawer.rpy +# Celeste Desktop Shell # # (C) 2021 Marquis Kurt. All rights reserved. # @@ -9,11 +9,11 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. # -init screen CabertoDrawer(): - style_prefix "CabertoDrawer" +init screen CelesteDrawer(): + style_prefix "CelesteDrawer" modal False - $ all_apps = sorted(caberto.get_all_applications(), key=lambda app: app.get_name() if isinstance(app, CAApplication) else app.bundleName) + $ all_apps = sorted(celeste.get_all_applications(), key=lambda app: app.get_name() if isinstance(app, CAApplication) else app.bundleName) frame: xsize 700 @@ -36,7 +36,7 @@ init screen CabertoDrawer(): _app_name = _app_name[:34] + "..." button action [ - Function(caberto.drawer), Function(caberto.launch_app_bundle, app_bundle=app) + Function(celeste.drawer), Function(celeste.launch_app_bundle, app_bundle=app) ]: xysize(96, 128) sensitive True @@ -45,7 +45,7 @@ init screen CabertoDrawer(): xfill True yfill True - add AlphaMask(app.icons[64], caberto.get_app_mask(), xysize=(64, 64)): + add AlphaMask(app.icons[64], celeste.get_app_mask(), xysize=(64, 64)): xalign 0.5 text "[_app_name]": xalign 0.5 @@ -53,13 +53,13 @@ init screen CabertoDrawer(): -style CabertoDrawer_frame is frame: +style CelesteDrawer_frame is frame: margin (0, 0) top_margin 28 left_margin 72 padding(24, 16) background "#080808EE" -style CabertoDrawer_text is text: +style CelesteDrawer_text is text: font get_font("Ubuntu", "Regular") size 16 diff --git a/game/System/CoreServices/Caberto.aoscservice/Components/CabertoLauncher.rpy b/game/System/CoreServices/Celeste.aoscservice/Components/CelesteLauncher.rpy similarity index 68% rename from game/System/CoreServices/Caberto.aoscservice/Components/CabertoLauncher.rpy rename to game/System/CoreServices/Celeste.aoscservice/Components/CelesteLauncher.rpy index 76a08df..d5af176 100644 --- a/game/System/CoreServices/Caberto.aoscservice/Components/CabertoLauncher.rpy +++ b/game/System/CoreServices/Celeste.aoscservice/Components/CelesteLauncher.rpy @@ -1,6 +1,6 @@ # -# CabertoLauncher.rpy -# Caberto Desktop Shell +# CelesteLauncher.rpy +# Celeste Desktop Shell # # (C) 2021 Marquis Kurt. All rights reserved. # @@ -9,10 +9,10 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. # -screen CabertoLauncher(apps): +screen CelesteLauncher(apps): tag desktop modal False - style_prefix "CabertoLauncher" + style_prefix "CelesteLauncher" frame: yfill True @@ -31,19 +31,19 @@ screen CabertoLauncher(apps): _icon = app.get_app_icon(64) if isinstance(app, CAApplication) else app.icons[64] _name = app.product_name if isinstance(app, CAApplication) else app.bundleName - button action Function(caberto.launch_app_bundle, app_bundle=app): + button action Function(celeste.launch_app_bundle, app_bundle=app): xysize (72, 68) - add AlphaMask(_icon, caberto.get_app_mask(), xysize=(64, 64)): + add AlphaMask(_icon, celeste.get_app_mask(), xysize=(64, 64)): size (60, 60) xalign 0.5 - button action Function(caberto.drawer): + button action Function(celeste.drawer): ysize 72 - add "#FC9856" # TODO: Replace this with the Caberto/Candella logo. - add caberto.bundleDir + "Resources/distributor_logo.png": + add "#FC9856" # TODO: Replace this with the Celeste/Candella logo. + add celeste.bundleDir + "Resources/distributor_logo.png": align (0.5, 0.5) -style CabertoLauncher_frame is frame: +style CelesteLauncher_frame is frame: margin (0, 0) padding (0, 0) background "#212121EE" diff --git a/game/System/CoreServices/Caberto.aoscservice/Components/CabertoShellView.rpy b/game/System/CoreServices/Celeste.aoscservice/Components/CelesteShellView.rpy similarity index 72% rename from game/System/CoreServices/Caberto.aoscservice/Components/CabertoShellView.rpy rename to game/System/CoreServices/Celeste.aoscservice/Components/CelesteShellView.rpy index b63633c..76f4a60 100644 --- a/game/System/CoreServices/Caberto.aoscservice/Components/CabertoShellView.rpy +++ b/game/System/CoreServices/Celeste.aoscservice/Components/CelesteShellView.rpy @@ -1,6 +1,6 @@ # -# CabertoShellView.rpy -# Caberto Desktop Shell +# CelesteShellView.rpy +# Celeste Desktop Shell # # (C) 2021 Marquis Kurt. All rights reserved. # @@ -9,7 +9,7 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. # -screen CabertoShellView(wallpaper, apps): +screen CelesteShellView(wallpaper, apps): tag desktop modal False @@ -19,8 +19,8 @@ screen CabertoShellView(wallpaper, apps): size (1280, 720) # Display the top bar and the launcher on the side. - use CabertoLauncher(apps=apps) - use CabertoTopBar + use CelesteLauncher(apps=apps) + use CelesteTopBar # Listen for changes on the set wallpaper and refresh the wallpaper. - timer 0.25 action SetScreenVariable("wall", caberto._wallpaper) repeat True + timer 0.25 action SetScreenVariable("wall", celeste._wallpaper) repeat True diff --git a/game/System/CoreServices/Caberto.aoscservice/Components/CabertoTopBar.rpy b/game/System/CoreServices/Celeste.aoscservice/Components/CelesteTopBar.rpy similarity index 59% rename from game/System/CoreServices/Caberto.aoscservice/Components/CabertoTopBar.rpy rename to game/System/CoreServices/Celeste.aoscservice/Components/CelesteTopBar.rpy index 7ae16d7..e9d49ca 100644 --- a/game/System/CoreServices/Caberto.aoscservice/Components/CabertoTopBar.rpy +++ b/game/System/CoreServices/Celeste.aoscservice/Components/CelesteTopBar.rpy @@ -1,6 +1,6 @@ # -# CabertoTopBar.rpy -# Caberto Desktop Shell +# CelesteTopBar.rpy +# Celeste Desktop Shell # # (C) 2021 Marquis Kurt. All rights reserved. # @@ -9,22 +9,22 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. # -screen CabertoTopBar(): +screen CelesteTopBar(): tag desktop modal False - style_prefix "CabertoTopBar" + style_prefix "CelesteTopBar" default _CurrentTime = "Tue. 9:41 AM" default _Username = "User" default _CurrentApp = "" python: - _CurrentTime = CabertoShell.current_time() + _CurrentTime = CelesteShell.current_time() _user = CAAccountsService.get_logged_in_user() _Username = _user.display_name - _CurrentApp = caberto._current_app_name + _CurrentApp = celeste._current_app_name - timer 0.5 action [SetScreenVariable("_CurrentApp", caberto._current_app_name), SetScreenVariable("_CurrentTime", CabertoShell.current_time())] repeat True + timer 0.5 action [SetScreenVariable("_CurrentApp", celeste._current_app_name), SetScreenVariable("_CurrentTime", CelesteShell.current_time())] repeat True frame: xfill True @@ -33,46 +33,46 @@ screen CabertoTopBar(): has hbox: xfill True text "[_CurrentApp]": - style "CabertoTopBar_AppName" + style "CelesteTopBar_AppName" hbox: xalign 1.0 spacing 8 - textbutton "[_Username]" action Function(caberto.start_acct_manager) + textbutton "[_Username]" action Function(celeste.start_acct_manager) text "[_CurrentTime]" - button action Show("CabertoSettings"): + button action Show("CelesteSettings"): xysize (24, 18) - add caberto.bundleDir + "Resources/settings.png": + add celeste.bundleDir + "Resources/settings.png": size (18, 18) align (0.5, 0.5) - button action Return("CabertoShellView"): + button action Return("CelesteShellView"): xysize (24, 18) - add caberto.bundleDir + "Resources/logoff.png": + add celeste.bundleDir + "Resources/logoff.png": size (18, 18) align (0.5, 0.5) -style CabertoTopBar_frame is frame: +style CelesteTopBar_frame is frame: background Frame("#191919", Borders(0, 0, 0, 0), tile=True) margin (0, 0) xpadding 8 ypadding 4 -style CabertoTopBar_hbox is hbox: +style CelesteTopBar_hbox is hbox: spacing 8 -style CabertoTopBar_text is text: +style CelesteTopBar_text is text: font get_font("Ubuntu", "Light") color "#ffffff" size 16 -style CabertoTopBar_AppName is text: +style CelesteTopBar_AppName is text: font get_font("Ubuntu", "Medium") color "#ffffff" size 16 -style CabertoTopBar_button is button: +style CelesteTopBar_button is button: padding (0, 0) -style CabertoTopBar_button_text is CabertoTopBar_text +style CelesteTopBar_button_text is CelesteTopBar_text diff --git a/game/System/CoreServices/Caberto.aoscservice/LICENSE.txt b/game/System/CoreServices/Celeste.aoscservice/LICENSE.txt similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/LICENSE.txt rename to game/System/CoreServices/Celeste.aoscservice/LICENSE.txt diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/1024.png b/game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/1024.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/1024.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/1024.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/128.png b/game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/128.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/128.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/128.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/16.png b/game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/16.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/16.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/16.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/24.png b/game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/24.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/24.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/24.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/256.png b/game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/256.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/256.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/256.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/32.png b/game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/32.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/32.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/32.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/48.png b/game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/48.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/48.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/48.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/512.png b/game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/512.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/512.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/512.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/64.png b/game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/64.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/Iconset/64.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/Iconset/64.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/app_mask.png b/game/System/CoreServices/Celeste.aoscservice/Resources/app_mask.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/app_mask.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/app_mask.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/app_mask.svg b/game/System/CoreServices/Celeste.aoscservice/Resources/app_mask.svg similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/app_mask.svg rename to game/System/CoreServices/Celeste.aoscservice/Resources/app_mask.svg diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/distributor_logo.png b/game/System/CoreServices/Celeste.aoscservice/Resources/distributor_logo.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/distributor_logo.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/distributor_logo.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/logoff.png b/game/System/CoreServices/Celeste.aoscservice/Resources/logoff.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/logoff.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/logoff.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Resources/settings.png b/game/System/CoreServices/Celeste.aoscservice/Resources/settings.png similarity index 100% rename from game/System/CoreServices/Caberto.aoscservice/Resources/settings.png rename to game/System/CoreServices/Celeste.aoscservice/Resources/settings.png diff --git a/game/System/CoreServices/Caberto.aoscservice/Views/CabertoAccountSwitcher.rpy b/game/System/CoreServices/Celeste.aoscservice/Views/CelesteAccountSwitcher.rpy similarity index 91% rename from game/System/CoreServices/Caberto.aoscservice/Views/CabertoAccountSwitcher.rpy rename to game/System/CoreServices/Celeste.aoscservice/Views/CelesteAccountSwitcher.rpy index c7fefd5..8b707ec 100644 --- a/game/System/CoreServices/Caberto.aoscservice/Views/CabertoAccountSwitcher.rpy +++ b/game/System/CoreServices/Celeste.aoscservice/Views/CelesteAccountSwitcher.rpy @@ -1,6 +1,6 @@ # -# CabertoAccountSwitcher.rpy -# Caberto Shell - Account Switcher +# CelesteAccountSwitcher.rpy +# Celeste Shell - Account Switcher # # (C) 2021 Marquis Kurt. All rights reserved. # @@ -11,8 +11,8 @@ init offset = 5 -screen CabertoAccountSwitcher(users): - tag CabertoAccounts +screen CelesteAccountSwitcher(users): + tag CelesteAccounts zorder 105 modal True style_prefix "ASInterface" @@ -55,4 +55,3 @@ screen CabertoAccountSwitcher(users): textbutton "Cancel" action [Return(None)]: xalign 0.5 - diff --git a/game/System/CoreServices/Caberto.aoscservice/Views/CabertoSettings.rpy b/game/System/CoreServices/Celeste.aoscservice/Views/CelesteSettings.rpy similarity index 54% rename from game/System/CoreServices/Caberto.aoscservice/Views/CabertoSettings.rpy rename to game/System/CoreServices/Celeste.aoscservice/Views/CelesteSettings.rpy index c71bde6..623d709 100644 --- a/game/System/CoreServices/Caberto.aoscservice/Views/CabertoSettings.rpy +++ b/game/System/CoreServices/Celeste.aoscservice/Views/CelesteSettings.rpy @@ -1,6 +1,6 @@ # -# CabertoSettings.rpy -# Caberto Desktop Shell +# CelesteSettings.rpy +# Celeste Desktop Shell # # (C) 2021 Marquis Kurt. All rights reserved. # @@ -9,9 +9,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. # -screen CabertoSettings(): +screen CelesteSettings(): zorder 100 - style_prefix "CabertoSettings" + style_prefix "CelesteSettings" modal False default wallpaper = "Candella" @@ -25,14 +25,14 @@ screen CabertoSettings(): xalign 0.5 yfit True - use ASInterfaceTitlebar("", onClose=Hide("CabertoSettings")) + use ASInterfaceTitlebar("", onClose=Hide("CelesteSettings")) vbox: label "Settings" hbox: vbox: - style_prefix "CabertoSettings_panel" + style_prefix "CelesteSettings_panel" xsize 420 label "Desktop Background" @@ -41,32 +41,32 @@ screen CabertoSettings(): spacing 8 box_wrap True - for _wall in CabertoShell.wallpapers(): - use CabertoSettingsWallpaperButton(_wall) + for _wall in CelesteShell.wallpapers(): + use CelesteSettingsWallpaperButton(_wall) -style CabertoSettings_frame is ASInterface_frame -style CabertoSettings_vbox is ASInterface_vbox +style CelesteSettings_frame is ASInterface_frame +style CelesteSettings_vbox is ASInterface_vbox -style CabertoSettings_label is ASInterface_label -style CabertoSettings_label_text is ASInterface_label_text: +style CelesteSettings_label is ASInterface_label +style CelesteSettings_label_text is ASInterface_label_text: font get_font("Interface", variant="Bold") -style CabertoSettings_text is ASInterface_text: +style CelesteSettings_text is ASInterface_text: size 14 -style CabertoSettings_panel_label is ASInterface_label -style CabertoSettings_panel_label_text is ASInterface_label_text: +style CelesteSettings_panel_label is ASInterface_label +style CelesteSettings_panel_label_text is ASInterface_label_text: font get_font("Interface", variant="Medium") size 18 -screen CabertoSettingsWallpaperButton(wallpaper): - style_prefix "CabertoSettingsWallpaperButton" - button action [SetScreenVariable("wallpaper", wallpaper), Function(caberto._set_wallpaper, name=wallpaper)]: +screen CelesteSettingsWallpaperButton(wallpaper): + style_prefix "CelesteSettingsWallpaperButton" + button action [SetScreenVariable("wallpaper", wallpaper), Function(celeste._set_wallpaper, name=wallpaper)]: xysize (144, 90) vbox: add AS_LIBRARY_DIR + "Desktop Pictures/" + wallpaper + ".png": size (144, 82) -style CabertoSettingsWallpaperButton_text is ASInterface_text: +style CelesteSettingsWallpaperButton_text is ASInterface_text: size 12 diff --git a/game/System/CoreServices/Caberto.aoscservice/manifest.json b/game/System/CoreServices/Celeste.aoscservice/manifest.json similarity index 93% rename from game/System/CoreServices/Caberto.aoscservice/manifest.json rename to game/System/CoreServices/Celeste.aoscservice/manifest.json index 2940733..3339340 100644 --- a/game/System/CoreServices/Caberto.aoscservice/manifest.json +++ b/game/System/CoreServices/Celeste.aoscservice/manifest.json @@ -1,5 +1,5 @@ { - "name": "Caberto Shell", + "name": "Celeste Shell", "id": "dev.unscriptedvn.candella.caberto-shell", "author": "Marquis Kurt ", "version": "1.0.0", diff --git a/game/script.rpy b/game/script.rpy index 9364d9c..f6523e5 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -13,7 +13,7 @@ label quit: # Open the desktop. label start: - $ caberto.launch() + $ celeste.launch() return # Show an example Stop screen. diff --git a/vanilla/main.html b/vanilla/main.html index 7b98bdf..f30b996 100644 --- a/vanilla/main.html +++ b/vanilla/main.html @@ -18,7 +18,7 @@

A modern Ren'Py operating environment

- Caberto Shell on Candella + Celeste Shell on Candella