diff --git a/novelwriter/assets/icons/material_filled_normal.icons b/novelwriter/assets/icons/material_filled_normal.icons index 36b8536f..1cd8cfb1 100644 --- a/novelwriter/assets/icons/material_filled_normal.icons +++ b/novelwriter/assets/icons/material_filled_normal.icons @@ -59,6 +59,17 @@ icon:sb_stats = icon:theme_dark = icon:theme_auto = +icon:btn_ok = +icon:btn_cancel = +icon:btn_yes = +icon:btn_no = +icon:btn_open = +icon:btn_close = +icon:btn_browse = +icon:btn_list = +icon:btn_new = +icon:btn_create = +icon:btn_reset = icon:add = icon:bookmarks = icon:browse = @@ -94,7 +105,6 @@ icon:minimise = icon:more_vertical = icon:noncheckable = -icon:open = icon:panel = icon:pin = icon:project_copy = @@ -103,7 +113,6 @@ icon:refresh = icon:revert = icon:settings = -icon:star = icon:stats = icon:text = icon:timer_off = diff --git a/novelwriter/assets/icons/material_filled_thin.icons b/novelwriter/assets/icons/material_filled_thin.icons index a405ea3e..2d399f22 100644 --- a/novelwriter/assets/icons/material_filled_thin.icons +++ b/novelwriter/assets/icons/material_filled_thin.icons @@ -59,6 +59,17 @@ icon:sb_stats = icon:theme_dark = icon:theme_auto = +icon:btn_ok = +icon:btn_cancel = +icon:btn_yes = +icon:btn_no = +icon:btn_open = +icon:btn_close = +icon:btn_browse = +icon:btn_list = +icon:btn_new = +icon:btn_create = +icon:btn_reset = icon:add = icon:bookmarks = icon:browse = @@ -94,7 +105,6 @@ icon:minimise = icon:more_vertical = icon:noncheckable = -icon:open = icon:panel = icon:pin = icon:project_copy = @@ -103,7 +113,6 @@ icon:refresh = icon:revert = icon:settings = -icon:star = icon:stats = icon:text = icon:timer_off = diff --git a/novelwriter/assets/icons/material_rounded_normal.icons b/novelwriter/assets/icons/material_rounded_normal.icons index 9c22a001..044bdd5d 100644 --- a/novelwriter/assets/icons/material_rounded_normal.icons +++ b/novelwriter/assets/icons/material_rounded_normal.icons @@ -59,6 +59,17 @@ icon:sb_stats = icon:theme_dark = icon:theme_auto = +icon:btn_ok = +icon:btn_cancel = +icon:btn_yes = +icon:btn_no = +icon:btn_open = +icon:btn_close = +icon:btn_browse = +icon:btn_list = +icon:btn_new = +icon:btn_create = +icon:btn_reset = icon:add = icon:bookmarks = icon:browse = @@ -94,7 +105,6 @@ icon:minimise = icon:more_vertical = icon:noncheckable = -icon:open = icon:panel = icon:pin = icon:project_copy = @@ -103,7 +113,6 @@ icon:refresh = icon:revert = icon:settings = -icon:star = icon:stats = icon:text = icon:timer_off = diff --git a/novelwriter/assets/icons/material_rounded_thin.icons b/novelwriter/assets/icons/material_rounded_thin.icons index 1002fcbf..22834e45 100644 --- a/novelwriter/assets/icons/material_rounded_thin.icons +++ b/novelwriter/assets/icons/material_rounded_thin.icons @@ -59,6 +59,17 @@ icon:sb_stats = icon:theme_dark = icon:theme_auto = +icon:btn_ok = +icon:btn_cancel = +icon:btn_yes = +icon:btn_no = +icon:btn_open = +icon:btn_close = +icon:btn_browse = +icon:btn_list = +icon:btn_new = +icon:btn_create = +icon:btn_reset = icon:add = icon:bookmarks = icon:browse = @@ -94,7 +105,6 @@ icon:minimise = icon:more_vertical = icon:noncheckable = -icon:open = icon:panel = icon:pin = icon:project_copy = @@ -103,7 +113,6 @@ icon:refresh = icon:revert = icon:settings = -icon:star = icon:stats = icon:text = icon:timer_off = diff --git a/novelwriter/assets/icons/material_sharp_normal.icons b/novelwriter/assets/icons/material_sharp_normal.icons index b8b8c0e6..13c68127 100644 --- a/novelwriter/assets/icons/material_sharp_normal.icons +++ b/novelwriter/assets/icons/material_sharp_normal.icons @@ -59,6 +59,17 @@ icon:sb_stats = icon:theme_dark = icon:theme_auto = +icon:btn_ok = +icon:btn_cancel = +icon:btn_yes = +icon:btn_no = +icon:btn_open = +icon:btn_close = +icon:btn_browse = +icon:btn_list = +icon:btn_new = +icon:btn_create = +icon:btn_reset = icon:add = icon:bookmarks = icon:browse = @@ -94,7 +105,6 @@ icon:minimise = icon:more_vertical = icon:noncheckable = -icon:open = icon:panel = icon:pin = icon:project_copy = @@ -103,7 +113,6 @@ icon:refresh = icon:revert = icon:settings = -icon:star = icon:stats = icon:text = icon:timer_off = diff --git a/novelwriter/assets/icons/material_sharp_thin.icons b/novelwriter/assets/icons/material_sharp_thin.icons index afe8528d..c8bb13a8 100644 --- a/novelwriter/assets/icons/material_sharp_thin.icons +++ b/novelwriter/assets/icons/material_sharp_thin.icons @@ -59,6 +59,17 @@ icon:sb_stats = icon:theme_dark = icon:theme_auto = +icon:btn_ok = +icon:btn_cancel = +icon:btn_yes = +icon:btn_no = +icon:btn_open = +icon:btn_close = +icon:btn_browse = +icon:btn_list = +icon:btn_new = +icon:btn_create = +icon:btn_reset = icon:add = icon:bookmarks = icon:browse = @@ -94,7 +105,6 @@ icon:minimise = icon:more_vertical = icon:noncheckable = -icon:open = icon:panel = icon:pin = icon:project_copy = @@ -103,7 +113,6 @@ icon:refresh = icon:revert = icon:settings = -icon:star = icon:stats = icon:text = icon:timer_off = diff --git a/tests/files/all_icons.json b/tests/files/all_icons.json index 3d85f818..41797f20 100644 --- a/tests/files/all_icons.json +++ b/tests/files/all_icons.json @@ -60,6 +60,18 @@ "theme_dark", "theme_auto", + "btn_ok", + "btn_cancel", + "btn_yes", + "btn_no", + "btn_open", + "btn_close", + "btn_browse", + "btn_list", + "btn_new", + "btn_create", + "btn_reset", + "add", "bookmarks", "browse", @@ -95,7 +107,6 @@ "more_arrow", "more_vertical", "noncheckable", - "open", "panel", "pin", "project_copy", @@ -104,7 +115,6 @@ "remove", "revert", "settings", - "star", "stats", "text", "timer_off", diff --git a/utils/icon_themes.py b/utils/icon_themes.py index cb906b01..e5c2268f 100644 --- a/utils/icon_themes.py +++ b/utils/icon_themes.py @@ -107,6 +107,18 @@ ICONS = [ "theme_dark", "theme_auto", + "btn_ok", + "btn_cancel", + "btn_yes", + "btn_no", + "btn_open", + "btn_close", + "btn_browse", + "btn_list", + "btn_new", + "btn_create", + "btn_reset", + "add", "bookmarks", "browse", @@ -142,7 +154,6 @@ ICONS = [ "more_arrow", "more_vertical", "noncheckable", - "open", "panel", "pin", "project_copy", @@ -151,7 +162,6 @@ ICONS = [ "remove", "revert", "settings", - "star", "stats", "text", "timer_off", @@ -288,6 +298,8 @@ def processFontAwesome(workDir: Path, iconsDir: Path, jobs: dict) -> None: viewbox = [int(x) for x in svg.get("viewBox", "").split()] viewbox = [viewbox[2]//2 - 256, 0, 512, 512] svg.set("viewBox", " ".join(str(x) for x in viewbox)) + for elem in svg.iter(): + elem.attrib.pop("fill", None) icons[key] = svg else: print(f"Not Found: {icon}.svg") diff --git a/utils/icon_themes/font_awesome.json b/utils/icon_themes/font_awesome.json index d98dc9e2..1769409e 100644 --- a/utils/icon_themes/font_awesome.json +++ b/utils/icon_themes/font_awesome.json @@ -60,6 +60,18 @@ "theme_dark": "moon", "theme_auto": "circle-half-stroke", + "btn_ok": "circle-check", + "btn_cancel": "ban", + "btn_yes": "circle-check", + "btn_no": "circle-xmark", + "btn_open": "file-arrow-up", + "btn_close": "circle-xmark", + "btn_browse": "folder-open", + "btn_list": "list", + "btn_new": "plus", + "btn_create": "star", + "btn_reset": "rotate-left", + "add": "plus", "bookmarks": "bookmark", "browse": "folder-open", @@ -95,16 +107,14 @@ "more_arrow": "caret-right", "more_vertical": "ellipsis-vertical", "noncheckable": "square-minus", - "open": "file-arrow-up", "panel": "table-list", "pin": "thumbtack", "project_copy": "copy", "quote": "quote-right", - "refresh": "arrow-rotate-right", + "refresh": "rotate-right", "remove": "minus", - "revert": "arrow-rotate-left", + "revert": "rotate-left", "settings": "gear", - "star": "star", "stats": "chart-line", "text": "file-lines", "timer_off": "pause", diff --git a/utils/icon_themes/material_symbols.json b/utils/icon_themes/material_symbols.json index 61c1975a..3d1adc47 100644 --- a/utils/icon_themes/material_symbols.json +++ b/utils/icon_themes/material_symbols.json @@ -60,6 +60,18 @@ "theme_dark": "dark_mode", "theme_auto": "contrast", + "btn_ok": "check_circle", + "btn_cancel": "cancel", + "btn_yes": "check_circle", + "btn_no": "do_not_disturb_on", + "btn_open": "open_in_new", + "btn_close": "close", + "btn_browse": "folder_open", + "btn_list": "format_list_bulleted", + "btn_new": "new_window", + "btn_create": "star", + "btn_reset": "undo", + "add": "add", "bookmarks": "bookmarks", "browse": "folder_open", @@ -95,7 +107,6 @@ "more_arrow": "arrow_right", "more_vertical": "more_vert", "noncheckable": "indeterminate_check_box", - "open": "open_in_new", "panel": "dock_to_bottom", "pin": "keep", "project_copy": "folder_copy", @@ -104,7 +115,6 @@ "remove": "remove", "revert": "settings_backup_restore", "settings": "settings", - "star": "star", "stats": "stacked_line_chart", "text": "subject", "timer_off": "timer_off", diff --git a/utils/icon_themes/remix.json b/utils/icon_themes/remix.json index 0ac173ec..da78a84f 100644 --- a/utils/icon_themes/remix.json +++ b/utils/icon_themes/remix.json @@ -60,6 +60,18 @@ "theme_dark": "moon", "theme_auto": "contrast", + "btn_ok": "checkbox-circle", + "btn_cancel": "indeterminate-circle", + "btn_yes": "checkbox-circle", + "btn_no": "close-circle", + "btn_open": "file-upload", + "btn_close": "close-circle", + "btn_browse": "folder-2", + "btn_list": "list-unordered", + "btn_new": "add", + "btn_create": "star-fill", + "btn_reset": "reset-left", + "add": "add", "bookmarks": "bookmark", "browse": "folder-2", @@ -95,7 +107,6 @@ "more_arrow": "arrow-right-s-fill", "more_vertical": "more-2-fill", "noncheckable": "checkbox-indeterminate", - "open": "file-upload", "panel": "layout-bottom", "pin": "pushpin", "project_copy": "file-copy-2", @@ -104,7 +115,6 @@ "remove": "subtract", "revert": "reset-left", "settings": "settings-2", - "star": "star-fill", "stats": "line-chart", "text": "file-text", "timer_off": "zzz",