Merge branch 'master' into fixes_issue_264

Author: dalthviz

README.md

@@ -51,11 +51,17 @@ The following prefixes are currently available to use:
 
 - [**FontAwesome**](https://fontawesome.com):
 
+  - FA 6.7.2 features 2,060 free icons in different styles:
+
+    - `fa6` prefix has [163 icons in the "**regular**" style.](https://fontawesome.com/v6/search?o=r&ic=free&s=regular)
+    - `fa6s` prefix has [1402 icons in the "**solid**" style.](https://fontawesome.com/v6/search?o=r&ic=free&s=solid)
+    - `fa6b` prefix has [495 icons of various **brands**.](https://fontawesome.com/v6/search?o=r&ic=free&ip=brands)
+
   - FA 5.15.4 features 1,608 free icons in different styles:
 
-    - `fa5` prefix has [151 icons in the "**regular**" style.](https://fontawesome.com/v5/search?o=r&m=free&s=regular)
-    - `fa5s` prefix has [1001 icons in the "**solid**" style.](https://fontawesome.com/v5/search?o=r&m=free&s=solid)
-    - `fa5b` prefix has [456 icons of various **brands**.](https://fontawesome.com/v5/search?o=r&m=free&f=brands)
+    - `fa5` prefix has [151 icons in the "**regular**" style.](https://fontawesome.com/v5/search?o=r&ic=free&s=regular)
+    - `fa5s` prefix has [1001 icons in the "**solid**" style.](https://fontawesome.com/v5/search?o=r&ic=free&s=solid)
+    - `fa5b` prefix has [456 icons of various **brands**.](https://fontawesome.com/v5/search?ic=brands)
 
 - `ei` prefix holds [**Elusive Icons** 2.0 with its 304 icons](http://elusiveicons.com/icons/).
 
@@ -80,13 +86,21 @@ import qtawesome as qta
 - Use Font Awesome, Elusive Icons, Material Design Icons, Phosphor, Remix Icon or Microsoft's Codicons.
 
 ```python
-# Get FontAwesome 5.x icons by name in various styles:
+# Get FontAwesome 6.x icons by name in various styles:
+fa6_icon = qta.icon('fa6.flag')
+fa6_button = QtWidgets.QPushButton(fa6_icon, 'Font Awesome 6! (regular)')
+fa6s_icon = qta.icon('fa6s.flag')
+fa6s_button = QtWidgets.QPushButton(fa6s_icon, 'Font Awesome 6! (solid)')
+fa6b_icon = qta.icon('fa6b.github')
+fa6b_button = QtWidgets.QPushButton(fa6b_icon, 'Font Awesome 6! (brands)')
+
+# or FontAwesome 5.x icons by name in various styles:
 fa5_icon = qta.icon('fa5.flag')
-fa5_button = QtWidgets.QPushButton(fa5_icon, 'Font Awesome! (regular)')
+fa5_button = QtWidgets.QPushButton(fa5_icon, 'Font Awesome 5! (regular)')
 fa5s_icon = qta.icon('fa5s.flag')
-fa5s_button = QtWidgets.QPushButton(fa5s_icon, 'Font Awesome! (solid)')
+fa5s_button = QtWidgets.QPushButton(fa5s_icon, 'Font Awesome 5! (solid)')
 fa5b_icon = qta.icon('fa5b.github')
-fa5b_button = QtWidgets.QPushButton(fa5b_icon, 'Font Awesome! (brands)')
+fa5b_button = QtWidgets.QPushButton(fa5b_icon, 'Font Awesome 5! (brands)')
 
 # or Elusive Icons:
 asl_icon = qta.icon('ei.asl')

UPDATE.md

@@ -7,7 +7,7 @@ To update _FontAwesome_ icons, one must:
 - check what is the latest released version here: https://github.com/FortAwesome/Font-Awesome/releases/
 - update font version in \_\_init__.py
 - remove outdated files in the fonts dir
-- run: `python setup.py update_fa5 --fa-version X.X.X`
+- run: `python setup.py update_fa6 --fa-version X.X.X`
 - update FA version number, icon counts and URLs inside:
   - README.md
   - qtawesome/docs/source/usage.rst

docs/source/usage.rst

@@ -10,6 +10,12 @@ The following prefixes are currently available to use:
 
 -  `FontAwesome`_:
 
+   - FA 6.7.2 features 2,060 free icons in different styles:
+
+      - ``fa6`` prefix has `163 icons in the "regular" style.`_
+      - ``fa6s`` prefix has `1402 icons in the "solid" style.`_
+      - ``fa6b`` prefix has `495 icons of various brands.`_
+
    -  FA 5.15.4 features 1,608 free icons in different styles:
 
       -  ``fa5`` prefix has `151 icons in the "regular" style.`_
@@ -31,9 +37,12 @@ The following prefixes are currently available to use:
 -  ``msc`` prefix holds Microsoft's `Codicons 0.0.35 with its 540 icons.`_
 
 .. _FontAwesome: https://fontawesome.com
-.. _151 icons in the "regular" style.: https://fontawesome.com/v5/search?o=r&m=free&s=regular
-.. _1001 icons in the "solid" style.: https://fontawesome.com/v5/search?o=r&m=free&s=solid
-.. _456 icons of various brands.: https://fontawesome.com/v5/search?o=r&m=free&f=brands
+.. _163 icons in the "regular" style.: https://fontawesome.com/v6/search?o=r&ic=free&s=regular
+.. _1402 icons in the "solid" style.: https://fontawesome.com/v6/search?o=r&ic=free&s=solid
+.. _495 icons of various brands.: https://fontawesome.com/v6/search?o=r&ic=free&ip=brands
+.. _151 icons in the "regular" style.: https://fontawesome.com/v5/search?o=r&ic=free&s=regular
+.. _1001 icons in the "solid" style.: https://fontawesome.com/v5/search?o=r&ic=free&s=solid
+.. _456 icons of various brands.: https://fontawesome.com/v5/search?ic=brands
 .. _Elusive Icons 2.0 with its 304 icons: http://elusiveicons.com/icons/
 .. _Material Design Icons: https://pictogrammers.com/library/mdi/
 .. _Material Design Icons 6.9.96 with its 6997 icons.: https://cdn.materialdesignicons.com/6.9.96/
@@ -53,15 +62,25 @@ Examples
 
 .. code:: python
 
-   # Get FontAwesome 5.x icons by name in various styles by name
+   # Get FontAwesome 6.x icons by name in various styles:
+   fa6_icon = qta.icon('fa6.flag')
+   fa6_button = QtWidgets.QPushButton(fa6_icon, 'Font Awesome 6! (regular)')
+
+   fa6s_icon = qta.icon('fa6s.flag')
+   fa6s_button = QtWidgets.QPushButton(fa6s_icon, 'Font Awesome 6! (solid)')
+
+   fa6b_icon = qta.icon('fa6b.github')
+   fa6b_button = QtWidgets.QPushButton(fa6b_icon, 'Font Awesome 6! (brands)')
+
+   # Get FontAwesome 5.x icons by name in various styles:
    fa5_icon = qta.icon('fa5.flag')
-   fa5_button = QtWidgets.QPushButton(fa5_icon, 'Font Awesome! (regular)')
+   fa5_button = QtWidgets.QPushButton(fa5_icon, 'Font Awesome 5! (regular)')
 
    fa5s_icon = qta.icon('fa5s.flag')
-   fa5s_button = QtWidgets.QPushButton(fa5s_icon, 'Font Awesome! (solid)')
+   fa5s_button = QtWidgets.QPushButton(fa5s_icon, 'Font Awesome 5! (solid)')
 
    fa5b_icon = qta.icon('fa5b.github')
-   fa5b_button = QtWidgets.QPushButton(fa5b_icon, 'Font Awesome! (brands)')
+   fa5b_button = QtWidgets.QPushButton(fa5b_icon, 'Font Awesome 5! (brands)')
 
    # Get Elusive icons by name
    asl_icon = qta.icon('ei.asl')

example.py

@@ -13,20 +13,31 @@
 class AwesomeExample(QtWidgets.QDialog):
     def __init__(self):
         super().__init__()
+        self.setWindowIcon(qta.icon("fa5s.icons"))
 
         # Label for supported fonts
         supported_fonts_label = QtWidgets.QLabel("Supported fonts (prefix)")
         supported_fonts_label.setAlignment(QtCore.Qt.AlignCenter)
 
-        # Get FontAwesome 5.x icons by name in various styles by name
+        # Get FontAwesome 6.x icons by name in various styles:
+        fa6_icon = qta.icon("fa6.flag")
+        fa6_button = QtWidgets.QPushButton(fa6_icon, "Font Awesome 6! (regular)")
+
+        fa6s_icon = qta.icon("fa6s.flag")
+        fa6s_button = QtWidgets.QPushButton(fa6s_icon, "Font Awesome 6! (solid)")
+
+        fa6b_icon = qta.icon("fa6b.github")
+        fa6b_button = QtWidgets.QPushButton(fa6b_icon, "Font Awesome 6! (brands)")
+
+        # Get FontAwesome 5.x icons by name in various styles:
         fa5_icon = qta.icon("fa5.flag")
-        fa5_button = QtWidgets.QPushButton(fa5_icon, "Font Awesome regular (fa5)")
+        fa5_button = QtWidgets.QPushButton(fa5_icon, "Font Awesome 5! (regular)")
 
         fa5s_icon = qta.icon("fa5s.flag")
-        fa5s_button = QtWidgets.QPushButton(fa5s_icon, "Font Awesome solid (fa5s)")
+        fa5s_button = QtWidgets.QPushButton(fa5s_icon, "Font Awesome 5! (solid)")
 
         fa5b_icon = qta.icon("fa5b.github")
-        fa5b_button = QtWidgets.QPushButton(fa5b_icon, "Font Awesome brands (fa5b)")
+        fa5b_button = QtWidgets.QPushButton(fa5b_icon, "Font Awesome 5! (brands)")
 
         # Get Elusive icons by name
         asl_icon = qta.icon("ei.asl")
@@ -168,6 +179,9 @@ def __init__(self):
         grid = QtWidgets.QGridLayout()
         fonts_widgets = [
             supported_fonts_label,
+            fa6_button,
+            fa6s_button,
+            fa6b_button,
             fa5_button,
             fa5s_button,
             fa5b_button,

qtawesome-screenshot.gif

@@ -50,6 +50,21 @@
         "fontawesome5-brands-webfont-5.15.4.ttf",
         "fontawesome5-brands-webfont-charmap-5.15.4.json",
     ),
+    (
+        "fa6",
+        "fontawesome6-regular-webfont-6.7.2.ttf",
+        "fontawesome6-regular-webfont-charmap-6.7.2.json",
+    ),
+    (
+        "fa6s",
+        "fontawesome6-solid-webfont-6.7.2.ttf",
+        "fontawesome6-solid-webfont-charmap-6.7.2.json",
+    ),
+    (
+        "fa6b",
+        "fontawesome6-brands-webfont-6.7.2.ttf",
+        "fontawesome6-brands-webfont-charmap-6.7.2.json",
+    ),
     ("ei", "elusiveicons-webfont-2.0.ttf", "elusiveicons-webfont-charmap-2.0.json"),
     (
         "mdi",
@@ -72,6 +87,9 @@
     "fontawesome5-regular-webfont-5.15.4.ttf": "dc47e4089f5bcb25f241bdeb2de0fb58",
     "fontawesome5-solid-webfont-5.15.4.ttf": "5de19800fc9ae73438c2e5c61d041b48",
     "fontawesome5-brands-webfont-5.15.4.ttf": "513aa607d398efaccc559916c3431403",
+    "fontawesome6-regular-webfont-6.7.2.ttf": "2b9e6cb53822f6a9b42f15229a36811a",
+    "fontawesome6-solid-webfont-6.7.2.ttf": "07312c769a05b2c17133da1a09db4ccf",
+    "fontawesome6-brands-webfont-6.7.2.ttf": "15d54d142da2f2d6f2e90ed1d55121af",
     "elusiveicons-webfont-2.0.ttf": "207966b04c032d5b873fd595a211582e",
     "materialdesignicons5-webfont-5.9.55.ttf": "b7d40e7ef80c1d4af6d94902af66e524",
     "materialdesignicons6-webfont-6.9.96.ttf": "ecaabfbb23fdac4ddbaf897b97257a92",
@@ -165,10 +183,12 @@ def icon(*names, **kwargs):
     The ``prefix`` corresponds to the font to be used and ``name`` is the
     name of the icon.
 
-     - The prefix corresponding to Font-Awesome 4.x is 'fa'
-     - The prefix corresponding to Font-Awesome 5.x (regular) is 'fa5'
-     - The prefix corresponding to Font-Awesome 5.x (solid) is 'fa5s'
-     - The prefix corresponding to Font-Awesome 5.x (brands) is 'fa5b'
+     - The prefix corresponding to Font-Awesome 6.x (regular) is 'fa6'
+     - The prefix corresponding to Font-Awesome 6.x (solid) is 'fa6s'
+     - The prefix corresponding to Font-Awesome 6.x (brands) is 'fa6b'
+     - The prefix corresponding to Font-Awesome 5 (regular) is 'fa5'
+     - The prefix corresponding to Font-Awesome 5 (solid) is 'fa5s'
+     - The prefix corresponding to Font-Awesome 5 (brands) is 'fa5b'
      - The prefix corresponding to Elusive-Icons is 'ei'
      - The prefix corresponding to Material-Design-Icons 5.x is 'mdi'
      - The prefix corresponding to Material-Design-Icons 6.x is 'mdi6'

qtawesome/__init__.py

@@ -0,0 +1,165 @@
+{
+    "address-book": "f2b9",
+    "address-card": "f2bb",
+    "bell": "f0f3",
+    "bell-slash": "f1f6",
+    "bookmark": "f02e",
+    "building": "f1ad",
+    "calendar": "f133",
+    "calendar-check": "f274",
+    "calendar-days": "f073",
+    "calendar-minus": "f272",
+    "calendar-plus": "f271",
+    "calendar-xmark": "f273",
+    "chart-bar": "f080",
+    "chess-bishop": "f43a",
+    "chess-king": "f43f",
+    "chess-knight": "f441",
+    "chess-pawn": "f443",
+    "chess-queen": "f445",
+    "chess-rook": "f447",
+    "circle": "f111",
+    "circle-check": "f058",
+    "circle-dot": "f192",
+    "circle-down": "f358",
+    "circle-left": "f359",
+    "circle-pause": "f28b",
+    "circle-play": "f144",
+    "circle-question": "f059",
+    "circle-right": "f35a",
+    "circle-stop": "f28d",
+    "circle-up": "f35b",
+    "circle-user": "f2bd",
+    "circle-xmark": "f057",
+    "clipboard": "f328",
+    "clock": "f017",
+    "clone": "f24d",
+    "closed-captioning": "f20a",
+    "comment": "f075",
+    "comment-dots": "f4ad",
+    "comments": "f086",
+    "compass": "f14e",
+    "copy": "f0c5",
+    "copyright": "f1f9",
+    "credit-card": "f09d",
+    "envelope": "f0e0",
+    "envelope-open": "f2b6",
+    "eye": "f06e",
+    "eye-slash": "f070",
+    "face-angry": "f556",
+    "face-dizzy": "f567",
+    "face-flushed": "f579",
+    "face-frown": "f119",
+    "face-frown-open": "f57a",
+    "face-grimace": "f57f",
+    "face-grin": "f580",
+    "face-grin-beam": "f582",
+    "face-grin-beam-sweat": "f583",
+    "face-grin-hearts": "f584",
+    "face-grin-squint": "f585",
+    "face-grin-squint-tears": "f586",
+    "face-grin-stars": "f587",
+    "face-grin-tears": "f588",
+    "face-grin-tongue": "f589",
+    "face-grin-tongue-squint": "f58a",
+    "face-grin-tongue-wink": "f58b",
+    "face-grin-wide": "f581",
+    "face-grin-wink": "f58c",
+    "face-kiss": "f596",
+    "face-kiss-beam": "f597",
+    "face-kiss-wink-heart": "f598",
+    "face-laugh": "f599",
+    "face-laugh-beam": "f59a",
+    "face-laugh-squint": "f59b",
+    "face-laugh-wink": "f59c",
+    "face-meh": "f11a",
+    "face-meh-blank": "f5a4",
+    "face-rolling-eyes": "f5a5",
+    "face-sad-cry": "f5b3",
+    "face-sad-tear": "f5b4",
+    "face-smile": "f118",
+    "face-smile-beam": "f5b8",
+    "face-smile-wink": "f4da",
+    "face-surprise": "f5c2",
+    "face-tired": "f5c8",
+    "file": "f15b",
+    "file-audio": "f1c7",
+    "file-code": "f1c9",
+    "file-excel": "f1c3",
+    "file-image": "f1c5",
+    "file-lines": "f15c",
+    "file-pdf": "f1c1",
+    "file-powerpoint": "f1c4",
+    "file-video": "f1c8",
+    "file-word": "f1c2",
+    "file-zipper": "f1c6",
+    "flag": "f024",
+    "floppy-disk": "f0c7",
+    "folder": "f07b",
+    "folder-closed": "e185",
+    "folder-open": "f07c",
+    "font-awesome": "f2b4",
+    "futbol": "f1e3",
+    "gem": "f3a5",
+    "hand": "f256",
+    "hand-back-fist": "f255",
+    "hand-lizard": "f258",
+    "hand-peace": "f25b",
+    "hand-point-down": "f0a7",
+    "hand-point-left": "f0a5",
+    "hand-point-right": "f0a4",
+    "hand-point-up": "f0a6",
+    "hand-pointer": "f25a",
+    "hand-scissors": "f257",
+    "hand-spock": "f259",
+    "handshake": "f2b5",
+    "hard-drive": "f0a0",
+    "heart": "f004",
+    "hospital": "f0f8",
+    "hourglass": "f254",
+    "hourglass-half": "f252",
+    "id-badge": "f2c1",
+    "id-card": "f2c2",
+    "image": "f03e",
+    "images": "f302",
+    "keyboard": "f11c",
+    "lemon": "f094",
+    "life-ring": "f1cd",
+    "lightbulb": "f0eb",
+    "map": "f279",
+    "message": "f27a",
+    "money-bill-1": "f3d1",
+    "moon": "f186",
+    "newspaper": "f1ea",
+    "note-sticky": "f249",
+    "object-group": "f247",
+    "object-ungroup": "f248",
+    "paper-plane": "f1d8",
+    "paste": "f0ea",
+    "pen-to-square": "f044",
+    "rectangle-list": "f022",
+    "rectangle-xmark": "f410",
+    "registered": "f25d",
+    "share-from-square": "f14d",
+    "snowflake": "f2dc",
+    "square": "f0c8",
+    "square-caret-down": "f150",
+    "square-caret-left": "f191",
+    "square-caret-right": "f152",
+    "square-caret-up": "f151",
+    "square-check": "f14a",
+    "square-full": "f45c",
+    "square-minus": "f146",
+    "square-plus": "f0fe",
+    "star": "f005",
+    "star-half": "f089",
+    "star-half-stroke": "f5c0",
+    "sun": "f185",
+    "thumbs-down": "f165",
+    "thumbs-up": "f164",
+    "trash-can": "f2ed",
+    "user": "f007",
+    "window-maximize": "f2d0",
+    "window-minimize": "f2d1",
+    "window-restore": "f2d2"
+}

qtawesome/fonts/fontawesome6-brands-webfont-6.7.2.ttf

@@ -47,7 +47,7 @@
         "Programming Language :: Python :: 3.10",
     ],
     cmdclass={
-        "update_fa5": setupbase.UpdateFA5Command,
+        "update_fa6": setupbase.UpdateFA6Command,
         "update_msc": setupbase.UpdateCodiconCommand,
     },
     entry_points={

qtawesome/fonts/fontawesome6-brands-webfont-charmap-6.7.2.json

@@ -16,7 +16,7 @@
 
 import setuptools
 
-LOG_INFO = 2
+LOG_INFO = 20
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 INIT_PY_PATH = os.path.join(HERE, "qtawesome", "__init__.py")
@@ -77,10 +77,10 @@ def rename_font(font_path, font_name):
         )
 
 
-class UpdateFA5Command(setuptools.Command):
-    """A custom command to make updating FontAwesome 5.x easy!"""
+class UpdateFA6Command(setuptools.Command):
+    """A custom command to make updating FontAwesome 6.x easy!"""
 
-    description = "Try to update the FontAwesome 5.x data in the project."
+    description = "Try to update the FontAwesome 6.x data in the project."
     user_options = [
         ("fa-version=", None, "FA version."),
         ("zip-path=", None, "Read from local zip file path."),
@@ -92,10 +92,10 @@ class UpdateFA5Command(setuptools.Command):
         HERE,
         "qtawesome",
         "fonts",
-        "fontawesome5-{style}-webfont-charmap-{version}.json",
+        "fontawesome6-{style}-webfont-charmap-{version}.json",
     )
     TTF_PATH_TEMPLATE = os.path.join(
-        HERE, "qtawesome", "fonts", "fontawesome5-{style}-webfont-{version}.ttf"
+        HERE, "qtawesome", "fonts", "fontawesome6-{style}-webfont-{version}.ttf"
     )
     URL_TEMPLATE = (
         "https://github.com/FortAwesome/Font-Awesome/"
@@ -207,7 +207,7 @@ def run(self):
 
             # Fix to prevent repeated font names:
             if style in ("regular", "solid"):
-                new_name = str("Font Awesome 5 Free %s") % style.title()
+                new_name = str("Font Awesome 6 Free %s") % style.title()
                 self.__print('Renaming font to "%s" in: %s' % (new_name, font_path))
                 if ttLib is not None:
                     rename_font(font_path, new_name)
@@ -221,7 +221,6 @@ def run(self):
                 with open(font_path, "rb") as f:
                     data = f.read()
                     files[style] = data
-
             # Store hashes for later:
             hashes[style] = hashlib.md5(data).hexdigest()
 
@@ -233,11 +232,11 @@ def run(self):
         # We read it in full, then use regex substitution:
         for style, md5 in hashes.items():
             self.__print('New "%s" hash is: %s' % (style, md5))
-            regex = r"('fontawesome5-%s-webfont-%s.ttf':\s+)'(\w+)'" % (
+            regex = r'("fontawesome6-%s-webfont-%s.ttf":\s+)"(\w+)"' % (
                 style,
                 self.fa_version,
             )
-            subst = r"\g<1>'" + md5 + "'"
+            subst = r'\g<1>"' + md5 + '"'
             contents = re.sub(regex, subst, contents, 1)
         # and finally overwrite with the modified file:
         self.__print("Dumping updated file: %s" % init_path)