DavHau/clan-core
1
0
Fork 0
forked from clan/clan-core
Code Pull Requests Activity

Merge pull request 'clan_manager: Implemented machine_icon, machine_description' (#813) from Qubasa-main into main

Browse Source
This commit is contained in:
clan-bot 2024-02-06 13:16:31 +00:00
commit 35bb076729
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/clan-cli/clan_cli/flakes/inspect.py
View File

@ -24,6 +24,10 @@ class FlakeConfig:
revision: str | None
vm: VmConfig
def __post_init__(self) -> None:
if isinstance(self.vm, dict):
self.vm = VmConfig(**self.vm)
def run_cmd(cmd: list[str]) -> str:
proc = run(cmd)

17
pkgs/clan-vm-manager/clan_vm_manager/views/list.py
View File

@ -109,14 +109,21 @@ class ClanList(Gtk.Box):
row.set_title_selectable(True)
# Subtitle
row.set_subtitle(flake.clan_name)
if flake.vm.machine_description:
row.set_subtitle(flake.vm.machine_description)
else:
row.set_subtitle(flake.clan_name)
row.set_subtitle_lines(1)
# # Avatar
# Avatar
avatar = Adw.Avatar()
if flake.icon:
avatar.set_custom_image(Gdk.Texture.new_from_filename(flake.icon))
if not flake.icon:
machine_icon = flake.vm.machine_icon
if machine_icon:
avatar.set_custom_image(Gdk.Texture.new_from_filename(str(machine_icon)))
elif flake.icon:
avatar.set_custom_image(Gdk.Texture.new_from_filename(str(flake.icon)))
else:
avatar.set_text(flake.clan_name + " " + flake.flake_attr)
avatar.set_show_initials(True)