From e5ac1fcd00a7fa4859c54954ba7b373490384669 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Thu, 24 Dec 2020 16:22:02 +0100 Subject: [PATCH] Base: Remove [Icons] section from .af files With everything now using GUI::FileIconProvider and therefore loading icons embedded in the executable files, this information is now longer being used. We might have to think about this again if we want to allow .af files with custom commands (e.g. shell scripts). Maybe those could get away with just an "Icon" entry under "[App]", but currently there's only "Executable" anyway. --- Base/res/apps/2048.af | 4 ---- Base/res/apps/Breakout.af | 4 ---- Base/res/apps/Browser.af | 4 ---- Base/res/apps/Calculator.af | 4 ---- Base/res/apps/Calendar.af | 4 ---- Base/res/apps/Chess.af | 4 ---- Base/res/apps/Cube.af | 4 ---- Base/res/apps/DisplaySettings.af | 4 ---- Base/res/apps/Eyes.af | 4 ---- Base/res/apps/FileManager.af | 4 ---- Base/res/apps/Fire.af | 4 ---- Base/res/apps/FontEditor.af | 4 ---- Base/res/apps/HackStudio.af | 4 ---- Base/res/apps/HelloWorld.af | 4 ---- Base/res/apps/Help.af | 4 ---- Base/res/apps/HexEditor.af | 4 ---- Base/res/apps/IRCClient.af | 4 ---- Base/res/apps/Inspector.af | 4 ---- Base/res/apps/Keyboard.af | 4 ---- Base/res/apps/LibGfxDemo.af | 4 ---- Base/res/apps/Minesweeper.af | 4 ---- Base/res/apps/Mouse.af | 4 ---- Base/res/apps/Piano.af | 4 ---- Base/res/apps/PixelPaint.af | 4 ---- Base/res/apps/Pong.af | 4 ---- Base/res/apps/Profiler.af | 4 ---- Base/res/apps/QuickShow.af | 4 ---- Base/res/apps/Screensaver.af | 4 ---- Base/res/apps/Snake.af | 4 ---- Base/res/apps/Solitaire.af | 3 --- Base/res/apps/SoundPlayer.af | 4 ---- Base/res/apps/Spreadsheet.af | 4 ---- Base/res/apps/SystemMonitor.af | 4 ---- Base/res/apps/Terminal.af | 4 ---- Base/res/apps/TextEditor.af | 4 ---- Base/res/apps/ThemeEditor.af | 4 ---- Base/res/apps/WidgetGallery.af | 4 ---- 37 files changed, 147 deletions(-) diff --git a/Base/res/apps/2048.af b/Base/res/apps/2048.af index e8ea8ed053e..b5f21952e80 100644 --- a/Base/res/apps/2048.af +++ b/Base/res/apps/2048.af @@ -2,7 +2,3 @@ Name=2048 Executable=/bin/2048 Category=Games - -[Icons] -16x16=/res/icons/16x16/app-2048.png -32x32=/res/icons/32x32/app-2048.png diff --git a/Base/res/apps/Breakout.af b/Base/res/apps/Breakout.af index 7af84519ffe..e0533589a17 100644 --- a/Base/res/apps/Breakout.af +++ b/Base/res/apps/Breakout.af @@ -2,7 +2,3 @@ Name=Breakout Executable=/bin/Breakout Category=Games - -[Icons] -16x16=/res/icons/16x16/app-breakout.png -32x32=/res/icons/32x32/app-breakout.png diff --git a/Base/res/apps/Browser.af b/Base/res/apps/Browser.af index 3a85bdb6652..c64f7454b3e 100644 --- a/Base/res/apps/Browser.af +++ b/Base/res/apps/Browser.af @@ -3,10 +3,6 @@ Name=Browser Executable=/bin/Browser Category=Internet -[Icons] -16x16=/res/icons/16x16/app-browser.png -32x32=/res/icons/32x32/app-browser.png - [Launcher] FileTypes=html,htm,md Protocols=gemini,http,https diff --git a/Base/res/apps/Calculator.af b/Base/res/apps/Calculator.af index f0adb793725..98d7ab1f0d0 100644 --- a/Base/res/apps/Calculator.af +++ b/Base/res/apps/Calculator.af @@ -2,7 +2,3 @@ Name=Calculator Executable=/bin/Calculator Category=Utilities - -[Icons] -16x16=/res/icons/16x16/app-calculator.png -32x32= diff --git a/Base/res/apps/Calendar.af b/Base/res/apps/Calendar.af index a4a1a7c9847..8a9d80a3155 100644 --- a/Base/res/apps/Calendar.af +++ b/Base/res/apps/Calendar.af @@ -2,7 +2,3 @@ Name=Calendar Executable=/bin/Calendar Category=Utilities - -[Icons] -16x16=/res/icons/16x16/app-calendar.png -32x32= diff --git a/Base/res/apps/Chess.af b/Base/res/apps/Chess.af index c2393a4dd57..79b084212ad 100644 --- a/Base/res/apps/Chess.af +++ b/Base/res/apps/Chess.af @@ -2,7 +2,3 @@ Name=Chess Executable=/bin/Chess Category=Games - -[Icons] -16x16=/res/icons/16x16/app-chess.png -32x32=/res/icons/32x32/app-chess.png diff --git a/Base/res/apps/Cube.af b/Base/res/apps/Cube.af index 8020adc8f7b..dce41fe1d23 100644 --- a/Base/res/apps/Cube.af +++ b/Base/res/apps/Cube.af @@ -2,7 +2,3 @@ Name=Cube Executable=/bin/Cube Category=Demos - -[Icons] -16x16=/res/icons/16x16/app-cube.png -32x32=/res/icons/32x32/app-cube.png diff --git a/Base/res/apps/DisplaySettings.af b/Base/res/apps/DisplaySettings.af index 3e0f9d6f169..66aa21f5ed5 100644 --- a/Base/res/apps/DisplaySettings.af +++ b/Base/res/apps/DisplaySettings.af @@ -2,7 +2,3 @@ Name=Display settings Executable=/bin/DisplaySettings Category=Settings - -[Icons] -16x16=/res/icons/16x16/app-display-settings.png -32x32=/res/icons/32x32/app-display-settings.png diff --git a/Base/res/apps/Eyes.af b/Base/res/apps/Eyes.af index 27b03061aac..b86a1c11802 100644 --- a/Base/res/apps/Eyes.af +++ b/Base/res/apps/Eyes.af @@ -2,7 +2,3 @@ Name=Eyes Executable=/bin/Eyes Category=Demos - -[Icons] -16x16=/res/icons/16x16/app-eyes.png -32x32=/res/icons/32x32/app-eyes.png diff --git a/Base/res/apps/FileManager.af b/Base/res/apps/FileManager.af index b1f6362cb7d..75be86b29a8 100644 --- a/Base/res/apps/FileManager.af +++ b/Base/res/apps/FileManager.af @@ -2,7 +2,3 @@ Name=File Manager Executable=/bin/FileManager Category=Utilities - -[Icons] -16x16=/res/icons/16x16/filetype-folder.png -32x32=/res/icons/32x32/filetype-folder.png diff --git a/Base/res/apps/Fire.af b/Base/res/apps/Fire.af index ebb669edeae..37d90edd2ef 100644 --- a/Base/res/apps/Fire.af +++ b/Base/res/apps/Fire.af @@ -2,7 +2,3 @@ Name=Fire Executable=/bin/Fire Category=Demos - -[Icons] -16x16=/res/icons/16x16/app-fire.png -32x32=/res/icons/32x32/app-fire.png diff --git a/Base/res/apps/FontEditor.af b/Base/res/apps/FontEditor.af index e61846d2119..f6085a0b092 100644 --- a/Base/res/apps/FontEditor.af +++ b/Base/res/apps/FontEditor.af @@ -3,9 +3,5 @@ Name=Font Editor Executable=/bin/FontEditor Category=Development -[Icons] -16x16=/res/icons/16x16/app-font-editor.png -32x32=/res/icons/32x32/app-font-editor.png - [Launcher] FileTypes=font diff --git a/Base/res/apps/HackStudio.af b/Base/res/apps/HackStudio.af index a70b0c29fdf..92bdcef97c4 100644 --- a/Base/res/apps/HackStudio.af +++ b/Base/res/apps/HackStudio.af @@ -2,7 +2,3 @@ Name=HackStudio Executable=/bin/HackStudio Category=Development - -[Icons] -16x16=/res/icons/16x16/app-hack-studio.png -32x32=/res/icons/32x32/app-hack-studio.png diff --git a/Base/res/apps/HelloWorld.af b/Base/res/apps/HelloWorld.af index 08f60034044..32d2d211c12 100644 --- a/Base/res/apps/HelloWorld.af +++ b/Base/res/apps/HelloWorld.af @@ -2,7 +2,3 @@ Name=Hello World Executable=/bin/HelloWorld Category=Demos - -[Icons] -16x16=/res/icons/16x16/app-hello-world.png -32x32= diff --git a/Base/res/apps/Help.af b/Base/res/apps/Help.af index 1555aa6815e..f64e23d880f 100644 --- a/Base/res/apps/Help.af +++ b/Base/res/apps/Help.af @@ -2,7 +2,3 @@ Name=Help Executable=/bin/Help Category=Utilities - -[Icons] -16x16=/res/icons/16x16/app-help.png -32x32=/res/icons/32x32/app-help.png diff --git a/Base/res/apps/HexEditor.af b/Base/res/apps/HexEditor.af index e2893a2cd55..fafe68dd68d 100644 --- a/Base/res/apps/HexEditor.af +++ b/Base/res/apps/HexEditor.af @@ -2,7 +2,3 @@ Name=Hex Editor Executable=/bin/HexEditor Category=Development - -[Icons] -16x16=/res/icons/16x16/app-hexeditor.png -32x32=/res/icons/32x32/app-hexeditor.png diff --git a/Base/res/apps/IRCClient.af b/Base/res/apps/IRCClient.af index ceba74e5913..3b2ed41b50b 100644 --- a/Base/res/apps/IRCClient.af +++ b/Base/res/apps/IRCClient.af @@ -3,9 +3,5 @@ Name=IRC Client Executable=/bin/IRCClient Category=Internet -[Icons] -16x16=/res/icons/16x16/app-irc-client.png -32x32=/res/icons/32x32/app-irc-client.png - [Launcher] Protocols=irc diff --git a/Base/res/apps/Inspector.af b/Base/res/apps/Inspector.af index 87213b43e70..018ddee4c81 100644 --- a/Base/res/apps/Inspector.af +++ b/Base/res/apps/Inspector.af @@ -2,7 +2,3 @@ Name=Inspector Executable=/bin/Inspector Category=Development - -[Icons] -16x16=/res/icons/16x16/app-inspector.png -32x32=/res/icons/32x32/app-inspector.png diff --git a/Base/res/apps/Keyboard.af b/Base/res/apps/Keyboard.af index ad0aced0ee9..7cb1bfda7e7 100644 --- a/Base/res/apps/Keyboard.af +++ b/Base/res/apps/Keyboard.af @@ -2,7 +2,3 @@ Name=Keyboard settings Executable=/bin/KeyboardSettings Category=Settings - -[Icons] -16x16=/res/icons/16x16/app-keyboard-settings.png -32x32=/res/icons/32x32/app-keyboard-settings.png diff --git a/Base/res/apps/LibGfxDemo.af b/Base/res/apps/LibGfxDemo.af index e1c237640db..ca98553cc46 100644 --- a/Base/res/apps/LibGfxDemo.af +++ b/Base/res/apps/LibGfxDemo.af @@ -2,7 +2,3 @@ Name=LibGfx Demo Executable=/bin/LibGfxDemo Category=Demos - -[Icons] -16x16=/res/icons/16x16/app-libgfx-demo.png -32x32=/res/icons/32x32/app-libgfx-demo.png diff --git a/Base/res/apps/Minesweeper.af b/Base/res/apps/Minesweeper.af index 5893f7e048d..a60633319cc 100644 --- a/Base/res/apps/Minesweeper.af +++ b/Base/res/apps/Minesweeper.af @@ -2,7 +2,3 @@ Name=Minesweeper Executable=/bin/Minesweeper Category=Games - -[Icons] -16x16=/res/icons/16x16/app-minesweeper.png -32x32=/res/icons/32x32/app-minesweeper.png diff --git a/Base/res/apps/Mouse.af b/Base/res/apps/Mouse.af index 8d280b517f1..b198299a01a 100644 --- a/Base/res/apps/Mouse.af +++ b/Base/res/apps/Mouse.af @@ -2,7 +2,3 @@ Name=Mouse Executable=/bin/Mouse Category=Demos - -[Icons] -16x16=/res/icons/16x16/app-mouse.png -32x32=/res/icons/32x32/app-mouse.png diff --git a/Base/res/apps/Piano.af b/Base/res/apps/Piano.af index 9b58d5fa11d..02ceda48e08 100644 --- a/Base/res/apps/Piano.af +++ b/Base/res/apps/Piano.af @@ -2,7 +2,3 @@ Name=Piano Executable=/bin/Piano Category=Sound - -[Icons] -16x16=/res/icons/16x16/app-piano.png -32x32=/res/icons/32x32/app-piano.png diff --git a/Base/res/apps/PixelPaint.af b/Base/res/apps/PixelPaint.af index e64b9bab6ce..d920ca5d768 100644 --- a/Base/res/apps/PixelPaint.af +++ b/Base/res/apps/PixelPaint.af @@ -2,7 +2,3 @@ Name=PixelPaint Executable=/bin/PixelPaint Category=Graphics - -[Icons] -16x16=/res/icons/16x16/app-pixel-paint.png -32x32=/res/icons/32x32/app-pixel-paint.png diff --git a/Base/res/apps/Pong.af b/Base/res/apps/Pong.af index 4ef90c4b393..a6eeef3d234 100644 --- a/Base/res/apps/Pong.af +++ b/Base/res/apps/Pong.af @@ -2,7 +2,3 @@ Name=Pong Executable=/bin/Pong Category=Games - -[Icons] -16x16=/res/icons/16x16/app-pong.png -32x32=/res/icons/32x32/app-pong.png diff --git a/Base/res/apps/Profiler.af b/Base/res/apps/Profiler.af index 50398fe65ab..7999f3d8d10 100644 --- a/Base/res/apps/Profiler.af +++ b/Base/res/apps/Profiler.af @@ -2,7 +2,3 @@ Name=Profiler Executable=/bin/Profiler Category=Development - -[Icons] -16x16=/res/icons/16x16/app-profiler.png -32x32=/res/icons/32x32/app-profiler.png diff --git a/Base/res/apps/QuickShow.af b/Base/res/apps/QuickShow.af index 26c225bec1e..fbc18f3b974 100644 --- a/Base/res/apps/QuickShow.af +++ b/Base/res/apps/QuickShow.af @@ -3,9 +3,5 @@ Name=QuickShow Executable=/bin/QuickShow Category=Graphics -[Icons] -16x16=/res/icons/16x16/filetype-image.png -32x32=/res/icons/32x32/filetype-image.png - [Launcher] FileTypes=pbm,pgm,png,ppm,gif,jpg,jpeg diff --git a/Base/res/apps/Screensaver.af b/Base/res/apps/Screensaver.af index 7ea8c7445c3..3765c6fbc98 100644 --- a/Base/res/apps/Screensaver.af +++ b/Base/res/apps/Screensaver.af @@ -2,7 +2,3 @@ Name=Screensaver Executable=/bin/Screensaver Category=Demos - -[Icons] -16x16=/res/icons/16x16/app-screensaver.png -32x32=/res/icons/32x32/app-screensaver.png diff --git a/Base/res/apps/Snake.af b/Base/res/apps/Snake.af index e6546d031c7..b11ef9b2bfc 100644 --- a/Base/res/apps/Snake.af +++ b/Base/res/apps/Snake.af @@ -2,7 +2,3 @@ Name=Snake Executable=/bin/Snake Category=Games - -[Icons] -16x16=/res/icons/16x16/app-snake.png -32x32=/res/icons/32x32/app-snake.png diff --git a/Base/res/apps/Solitaire.af b/Base/res/apps/Solitaire.af index 837e5838a43..69eb155c12d 100644 --- a/Base/res/apps/Solitaire.af +++ b/Base/res/apps/Solitaire.af @@ -2,6 +2,3 @@ Name=Solitaire Executable=/bin/Solitaire Category=Games - -[Icons] -16x16=/res/icons/16x16/app-solitaire.png diff --git a/Base/res/apps/SoundPlayer.af b/Base/res/apps/SoundPlayer.af index 43a10d4c614..ff90900a7e3 100644 --- a/Base/res/apps/SoundPlayer.af +++ b/Base/res/apps/SoundPlayer.af @@ -3,9 +3,5 @@ Name=SoundPlayer Executable=/bin/SoundPlayer Category=Sound -[Icons] -16x16=/res/icons/16x16/app-sound-player.png -32x32=/res/icons/32x32/app-sound-player.png - [Launcher] FileTypes=wav diff --git a/Base/res/apps/Spreadsheet.af b/Base/res/apps/Spreadsheet.af index 5a9551a1001..bd82054258c 100644 --- a/Base/res/apps/Spreadsheet.af +++ b/Base/res/apps/Spreadsheet.af @@ -3,9 +3,5 @@ Name=Spreadsheet Executable=/bin/Spreadsheet Category=Utilities -[Icons] -16x16=/res/icons/16x16/app-spreadsheet.png -32x32=/res/icons/32x32/app-spreadsheet.png - [Launcher] FileTypes=sheets diff --git a/Base/res/apps/SystemMonitor.af b/Base/res/apps/SystemMonitor.af index fc88fec4a4f..9787eafb525 100644 --- a/Base/res/apps/SystemMonitor.af +++ b/Base/res/apps/SystemMonitor.af @@ -2,7 +2,3 @@ Name=System Monitor Executable=/bin/SystemMonitor Category=Utilities - -[Icons] -16x16=/res/icons/16x16/app-system-monitor.png -32x32=/res/icons/32x32/app-system-monitor.png diff --git a/Base/res/apps/Terminal.af b/Base/res/apps/Terminal.af index 8adfc16340a..8852c4cb1e9 100644 --- a/Base/res/apps/Terminal.af +++ b/Base/res/apps/Terminal.af @@ -2,7 +2,3 @@ Name=Terminal Executable=/bin/Terminal Category=Utilities - -[Icons] -16x16=/res/icons/16x16/app-terminal.png -32x32=/res/icons/32x32/app-terminal.png diff --git a/Base/res/apps/TextEditor.af b/Base/res/apps/TextEditor.af index 381d67293ba..a081280c56e 100644 --- a/Base/res/apps/TextEditor.af +++ b/Base/res/apps/TextEditor.af @@ -3,9 +3,5 @@ Name=Text Editor Executable=/bin/TextEditor Category=Utilities -[Icons] -16x16=/res/icons/16x16/app-text-editor.png -32x32=/res/icons/32x32/app-text-editor.png - [Launcher] FileTypes=txt,md,html,htm,js,json,ini diff --git a/Base/res/apps/ThemeEditor.af b/Base/res/apps/ThemeEditor.af index d56873bf4b0..292a39358e3 100644 --- a/Base/res/apps/ThemeEditor.af +++ b/Base/res/apps/ThemeEditor.af @@ -2,7 +2,3 @@ Name=Theme Editor Executable=/bin/ThemeEditor Category=Development - -[Icons] -16x16=/res/icons/16x16/app-theme-editor.png -32x32= diff --git a/Base/res/apps/WidgetGallery.af b/Base/res/apps/WidgetGallery.af index 536109cea25..0152ed9748d 100644 --- a/Base/res/apps/WidgetGallery.af +++ b/Base/res/apps/WidgetGallery.af @@ -2,7 +2,3 @@ Name=Widget Gallery Executable=/bin/WidgetGallery Category=Demos - -[Icons] -16x16=/res/icons/16x16/app-widget-gallery.png -32x32=/res/icons/32x32/app-widget-gallery.png