impr: Remove Font Awesome

lib/libimhex/include/hex/ui/view.hpp

@@ -6,7 +6,6 @@
 #include <imgui_internal.h>
 #include <hex/ui/imgui_imhex_extensions.h>
 
-#include <fonts/fontawesome_font.h>
 #include <fonts/codicons_font.h>
 
 #include <hex/api/imhex_api.hpp>

lib/third_party/imgui/fonts/CMakeLists.txt

@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 # https://unifoundry.com/unifont/index.html
 # https://github.com/microsoft/vscode-codicons
-# https://github.com/FortAwesome/Font-Awesome
 project(imgui_fonts)
 
 set(CMAKE_CXX_STANDARD 17)

lib/third_party/imgui/fonts/FONTAWESOME_LICENSE.txt

@@ -1,165 +0,0 @@
-Fonticons, Inc. (https://fontawesome.com)
-
---------------------------------------------------------------------------------
-
-Font Awesome Free License
-
-Font Awesome Free is free, open source, and GPL friendly. You can use it for
-commercial projects, open source projects, or really almost whatever you want.
-Full Font Awesome Free license: https://fontawesome.com/license/free.
-
---------------------------------------------------------------------------------
-
-# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
-
-The Font Awesome Free download is licensed under a Creative Commons
-Attribution 4.0 International License and applies to all icons packaged
-as SVG and JS file types.
-
---------------------------------------------------------------------------------
-
-# Fonts: SIL OFL 1.1 License
-
-In the Font Awesome Free download, the SIL OFL license applies to all icons
-packaged as web and desktop font files.
-
-Copyright (c) 2023 Fonticons, Inc. (https://fontawesome.com)
-with Reserved Font Name: "Font Awesome".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-SIL OPEN FONT LICENSE
-Version 1.1 - 26 February 2007
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting — in part or in whole — any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
---------------------------------------------------------------------------------
-
-# Code: MIT License (https://opensource.org/licenses/MIT)
-
-In the Font Awesome Free download, the MIT license applies to all non-font and
-non-icon files.
-
-Copyright 2023 Fonticons, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in the
-Software without restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---------------------------------------------------------------------------------
-
-# Attribution
-
-Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
-Awesome Free files already contain embedded comments with sufficient
-attribution, so you shouldn't need to do anything additional when using these
-files normally.
-
-We've kept attribution comments terse, so we ask that you do not actively work
-to remove them from files, especially code. They're a great way for folks to
-learn about Font Awesome.
-
---------------------------------------------------------------------------------
-
-# Brand Icons
-
-All brand icons are trademarks of their respective owners. The use of these
-trademarks does not indicate endorsement of the trademark holder by Font
-Awesome, nor vice versa. **Please do not use brand logos for any purpose except
-to represent the company, product, or service to which they refer.**

lib/third_party/imgui/fonts/include/fonts/codicons_font.h

@@ -9,7 +9,7 @@ extern const unsigned int codicons_compressed_size;
 extern const unsigned int codicons_compressed_data[52184/4];
 
 #define ICON_MIN_VS 0xea60
-#define ICON_MAX_VS 0xebdd
+#define ICON_MAX_VS 0xec19
 #define ICON_VS_ADD "\xee\xa9\xa0"	// U+ea60
 #define ICON_VS_PLUS "\xee\xa9\xa0"	// U+ea60
 #define ICON_VS_GIST_NEW "\xee\xa9\xa0"	// U+ea60
@@ -473,3 +473,4 @@ extern const unsigned int codicons_compressed_data[52184/4];
 #define ICON_VS_GIT_PULL_REQUEST_DRAFT "\xee\xaf\x9b"	// U+ebdb
 #define ICON_VS_DEBUG_ALL "\xee\xaf\x9c"	// U+ebdc
 #define ICON_VS_DEBUG_COVERAGE "\xee\xaf\x9d"	// U+ebdd
+#define ICON_VS_CHIP "\xee\xb0\x99"   // U+ec19

plugins/builtin/source/content/fonts.cpp

@@ -5,7 +5,6 @@
 
 #include <hex/helpers/utils.hpp>
 
-#include <fonts/fontawesome_font.h>
 #include <fonts/codicons_font.h>
 #include <fonts/blendericons_font.h>
 
@@ -23,17 +22,12 @@ namespace hex::plugin::builtin {
          */
 
         ImHexApi::Fonts::loadFont("Blender Icons",  romfs::get("fonts/blendericons.ttf").span<u8>(),{ { ICON_MIN_BI, ICON_MAX_BI } }, { 0, -3_scaled });
-        ImHexApi::Fonts::loadFont("Font Awesome 5", romfs::get("fonts/fontawesome.otf").span<u8>(),
-            {
-                { glyph(ICON_FA_BACKSPACE), glyph(ICON_FA_INFINITY), glyph(ICON_FA_TACHOMETER_ALT), glyph(ICON_FA_MICROCHIP), glyph(ICON_FA_CODE_BRANCH) }
-            },
-            { 0, 0 });
 
         ImHexApi::Fonts::loadFont("VS Codicons", romfs::get("fonts/codicons.ttf").span<u8>(),
             {
                 { ICON_MIN_VS, ICON_MAX_VS }
             },
-            { 0, -1_scaled });
+            { -1_scaled, -1_scaled });
 
         ImHexApi::Fonts::loadFont("Unifont", romfs::get("fonts/unifont.otf").span<u8>());
     }

plugins/builtin/source/content/init_tasks.cpp

@@ -27,7 +27,7 @@ namespace hex::plugin::builtin {
             int checkForUpdates = ContentRegistry::Settings::read("hex.builtin.setting.general", "hex.builtin.setting.general.server_contact", 2);
 
             // Check if we should check for updates
-            if (checkForUpdates == 1){
+            if (checkForUpdates == 1) {
                 HttpRequest request("GET", GitHubApiURL + "/releases/latest"s);
 
                 // Query the GitHub API for the latest release version

plugins/builtin/source/content/tools/math_eval.cpp

@@ -7,7 +7,6 @@
 
 #include <imgui.h>
 #include <hex/ui/imgui_imhex_extensions.h>
-#include <fonts/fontawesome_font.h>
 #include <fonts/codicons_font.h>
 
 #include <vector>
@@ -123,7 +122,7 @@ namespace hex::plugin::builtin {
             ImGui::SameLine();
             if (ImGui::Button("CE", buttonSize)) mathInput.clear();
             ImGui::SameLine();
-            if (ImGui::Button(ICON_FA_BACKSPACE, buttonSize)) mathInput.clear();
+            if (ImGui::Button(ICON_VS_DISCARD, buttonSize)) mathInput.clear();
 
             ImGui::SameLine();
             ImGui::NewLine();

plugins/builtin/source/content/views/view_about.cpp

@@ -61,9 +61,14 @@ namespace hex::plugin::builtin {
                     ImGui::TableNextColumn();
                     {
                         // Draw basic information about ImHex and its version
-                        ImGuiExt::TextFormatted("ImHex Hex Editor v{} by WerWolv  " ICON_FA_CODE_BRANCH, ImHexApi::System::getImHexVersion());
+                        ImGuiExt::TextFormatted("ImHex Hex Editor v{} by WerWolv", ImHexApi::System::getImHexVersion());
+                    }
 
-                        ImGui::SameLine();
+                    ImGui::TableNextColumn();
+                    {
+                        ImGuiExt::TextFormatted(" {} ", ICON_VS_SOURCE_CONTROL);
+
+                        ImGui::SameLine(0, 0);
 
                         // Draw a clickable link to the current commit
                         if (ImGuiExt::Hyperlink(hex::format("{0}@{1}", ImHexApi::System::getCommitBranch(), ImHexApi::System::getCommitHash()).c_str()))

plugins/builtin/source/content/views/view_pattern_editor.cpp

@@ -324,9 +324,7 @@ namespace hex::plugin::builtin {
                     ImGui::SameLine();
 
                     if (auto max = runtime.getMaximumPatternCount(); max >= std::numeric_limits<u32>::max()) {
-                        ImGuiExt::TextFormatted("{} / {}",
+                        ImGuiExt::TextFormatted("{}", runtime.getCreatedPatternCount());
-                                             runtime.getCreatedPatternCount(),
-                                             ICON_FA_INFINITY);
                     } else {
                         ImGuiExt::TextFormatted("{} / {}",
                                              runtime.getCreatedPatternCount(),

plugins/windows/source/content/ui_items.cpp

@@ -6,9 +6,9 @@
 #include <psapi.h>
 
 #include <imgui.h>
+#include <fonts/codicons_font.h>
 #include <hex/ui/imgui_imhex_extensions.h>
 
-#include <fonts/fontawesome_font.h>
 #include <hex/api/event_manager.hpp>
 
 namespace hex::plugin::windows {
@@ -70,7 +70,7 @@ namespace hex::plugin::windows {
                 cpuUsage *= 100;
             }
 
-            ImGuiExt::TextFormatted(ICON_FA_TACHOMETER_ALT " {0:2}.{1:02}%", u32(cpuUsage), u32(cpuUsage * 100) % 100);
+            ImGuiExt::TextFormatted(ICON_VS_DASHBOARD " {0:2}.{1:02}%", u32(cpuUsage), u32(cpuUsage * 100) % 100);
         });
 
         ContentRegistry::Interface::addFooterItem([] {
@@ -89,7 +89,7 @@ namespace hex::plugin::windows {
             auto totalMem = memInfo.ullTotalPhys;
             auto usedMem  = pmc.WorkingSetSize;
 
-            ImGuiExt::TextFormatted(ICON_FA_MICROCHIP " {0} / {1}", hex::toByteString(usedMem), hex::toByteString(totalMem));
+            ImGuiExt::TextFormatted(ICON_VS_CHIP " {0} / {1}", hex::toByteString(usedMem), hex::toByteString(totalMem));
         });
     }