summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Base/home/anon/Documents/Example Presentation.presenter2
-rw-r--r--Base/res/graphics/catdog/alert.png (renamed from Base/res/icons/catdog/alert.png)bin649 -> 649 bytes
-rw-r--r--Base/res/graphics/catdog/artist.png (renamed from Base/res/icons/catdog/artist.png)bin617 -> 617 bytes
-rw-r--r--Base/res/graphics/catdog/erun1.png (renamed from Base/res/icons/catdog/erun1.png)bin744 -> 744 bytes
-rw-r--r--Base/res/graphics/catdog/erun2.png (renamed from Base/res/icons/catdog/erun2.png)bin761 -> 761 bytes
-rw-r--r--Base/res/graphics/catdog/inspector.png (renamed from Base/res/icons/catdog/inspector.png)bin6311 -> 6311 bytes
-rw-r--r--Base/res/graphics/catdog/nerun1.png (renamed from Base/res/icons/catdog/nerun1.png)bin731 -> 731 bytes
-rw-r--r--Base/res/graphics/catdog/nerun2.png (renamed from Base/res/icons/catdog/nerun2.png)bin762 -> 762 bytes
-rw-r--r--Base/res/graphics/catdog/nrun1.png (renamed from Base/res/icons/catdog/nrun1.png)bin636 -> 636 bytes
-rw-r--r--Base/res/graphics/catdog/nrun2.png (renamed from Base/res/icons/catdog/nrun2.png)bin713 -> 713 bytes
-rw-r--r--Base/res/graphics/catdog/nwrun1.png (renamed from Base/res/icons/catdog/nwrun1.png)bin775 -> 775 bytes
-rw-r--r--Base/res/graphics/catdog/nwrun2.png (renamed from Base/res/icons/catdog/nwrun2.png)bin807 -> 807 bytes
-rw-r--r--Base/res/graphics/catdog/serun1.png (renamed from Base/res/icons/catdog/serun1.png)bin764 -> 764 bytes
-rw-r--r--Base/res/graphics/catdog/serun2.png (renamed from Base/res/icons/catdog/serun2.png)bin804 -> 804 bytes
-rw-r--r--Base/res/graphics/catdog/sleep1.png (renamed from Base/res/icons/catdog/sleep1.png)bin602 -> 602 bytes
-rw-r--r--Base/res/graphics/catdog/sleep2.png (renamed from Base/res/icons/catdog/sleep2.png)bin605 -> 605 bytes
-rw-r--r--Base/res/graphics/catdog/srun1.png (renamed from Base/res/icons/catdog/srun1.png)bin626 -> 626 bytes
-rw-r--r--Base/res/graphics/catdog/srun2.png (renamed from Base/res/icons/catdog/srun2.png)bin709 -> 709 bytes
-rw-r--r--Base/res/graphics/catdog/still.png (renamed from Base/res/icons/catdog/still.png)bin623 -> 623 bytes
-rw-r--r--Base/res/graphics/catdog/swrun1.png (renamed from Base/res/icons/catdog/swrun1.png)bin745 -> 745 bytes
-rw-r--r--Base/res/graphics/catdog/swrun2.png (renamed from Base/res/icons/catdog/swrun2.png)bin757 -> 757 bytes
-rw-r--r--Base/res/graphics/catdog/wrun1.png (renamed from Base/res/icons/catdog/wrun1.png)bin756 -> 756 bytes
-rw-r--r--Base/res/graphics/catdog/wrun2.png (renamed from Base/res/icons/catdog/wrun2.png)bin795 -> 795 bytes
-rw-r--r--Userland/Demos/CatDog/CatDog.cpp48
24 files changed, 25 insertions, 25 deletions
diff --git a/Base/home/anon/Documents/Example Presentation.presenter b/Base/home/anon/Documents/Example Presentation.presenter
index 4cea71b891..7fb54cf8c1 100644
--- a/Base/home/anon/Documents/Example Presentation.presenter
+++ b/Base/home/anon/Documents/Example Presentation.presenter
@@ -62,7 +62,7 @@
"type": "image",
"rect": [50, 50, 200, 100],
- "path": "/res/icons/catdog/alert.png",
+ "path": "/res/graphics/catdog/alert.png",
"scaling": "fit-smallest",
"scaling-mode": "nearest-neighbor"
}
diff --git a/Base/res/icons/catdog/alert.png b/Base/res/graphics/catdog/alert.png
index 2cb0a53ee3..2cb0a53ee3 100644
--- a/Base/res/icons/catdog/alert.png
+++ b/Base/res/graphics/catdog/alert.png
Binary files differ
diff --git a/Base/res/icons/catdog/artist.png b/Base/res/graphics/catdog/artist.png
index b5ac5d5e8c..b5ac5d5e8c 100644
--- a/Base/res/icons/catdog/artist.png
+++ b/Base/res/graphics/catdog/artist.png
Binary files differ
diff --git a/Base/res/icons/catdog/erun1.png b/Base/res/graphics/catdog/erun1.png
index f70027a7fc..f70027a7fc 100644
--- a/Base/res/icons/catdog/erun1.png
+++ b/Base/res/graphics/catdog/erun1.png
Binary files differ
diff --git a/Base/res/icons/catdog/erun2.png b/Base/res/graphics/catdog/erun2.png
index f8b24e45db..f8b24e45db 100644
--- a/Base/res/icons/catdog/erun2.png
+++ b/Base/res/graphics/catdog/erun2.png
Binary files differ
diff --git a/Base/res/icons/catdog/inspector.png b/Base/res/graphics/catdog/inspector.png
index ff5711bb59..ff5711bb59 100644
--- a/Base/res/icons/catdog/inspector.png
+++ b/Base/res/graphics/catdog/inspector.png
Binary files differ
diff --git a/Base/res/icons/catdog/nerun1.png b/Base/res/graphics/catdog/nerun1.png
index 5b63c4e848..5b63c4e848 100644
--- a/Base/res/icons/catdog/nerun1.png
+++ b/Base/res/graphics/catdog/nerun1.png
Binary files differ
diff --git a/Base/res/icons/catdog/nerun2.png b/Base/res/graphics/catdog/nerun2.png
index 6a5ef17432..6a5ef17432 100644
--- a/Base/res/icons/catdog/nerun2.png
+++ b/Base/res/graphics/catdog/nerun2.png
Binary files differ
diff --git a/Base/res/icons/catdog/nrun1.png b/Base/res/graphics/catdog/nrun1.png
index f0fb254172..f0fb254172 100644
--- a/Base/res/icons/catdog/nrun1.png
+++ b/Base/res/graphics/catdog/nrun1.png
Binary files differ
diff --git a/Base/res/icons/catdog/nrun2.png b/Base/res/graphics/catdog/nrun2.png
index a3e0cd884e..a3e0cd884e 100644
--- a/Base/res/icons/catdog/nrun2.png
+++ b/Base/res/graphics/catdog/nrun2.png
Binary files differ
diff --git a/Base/res/icons/catdog/nwrun1.png b/Base/res/graphics/catdog/nwrun1.png
index ee233dae11..ee233dae11 100644
--- a/Base/res/icons/catdog/nwrun1.png
+++ b/Base/res/graphics/catdog/nwrun1.png
Binary files differ
diff --git a/Base/res/icons/catdog/nwrun2.png b/Base/res/graphics/catdog/nwrun2.png
index 1242326b1f..1242326b1f 100644
--- a/Base/res/icons/catdog/nwrun2.png
+++ b/Base/res/graphics/catdog/nwrun2.png
Binary files differ
diff --git a/Base/res/icons/catdog/serun1.png b/Base/res/graphics/catdog/serun1.png
index 9acfeba9fe..9acfeba9fe 100644
--- a/Base/res/icons/catdog/serun1.png
+++ b/Base/res/graphics/catdog/serun1.png
Binary files differ
diff --git a/Base/res/icons/catdog/serun2.png b/Base/res/graphics/catdog/serun2.png
index 4ae8680ba7..4ae8680ba7 100644
--- a/Base/res/icons/catdog/serun2.png
+++ b/Base/res/graphics/catdog/serun2.png
Binary files differ
diff --git a/Base/res/icons/catdog/sleep1.png b/Base/res/graphics/catdog/sleep1.png
index d1d8214fb9..d1d8214fb9 100644
--- a/Base/res/icons/catdog/sleep1.png
+++ b/Base/res/graphics/catdog/sleep1.png
Binary files differ
diff --git a/Base/res/icons/catdog/sleep2.png b/Base/res/graphics/catdog/sleep2.png
index 88c9c0acef..88c9c0acef 100644
--- a/Base/res/icons/catdog/sleep2.png
+++ b/Base/res/graphics/catdog/sleep2.png
Binary files differ
diff --git a/Base/res/icons/catdog/srun1.png b/Base/res/graphics/catdog/srun1.png
index 300bb4891d..300bb4891d 100644
--- a/Base/res/icons/catdog/srun1.png
+++ b/Base/res/graphics/catdog/srun1.png
Binary files differ
diff --git a/Base/res/icons/catdog/srun2.png b/Base/res/graphics/catdog/srun2.png
index 49da2400b2..49da2400b2 100644
--- a/Base/res/icons/catdog/srun2.png
+++ b/Base/res/graphics/catdog/srun2.png
Binary files differ
diff --git a/Base/res/icons/catdog/still.png b/Base/res/graphics/catdog/still.png
index 3b4df05ea4..3b4df05ea4 100644
--- a/Base/res/icons/catdog/still.png
+++ b/Base/res/graphics/catdog/still.png
Binary files differ
diff --git a/Base/res/icons/catdog/swrun1.png b/Base/res/graphics/catdog/swrun1.png
index 0f29c8e279..0f29c8e279 100644
--- a/Base/res/icons/catdog/swrun1.png
+++ b/Base/res/graphics/catdog/swrun1.png
Binary files differ
diff --git a/Base/res/icons/catdog/swrun2.png b/Base/res/graphics/catdog/swrun2.png
index 84df6f1b21..84df6f1b21 100644
--- a/Base/res/icons/catdog/swrun2.png
+++ b/Base/res/graphics/catdog/swrun2.png
Binary files differ
diff --git a/Base/res/icons/catdog/wrun1.png b/Base/res/graphics/catdog/wrun1.png
index 8544cde427..8544cde427 100644
--- a/Base/res/icons/catdog/wrun1.png
+++ b/Base/res/graphics/catdog/wrun1.png
Binary files differ
diff --git a/Base/res/icons/catdog/wrun2.png b/Base/res/graphics/catdog/wrun2.png
index cf7d7b048c..cf7d7b048c 100644
--- a/Base/res/icons/catdog/wrun2.png
+++ b/Base/res/graphics/catdog/wrun2.png
Binary files differ
diff --git a/Userland/Demos/CatDog/CatDog.cpp b/Userland/Demos/CatDog/CatDog.cpp
index 8f8bc9a9d4..598a9db5c0 100644
--- a/Userland/Demos/CatDog/CatDog.cpp
+++ b/Userland/Demos/CatDog/CatDog.cpp
@@ -22,30 +22,30 @@ ErrorOr<NonnullRefPtr<CatDog>> CatDog::create()
// So items with the more bits should be placed before items with less bits to
// ensure correct matching order. This also means that "Frame2" has to be first.
static constexpr Array<ImageSource, 24> const image_sources = {
- ImageSource { State::Up | State::Right | State::Frame2, "/res/icons/catdog/nerun2.png"sv },
- { State::Up | State::Right, "/res/icons/catdog/nerun1.png"sv },
- { State::Up | State::Left | State::Frame2, "/res/icons/catdog/nwrun2.png"sv },
- { State::Up | State::Left, "/res/icons/catdog/nwrun1.png"sv },
- { State::Down | State::Right | State::Frame2, "/res/icons/catdog/serun2.png"sv },
- { State::Down | State::Right, "/res/icons/catdog/serun1.png"sv },
- { State::Down | State::Left | State::Frame2, "/res/icons/catdog/swrun2.png"sv },
- { State::Down | State::Left, "/res/icons/catdog/swrun1.png"sv },
- { State::Up | State::Frame2, "/res/icons/catdog/nrun2.png"sv },
- { State::Up, "/res/icons/catdog/nrun1.png"sv },
- { State::Down | State::Frame2, "/res/icons/catdog/srun2.png"sv },
- { State::Down, "/res/icons/catdog/srun1.png"sv },
- { State::Left | State::Frame2, "/res/icons/catdog/wrun2.png"sv },
- { State::Left, "/res/icons/catdog/wrun1.png"sv },
- { State::Right | State::Frame2, "/res/icons/catdog/erun2.png"sv },
- { State::Right, "/res/icons/catdog/erun1.png"sv },
- { State::Sleeping | State::Frame2, "/res/icons/catdog/sleep2.png"sv },
- { State::Sleeping, "/res/icons/catdog/sleep1.png"sv },
- { State::Idle | State::Artist, "/res/icons/catdog/artist.png"sv },
- { State::Idle | State::Inspector, "/res/icons/catdog/inspector.png"sv },
- { State::Idle, "/res/icons/catdog/still.png"sv },
- { State::Alert | State::Artist, "/res/icons/catdog/artist.png"sv },
- { State::Alert | State::Inspector, "/res/icons/catdog/inspector.png"sv },
- { State::Alert, "/res/icons/catdog/alert.png"sv }
+ ImageSource { State::Up | State::Right | State::Frame2, "/res/graphics/catdog/nerun2.png"sv },
+ { State::Up | State::Right, "/res/graphics/catdog/nerun1.png"sv },
+ { State::Up | State::Left | State::Frame2, "/res/graphics/catdog/nwrun2.png"sv },
+ { State::Up | State::Left, "/res/graphics/catdog/nwrun1.png"sv },
+ { State::Down | State::Right | State::Frame2, "/res/graphics/catdog/serun2.png"sv },
+ { State::Down | State::Right, "/res/graphics/catdog/serun1.png"sv },
+ { State::Down | State::Left | State::Frame2, "/res/graphics/catdog/swrun2.png"sv },
+ { State::Down | State::Left, "/res/graphics/catdog/swrun1.png"sv },
+ { State::Up | State::Frame2, "/res/graphics/catdog/nrun2.png"sv },
+ { State::Up, "/res/graphics/catdog/nrun1.png"sv },
+ { State::Down | State::Frame2, "/res/graphics/catdog/srun2.png"sv },
+ { State::Down, "/res/graphics/catdog/srun1.png"sv },
+ { State::Left | State::Frame2, "/res/graphics/catdog/wrun2.png"sv },
+ { State::Left, "/res/graphics/catdog/wrun1.png"sv },
+ { State::Right | State::Frame2, "/res/graphics/catdog/erun2.png"sv },
+ { State::Right, "/res/graphics/catdog/erun1.png"sv },
+ { State::Sleeping | State::Frame2, "/res/graphics/catdog/sleep2.png"sv },
+ { State::Sleeping, "/res/graphics/catdog/sleep1.png"sv },
+ { State::Idle | State::Artist, "/res/graphics/catdog/artist.png"sv },
+ { State::Idle | State::Inspector, "/res/graphics/catdog/inspector.png"sv },
+ { State::Idle, "/res/graphics/catdog/still.png"sv },
+ { State::Alert | State::Artist, "/res/graphics/catdog/artist.png"sv },
+ { State::Alert | State::Inspector, "/res/graphics/catdog/inspector.png"sv },
+ { State::Alert, "/res/graphics/catdog/alert.png"sv }
};
auto catdog = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) CatDog));