Browse Source

png: replace icons

K. Lange 4 months ago
parent
commit
79bdb6fc02
100 changed files with 14 additions and 14 deletions
  1. 4 4
      apps/file-browser.c
  2. 1 1
      apps/help-browser.c
  3. 2 2
      apps/package-manager.c
  4. 1 1
      apps/panel.c
  5. 1 1
      apps/showdialog.c
  6. 1 1
      apps/terminal.c
  7. 4 4
      apps/tutorial.c
  8. BIN
      base/usr/share/icons/16/applications-generic.bmp
  9. BIN
      base/usr/share/icons/16/applications-generic.png
  10. BIN
      base/usr/share/icons/16/back.bmp
  11. BIN
      base/usr/share/icons/16/back.png
  12. BIN
      base/usr/share/icons/16/bookmark.bmp
  13. BIN
      base/usr/share/icons/16/bookmark.png
  14. BIN
      base/usr/share/icons/16/calculator.bmp
  15. BIN
      base/usr/share/icons/16/calculator.png
  16. BIN
      base/usr/share/icons/16/clock.bmp
  17. BIN
      base/usr/share/icons/16/clock.png
  18. BIN
      base/usr/share/icons/16/config.bmp
  19. BIN
      base/usr/share/icons/16/config.png
  20. BIN
      base/usr/share/icons/16/exit.bmp
  21. BIN
      base/usr/share/icons/16/exit.png
  22. BIN
      base/usr/share/icons/16/file.bmp
  23. BIN
      base/usr/share/icons/16/file.png
  24. BIN
      base/usr/share/icons/16/folder.bmp
  25. BIN
      base/usr/share/icons/16/folder.png
  26. BIN
      base/usr/share/icons/16/forward.bmp
  27. BIN
      base/usr/share/icons/16/forward.png
  28. BIN
      base/usr/share/icons/16/help.bmp
  29. BIN
      base/usr/share/icons/16/help.png
  30. BIN
      base/usr/share/icons/16/home.bmp
  31. BIN
      base/usr/share/icons/16/home.png
  32. BIN
      base/usr/share/icons/16/menu-tick.bmp
  33. BIN
      base/usr/share/icons/16/menu-tick.png
  34. BIN
      base/usr/share/icons/16/mines.bmp
  35. BIN
      base/usr/share/icons/16/mines.png
  36. BIN
      base/usr/share/icons/16/missing.bmp
  37. BIN
      base/usr/share/icons/16/missing.png
  38. BIN
      base/usr/share/icons/16/new.bmp
  39. BIN
      base/usr/share/icons/16/new.png
  40. BIN
      base/usr/share/icons/16/open.bmp
  41. BIN
      base/usr/share/icons/16/open.png
  42. BIN
      base/usr/share/icons/16/package.bmp
  43. BIN
      base/usr/share/icons/16/package.png
  44. BIN
      base/usr/share/icons/16/refresh.bmp
  45. BIN
      base/usr/share/icons/16/refresh.png
  46. BIN
      base/usr/share/icons/16/save.bmp
  47. BIN
      base/usr/share/icons/16/save.png
  48. BIN
      base/usr/share/icons/16/star.bmp
  49. BIN
      base/usr/share/icons/16/star.png
  50. BIN
      base/usr/share/icons/16/up.bmp
  51. BIN
      base/usr/share/icons/16/up.png
  52. BIN
      base/usr/share/icons/16/utilities-terminal.bmp
  53. BIN
      base/usr/share/icons/16/utilities-terminal.png
  54. BIN
      base/usr/share/icons/48/applications-generic.bmp
  55. BIN
      base/usr/share/icons/48/applications-generic.png
  56. BIN
      base/usr/share/icons/48/applications-painting.bmp
  57. BIN
      base/usr/share/icons/48/applications-painting.png
  58. BIN
      base/usr/share/icons/48/c.bmp
  59. BIN
      base/usr/share/icons/48/c.png
  60. BIN
      base/usr/share/icons/48/calculator.bmp
  61. BIN
      base/usr/share/icons/48/calculator.png
  62. BIN
      base/usr/share/icons/48/clock.bmp
  63. BIN
      base/usr/share/icons/48/clock.png
  64. BIN
      base/usr/share/icons/48/drawlines.bmp
  65. BIN
      base/usr/share/icons/48/drawlines.png
  66. BIN
      base/usr/share/icons/48/exit.bmp
  67. BIN
      base/usr/share/icons/48/exit.png
  68. BIN
      base/usr/share/icons/48/file.bmp
  69. BIN
      base/usr/share/icons/48/file.png
  70. BIN
      base/usr/share/icons/48/folder.bmp
  71. BIN
      base/usr/share/icons/48/folder.png
  72. BIN
      base/usr/share/icons/48/font.bmp
  73. BIN
      base/usr/share/icons/48/font.png
  74. BIN
      base/usr/share/icons/48/gears.bmp
  75. BIN
      base/usr/share/icons/48/gears.png
  76. BIN
      base/usr/share/icons/48/h.bmp
  77. BIN
      base/usr/share/icons/48/h.png
  78. BIN
      base/usr/share/icons/48/help.bmp
  79. BIN
      base/usr/share/icons/48/help.png
  80. BIN
      base/usr/share/icons/48/image.bmp
  81. BIN
      base/usr/share/icons/48/image.png
  82. BIN
      base/usr/share/icons/48/julia.bmp
  83. BIN
      base/usr/share/icons/48/julia.png
  84. BIN
      base/usr/share/icons/48/mines.bmp
  85. BIN
      base/usr/share/icons/48/mines.png
  86. BIN
      base/usr/share/icons/48/package-uninstalled.bmp
  87. BIN
      base/usr/share/icons/48/package-uninstalled.png
  88. BIN
      base/usr/share/icons/48/package.bmp
  89. BIN
      base/usr/share/icons/48/package.png
  90. BIN
      base/usr/share/icons/48/plasma.bmp
  91. BIN
      base/usr/share/icons/48/plasma.png
  92. BIN
      base/usr/share/icons/48/py.bmp
  93. BIN
      base/usr/share/icons/48/py.png
  94. BIN
      base/usr/share/icons/48/sh.bmp
  95. BIN
      base/usr/share/icons/48/sh.png
  96. BIN
      base/usr/share/icons/48/star.bmp
  97. BIN
      base/usr/share/icons/48/star.png
  98. BIN
      base/usr/share/icons/48/utilities-terminal.bmp
  99. BIN
      base/usr/share/icons/48/utilities-terminal.png
  100. 0 0
      base/usr/share/icons/48/wallpaper-picker.bmp

+ 4 - 4
apps/file-browser.c

@@ -462,7 +462,7 @@ static void load_directory(const char * path, int modifies_history) {
 		if (!fork()) {
 			char tmp[512];
 			sprintf(tmp, "Could not open directory \"%s\": %s", path, strerror(errno));
-			char * args[] = {"showdialog","File Browser","/usr/share/icons/48/folder.bmp",tmp,NULL};
+			char * args[] = {"showdialog","File Browser","/usr/share/icons/48/folder.png",tmp,NULL};
 			execvp(args[0],args);
 			exit(0);
 		}
@@ -1289,7 +1289,7 @@ static void _menu_action_paste(struct MenuEntry * entry) {
 static void _menu_action_about(struct MenuEntry * entry) {
 	/* Show About dialog */
 	char about_cmd[1024] = "\0";
-	strcat(about_cmd, "about \"About File Browser\" /usr/share/icons/48/folder.bmp \"ToaruOS File Browser\" \"(C) 2018 K. Lange\n-\nPart of ToaruOS, which is free software\nreleased under the NCSA/University of Illinois\nlicense.\n-\n%https://toaruos.org\n%https://github.com/klange/toaruos\" ");
+	strcat(about_cmd, "about \"About File Browser\" /usr/share/icons/48/folder.png \"ToaruOS File Browser\" \"(C) 2018 K. Lange\n-\nPart of ToaruOS, which is free software\nreleased under the NCSA/University of Illinois\nlicense.\n-\n%https://toaruos.org\n%https://github.com/klange/toaruos\" ");
 	char coords[100];
 	sprintf(coords, "%d %d &", (int)main_window->x + (int)main_window->width / 2, (int)main_window->y + (int)main_window->height / 2);
 	strcat(about_cmd, coords);
@@ -1470,14 +1470,14 @@ static void handle_clipboard(char * contents) {
 		struct stat statbuf;
 		if (!stat(destination, &statbuf)) {
 			char message[4096];
-			sprintf(message, "showdialog \"File Browser\" /usr/share/icons/48/folder.bmp \"Not overwriting file '%s'.\"", cheap_basename);
+			sprintf(message, "showdialog \"File Browser\" /usr/share/icons/48/folder.png \"Not overwriting file '%s'.\"", cheap_basename);
 			launch_application(message);
 		} else {
 			char cp[1024];
 			sprintf(cp, "cp -r \"%s\" \"%s\"", file, current_directory);
 			if (system(cp)) {
 				char message[4096];
-				sprintf(message, "showdialog \"File Browser\" /usr/share/icons/48/folder.bmp \"Error copying file '%s'.\"", cheap_basename);
+				sprintf(message, "showdialog \"File Browser\" /usr/share/icons/48/folder.png \"Error copying file '%s'.\"", cheap_basename);
 				launch_application(message);
 			}
 		}

+ 1 - 1
apps/help-browser.c

@@ -321,7 +321,7 @@ static void _menu_action_forward(struct MenuEntry * entry) {
 static void _menu_action_about(struct MenuEntry * entry) {
 	/* Show About dialog */
 	char about_cmd[1024] = "\0";
-	strcat(about_cmd, "about \"About Help Browser\" /usr/share/icons/48/help.bmp \"ToaruOS Help Browser\" \"(C) 2018-2020 K. Lange\n-\nPart of ToaruOS, which is free software\nreleased under the NCSA/University of Illinois\nlicense.\n-\n%https://toaruos.org\n%https://github.com/klange/toaruos\" ");
+	strcat(about_cmd, "about \"About Help Browser\" /usr/share/icons/48/help.png \"ToaruOS Help Browser\" \"(C) 2018-2020 K. Lange\n-\nPart of ToaruOS, which is free software\nreleased under the NCSA/University of Illinois\nlicense.\n-\n%https://toaruos.org\n%https://github.com/klange/toaruos\" ");
 	char coords[100];
 	sprintf(coords, "%d %d &", (int)main_window->x + (int)main_window->width / 2, (int)main_window->y + (int)main_window->height / 2);
 	strcat(about_cmd, coords);

+ 2 - 2
apps/package-manager.c

@@ -341,7 +341,7 @@ static void install_package(struct Package * package) {
 static void _menu_action_about(struct MenuEntry * entry) {
 	/* Show About dialog */
 	char about_cmd[1024] = "\0";
-	strcat(about_cmd, "about \"About " APPLICATION_TITLE "\" /usr/share/icons/48/package.bmp \"ToaruOS " APPLICATION_TITLE "\" \"(C) 2018 K. Lange\n-\nPart of ToaruOS, which is free software\nreleased under the NCSA/University of Illinois\nlicense.\n-\n%https://toaruos.org\n%https://github.com/klange/toaruos\" ");
+	strcat(about_cmd, "about \"About " APPLICATION_TITLE "\" /usr/share/icons/48/package.png \"ToaruOS " APPLICATION_TITLE "\" \"(C) 2018 K. Lange\n-\nPart of ToaruOS, which is free software\nreleased under the NCSA/University of Illinois\nlicense.\n-\n%https://toaruos.org\n%https://github.com/klange/toaruos\" ");
 	char coords[100];
 	sprintf(coords, "%d %d &", (int)main_window->x + (int)main_window->width / 2, (int)main_window->y + (int)main_window->height / 2);
 	strcat(about_cmd, coords);
@@ -439,7 +439,7 @@ int main(int argc, char * argv[]) {
 		char * args[] = {
 			"showdialog",
 			"Package Manager",
-			"/usr/share/icons/48/package.bmp",
+			"/usr/share/icons/48/package.png",
 			"Only root can manage packages.",
 			NULL,
 		};

+ 1 - 1
apps/panel.c

@@ -824,7 +824,7 @@ static void launch_application_menu(struct MenuEntry * self) {
 	struct MenuEntry_Normal * _self = (void *)self;
 
 	if (!strcmp((char *)_self->action,"log-out")) {
-		if (system("showdialog \"Log Out\" /usr/share/icons/48/exit.bmp \"Are you sure you want to log out?\"") == 0) {
+		if (system("showdialog \"Log Out\" /usr/share/icons/48/exit.png \"Are you sure you want to log out?\"") == 0) {
 			yutani_session_end(yctx);
 			_continue = 0;
 		}

+ 1 - 1
apps/showdialog.c

@@ -74,7 +74,7 @@ static void redraw(void) {
 
 static void init_default(void) {
 	title_str = "Dialog Prompt";
-	icon_path = "/usr/share/icons/48/folder.bmp";
+	icon_path = "/usr/share/icons/48/folder.png";
 
 	copyright_str[0] = "This is a demonstration of a dialog box.";
 	copyright_str[1] = "You can press \"Okay\" or \"Cancel\" or close the window.";

+ 1 - 1
apps/terminal.c

@@ -2179,7 +2179,7 @@ static void _menu_action_toggle_free_size(struct MenuEntry * self) {
 
 static void _menu_action_show_about(struct MenuEntry * self) {
 	char about_cmd[1024] = "\0";
-	strcat(about_cmd, "about \"About Terminal\" /usr/share/icons/48/utilities-terminal.bmp \"ToaruOS Terminal\" \"(C) 2013-2020 K. Lange\n-\nPart of ToaruOS, which is free software\nreleased under the NCSA/University of Illinois\nlicense.\n-\n%https://toaruos.org\n%https://github.com/klange/toaruos\" ");
+	strcat(about_cmd, "about \"About Terminal\" /usr/share/icons/48/utilities-terminal.png \"ToaruOS Terminal\" \"(C) 2013-2020 K. Lange\n-\nPart of ToaruOS, which is free software\nreleased under the NCSA/University of Illinois\nlicense.\n-\n%https://toaruos.org\n%https://github.com/klange/toaruos\" ");
 	char coords[100];
 	sprintf(coords, "%d %d &", (int)window->x + (int)window->width / 2, (int)window->y + (int)window->height / 2);
 	strcat(about_cmd, coords);

+ 4 - 4
apps/tutorial.c

@@ -328,10 +328,10 @@ int main(int argc, char * argv[]) {
 
 	/* Load icons */
 	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");
-	load_sprite(&mouse_drag, "/usr/share/cursor/drag.bmp");
+	load_sprite(&terminal, "/usr/share/icons/48/utilities-terminal.png");
+	load_sprite(&folder, "/usr/share/icons/48/folder.png");
+	load_sprite(&package, "/usr/share/icons/48/package.png");
+	load_sprite(&mouse_drag, "/usr/share/cursor/drag.png");
 
 	load_page(0);
 

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


BIN
base/usr/share/icons/16/applications-generic.png


BIN
base/usr/share/icons/16/back.bmp


BIN
base/usr/share/icons/16/back.png


BIN
base/usr/share/icons/16/bookmark.bmp


BIN
base/usr/share/icons/16/bookmark.png


BIN
base/usr/share/icons/16/calculator.bmp


BIN
base/usr/share/icons/16/calculator.png


BIN
base/usr/share/icons/16/clock.bmp


BIN
base/usr/share/icons/16/clock.png


BIN
base/usr/share/icons/16/config.bmp


BIN
base/usr/share/icons/16/config.png


BIN
base/usr/share/icons/16/exit.bmp


BIN
base/usr/share/icons/16/exit.png


BIN
base/usr/share/icons/16/file.bmp


BIN
base/usr/share/icons/16/file.png


BIN
base/usr/share/icons/16/folder.bmp


BIN
base/usr/share/icons/16/folder.png


BIN
base/usr/share/icons/16/forward.bmp


BIN
base/usr/share/icons/16/forward.png


BIN
base/usr/share/icons/16/help.bmp


BIN
base/usr/share/icons/16/help.png


BIN
base/usr/share/icons/16/home.bmp


BIN
base/usr/share/icons/16/home.png


BIN
base/usr/share/icons/16/menu-tick.bmp


BIN
base/usr/share/icons/16/menu-tick.png


BIN
base/usr/share/icons/16/mines.bmp


BIN
base/usr/share/icons/16/mines.png


BIN
base/usr/share/icons/16/missing.bmp


BIN
base/usr/share/icons/16/missing.png


BIN
base/usr/share/icons/16/new.bmp


BIN
base/usr/share/icons/16/new.png


BIN
base/usr/share/icons/16/open.bmp


BIN
base/usr/share/icons/16/open.png


BIN
base/usr/share/icons/16/package.bmp


BIN
base/usr/share/icons/16/package.png


BIN
base/usr/share/icons/16/refresh.bmp


BIN
base/usr/share/icons/16/refresh.png


BIN
base/usr/share/icons/16/save.bmp


BIN
base/usr/share/icons/16/save.png


BIN
base/usr/share/icons/16/star.bmp


BIN
base/usr/share/icons/16/star.png


BIN
base/usr/share/icons/16/up.bmp


BIN
base/usr/share/icons/16/up.png


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


BIN
base/usr/share/icons/16/utilities-terminal.png


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


BIN
base/usr/share/icons/48/applications-generic.png


BIN
base/usr/share/icons/48/applications-painting.bmp


BIN
base/usr/share/icons/48/applications-painting.png


BIN
base/usr/share/icons/48/c.bmp


BIN
base/usr/share/icons/48/c.png


BIN
base/usr/share/icons/48/calculator.bmp


BIN
base/usr/share/icons/48/calculator.png


BIN
base/usr/share/icons/48/clock.bmp


BIN
base/usr/share/icons/48/clock.png


BIN
base/usr/share/icons/48/drawlines.bmp


BIN
base/usr/share/icons/48/drawlines.png


BIN
base/usr/share/icons/48/exit.bmp


BIN
base/usr/share/icons/48/exit.png


BIN
base/usr/share/icons/48/file.bmp


BIN
base/usr/share/icons/48/file.png


BIN
base/usr/share/icons/48/folder.bmp


BIN
base/usr/share/icons/48/folder.png


BIN
base/usr/share/icons/48/font.bmp


BIN
base/usr/share/icons/48/font.png


BIN
base/usr/share/icons/48/gears.bmp


BIN
base/usr/share/icons/48/gears.png


BIN
base/usr/share/icons/48/h.bmp


BIN
base/usr/share/icons/48/h.png


BIN
base/usr/share/icons/48/help.bmp


BIN
base/usr/share/icons/48/help.png


BIN
base/usr/share/icons/48/image.bmp


BIN
base/usr/share/icons/48/image.png


BIN
base/usr/share/icons/48/julia.bmp


BIN
base/usr/share/icons/48/julia.png


BIN
base/usr/share/icons/48/mines.bmp


BIN
base/usr/share/icons/48/mines.png


BIN
base/usr/share/icons/48/package-uninstalled.bmp


BIN
base/usr/share/icons/48/package-uninstalled.png


BIN
base/usr/share/icons/48/package.bmp


BIN
base/usr/share/icons/48/package.png


BIN
base/usr/share/icons/48/plasma.bmp


BIN
base/usr/share/icons/48/plasma.png


BIN
base/usr/share/icons/48/py.bmp


BIN
base/usr/share/icons/48/py.png


BIN
base/usr/share/icons/48/sh.bmp


BIN
base/usr/share/icons/48/sh.png


BIN
base/usr/share/icons/48/star.bmp


BIN
base/usr/share/icons/48/star.png


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


BIN
base/usr/share/icons/48/utilities-terminal.png


+ 0 - 0
base/usr/share/icons/48/wallpaper-picker.bmp


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