Browse Source

png: replace several BMP assets with PNGs

K. Lange 6 months ago
parent
commit
7dfb9c34ce
100 changed files with 29 additions and 29 deletions
  1. 1 1
      apps/about.c
  2. 6 6
      apps/compositor.c
  3. 1 1
      apps/glogin-provider.c
  4. 10 10
      apps/panel.c
  5. 3 3
      apps/pong.c
  6. 1 1
      apps/tutorial.c
  7. BIN
      base/usr/share/cursor/drag.bmp
  8. BIN
      base/usr/share/cursor/drag.png
  9. BIN
      base/usr/share/cursor/mouse.bmp
  10. BIN
      base/usr/share/cursor/normal.png
  11. BIN
      base/usr/share/cursor/resize-dlur.bmp
  12. BIN
      base/usr/share/cursor/resize-dlur.png
  13. BIN
      base/usr/share/cursor/resize-horizontal.bmp
  14. BIN
      base/usr/share/cursor/resize-horizontal.png
  15. BIN
      base/usr/share/cursor/resize-uldr.bmp
  16. BIN
      base/usr/share/cursor/resize-uldr.png
  17. BIN
      base/usr/share/cursor/resize-vertical.bmp
  18. BIN
      base/usr/share/cursor/resize-vertical.png
  19. BIN
      base/usr/share/icons/24/applications-generic.bmp
  20. BIN
      base/usr/share/icons/24/mouse-relative.bmp
  21. BIN
      base/usr/share/icons/24/mouse-relative.png
  22. BIN
      base/usr/share/icons/24/mouse-status.bmp
  23. BIN
      base/usr/share/icons/24/mouse-status.png
  24. BIN
      base/usr/share/icons/24/net-active.bmp
  25. BIN
      base/usr/share/icons/24/net-active.png
  26. BIN
      base/usr/share/icons/24/net-disconnected.bmp
  27. BIN
      base/usr/share/icons/24/net-disconnected.png
  28. BIN
      base/usr/share/icons/24/utilities-terminal.bmp
  29. BIN
      base/usr/share/icons/24/volume-full.bmp
  30. BIN
      base/usr/share/icons/24/volume-full.png
  31. BIN
      base/usr/share/icons/24/volume-low.bmp
  32. BIN
      base/usr/share/icons/24/volume-low.png
  33. BIN
      base/usr/share/icons/24/volume-medium.bmp
  34. BIN
      base/usr/share/icons/24/volume-medium.png
  35. BIN
      base/usr/share/icons/24/volume-mute.bmp
  36. BIN
      base/usr/share/icons/24/volume-mute.png
  37. BIN
      base/usr/share/icons/panel-shutdown.bmp
  38. BIN
      base/usr/share/icons/panel-shutdown.png
  39. BIN
      base/usr/share/icons/watchface.bmp
  40. BIN
      base/usr/share/icons/watchface.png
  41. BIN
      base/usr/share/icons/weather/01d.bmp
  42. BIN
      base/usr/share/icons/weather/01d.png
  43. BIN
      base/usr/share/icons/weather/01n.bmp
  44. BIN
      base/usr/share/icons/weather/01n.png
  45. BIN
      base/usr/share/icons/weather/02d.bmp
  46. BIN
      base/usr/share/icons/weather/02d.png
  47. BIN
      base/usr/share/icons/weather/02n.bmp
  48. BIN
      base/usr/share/icons/weather/02n.png
  49. 0 1
      base/usr/share/icons/weather/03d.bmp
  50. 1 0
      base/usr/share/icons/weather/03d.png
  51. 0 1
      base/usr/share/icons/weather/03n.bmp
  52. 1 0
      base/usr/share/icons/weather/03n.png
  53. BIN
      base/usr/share/icons/weather/04d.bmp
  54. BIN
      base/usr/share/icons/weather/04d.png
  55. BIN
      base/usr/share/icons/weather/04n.bmp
  56. BIN
      base/usr/share/icons/weather/04n.png
  57. BIN
      base/usr/share/icons/weather/09d.bmp
  58. BIN
      base/usr/share/icons/weather/09d.png
  59. 0 1
      base/usr/share/icons/weather/09n.bmp
  60. 1 0
      base/usr/share/icons/weather/09n.png
  61. BIN
      base/usr/share/icons/weather/10d.bmp
  62. BIN
      base/usr/share/icons/weather/10d.png
  63. 0 1
      base/usr/share/icons/weather/10n.bmp
  64. 1 0
      base/usr/share/icons/weather/10n.png
  65. BIN
      base/usr/share/icons/weather/11d.bmp
  66. BIN
      base/usr/share/icons/weather/11d.png
  67. 0 1
      base/usr/share/icons/weather/11n.bmp
  68. 1 0
      base/usr/share/icons/weather/11n.png
  69. BIN
      base/usr/share/icons/weather/13d.bmp
  70. BIN
      base/usr/share/icons/weather/13d.png
  71. 0 1
      base/usr/share/icons/weather/13n.bmp
  72. 1 0
      base/usr/share/icons/weather/13n.png
  73. BIN
      base/usr/share/icons/weather/50d.bmp
  74. BIN
      base/usr/share/icons/weather/50d.png
  75. 0 1
      base/usr/share/icons/weather/50n.bmp
  76. 1 0
      base/usr/share/icons/weather/50n.png
  77. BIN
      base/usr/share/logo_login.bmp
  78. 0 0
      base/usr/share/logo_login.png
  79. BIN
      base/usr/share/panel.bmp
  80. BIN
      base/usr/share/panel.png
  81. BIN
      base/usr/share/pong/ball.bmp
  82. BIN
      base/usr/share/pong/ball.png
  83. BIN
      base/usr/share/pong/paddle-blue.bmp
  84. BIN
      base/usr/share/pong/paddle-blue.png
  85. BIN
      base/usr/share/pong/paddle-red.bmp
  86. BIN
      base/usr/share/pong/paddle-red.png
  87. BIN
      base/usr/share/ttk/active/button-close.bmp
  88. BIN
      base/usr/share/ttk/active/button-close.png
  89. BIN
      base/usr/share/ttk/active/button-maximize.bmp
  90. BIN
      base/usr/share/ttk/active/button-maximize.png
  91. BIN
      base/usr/share/ttk/active/ll.bmp
  92. BIN
      base/usr/share/ttk/active/ll.png
  93. BIN
      base/usr/share/ttk/active/lm.bmp
  94. BIN
      base/usr/share/ttk/active/lm.png
  95. BIN
      base/usr/share/ttk/active/lr.bmp
  96. BIN
      base/usr/share/ttk/active/lr.png
  97. BIN
      base/usr/share/ttk/active/ml.bmp
  98. BIN
      base/usr/share/ttk/active/ml.png
  99. BIN
      base/usr/share/ttk/active/mr.bmp
  100. 0 0
      base/usr/share/ttk/active/mr.png

+ 1 - 1
apps/about.c

@@ -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);

+ 6 - 6
apps/compositor.c

@@ -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...");

+ 1 - 1
apps/glogin-provider.c

@@ -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

+ 10 - 10
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 */

+ 3 - 3
apps/pong.c

@@ -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();

+ 1 - 1
apps/tutorial.c

@@ -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");

BIN
base/usr/share/cursor/drag.bmp


BIN
base/usr/share/cursor/drag.png


BIN
base/usr/share/cursor/mouse.bmp


BIN
base/usr/share/cursor/normal.png


BIN
base/usr/share/cursor/resize-dlur.bmp


BIN
base/usr/share/cursor/resize-dlur.png


BIN
base/usr/share/cursor/resize-horizontal.bmp


BIN
base/usr/share/cursor/resize-horizontal.png


BIN
base/usr/share/cursor/resize-uldr.bmp


BIN
base/usr/share/cursor/resize-uldr.png


BIN
base/usr/share/cursor/resize-vertical.bmp


BIN
base/usr/share/cursor/resize-vertical.png


BIN
base/usr/share/icons/24/applications-generic.bmp


BIN
base/usr/share/icons/24/mouse-relative.bmp


BIN
base/usr/share/icons/24/mouse-relative.png


BIN
base/usr/share/icons/24/mouse-status.bmp


BIN
base/usr/share/icons/24/mouse-status.png


BIN
base/usr/share/icons/24/net-active.bmp


BIN
base/usr/share/icons/24/net-active.png


BIN
base/usr/share/icons/24/net-disconnected.bmp


BIN
base/usr/share/icons/24/net-disconnected.png


BIN
base/usr/share/icons/24/utilities-terminal.bmp


BIN
base/usr/share/icons/24/volume-full.bmp


BIN
base/usr/share/icons/24/volume-full.png


BIN
base/usr/share/icons/24/volume-low.bmp


BIN
base/usr/share/icons/24/volume-low.png


BIN
base/usr/share/icons/24/volume-medium.bmp


BIN
base/usr/share/icons/24/volume-medium.png


BIN
base/usr/share/icons/24/volume-mute.bmp


BIN
base/usr/share/icons/24/volume-mute.png


BIN
base/usr/share/icons/panel-shutdown.bmp


BIN
base/usr/share/icons/panel-shutdown.png


BIN
base/usr/share/icons/watchface.bmp


BIN
base/usr/share/icons/watchface.png


BIN
base/usr/share/icons/weather/01d.bmp


BIN
base/usr/share/icons/weather/01d.png


BIN
base/usr/share/icons/weather/01n.bmp


BIN
base/usr/share/icons/weather/01n.png


BIN
base/usr/share/icons/weather/02d.bmp


BIN
base/usr/share/icons/weather/02d.png


BIN
base/usr/share/icons/weather/02n.bmp


BIN
base/usr/share/icons/weather/02n.png


+ 0 - 1
base/usr/share/icons/weather/03d.bmp

@@ -1 +0,0 @@
-02d.bmp

+ 1 - 0
base/usr/share/icons/weather/03d.png

@@ -0,0 +1 @@
+02d.png

+ 0 - 1
base/usr/share/icons/weather/03n.bmp

@@ -1 +0,0 @@
-02n.bmp

+ 1 - 0
base/usr/share/icons/weather/03n.png

@@ -0,0 +1 @@
+02n.png

BIN
base/usr/share/icons/weather/04d.bmp


BIN
base/usr/share/icons/weather/04d.png


BIN
base/usr/share/icons/weather/04n.bmp


BIN
base/usr/share/icons/weather/04n.png


BIN
base/usr/share/icons/weather/09d.bmp


BIN
base/usr/share/icons/weather/09d.png


+ 0 - 1
base/usr/share/icons/weather/09n.bmp

@@ -1 +0,0 @@
-09d.bmp

+ 1 - 0
base/usr/share/icons/weather/09n.png

@@ -0,0 +1 @@
+09d.png

BIN
base/usr/share/icons/weather/10d.bmp


BIN
base/usr/share/icons/weather/10d.png


+ 0 - 1
base/usr/share/icons/weather/10n.bmp

@@ -1 +0,0 @@
-10d.bmp

+ 1 - 0
base/usr/share/icons/weather/10n.png

@@ -0,0 +1 @@
+10d.png

BIN
base/usr/share/icons/weather/11d.bmp


BIN
base/usr/share/icons/weather/11d.png


+ 0 - 1
base/usr/share/icons/weather/11n.bmp

@@ -1 +0,0 @@
-11d.bmp

+ 1 - 0
base/usr/share/icons/weather/11n.png

@@ -0,0 +1 @@
+11d.png

BIN
base/usr/share/icons/weather/13d.bmp


BIN
base/usr/share/icons/weather/13d.png


+ 0 - 1
base/usr/share/icons/weather/13n.bmp

@@ -1 +0,0 @@
-13d.bmp

+ 1 - 0
base/usr/share/icons/weather/13n.png

@@ -0,0 +1 @@
+13d.png

BIN
base/usr/share/icons/weather/50d.bmp


BIN
base/usr/share/icons/weather/50d.png


+ 0 - 1
base/usr/share/icons/weather/50n.bmp

@@ -1 +0,0 @@
-50d.bmp

+ 1 - 0
base/usr/share/icons/weather/50n.png

@@ -0,0 +1 @@
+50d.png

BIN
base/usr/share/logo_login.bmp


base/opt/logo_login.png → base/usr/share/logo_login.png


BIN
base/usr/share/panel.bmp


BIN
base/usr/share/panel.png


BIN
base/usr/share/pong/ball.bmp


BIN
base/usr/share/pong/ball.png


BIN
base/usr/share/pong/paddle-blue.bmp


BIN
base/usr/share/pong/paddle-blue.png


BIN
base/usr/share/pong/paddle-red.bmp


BIN
base/usr/share/pong/paddle-red.png


BIN
base/usr/share/ttk/active/button-close.bmp


BIN
base/usr/share/ttk/active/button-close.png


BIN
base/usr/share/ttk/active/button-maximize.bmp


BIN
base/usr/share/ttk/active/button-maximize.png


BIN
base/usr/share/ttk/active/ll.bmp


BIN
base/usr/share/ttk/active/ll.png


BIN
base/usr/share/ttk/active/lm.bmp


BIN
base/usr/share/ttk/active/lm.png


BIN
base/usr/share/ttk/active/lr.bmp


BIN
base/usr/share/ttk/active/lr.png


BIN
base/usr/share/ttk/active/ml.bmp


BIN
base/usr/share/ttk/active/ml.png


BIN
base/usr/share/ttk/active/mr.bmp


+ 0 - 0
base/usr/share/ttk/active/mr.png


Some files were not shown because too many files changed in this diff