Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS 26: set icons on most menu items (#7787)

Browse Source 
* macOS 26: set icons on most menu items

This is a first pass, and likely needs some adjustments and updated.

This also removes Select None, which does not seem to be in favor in Mac apps anymore.

* Explicitly set the image on toolbar items' menu representation

* Icons for Info > Files context menu
This commit is contained in:
Mitch Livingston
2025-11-09 17:28:28 -05:00
committed by GitHub
parent cd45c648a1
commit b99232777e
3 changed files with 185 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

323
macosx/Base.lproj/MainMenu.xib
View File

@@ -538,6 +538,7 @@
</connections>
</menuItem>
<menuItem title="Donate…" tag="5678" id="3212">
<imageReference key="image" image="heart" catalog="system" symbolScale="default" variableValue="1"/>
<connections>
<action selector="linkDonate:" target="206" id="3213"/>
</connections>
@@ -589,23 +590,23 @@
<menuItem title="File" id="83">
<menu key="submenu" title="File" id="81">
<items>
<menuItem title="Create Torrent File…" keyEquivalent="n" id="1921">
<menuItem title="Create Torrent File…" image="document.badge.plus" catalog="system" keyEquivalent="n" id="1921">
<connections>
<action selector="createFile:" target="206" id="1922"/>
</connections>
</menuItem>
<menuItem title="Open Torrent File…" keyEquivalent="o" id="72">
<menuItem title="Open Torrent File…" image="folder" catalog="system" keyEquivalent="o" id="72">
<connections>
<action selector="openShowSheet:" target="206" id="300"/>
</connections>
</menuItem>
<menuItem title="Open With Options Window…" tag="501" alternate="YES" keyEquivalent="o" id="1680">
<menuItem title="Open With Options Window…" image="folder.badge.gear" catalog="system" tag="501" alternate="YES" keyEquivalent="o" id="1680">
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
<connections>
<action selector="openShowSheet:" target="206" id="1681"/>
</connections>
</menuItem>
<menuItem title="Open Torrent Address…" keyEquivalent="u" id="1846">
<menuItem title="Open Torrent Address…" image="globe" catalog="system" keyEquivalent="u" id="1846">
<connections>
<action selector="openURLShowSheet:" target="206" id="1847"/>
</connections>
@@ -621,7 +622,7 @@
<menuItem isSeparatorItem="YES" id="79">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Quick Look" keyEquivalent="y" id="3166">
<menuItem title="Quick Look" image="eye" catalog="system" keyEquivalent="y" id="3166">
<connections>
<action selector="toggleQuickLook:" target="206" id="3168"/>
</connections>
@@ -629,12 +630,12 @@
<menuItem isSeparatorItem="YES" id="3167">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Move Data File To…" id="1891">
<menuItem title="Move Data File To…" image="arrow.forward.folder" catalog="system" id="1891">
<connections>
<action selector="moveDataFilesSelected:" target="206" id="3153"/>
</connections>
</menuItem>
<menuItem title="Rename File…" id="3448">
<menuItem title="Rename File…" image="pencil" catalog="system" id="3448">
<connections>
<action selector="renameSelected:" target="206" id="3449"/>
</connections>
@@ -642,12 +643,12 @@
<menuItem isSeparatorItem="YES" id="3215">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Save Torrent File As…" tag="4" keyEquivalent="s" id="1533">
<menuItem title="Save Torrent File As…" image="document.badge.plus" catalog="system" tag="4" keyEquivalent="s" id="1533">
<connections>
<action selector="copyTorrentFiles:" target="206" id="1893"/>
</connections>
</menuItem>
<menuItem title="Share Torrent File" id="s5v-VO-G2y">
<menuItem title="Share Torrent File" image="square.and.arrow.up" catalog="system" id="s5v-VO-G2y">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Share Torrent File" id="Cay-iU-bH4">
<connections>
@@ -655,7 +656,7 @@
</connections>
</menu>
</menuItem>
<menuItem title="Copy Magnet Link to Clipboard" id="3216">
<menuItem title="Copy Magnet Link to Clipboard" image="clipboard" catalog="system" id="3216">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="copyMagnetLinks:" target="206" id="3217"/>
@@ -703,29 +704,24 @@
<action selector="selectAll:" target="-1" id="179"/>
</connections>
</menuItem>
<menuItem title="Select None" keyEquivalent="A" id="1675">
<connections>
<action selector="deselectAll:" target="-1" id="1677"/>
</connections>
</menuItem>
</items>
</menu>
</menuItem>
<menuItem title="View" id="301">
<menu key="submenu" title="View" id="302">
<items>
<menuItem title="Compact View" keyEquivalent="t" id="1578">
<menuItem title="Compact View" image="arrow.down.forward.and.arrow.up.backward" catalog="system" keyEquivalent="t" id="1578">
<connections>
<action selector="toggleSmallView:" target="206" id="1579"/>
</connections>
</menuItem>
<menuItem title="Pieces Bar" keyEquivalent="t" id="2185">
<menuItem title="Pieces Bar" image="puzzlepiece" catalog="system" keyEquivalent="t" id="2185">
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
<connections>
<action selector="togglePiecesBar:" target="206" id="2186"/>
</connections>
</menuItem>
<menuItem title="Availability" id="2279">
<menuItem title="Availability" image="hand.thumbsdown.hand.thumbsup" catalog="system" id="2279">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="toggleAvailabilityBar:" target="206" id="2280"/>
@@ -734,12 +730,12 @@
<menuItem isSeparatorItem="YES" id="1282">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Use Groups" keyEquivalent="g" id="3078">
<menuItem title="Use Groups" image="pin" catalog="system" keyEquivalent="g" id="3078">
<connections>
<action selector="setSortByGroup:" target="206" id="3079"/>
</connections>
</menuItem>
<menuItem title="Sort Transfers By" id="1894">
<menuItem title="Sort Transfers By" image="arrow.up.arrow.down" catalog="system" id="1894">
<menu key="submenu" title="Sort Transfers By" id="1895">
<items>
<menuItem title="Queue Order" id="1901">
@@ -790,12 +786,12 @@
<menuItem isSeparatorItem="YES" id="2881">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Ascending" id="1899">
<menuItem title="Ascending" image="arrow.up" catalog="system" id="1899">
<connections>
<action selector="setSortReverse:" target="206" id="1908"/>
</connections>
</menuItem>
<menuItem title="Descending" tag="1" id="3405">
<menuItem title="Descending" image="arrow.down" catalog="system" tag="1" id="3405">
<connections>
<action selector="setSortReverse:" target="206" id="3406"/>
</connections>
@@ -806,7 +802,7 @@
<menuItem isSeparatorItem="YES" id="1591">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Show Inspector" keyEquivalent="i" id="1536">
<menuItem title="Show Inspector" image="info.circle" catalog="system" keyEquivalent="i" id="1536">
<connections>
<action selector="showInfo:" target="206" id="1538"/>
</connections>
@@ -843,7 +839,7 @@
<menuItem title="Transfers" id="1399">
<menu key="submenu" title="Transfers" id="1400">
<items>
<menuItem title="Speed Limit" keyEquivalent="l" id="1566">
<menuItem title="Speed Limit" image="tortoise" catalog="system" keyEquivalent="l" id="1566">
<connections>
<action selector="toggleSpeedLimit:" target="206" id="2144"/>
</connections>
@@ -851,12 +847,12 @@
<menuItem isSeparatorItem="YES" id="1567">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Pause Selected" keyEquivalent="." id="1403">
<menuItem title="Pause Selected" image="pause" catalog="system" keyEquivalent="." id="1403">
<connections>
<action selector="stopSelectedTorrents:" target="206" id="1581"/>
</connections>
</menuItem>
<menuItem title="Resume Selected" keyEquivalent="/" id="1404">
<menuItem title="Resume Selected" image="arrow.clockwise" catalog="system" keyEquivalent="/" id="1404">
<connections>
<action selector="resumeSelectedTorrents:" target="206" id="1582"/>
</connections>
@@ -864,7 +860,7 @@
<menuItem isSeparatorItem="YES" id="1412">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Remove From List" tag="2" id="1516">
<menuItem title="Remove From List" image="trash" catalog="system" tag="2" id="1516">
<string key="keyEquivalent" base64-UTF8="YES">
CA
</string>
@@ -872,7 +868,7 @@ CA
<action selector="removeNoDelete:" target="206" id="1546"/>
</connections>
</menuItem>
<menuItem title="Remove and Trash Data File" tag="4" id="1514">
<menuItem title="Remove and Trash Data File" image="document.on.trash" catalog="system" tag="4" id="1514">
<string key="keyEquivalent" base64-UTF8="YES">
CA
</string>
@@ -881,7 +877,7 @@ CA
<action selector="removeDeleteData:" target="206" id="1547"/>
</connections>
</menuItem>
<menuItem title="Remove All Completed From List" id="3407">
<menuItem title="Remove All Completed From List" image="trash.square" catalog="system" id="3407">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="clearCompleted:" target="206" id="3409"/>
@@ -890,7 +886,7 @@ CA
<menuItem isSeparatorItem="YES" id="1526">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Show in Finder" keyEquivalent="r" id="1539">
<menuItem title="Show in Finder" image="finder" catalog="system" keyEquivalent="r" id="1539">
<connections>
<action selector="revealFile:" target="-1" id="1543"/>
</connections>
@@ -898,13 +894,13 @@ CA
<menuItem isSeparatorItem="YES" id="1541">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Pause All" keyEquivalent="." id="1413">
<menuItem title="Pause All" image="pause.circle.fill" catalog="system" keyEquivalent="." id="1413">
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
<connections>
<action selector="stopAllTorrents:" target="206" id="1417"/>
</connections>
</menuItem>
<menuItem title="Resume All" keyEquivalent="/" id="1414">
<menuItem title="Resume All" image="arrow.clockwise.circle.fill" catalog="system" keyEquivalent="/" id="1414">
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
<connections>
<action selector="resumeAllTorrents:" target="206" id="1418"/>
@@ -913,12 +909,12 @@ CA
<menuItem isSeparatorItem="YES" id="1805">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Resume Selected Right Away" id="1678">
<menuItem title="Resume Selected Right Away" image="arrow.clockwise.circle" catalog="system" id="1678">
<connections>
<action selector="resumeSelectedTorrentsNoWait:" target="206" id="1806"/>
</connections>
</menuItem>
<menuItem title="Resume All Waiting" id="1804">
<menuItem title="Resume All Waiting" image="stopwatch" catalog="system" id="1804">
<connections>
<action selector="resumeWaitingTorrents:" target="206" id="1807"/>
</connections>
@@ -926,7 +922,7 @@ CA
<menuItem isSeparatorItem="YES" id="1861">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Group" id="2839">
<menuItem title="Group" image="pin" catalog="system" id="2839">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Group" id="2840">
<connections>
@@ -937,12 +933,12 @@ CA
<menuItem isSeparatorItem="YES" id="3408">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Update Tracker" id="1860">
<menuItem title="Update Tracker" image="megaphone" catalog="system" id="1860">
<connections>
<action selector="announceSelectedTorrents:" target="206" id="1862"/>
</connections>
</menuItem>
<menuItem title="Verify Local Data" id="1877">
<menuItem title="Verify Local Data" image="bandage" catalog="system" id="1877">
<connections>
<action selector="verifySelectedTorrents:" target="206" id="3147"/>
</connections>
@@ -994,17 +990,17 @@ CA
<menuItem isSeparatorItem="YES" id="1799">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Transmission" keyEquivalent="1" id="1696">
<menuItem title="Transmission" image="house" catalog="system" keyEquivalent="1" id="1696">
<connections>
<action selector="showMainWindow:" target="206" id="1702"/>
</connections>
</menuItem>
<menuItem title="Statistics" keyEquivalent="2" id="2301">
<menuItem title="Statistics" image="flask" catalog="system" keyEquivalent="2" id="2301">
<connections>
<action selector="showStatsWindow:" target="206" id="2302"/>
</connections>
</menuItem>
<menuItem title="Message Log" keyEquivalent="3" id="1795">
<menuItem title="Message Log" image="bubble" catalog="system" keyEquivalent="3" id="1795">
<connections>
<action selector="showMessageWindow:" target="206" id="1796"/>
</connections>
@@ -1031,17 +1027,17 @@ CA
<menuItem isSeparatorItem="YES" id="1559">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Transmission Homepage" id="1558">
<menuItem title="Transmission Homepage" image="globe" catalog="system" id="1558">
<connections>
<action selector="linkHomepage:" target="206" id="1560"/>
</connections>
</menuItem>
<menuItem title="Forums" id="418">
<menuItem title="Forums" image="bubble.left.and.text.bubble.right" catalog="system" id="418">
<connections>
<action selector="linkForums:" target="206" id="421"/>
</connections>
</menuItem>
<menuItem title="Support &amp; Development" id="3170">
<menuItem title="Support &amp; Development" image="keyboard" catalog="system" id="3170">
<connections>
<action selector="linkGitHub:" target="206" id="3171"/>
</connections>
@@ -1074,17 +1070,17 @@ CA
</customObject>
<menu title="Menu" id="456" userLabel="ContextRowMenu">
<items>
<menuItem title="Pause Selected" tag="1" id="457">
<menuItem title="Pause Selected" image="pause" catalog="system" tag="1" id="457">
<connections>
<action selector="stopSelectedTorrents:" target="206" id="1583"/>
</connections>
</menuItem>
<menuItem title="Resume Selected" tag="1" id="1028">
<menuItem title="Resume Selected" image="arrow.clockwise" catalog="system" tag="1" id="1028">
<connections>
<action selector="resumeSelectedTorrents:" target="206" id="1584"/>
</connections>
</menuItem>
<menuItem title="Resume Selected Right Away" tag="1" id="1808">
<menuItem title="Resume Selected Right Away" image="arrow.clockwise.circle" catalog="system" tag="1" id="1808">
<connections>
<action selector="resumeSelectedTorrentsNoWait:" target="206" id="1809"/>
</connections>
@@ -1092,12 +1088,12 @@ CA
<menuItem isSeparatorItem="YES" id="613">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Remove From List" tag="2" id="1550">
<menuItem title="Remove From List" image="trash" catalog="system" tag="2" id="1550">
<connections>
<action selector="removeNoDelete:" target="206" id="1554"/>
</connections>
</menuItem>
<menuItem title="Remove and Trash Data File" tag="4" id="1551">
<menuItem title="Remove and Trash Data File" image="document.on.trash" catalog="system" tag="4" id="1551">
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
<connections>
<action selector="removeDeleteData:" target="206" id="1555"/>
@@ -1106,7 +1102,7 @@ CA
<menuItem isSeparatorItem="YES" id="3172">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Show in Finder" id="516">
<menuItem title="Show in Finder" image="finder" catalog="system" id="516">
<connections>
<action selector="revealFile:" target="206" id="1467"/>
</connections>
@@ -1114,7 +1110,7 @@ CA
<menuItem isSeparatorItem="YES" id="1522">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Group" id="2849">
<menuItem title="Group" image="pin" catalog="system" id="2849">
<menu key="submenu" title="Group" id="2850">
<connections>
<outlet property="delegate" destination="206" id="2854"/>
@@ -1124,12 +1120,12 @@ CA
<menuItem isSeparatorItem="YES" id="3206">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Move Data File To…" id="3209">
<menuItem title="Move Data File To…" image="document.badge.arrow.up" catalog="system" id="3209">
<connections>
<action selector="moveDataFilesSelected:" target="206" id="3210"/>
</connections>
</menuItem>
<menuItem title="Rename File…" tag="4" id="3445">
<menuItem title="Rename File…" image="pencil" catalog="system" tag="4" id="3445">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="renameSelected:" target="206" id="3447"/>
@@ -1138,13 +1134,13 @@ CA
<menuItem isSeparatorItem="YES" id="3220">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Save Torrent File As…" tag="4" id="3207">
<menuItem title="Save Torrent File As…" image="document.badge.plus" catalog="system" tag="4" id="3207">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="copyTorrentFiles:" target="206" id="3208"/>
</connections>
</menuItem>
<menuItem title="Share Torrent File" id="8t6-wh-5UW">
<menuItem title="Share Torrent File" image="square.and.arrow.up" catalog="system" id="8t6-wh-5UW">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Share Torrent File" id="lvU-Va-GzM">
<connections>
@@ -1152,7 +1148,7 @@ CA
</connections>
</menu>
</menuItem>
<menuItem title="Copy Magnet Link to Clipboard" id="3218">
<menuItem title="Copy Magnet Link to Clipboard" image="clipboard" catalog="system" id="3218">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="copyMagnetLinks:" target="206" id="3219"/>
@@ -1161,12 +1157,12 @@ CA
<menuItem isSeparatorItem="YES" id="2848">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Update Tracker" id="2122">
<menuItem title="Update Tracker" image="megaphone" catalog="system" id="2122">
<connections>
<action selector="announceSelectedTorrents:" target="206" id="2124"/>
</connections>
</menuItem>
<menuItem title="Verify Local Data" id="3221">
<menuItem title="Verify Local Data" image="bandage" catalog="system" id="3221">
<connections>
<action selector="verifySelectedTorrents:" target="206" id="3222"/>
</connections>
@@ -1174,7 +1170,7 @@ CA
<menuItem isSeparatorItem="YES" id="3450">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Show Inspector" tag="6" id="459">
<menuItem title="Show Inspector" image="info.circle" catalog="system" tag="6" id="459">
<connections>
<action selector="showInfo:" target="206" id="477"/>
</connections>
@@ -1184,17 +1180,17 @@ CA
</menu>
<menu title="Menu" id="589" userLabel="ContextNoRowMenu">
<items>
<menuItem title="Create Torrent File…" id="1923">
<menuItem title="Create Torrent File…" image="document.badge.plus" catalog="system" id="1923">
<connections>
<action selector="createFile:" target="206" id="1924"/>
</connections>
</menuItem>
<menuItem title="Open Torrent File…" id="611">
<menuItem title="Open Torrent File…" image="folder" catalog="system" id="611">
<connections>
<action selector="openShowSheet:" target="206" id="612"/>
</connections>
</menuItem>
<menuItem title="Open Torrent Address…" id="1858">
<menuItem title="Open Torrent Address…" image="globe" catalog="system" id="1858">
<connections>
<action selector="openURLShowSheet:" target="206" id="1859"/>
</connections>
@@ -1202,7 +1198,7 @@ CA
<menuItem isSeparatorItem="YES" id="3077">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Show Inspector" tag="6" id="598">
<menuItem title="Show Inspector" image="info.circle" catalog="system" tag="6" id="598">
<connections>
<action selector="showInfo:" target="206" id="605"/>
</connections>
@@ -1224,14 +1220,38 @@ CA
<image name="RevealOff" width="14" height="14"/>
<image name="TortoiseTemplate" width="18" height="18"/>
<image name="UpArrowTemplate" width="8" height="12"/>
<image name="arrow.clockwise" catalog="system" width="14" height="16"/>
<image name="arrow.clockwise.circle" catalog="system" width="15" height="15"/>
<image name="arrow.clockwise.circle.fill" catalog="system" width="15" height="15"/>
<image name="arrow.down" catalog="system" width="13" height="14"/>
<image name="arrow.down.forward.and.arrow.up.backward" catalog="system" width="16" height="15"/>
<image name="arrow.forward.folder" catalog="system" width="18" height="14"/>
<image name="arrow.up" catalog="system" width="13" height="14"/>
<image name="arrow.up.arrow.down" catalog="system" width="18" height="15"/>
<image name="bandage" catalog="system" width="16" height="16"/>
<image name="bubble" catalog="system" width="17" height="16"/>
<image name="bubble.left.and.text.bubble.right" catalog="system" width="22" height="17"/>
<image name="clipboard" catalog="system" width="14" height="19"/>
<image name="document.badge.arrow.up" catalog="system" width="16" height="18"/>
<image name="document.badge.plus" catalog="system" width="16" height="18"/>
<image name="document.on.trash" catalog="system" width="17" height="20"/>
<image name="eye" catalog="system" width="21" height="13"/>
<image name="finder" catalog="system" width="16" height="15"/>
<image name="flask" catalog="system" width="16" height="16"/>
<image name="folder" catalog="system" width="18" height="14"/>
<image name="folder.badge.gear" catalog="system" width="20" height="15"/>
<image name="globe" catalog="system" width="15" height="15"/>
<image name="hand.thumbsdown.hand.thumbsup" catalog="system" width="22" height="19"/>
<image name="heart" catalog="system" width="16" height="14"/>
<image name="house" catalog="system" width="19" height="16"/>
<image name="imageCell:Uue-OE-Cnc:image" width="62" height="62">
<mutableData key="keyedArchiveRepresentation">
YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCkqMTQ3PUBVJG51bGzWDQ4PEBESExQVFhcYVk5T
U2l6ZV5OU1Jlc2l6aW5nTW9kZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVwc1dOU0NvbG9ygAIQAIAN
EiDAAACAA4ALWHs2MiwgNjJ90hsPHB5aTlMub2JqZWN0c6EdgASACtIbDyAjoiEigAWABoAJ0w8lJico
FF8QFE5TVElGRlJlcHJlc2VudGF0aW9uXxAZTlNJbnRlcm5hbExheW91dERpcmVjdGlvboAIgAdPEgAB
AHpNTQAqAADwSPLy8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly
S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwbHCEaJissMzY5P0JVJG51bGzXDQ4PEBESExQVFhcYGRpW
TlNTaXplViRjbGFzc1xOU0ltYWdlRmxhZ3NWTlNSZXBzW05TVGludENvbG9yV05TQ29sb3JeTlNSZXNp
emluZ01vZGWAAoANEiDAAACAA4AAgAsQAFh7NjIsIDYyfdIdDh4gWk5TLm9iamVjdHOhH4AEgArSHQ4i
JaIjJIAFgAaACdMOJygpKhpfEBROU1RJRkZSZXByZXNlbnRhdGlvbl8QGU5TSW50ZXJuYWxMYXlvdXRE
aXJlY3Rpb26ACIAHTxIAAQB6TU0AKgAA8Ejy8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly
8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly
8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly
8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly
@@ -2256,85 +2276,98 @@ AHpNTQAqAADwSPLy8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly
8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly
8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly
8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly
8v/y8vL/8vLy//Ly8v8AEgEAAAMAAAABAHwAAAEBAAMAAAABAHwAAAECAAMAAAAEAADxNgEDAAMAAAAB
AAEAAAEGAAMAAAABAAIAAAEKAAMAAAABAAEAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAAB
AAQAAAEWAAMAAAABAHwAAAEXAAQAAAABAADwQAEaAAUAAAABAADxJgEbAAUAAAABAADxLgEcAAMAAAAB
AAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMAAAAEAADxPodzAAcAAA80AADxRgAAAAAAAACQ
AAAAAQAAAJAAAAABAAgACAAIAAgAAQABAAEAAQAADzRhcHBsAhAAAG1udHJSR0IgWFlaIAffAAwABQAN
ABIACGFjc3BBUFBMAAAAAEFQUEwAAAAAAAAAAAAAAAAAAAAAAAD21gABAAAAANMtYXBwbAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEWRlc2MAAAFQAAAAYmRzY20AAAG0
AAAEGmNwcnQAAAXQAAAAI3d0cHQAAAX0AAAAFHJYWVoAAAYIAAAAFGdYWVoAAAYcAAAAFGJYWVoAAAYw
AAAAFHJUUkMAAAZEAAAIDGFhcmcAAA5QAAAAIHZjZ3QAAA5wAAAAMG5kaW4AAA6gAAAAPmNoYWQAAA7g
AAAALG1tb2QAAA8MAAAAKGJUUkMAAAZEAAAIDGdUUkMAAAZEAAAIDGFhYmcAAA5QAAAAIGFhZ2cAAA5Q
AAAAIGRlc2MAAAAAAAAACERpc3BsYXkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAACIAAAAM
aHJIUgAAABQAAAGoa29LUgAAAAwAAAG8bmJOTwAAABIAAAHIaWQAAAAAABIAAAHaaHVIVQAAABQAAAHs
Y3NDWgAAABYAAAIAZGFESwAAABwAAAIWdWtVQQAAABwAAAIyYXIAAAAAABQAAAJOaXRJVAAAABQAAAJi
cm9STwAAABIAAAJ2bmxOTAAAABYAAAKIaGVJTAAAABYAAAKeZXNFUwAAABIAAAJ2ZmlGSQAAABAAAAK0
emhUVwAAAAwAAALEdmlWTgAAAA4AAALQc2tTSwAAABYAAALeemhDTgAAAAwAAALEcnVSVQAAACQAAAL0
ZnJGUgAAABYAAAMYbXMAAAAAABIAAAMuY2FFUwAAABgAAANAdGhUSAAAAAwAAANYZXNYTAAAABIAAAJ2
ZGVERQAAABAAAANkZW5VUwAAABIAAAN0cHRCUgAAABgAAAOGcGxQTAAAABIAAAOeZWxHUgAAACIAAAOw
c3ZTRQAAABAAAAPSdHJUUgAAABQAAAPiamFKUAAAAA4AAAP2cHRQVAAAABYAAAQEAEwAQwBEACAAdQAg
AGIAbwBqAGnO7LfsACAATABDAEQARgBhAHIAZwBlAC0ATABDAEQATABDAEQAIABXAGEAcgBuAGEAUwB6
AO0AbgBlAHMAIABMAEMARABCAGEAcgBlAHYAbgD9ACAATABDAEQATABDAEQALQBmAGEAcgB2AGUAcwBr
AOYAcgBtBBoEPgQ7BEwEPgRABD4EMgQ4BDkAIABMAEMARCAPAEwAQwBEACAGRQZEBkgGRgYpAEwAQwBE
ACAAYwBvAGwAbwByAGkATABDAEQAIABjAG8AbABvAHIASwBsAGUAdQByAGUAbgAtAEwAQwBEIA8ATABD
AEQAIAXmBdEF4gXVBeAF2QBWAOQAcgBpAC0ATABDAERfaYJyACAATABDAEQATABDAEQAIABNAOAAdQBG
AGEAcgBlAGIAbgDpACAATABDAEQEJgQyBDUEQgQ9BD4EOQAgBBYEGgAtBDQEOARBBD8EOwQ1BDkATABD
AEQAIABjAG8AdQBsAGUAdQByAFcAYQByAG4AYQAgAEwAQwBEAEwAQwBEACAAZQBuACAAYwBvAGwAbwBy
AEwAQwBEACAOKg41AEYAYQByAGIALQBMAEMARABDAG8AbABvAHIAIABMAEMARABMAEMARAAgAEMAbwBs
AG8AcgBpAGQAbwBLAG8AbABvAHIAIABMAEMARAOIA7MDxwPBA8kDvAO3ACADvwO4A8wDvQO3ACAATABD
AEQARgDkAHIAZwAtAEwAQwBEAFIAZQBuAGsAbABpACAATABDAEQwqzDpMPwAIABMAEMARABMAEMARAAg
AGEAIABDAG8AcgBlAHMAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlIEluYy4sIDIwMTUAAFhZWiAAAAAA
AADzFgABAAAAARbKWFlaIAAAAAAAAHHAAAA5igAAAWdYWVogAAAAAAAAYSMAALnmAAAT9lhZWiAAAAAA
AAAj8gAADJAAAL3QY3VydgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAoAC0AMgA2ADsAQABFAEoATwBU
AFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKMAqACtALIAtwC8AMEAxgDLANAA1QDbAOAA5QDr
APAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFFAUwBUgFZAWABZwFuAXUBfAGDAYsBkgGaAaEBqQGx
AbkBwQHJAdEB2QHhAekB8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJnAnECegKEAo4CmAKiAqwCtgLB
AssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOuA7oDxwPTA+AD7AP5BAYEEwQg
BC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJBVgFZwV3BYYFlgWmBbUFxQXV
BeUF9gYGBhYGJwY3BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9B08HYQd0B4YHmQesB78H0gfl
B/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmPCaQJugnPCeUJ+woRCicKPQpU
CmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxDDFwMdQyODKcMwAzZDPMNDQ0m
DUANWg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9eD3oPlg+zD88P7BAJECYQQxBh
EH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLjEwMTIxNDE2MTgxOkE8UT5RQG
FCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbWFvoXHRdBF2UXiReuF9IX9xgb
GEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7G2MbihuyG9ocAhwqHFIcexyj
HMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAVIEEgbCCYIMQg8CEcIUghdSGh
Ic4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVoJZclxyX3JicmVyaHJrcm6CcY
J0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2K2krnSvRLAUsOSxuLKIs1y0M
LUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGCMbox8jIqMmMymzLUMw0zRjN/
M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDecN9c4FDhQOIw4yDkFOUI5fzm8Ofk6Njp0
OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+iP+JAI0BkQKZA50EpQWpBrEHu
QjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7R8BIBUhLSJFI10kdSWNJqUnw
SjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4lTm5Ot08AT0lPk0/dUCdQcVC7UQZRUFGbUeZSMVJ8
UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjLWRpZaVm4WgdaVlqmWvVbRVuV
W+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJYpxi8GNDY5dj62RAZJRk6WU9
ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpIap9q92tPa6dr/2xXbK9tCG1gbbluEm5rbsRvHm94
b9FwK3CGcOBxOnGVcfByS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4d1Z3s3gReG54zHkqeYl553pG
eqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIwgpKC9INXg7qEHYSAhOOFR4Wr
hg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/jmaOzo82j56QBpBukNaRP5Go
khGSepLjk02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/JpomtWbQpuvnByciZz3nWSd0p5A
nq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adup+CoUqjEqTepqaocqo+rAqt1
q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUTtYq2AbZ5tvC3aLfguFm40blK
ucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NYw9TEUcTOxUvFyMZGxsPHQce/
yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/0sHTRNPG1EnUy9VO1dHWVdbY
11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM4lPi2+Nj4+vkc+T85YTmDeaW
5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/8ozzGfOn9DT0wvVQ9d72bfb7
94r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t//9wYXJhAAAAAAADAAAAAmZmAADypwAADVkAABPQ
AAAKDnZjZ3QAAAAAAAAAAQABAAAAAAAAAAEAAAABAAAAAAAAAAEAAAABAAAAAAAAAAEAAG5kaW4AAAAA
AAAANgAAp0AAAFWAAABMwAAAnsAAACWAAAAMwAAAUAAAAFRAAAIzMwACMzMAAjMzAAAAAAAAAABzZjMy
AAAAAAABDHIAAAX4///zHQAAB7oAAP1y///7nf///aQAAAPZAADAcW1tb2QAAAAAAAAGEAAAoA4AAAAA
yc58GAAAAAAAAAAAAAAAAAAAAADSKywtLlokY2xhc3NuYW1lWCRjbGFzc2VzXxAQTlNCaXRtYXBJbWFn
ZVJlcKMtLzBaTlNJbWFnZVJlcFhOU09iamVjdNIrLDIzV05TQXJyYXmiMjDSKyw1Nl5OU011dGFibGVB
cnJheaM1MjDTODkPOjs8V05TV2hpdGVcTlNDb2xvclNwYWNlRDAgMAAQA4AM0issPj9XTlNDb2xvcqI+
MNIrLEFCV05TSW1hZ2WiQTAAAAAIAAAAEQAAABoAAAAkAAAAKQAAADIAAAA3AAAASQAAAEwAAABRAAAA
UwAAAGIAAABoAAAAdQAAAHwAAACLAAAAkgAAAJ8AAACmAAAArgAAALAAAACyAAAAtAAAALkAAAC7AAAA
vQAAAMYAAADLAAAA1gAAANgAAADaAAAA3AAAAOEAAADkAAAA5gAAAOgAAADqAAAA8QAAAQgAAAEkAAAB
JgAAASgAAQGoAAEBrQABAbgAAQHBAAEB1AABAdgAAQHjAAEB7AABAfEAAQH5AAEB/AABAgEAAQIQAAEC
FAABAhsAAQIjAAECMAABAjUAAQI3AAECOQABAj4AAQJGAAECSQABAk4AAQJWAAAAAAAABAEAAAAAAAAA
QwAAAAAAAAAAAAAAAAABAlk
8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/ABIBAAADAAAAAQB8AAABAQADAAAAAQB8AAABAgAD
AAAABAAA8TYBAwADAAAAAQABAAABBgADAAAAAQACAAABCgADAAAAAQABAAABEQAEAAAAAQAAAAgBEgAD
AAAAAQABAAABFQADAAAAAQAEAAABFgADAAAAAQB8AAABFwAEAAAAAQAA8EABGgAFAAAAAQAA8SYBGwAF
AAAAAQAA8S4BHAADAAAAAQABAAABKAADAAAAAQACAAABUgADAAAAAQABAAABUwADAAAABAAA8T6HcwAH
AAAPNAAA8UYAAAAAAAAAkAAAAAEAAACQAAAAAQAIAAgACAAIAAEAAQABAAEAAA80YXBwbAIQAABtbnRy
UkdCIFhZWiAH3wAMAAUADQASAAhhY3NwQVBQTAAAAABBUFBMAAAAAAAAAAAAAAAAAAAAAAAA9tYAAQAA
AADTLWFwcGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFkZXNj
AAABUAAAAGJkc2NtAAABtAAABBpjcHJ0AAAF0AAAACN3dHB0AAAF9AAAABRyWFlaAAAGCAAAABRnWFla
AAAGHAAAABRiWFlaAAAGMAAAABRyVFJDAAAGRAAACAxhYXJnAAAOUAAAACB2Y2d0AAAOcAAAADBuZGlu
AAAOoAAAAD5jaGFkAAAO4AAAACxtbW9kAAAPDAAAAChiVFJDAAAGRAAACAxnVFJDAAAGRAAACAxhYWJn
AAAOUAAAACBhYWdnAAAOUAAAACBkZXNjAAAAAAAAAAhEaXNwbGF5AAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
bWx1YwAAAAAAAAAiAAAADGhySFIAAAAUAAABqGtvS1IAAAAMAAABvG5iTk8AAAASAAAByGlkAAAAAAAS
AAAB2mh1SFUAAAAUAAAB7GNzQ1oAAAAWAAACAGRhREsAAAAcAAACFnVrVUEAAAAcAAACMmFyAAAAAAAU
AAACTml0SVQAAAAUAAACYnJvUk8AAAASAAACdm5sTkwAAAAWAAACiGhlSUwAAAAWAAACnmVzRVMAAAAS
AAACdmZpRkkAAAAQAAACtHpoVFcAAAAMAAACxHZpVk4AAAAOAAAC0HNrU0sAAAAWAAAC3npoQ04AAAAM
AAACxHJ1UlUAAAAkAAAC9GZyRlIAAAAWAAADGG1zAAAAAAASAAADLmNhRVMAAAAYAAADQHRoVEgAAAAM
AAADWGVzWEwAAAASAAACdmRlREUAAAAQAAADZGVuVVMAAAASAAADdHB0QlIAAAAYAAADhnBsUEwAAAAS
AAADnmVsR1IAAAAiAAADsHN2U0UAAAAQAAAD0nRyVFIAAAAUAAAD4mphSlAAAAAOAAAD9nB0UFQAAAAW
AAAEBABMAEMARAAgAHUAIABiAG8AagBpzuy37AAgAEwAQwBEAEYAYQByAGcAZQAtAEwAQwBEAEwAQwBE
ACAAVwBhAHIAbgBhAFMAegDtAG4AZQBzACAATABDAEQAQgBhAHIAZQB2AG4A/QAgAEwAQwBEAEwAQwBE
AC0AZgBhAHIAdgBlAHMAawDmAHIAbQQaBD4EOwRMBD4EQAQ+BDIEOAQ5ACAATABDAEQgDwBMAEMARAAg
BkUGRAZIBkYGKQBMAEMARAAgAGMAbwBsAG8AcgBpAEwAQwBEACAAYwBvAGwAbwByAEsAbABlAHUAcgBl
AG4ALQBMAEMARCAPAEwAQwBEACAF5gXRBeIF1QXgBdkAVgDkAHIAaQAtAEwAQwBEX2mCcgAgAEwAQwBE
AEwAQwBEACAATQDgAHUARgBhAHIAZQBiAG4A6QAgAEwAQwBEBCYEMgQ1BEIEPQQ+BDkAIAQWBBoALQQ0
BDgEQQQ/BDsENQQ5AEwAQwBEACAAYwBvAHUAbABlAHUAcgBXAGEAcgBuAGEAIABMAEMARABMAEMARAAg
AGUAbgAgAGMAbwBsAG8AcgBMAEMARAAgDioONQBGAGEAcgBiAC0ATABDAEQAQwBvAGwAbwByACAATABD
AEQATABDAEQAIABDAG8AbABvAHIAaQBkAG8ASwBvAGwAbwByACAATABDAEQDiAOzA8cDwQPJA7wDtwAg
A78DuAPMA70DtwAgAEwAQwBEAEYA5AByAGcALQBMAEMARABSAGUAbgBrAGwAaQAgAEwAQwBEMKsw6TD8
ACAATABDAEQATABDAEQAIABhACAAQwBvAHIAZQBzAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBJbmMu
LCAyMDE1AABYWVogAAAAAAAA8xYAAQAAAAEWylhZWiAAAAAAAABxwAAAOYoAAAFnWFlaIAAAAAAAAGEj
AAC55gAAE/ZYWVogAAAAAAAAI/IAAAyQAAC90GN1cnYAAAAAAAAEAAAAAAUACgAPABQAGQAeACMAKAAt
ADIANgA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3AHwAgQCGAIsAkACVAJoAnwCjAKgArQCyALcAvADB
AMYAywDQANUA2wDgAOUA6wDwAPYA+wEBAQcBDQETARkBHwElASsBMgE4AT4BRQFMAVIBWQFgAWcBbgF1
AXwBgwGLAZIBmgGhAakBsQG5AcEByQHRAdkB4QHpAfIB+gIDAgwCFAIdAiYCLwI4AkECSwJUAl0CZwJx
AnoChAKOApgCogKsArYCwQLLAtUC4ALrAvUDAAMLAxYDIQMtAzgDQwNPA1oDZgNyA34DigOWA6IDrgO6
A8cD0wPgA+wD+QQGBBMEIAQtBDsESARVBGMEcQR+BIwEmgSoBLYExATTBOEE8AT+BQ0FHAUrBToFSQVY
BWcFdwWGBZYFpgW1BcUF1QXlBfYGBgYWBicGNwZIBlkGagZ7BowGnQavBsAG0QbjBvUHBwcZBysHPQdP
B2EHdAeGB5kHrAe/B9IH5Qf4CAsIHwgyCEYIWghuCIIIlgiqCL4I0gjnCPsJEAklCToJTwlkCXkJjwmk
CboJzwnlCfsKEQonCj0KVApqCoEKmAquCsUK3ArzCwsLIgs5C1ELaQuAC5gLsAvIC+EL+QwSDCoMQwxc
DHUMjgynDMAM2QzzDQ0NJg1ADVoNdA2ODakNww3eDfgOEw4uDkkOZA5/DpsOtg7SDu4PCQ8lD0EPXg96
D5YPsw/PD+wQCRAmEEMQYRB+EJsQuRDXEPURExExEU8RbRGMEaoRyRHoEgcSJhJFEmQShBKjEsMS4xMD
EyMTQxNjE4MTpBPFE+UUBhQnFEkUahSLFK0UzhTwFRIVNBVWFXgVmxW9FeAWAxYmFkkWbBaPFrIW1hb6
Fx0XQRdlF4kXrhfSF/cYGxhAGGUYihivGNUY+hkgGUUZaxmRGbcZ3RoEGioaURp3Gp4axRrsGxQbOxtj
G4obshvaHAIcKhxSHHscoxzMHPUdHh1HHXAdmR3DHeweFh5AHmoelB6+HukfEx8+H2kflB+/H+ogFSBB
IGwgmCDEIPAhHCFIIXUhoSHOIfsiJyJVIoIiryLdIwojOCNmI5QjwiPwJB8kTSR8JKsk2iUJJTglaCWX
Jccl9yYnJlcmhya3JugnGCdJJ3onqyfcKA0oPyhxKKIo1CkGKTgpaymdKdAqAio1KmgqmyrPKwIrNitp
K50r0SwFLDksbiyiLNctDC1BLXYtqy3hLhYuTC6CLrcu7i8kL1ovkS/HL/4wNTBsMKQw2zESMUoxgjG6
MfIyKjJjMpsy1DMNM0YzfzO4M/E0KzRlNJ402DUTNU01hzXCNf02NzZyNq426TckN2A3nDfXOBQ4UDiM
OMg5BTlCOX85vDn5OjY6dDqyOu87LTtrO6o76DwnPGU8pDzjPSI9YT2hPeA+ID5gPqA+4D8hP2E/oj/i
QCNAZECmQOdBKUFqQaxB7kIwQnJCtUL3QzpDfUPARANER0SKRM5FEkVVRZpF3kYiRmdGq0bwRzVHe0fA
SAVIS0iRSNdJHUljSalJ8Eo3Sn1KxEsMS1NLmkviTCpMcky6TQJNSk2TTdxOJU5uTrdPAE9JT5NP3VAn
UHFQu1EGUVBRm1HmUjFSfFLHUxNTX1OqU/ZUQlSPVNtVKFV1VcJWD1ZcVqlW91dEV5JX4FgvWH1Yy1ka
WWlZuFoHWlZaplr1W0VblVvlXDVchlzWXSddeF3JXhpebF69Xw9fYV+zYAVgV2CqYPxhT2GiYfViSWKc
YvBjQ2OXY+tkQGSUZOllPWWSZedmPWaSZuhnPWeTZ+loP2iWaOxpQ2maafFqSGqfavdrT2una/9sV2yv
bQhtYG25bhJua27Ebx5veG/RcCtwhnDgcTpxlXHwcktypnMBc11zuHQUdHB0zHUodYV14XY+dpt2+HdW
d7N4EXhueMx5KnmJeed6RnqlewR7Y3vCfCF8gXzhfUF9oX4BfmJ+wn8jf4R/5YBHgKiBCoFrgc2CMIKS
gvSDV4O6hB2EgITjhUeFq4YOhnKG14c7h5+IBIhpiM6JM4mZif6KZIrKizCLlov8jGOMyo0xjZiN/45m
js6PNo+ekAaQbpDWkT+RqJIRknqS45NNk7aUIJSKlPSVX5XJljSWn5cKl3WX4JhMmLiZJJmQmfyaaJrV
m0Kbr5wcnImc951kndKeQJ6unx2fi5/6oGmg2KFHobaiJqKWowajdqPmpFakx6U4pammGqaLpv2nbqfg
qFKoxKk3qamqHKqPqwKrdavprFys0K1ErbiuLa6hrxavi7AAsHWw6rFgsdayS7LCszizrrQltJy1E7WK
tgG2ebbwt2i34LhZuNG5SrnCuju6tbsuu6e8IbybvRW9j74KvoS+/796v/XAcMDswWfB48JfwtvDWMPU
xFHEzsVLxcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB
00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp22vvbgNwF3IrdEN2W3hzeot8p36/gNuC94UThzOJT
4tvjY+Pr5HPk/OWE5g3mlucf56noMui86Ubp0Opb6uXrcOv77IbtEe2c7ijutO9A78zwWPDl8XLx//KM
8xnzp/Q09ML1UPXe9m32+/eK+Bn4qPk4+cf6V/rn+3f8B/yY/Sn9uv5L/tz/bf//cGFyYQAAAAAAAwAA
AAJmZgAA8qcAAA1ZAAAT0AAACg52Y2d0AAAAAAAAAAEAAQAAAAAAAAABAAAAAQAAAAAAAAABAAAAAQAA
AAAAAAABAABuZGluAAAAAAAAADYAAKdAAABVgAAATMAAAJ7AAAAlgAAADMAAAFAAAABUQAACMzMAAjMz
AAIzMwAAAAAAAAAAc2YzMgAAAAAAAQxyAAAF+P//8x0AAAe6AAD9cv//+53///2kAAAD2QAAwHFtbW9k
AAAAAAAABhAAAKAOAAAAAMnOfBgAAAAAAAAAAAAAAAAAAAAA0i0uLzBaJGNsYXNzbmFtZVgkY2xhc3Nl
c18QEE5TQml0bWFwSW1hZ2VSZXCjLzEyWk5TSW1hZ2VSZXBYTlNPYmplY3TSLS40NVdOU0FycmF5ojQy
0i0uNzheTlNNdXRhYmxlQXJyYXmjNzQy0zo7Djw9PldOU1doaXRlXE5TQ29sb3JTcGFjZUQwIDAAEAOA
DNItLkBBV05TQ29sb3KiQDLSLS5DRFdOU0ltYWdlokMyAAAACAAAABEAAAAaAAAAJAAAACkAAAAyAAAA
NwAAAEkAAABMAAAAUQAAAFMAAABiAAAAaAAAAHcAAAB+AAAAhQAAAJIAAACZAAAApQAAAK0AAAC8AAAA
vgAAAMAAAADFAAAAxwAAAMkAAADLAAAAzQAAANYAAADbAAAA5gAAAOgAAADqAAAA7AAAAPEAAAD0AAAA
9gAAAPgAAAD6AAABAQAAARgAAAE0AAABNgAAATgAAQG4AAEBvQABAcgAAQHRAAEB5AABAegAAQHzAAEB
/AABAgEAAQIJAAECDAABAhEAAQIgAAECJAABAisAAQIzAAECQAABAkUAAQJHAAECSQABAk4AAQJWAAEC
WQABAl4AAQJmAAAAAAAABAEAAAAAAAAARQAAAAAAAAAAAAAAAAABAmk
</mutableData>
</image>
<image name="info.circle" catalog="system" width="15" height="15"/>
<image name="keyboard" catalog="system" width="19" height="13"/>
<image name="megaphone" catalog="system" width="18" height="16"/>
<image name="pause" catalog="system" width="9" height="13"/>
<image name="pause.circle.fill" catalog="system" width="15" height="15"/>
<image name="pencil" catalog="system" width="14" height="13"/>
<image name="pin" catalog="system" width="15" height="17"/>
<image name="puzzlepiece" catalog="system" width="22" height="15"/>
<image name="square.and.arrow.up" catalog="system" width="15" height="18"/>
<image name="stopwatch" catalog="system" width="15" height="17"/>
<image name="tortoise" catalog="system" width="25" height="13"/>
<image name="trash" catalog="system" width="15" height="17"/>
<image name="trash.square" catalog="system" width="15" height="14"/>
</resources>
</document>

1
macosx/ButtonToolbarItem.mm
View File

@@ -14,6 +14,7 @@
- (NSMenuItem*)menuFormRepresentation
{
NSMenuItem* menuItem = [[NSMenuItem alloc] initWithTitle:self.label action:self.action keyEquivalent:@""];
menuItem.image = self.image;
menuItem.target = self.target;
menuItem.enabled = [self.target validateToolbarItem:self];

6
macosx/FileOutlineController.mm
View File

@@ -560,6 +560,7 @@ typedef NS_ENUM(NSUInteger, FilePriorityMenuTag) { //
NSMenuItem* item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Check Selected", "File Outline -> Menu")
action:@selector(setCheck:)
keyEquivalent:@""];
item.image = [NSImage imageWithSystemSymbolName:@"checkmark.circle" accessibilityDescription:nil];
item.target = self;
item.tag = FileCheckMenuTagCheck;
[menu addItem:item];
@@ -567,6 +568,7 @@ typedef NS_ENUM(NSUInteger, FilePriorityMenuTag) { //
item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Uncheck Selected", "File Outline -> Menu")
action:@selector(setCheck:)
keyEquivalent:@""];
item.image = [NSImage imageWithSystemSymbolName:@"circle" accessibilityDescription:nil];
item.target = self;
item.tag = FileCheckMenuTagUncheck;
[menu addItem:item];
@@ -575,6 +577,7 @@ typedef NS_ENUM(NSUInteger, FilePriorityMenuTag) { //
item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Only Check Selected", "File Outline -> Menu")
action:@selector(setOnlySelectedCheck:)
keyEquivalent:@""];
item.image = [NSImage imageWithSystemSymbolName:@"checkmark.circle.dotted" accessibilityDescription:nil];
item.target = self;
[menu addItem:item];
@@ -583,6 +586,7 @@ typedef NS_ENUM(NSUInteger, FilePriorityMenuTag) { //
//priority
item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Priority", "File Outline -> Menu") action:NULL keyEquivalent:@""];
NSMenu* priorityMenu = [[NSMenu alloc] initWithTitle:@""];
item.image = [NSImage imageWithSystemSymbolName:@"chevron.up.chevron.down" accessibilityDescription:nil];
item.submenu = priorityMenu;
[menu addItem:item];
@@ -616,6 +620,7 @@ typedef NS_ENUM(NSUInteger, FilePriorityMenuTag) { //
item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Show in Finder", "File Outline -> Menu")
action:@selector(revealFile:)
keyEquivalent:@""];
item.image = [NSImage imageWithSystemSymbolName:@"finder" accessibilityDescription:nil];
item.target = self;
[menu addItem:item];
@@ -625,6 +630,7 @@ typedef NS_ENUM(NSUInteger, FilePriorityMenuTag) { //
item = [[NSMenuItem alloc] initWithTitle:[NSLocalizedString(@"Rename File", "File Outline -> Menu") stringByAppendingEllipsis]
action:@selector(renameSelected:)
keyEquivalent:@""];
item.image = [NSImage imageWithSystemSymbolName:@"pencil" accessibilityDescription:nil];
item.target = self;
[menu addItem:item];