From ec1047207c1ff19334aca2fe685aaf8184fc05ec Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Fri, 10 Jan 2025 17:39:20 +0100
Subject: [PATCH 1/6] Restructure how icon themes are generated
---
pkgutils.py | 16 ++-
utils/icon_themes.py | 270 ++++++++++++++++++++++++++++++++++++
utils/material_icons.py | 186 -------------------------
utils/material_symbols.json | 105 ++++++++++++++
4 files changed, 387 insertions(+), 190 deletions(-)
create mode 100644 utils/icon_themes.py
delete mode 100644 utils/material_icons.py
create mode 100644 utils/material_symbols.json
diff --git a/pkgutils.py b/pkgutils.py
index 060a1220e..aa4ddad6c 100755
--- a/pkgutils.py
+++ b/pkgutils.py
@@ -35,7 +35,7 @@
from pathlib import Path
-from utils.material_icons import processMaterialIcons
+from utils.icon_themes import processFontAwesome, processMaterialIcons
CURR_DIR = Path(__file__).parent
SETUP_DIR = CURR_DIR / "setup"
@@ -330,10 +330,10 @@ def buildSampleZip(args: argparse.Namespace | None = None) -> None:
##
def buildIconTheme(args: argparse.Namespace) -> None:
- """Build an icon theme."""
+ """Build icon themes."""
print("")
- print("Build Icon Theme")
- print("================")
+ print("Build Icon Themes")
+ print("=================")
print("")
workDir = Path(args.sources).absolute()
@@ -384,6 +384,14 @@ def buildIconTheme(args: argparse.Namespace) -> None:
},
})
+ if style in ("all", "fa"):
+ processFontAwesome(workDir, iconsDir, {
+ "font_awesome": {
+ "name": "Font Awesome 6",
+ },
+ })
+
+ print("Done")
print("")
return
diff --git a/utils/icon_themes.py b/utils/icon_themes.py
new file mode 100644
index 000000000..1371debde
--- /dev/null
+++ b/utils/icon_themes.py
@@ -0,0 +1,270 @@
+"""
+novelWriter – Icon Theme Utils
+==============================
+
+This file is a part of novelWriter
+Copyright (C) 2025 Veronica Berglyd Olsen and novelWriter contributors
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see Assets
Material Symbols icons by Google Inc (Apache 2.0)Remix icons by RemixIcon (Apache 2.0)Font Awesome icons by Fonticons Inc (CC BY 4.0)Tomorrow syntax themes by Chris Kempson (MIT License)Owl syntax themes by Sarah Drasner (MIT License)Solarized themes by Ethan Schoonover (MIT License)
License: Apache 2.0
+
+Remix Icon
+Copyright: Remix Icon
+Website:
+License: Apache 2.0
+
+Font Awesome
+Copyright: Fonticons Inc
+Website:
+License: CC BY 4.0