png: replace several BMP assets with PNGs
@ -76,7 +76,7 @@ static void redraw(void) {
|
||||
|
||||
static void init_default(void) {
|
||||
title_str = "About ToaruOS";
|
||||
icon_path = "/usr/share/logo_login.bmp";
|
||||
icon_path = "/usr/share/logo_login.png";
|
||||
|
||||
{
|
||||
version_str = malloc(100);
|
||||
|
@ -2174,12 +2174,12 @@ int main(int argc, char * argv[]) {
|
||||
|
||||
TRACE("Loading sprites...");
|
||||
#define MOUSE_DIR "/usr/share/cursor/"
|
||||
load_sprite(&yg->mouse_sprite, MOUSE_DIR "mouse.bmp");
|
||||
load_sprite(&yg->mouse_sprite_drag, MOUSE_DIR "drag.bmp");
|
||||
load_sprite(&yg->mouse_sprite_resize_v, MOUSE_DIR "resize-vertical.bmp");
|
||||
load_sprite(&yg->mouse_sprite_resize_h, MOUSE_DIR "resize-horizontal.bmp");
|
||||
load_sprite(&yg->mouse_sprite_resize_da, MOUSE_DIR "resize-uldr.bmp");
|
||||
load_sprite(&yg->mouse_sprite_resize_db, MOUSE_DIR "resize-dlur.bmp");
|
||||
load_sprite(&yg->mouse_sprite, MOUSE_DIR "normal.png");
|
||||
load_sprite(&yg->mouse_sprite_drag, MOUSE_DIR "drag.png");
|
||||
load_sprite(&yg->mouse_sprite_resize_v, MOUSE_DIR "resize-vertical.png");
|
||||
load_sprite(&yg->mouse_sprite_resize_h, MOUSE_DIR "resize-horizontal.png");
|
||||
load_sprite(&yg->mouse_sprite_resize_da, MOUSE_DIR "resize-uldr.png");
|
||||
load_sprite(&yg->mouse_sprite_resize_db, MOUSE_DIR "resize-dlur.png");
|
||||
TRACE("Done.");
|
||||
|
||||
TRACE("Initializing variables...");
|
||||
|
@ -56,7 +56,7 @@ static int BOX_COLOR_G=0;
|
||||
static int BOX_COLOR_B=0;
|
||||
static int BOX_COLOR_A=127;
|
||||
static char * WALLPAPER = "/usr/share/wallpaper.jpg";
|
||||
static char * LOGO = "/usr/share/logo_login.bmp";
|
||||
static char * LOGO = "/usr/share/logo_login.png";
|
||||
|
||||
#define TEXTBOX_INTERIOR_LEFT 4
|
||||
#define EXTRA_TEXT_OFFSET 15
|
||||
|
20
apps/panel.c
@ -362,7 +362,7 @@ static void update_weather_status(void) {
|
||||
if (!hashmap_has(weather_icons, icon)) {
|
||||
sprite_t * tmp = malloc(sizeof(sprite_t));
|
||||
char path[512];
|
||||
sprintf(path,"/usr/share/icons/weather/%s.bmp", icon);
|
||||
sprintf(path,"/usr/share/icons/weather/%s.png", icon);
|
||||
load_sprite(tmp, path);
|
||||
hashmap_set(weather_icons, icon, tmp);
|
||||
}
|
||||
@ -1365,7 +1365,7 @@ struct MenuEntry * menu_create_clock(void) {
|
||||
|
||||
if (!watchface) {
|
||||
watchface = malloc(sizeof(sprite_t));
|
||||
load_sprite(watchface, "/usr/share/icons/watchface.bmp");
|
||||
load_sprite(watchface, "/usr/share/icons/watchface.png");
|
||||
}
|
||||
|
||||
out->_type = -1; /* Special */
|
||||
@ -1522,8 +1522,8 @@ int main (int argc, char ** argv) {
|
||||
sprite_panel = malloc(sizeof(sprite_t));
|
||||
sprite_logout = malloc(sizeof(sprite_t));
|
||||
|
||||
load_sprite(sprite_panel, "/usr/share/panel.bmp");
|
||||
load_sprite(sprite_logout, "/usr/share/icons/panel-shutdown.bmp");
|
||||
load_sprite(sprite_panel, "/usr/share/panel.png");
|
||||
load_sprite(sprite_logout, "/usr/share/icons/panel-shutdown.png");
|
||||
|
||||
struct stat stat_tmp;
|
||||
if (!stat("/dev/dsp",&stat_tmp)) {
|
||||
@ -1533,10 +1533,10 @@ int main (int argc, char ** argv) {
|
||||
sprite_volume_low = malloc(sizeof(sprite_t));
|
||||
sprite_volume_med = malloc(sizeof(sprite_t));
|
||||
sprite_volume_high = malloc(sizeof(sprite_t));
|
||||
load_sprite(sprite_volume_mute, "/usr/share/icons/24/volume-mute.bmp");
|
||||
load_sprite(sprite_volume_low, "/usr/share/icons/24/volume-low.bmp");
|
||||
load_sprite(sprite_volume_med, "/usr/share/icons/24/volume-medium.bmp");
|
||||
load_sprite(sprite_volume_high, "/usr/share/icons/24/volume-full.bmp");
|
||||
load_sprite(sprite_volume_mute, "/usr/share/icons/24/volume-mute.png");
|
||||
load_sprite(sprite_volume_low, "/usr/share/icons/24/volume-low.png");
|
||||
load_sprite(sprite_volume_med, "/usr/share/icons/24/volume-medium.png");
|
||||
load_sprite(sprite_volume_high, "/usr/share/icons/24/volume-full.png");
|
||||
/* XXX store current volume */
|
||||
}
|
||||
|
||||
@ -1544,9 +1544,9 @@ int main (int argc, char ** argv) {
|
||||
widgets_network_enabled = 1;
|
||||
widgets_width += WIDGET_WIDTH;
|
||||
sprite_net_active = malloc(sizeof(sprite_t));
|
||||
load_sprite(sprite_net_active, "/usr/share/icons/24/net-active.bmp");
|
||||
load_sprite(sprite_net_active, "/usr/share/icons/24/net-active.png");
|
||||
sprite_net_disabled = malloc(sizeof(sprite_t));
|
||||
load_sprite(sprite_net_disabled, "/usr/share/icons/24/net-disconnected.bmp");
|
||||
load_sprite(sprite_net_disabled, "/usr/share/icons/24/net-disconnected.png");
|
||||
}
|
||||
|
||||
/* TODO Probably should use the app launch shortcut */
|
||||
|
@ -232,9 +232,9 @@ int main (int argc, char ** argv) {
|
||||
ball.vel_x = -10.0;
|
||||
|
||||
fprintf(stderr, "Loading sprites...\n");
|
||||
load_sprite(&left.sprite, GAME_PATH "/paddle-red.bmp");
|
||||
load_sprite(&right.sprite,GAME_PATH "/paddle-blue.bmp");
|
||||
load_sprite(&ball.sprite, GAME_PATH "/ball.bmp");
|
||||
load_sprite(&left.sprite, GAME_PATH "/paddle-red.png");
|
||||
load_sprite(&right.sprite,GAME_PATH "/paddle-blue.png");
|
||||
load_sprite(&ball.sprite, GAME_PATH "/ball.png");
|
||||
|
||||
redraw();
|
||||
update_left();
|
||||
|
@ -327,7 +327,7 @@ int main(int argc, char * argv[]) {
|
||||
window = yutani_window_create(yctx, width + bounds.width, height + bounds.height);
|
||||
|
||||
/* Load icons */
|
||||
load_sprite(&logo, "/usr/share/logo_login.bmp");
|
||||
load_sprite(&logo, "/usr/share/logo_login.png");
|
||||
load_sprite(&terminal, "/usr/share/icons/48/utilities-terminal.bmp");
|
||||
load_sprite(&folder, "/usr/share/icons/48/folder.bmp");
|
||||
load_sprite(&package, "/usr/share/icons/48/package.bmp");
|
||||
|
Before Width: | Height: | Size: 9.1 KiB |
BIN
base/usr/share/cursor/drag.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 9.1 KiB |
BIN
base/usr/share/cursor/normal.png
Normal file
After Width: | Height: | Size: 718 B |
Before Width: | Height: | Size: 9.1 KiB |
BIN
base/usr/share/cursor/resize-dlur.png
Normal file
After Width: | Height: | Size: 951 B |
Before Width: | Height: | Size: 9.1 KiB |
BIN
base/usr/share/cursor/resize-horizontal.png
Normal file
After Width: | Height: | Size: 643 B |
Before Width: | Height: | Size: 9.1 KiB |
BIN
base/usr/share/cursor/resize-uldr.png
Normal file
After Width: | Height: | Size: 854 B |
Before Width: | Height: | Size: 9.1 KiB |
BIN
base/usr/share/cursor/resize-vertical.png
Normal file
After Width: | Height: | Size: 710 B |
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/24/mouse-relative.png
Normal file
After Width: | Height: | Size: 330 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/24/mouse-status.png
Normal file
After Width: | Height: | Size: 336 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/24/net-active.png
Normal file
After Width: | Height: | Size: 322 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/24/net-disconnected.png
Normal file
After Width: | Height: | Size: 463 B |
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/24/volume-full.png
Normal file
After Width: | Height: | Size: 464 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/24/volume-low.png
Normal file
After Width: | Height: | Size: 282 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/24/volume-medium.png
Normal file
After Width: | Height: | Size: 348 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/24/volume-mute.png
Normal file
After Width: | Height: | Size: 292 B |
Before Width: | Height: | Size: 2.0 KiB |
BIN
base/usr/share/icons/panel-shutdown.png
Normal file
After Width: | Height: | Size: 458 B |
Before Width: | Height: | Size: 77 KiB |
BIN
base/usr/share/icons/watchface.png
Normal file
After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/weather/01d.png
Normal file
After Width: | Height: | Size: 392 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/weather/01n.png
Normal file
After Width: | Height: | Size: 363 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/weather/02d.png
Normal file
After Width: | Height: | Size: 491 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/weather/02n.png
Normal file
After Width: | Height: | Size: 409 B |
@ -1 +0,0 @@
|
||||
02d.bmp
|
1
base/usr/share/icons/weather/03d.png
Symbolic link
@ -0,0 +1 @@
|
||||
02d.png
|
@ -1 +0,0 @@
|
||||
02n.bmp
|
1
base/usr/share/icons/weather/03n.png
Symbolic link
@ -0,0 +1 @@
|
||||
02n.png
|
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/weather/04d.png
Normal file
After Width: | Height: | Size: 514 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/weather/04n.png
Normal file
After Width: | Height: | Size: 439 B |
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/weather/09d.png
Normal file
After Width: | Height: | Size: 290 B |
@ -1 +0,0 @@
|
||||
09d.bmp
|
1
base/usr/share/icons/weather/09n.png
Symbolic link
@ -0,0 +1 @@
|
||||
09d.png
|
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/weather/10d.png
Normal file
After Width: | Height: | Size: 258 B |
@ -1 +0,0 @@
|
||||
10d.bmp
|
1
base/usr/share/icons/weather/10n.png
Symbolic link
@ -0,0 +1 @@
|
||||
10d.png
|
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/weather/11d.png
Normal file
After Width: | Height: | Size: 470 B |
@ -1 +0,0 @@
|
||||
11d.bmp
|
1
base/usr/share/icons/weather/11n.png
Symbolic link
@ -0,0 +1 @@
|
||||
11d.png
|
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/weather/13d.png
Normal file
After Width: | Height: | Size: 687 B |
@ -1 +0,0 @@
|
||||
13d.bmp
|
1
base/usr/share/icons/weather/13n.png
Symbolic link
@ -0,0 +1 @@
|
||||
13d.png
|
Before Width: | Height: | Size: 2.4 KiB |
BIN
base/usr/share/icons/weather/50d.png
Normal file
After Width: | Height: | Size: 678 B |
@ -1 +0,0 @@
|
||||
50d.bmp
|
1
base/usr/share/icons/weather/50n.png
Symbolic link
@ -0,0 +1 @@
|
||||
50d.png
|
Before Width: | Height: | Size: 53 KiB |
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 9.6 KiB |
Before Width: | Height: | Size: 5.4 KiB |
BIN
base/usr/share/panel.png
Normal file
After Width: | Height: | Size: 198 B |
Before Width: | Height: | Size: 9.9 KiB |
BIN
base/usr/share/pong/ball.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 59 KiB |
BIN
base/usr/share/pong/paddle-blue.png
Normal file
After Width: | Height: | Size: 8.4 KiB |
Before Width: | Height: | Size: 59 KiB |
BIN
base/usr/share/pong/paddle-red.png
Normal file
After Width: | Height: | Size: 5.6 KiB |
Before Width: | Height: | Size: 394 B |
BIN
base/usr/share/ttk/active/button-close.png
Normal file
After Width: | Height: | Size: 223 B |
Before Width: | Height: | Size: 394 B |
BIN
base/usr/share/ttk/active/button-maximize.png
Normal file
After Width: | Height: | Size: 152 B |
Before Width: | Height: | Size: 462 B |
BIN
base/usr/share/ttk/active/ll.png
Normal file
After Width: | Height: | Size: 301 B |
Before Width: | Height: | Size: 174 B |
BIN
base/usr/share/ttk/active/lm.png
Normal file
After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 462 B |
BIN
base/usr/share/ttk/active/lr.png
Normal file
After Width: | Height: | Size: 291 B |
Before Width: | Height: | Size: 162 B |
BIN
base/usr/share/ttk/active/ml.png
Normal file
After Width: | Height: | Size: 198 B |
Before Width: | Height: | Size: 162 B |
BIN
base/usr/share/ttk/active/mr.png
Normal file
After Width: | Height: | Size: 1.1 KiB |