Merge c77967292d into 821a6816ef

CMakeLists.txt

@@ -234,6 +234,8 @@ endif()
 
 set(CMAKE_FOLDER "${TR_THIRD_PARTY_DIR_NAME}")
 
+set(SOURCE_ICONS_DIR "${PROJECT_SOURCE_DIR}/icons")
+
 find_package(FastFloat)
 find_package(Fmt)
 find_package(RapidJSON)

dist/msi/CMakeLists.txt

@@ -58,7 +58,7 @@ else()
 endif()
 
 file(
-    COPY "${PROJECT_SOURCE_DIR}/qt/icons/transmission.ico"
+    COPY "${SOURCE_ICONS_DIR}/transmission.ico"
     DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 set(WEBSRCDIR "${CMAKE_INSTALL_PREFIX}/share/transmission/public_html")

gtk/CMakeLists.txt

@@ -226,7 +226,7 @@ foreach(ICON ${PUBLIC_ICONS})
     string(REGEX REPLACE ${ICON_NAME_REGEX} "\\1/\\3/\\2" ICON_DIR ${ICON})
     string(REGEX REPLACE ${ICON_NAME_REGEX} "\\4" ICON_NAME ${ICON})
     install(
-        FILES icons/${ICON}
+        FILES ${SOURCE_ICONS_DIR}/${ICON}
         DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/${ICON_DIR}/
         RENAME ${ICON_NAME})
 endforeach()

gtk/icons/SOURCES.md

@@ -1,12 +0,0 @@
-# Icon Sources
-
-| Name | Source | Author | License |
-|---|---|---|---|
-| lock.svg | [fxemoji](https://github.com/mozilla/fxemoji/blob/gh-pages/svgs/objects/u1F512-lock.svg) | Mozilla Foundation | [SPDX: CC-BY-4.0](https://spdx.org/licenses/CC-BY-4.0.html) |
-| ratio.svg | [forum.transmissionbt](https://forum.transmissionbt.com/viewtopic.php?p=42307#p42307) | [Jakub Steiner](https://jimmac.eu/) | [SPDX: CC-BY-SA-2.5](https://spdx.org/licenses/CC-BY-SA-2.5.html) |
-| turtle-silhouette.svg | [fxemoji](https://github.com/mozilla/fxemoji/blob/gh-pages/svgs/nature/u1F422-turtle.svg) (derived from) | Mozilla Foundation | [SPDX: CC-BY-4.0](https://spdx.org/licenses/CC-BY-4.0.html) |
-| turtle.svg | [fxemoji](https://github.com/mozilla/fxemoji/blob/gh-pages/svgs/nature/u1F422-turtle.svg) (derived from) | Mozilla Foundation | [SPDX: CC-BY-4.0](https://spdx.org/licenses/CC-BY-4.0.html) |
-
-# Notes
-
-transmission.ico created with https://www.npmjs.com/package/svg-to-ico

gtk/icons/turtle-symbolic.svg

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-<g transform="scale(-0.444, 0.444) translate(-36, -6)">
-<path fill="#474747" d="M9.842 19.922c0 9.842 6.575 9.673 5.158 10.078-7 2-8.803-7.618-9.464-7.618-2.378 0-5.536-.423-5.536-2.46C0 17.883 2.46 15 6.151 15c2.379 0 3.691 2.883 3.691 4.922zM36 28.638c0 1.104-3.518-.741-5 0-2 1-2-.896-2-2s1.343-1 3-1 4 1.895 4 3z"/>
-<path fill="#474747" d="M16.715 33.143c0 2.761-1.279 2.857-2.857 2.857S11 35.903 11 33.143c0-.489.085-1.029.234-1.587.69-2.59 2.754-5.556 4.052-5.556 1.578 0 1.429 4.382 1.429 7.143zm8.571 0c0 2.761 1.278 2.857 2.856 2.857C29.721 36 31 35.903 31 33.143c0-.489-.085-1.029-.234-1.587-.691-2.59-2.754-5.556-4.052-5.556-1.578 0-1.428 4.382-1.428 7.143z"/>
-<path fill="#474747" d="M32 27c0 4-5.149 4-11.5 4S9 31 9 27c0-6.627 5.149-12 11.5-12S32 20.373 32 27z"/>
-<path fill="#474747" d="M23.667 25.1c0 3.591-1.418 3.9-3.167 3.9s-3.167-.31-3.167-3.9S18.75 17 20.5 17s3.167 4.51 3.167 8.1zM30 24c.871 3.482-.784 4-2.533 4-1.749 0-2.533.69-2.533-2.9s-1.116-6.5.633-6.5C27.315 18.6 29 20 30 24zm-13.933 1.1c0 3.591-.785 2.9-2.534 2.9s-3.404-.518-2.533-4c1-4 3.251-5.4 5-5.4 1.75 0 .067 2.91.067 6.5z"/>
-</g>
-</svg>

gtk/transmission.gresource.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/com/transmissionbt/transmission">
-    <file alias="icons/scalable/actions/lock.svg">icons/lock.svg</file>
-    <file alias="icons/scalable/actions/options-symbolic.svg">icons/options-symbolic.svg</file>
-    <file alias="icons/scalable/actions/ratio-symbolic.svg">icons/ratio-symbolic.svg</file>
-    <file alias="icons/scalable/actions/turtle-symbolic.svg">icons/turtle-symbolic.svg</file>
-    <file alias="icons/scalable/apps/transmission.svg" compressed="true" preprocess="xml-stripblanks">icons/hicolor_apps_scalable_transmission.svg</file>
+    <file alias="icons/scalable/actions/lock.svg">../icons/lock.svg</file>
+    <file alias="icons/scalable/actions/options-symbolic.svg">../icons/options-symbolic.svg</file>
+    <file alias="icons/scalable/actions/ratio-symbolic.svg">../icons/ratio-symbolic.svg</file>
+    <file alias="icons/scalable/actions/turtle-symbolic.svg">../icons/turtle-silhouette.svg</file>
+    <file alias="icons/scalable/apps/transmission.svg" compressed="true" preprocess="xml-stripblanks">../icons/hicolor_apps_scalable_transmission.svg</file>
     <file compressed="true">transmission-ui.css</file>
     <file compressed="true" preprocess="xml-stripblanks">transmission-ui.xml</file>
   </gresource>

gtk/transmission.rc

@@ -1 +1 @@
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "./icons/transmission.ico"
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/transmission.ico"