diff --git a/CMakeLists.txt b/CMakeLists.txt index 011812be68392223f24070a8df8ad7da613682c2..ca52dc16e35a33f66049fb69228e95a04ac50d92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,9 +50,7 @@ list(APPEND copyq_LIBRARIES Qt5::Widgets) set(copyq_APP_ID com.github.hluk.copyq) set(copyq_ICON_PREFIX src/images/icon) set(copyq_ICON_NORMAL src/images/icon.svg) -set(copyq_ICON_BUSY src/images/icon-busy.svg) set(copyq_ICON_MASK src/images/icon_mask.svg) -set(copyq_ICON_BUSY_MASK src/images/icon_mask-busy.svg) set(copyq_DESKTOP shared/${copyq_APP_ID}.desktop) set(copyq_APPDATA shared/${copyq_APP_ID}.appdata.xml) set(copyq_MANPAGE debian/copyq.1) @@ -154,9 +152,7 @@ set_source_files_properties( if (UNIX AND NOT APPLE) install(FILES ${copyq_ICON_NORMAL} DESTINATION ${ICON_INSTALL_PREFIX} RENAME ${ICON_NAME}.svg) - install(FILES ${copyq_ICON_BUSY} DESTINATION ${ICON_INSTALL_PREFIX} RENAME ${ICON_NAME}-busy.svg) install(FILES ${copyq_ICON_MASK} DESTINATION ${ICON_INSTALL_PREFIX} RENAME ${ICON_NAME}_mask.svg) - install(FILES ${copyq_ICON_BUSY_MASK} DESTINATION ${ICON_INSTALL_PREFIX} RENAME ${ICON_NAME}_mask-busy.svg) install(FILES ${copyq_APPDATA} DESTINATION ${APPDATA_INSTALL_PREFIX}) install(FILES ${copyq_MANPAGE} DESTINATION ${MANPAGE_INSTALL_PREFIX}) @@ -166,7 +162,7 @@ if (UNIX AND NOT APPLE) foreach (copyq_ICON_EXTENT 16 22 24 32 48 64 128) set(copyq_ICON_SIZE "${copyq_ICON_EXTENT}x${copyq_ICON_EXTENT}") string(REPLACE "%SIZE%" "${copyq_ICON_SIZE}" copyq_ICON_TARGET_PREFIX "${ICON_INSTALL_PREFIX_TEMPLATE}") - foreach (copyq_ICON_TYPE "" "-busy") + foreach (copyq_ICON_TYPE "") install(FILES "${copyq_ICON_PREFIX}${copyq_ICON_TYPE}_${copyq_ICON_SIZE}.png" DESTINATION "${copyq_ICON_TARGET_PREFIX}" RENAME "${ICON_NAME}${copyq_ICON_TYPE}.png") endforeach() endforeach() diff --git a/docs/sessions.rst b/docs/sessions.rst index a0fa13f9df565557b243f04fd4e708993ad0369f..d614adb9546409fe2a0be4fa529b50ee41fb2211 100644 --- a/docs/sessions.rst +++ b/docs/sessions.rst @@ -83,7 +83,7 @@ name and can be changed using ``COPYQ_SESSION_COLOR`` environment variable. COPYQ_SESSION_COLOR="#f90" copyq On Linux, changing icon color won't work if current icon theme contains icon -named "copyq-normal" or doesn't contain "copyq-mask" (and "copyq-busy-mask"). +named "copyq-normal" or doesn't contain "copyq-mask". Use ``COPYQ_DEFAULT_ICON`` environment variable to avoid using the application icon from icon theme. diff --git a/src/copyq.qrc b/src/copyq.qrc index effea8bd3b15e6a90cdb115084c5b226ae91b298..deb4ea3ee30a6d8dfcc49f001082887b543633f5 100644 --- a/src/copyq.qrc +++ b/src/copyq.qrc @@ -1,9 +1,7 @@ <RCC> <qresource prefix="/"> <file alias="images/icon">images/icon.svg</file> - <file alias="images/icon-busy">images/icon-busy.svg</file> <file alias="images/icon_mask">images/icon_mask.svg</file> - <file alias="images/icon_mask-busy">images/icon_mask-busy.svg</file> <file alias="images/tab_icon">images/tab_icon.svg</file> <file alias="images/tab_new">images/tab_new.svg</file> <file alias="images/tab_rename">images/tab_rename.svg</file> diff --git a/src/images/icon-busy.svg b/src/images/icon-busy.svg deleted file mode 100644 index 4909af2866b95ff9b961d55b8484ef55c31ff1b3..0000000000000000000000000000000000000000 --- a/src/images/icon-busy.svg +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - width="64" - height="64" - id="svg2" - inkscape:version="0.48.5 r10040" - sodipodi:docname="icon-busy.svg"> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1025" - id="namedview14" - showgrid="false" - inkscape:zoom="7.0588728" - inkscape:cx="29.075234" - inkscape:cy="19.523057" - inkscape:window-x="-3" - inkscape:window-y="-3" - inkscape:window-maximized="1" - inkscape:current-layer="svg2" /> - <defs - id="defs3" /> - <metadata - id="metadata6"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g - transform="matrix(4,0,0,4,-0.696558,-4144.3494)" - id="layer1"> - <path - d="m 7.4679632,4.2456918 a 3.2699957,3.2699957 0 1 1 -6.53999136,0 3.2699957,3.2699957 0 1 1 6.53999136,0 z" - transform="matrix(-0.6666505,0.16219374,0.16219374,0.6666505,12.972998,1036.6959)" - id="path3807" - style="fill:none;stroke:#000000;stroke-width:4.37255669;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - inkscape:connector-curvature="0" /> - <path - d="m 8.2437649,1043.1718 c -4.9165616,4.4563 -0.5481982,7.7198 -0.5481982,7.7198 0.5227795,-2.3146 2.0149239,-6.9464 2.0149239,-6.9464 0,0 -1.0729042,-0.5138 -1.4667257,-0.7734 z" - id="path3809" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - inkscape:connector-curvature="0" /> - <path - d="m 7.4679632,4.2456918 a 3.2699957,3.2699957 0 1 1 -6.53999136,0 3.2699957,3.2699957 0 1 1 6.53999136,0 z" - transform="matrix(0.66271924,0.17757508,-0.17757508,0.66271924,3.5731874,1036.6101)" - id="path3805" - style="fill:none;stroke:#000000;stroke-width:4.37255669;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - inkscape:connector-curvature="0" /> - <path - d="m 8.2437649,1043.1718 c -4.9165616,4.4563 -0.5481982,7.7198 -0.5481982,7.7198 0.5227795,-2.3146 2.0149239,-6.9464 2.0149239,-6.9464 0,0 -1.0729042,-0.5138 -1.4667257,-0.7734 z" - id="path3811" - style="fill:#e6e6e6;fill-opacity:1;stroke:none" - inkscape:connector-curvature="0" /> - <path - d="m 8.1514141,1043.1856 c 4.8121379,4.5689 0.3694325,7.7304 0.3694325,7.7304 -0.4690819,-2.3261 -1.8536603,-6.9911 -1.8536603,-6.9911 0,0 1.0845062,-0.4889 1.4842278,-0.7393 z" - id="path3024" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - inkscape:connector-curvature="0" /> - <path - d="m 7.4679632,4.2456918 a 3.2699957,3.2699957 0 1 1 -6.53999136,0 3.2699957,3.2699957 0 1 1 6.53999136,0 z" - transform="matrix(-0.6666505,0.16219374,0.16219374,0.6666505,12.972998,1036.6959)" - id="path3813" - style="fill:none;stroke:#7fca9b;stroke-width:2.67028236;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - inkscape:connector-curvature="0" /> - <path - d="m 8.1514141,1043.1856 c 4.8121379,4.5689 0.3694325,7.7304 0.3694325,7.7304 -0.4690819,-2.3261 -1.8536603,-6.9911 -1.8536603,-6.9911 0,0 1.0845062,-0.4889 1.4842278,-0.7393 z" - id="path3846" - style="fill:#e6e6e6;fill-opacity:1;stroke:none" - inkscape:connector-curvature="0" /> - <path - d="m 7.4679632,4.2456918 a 3.2699957,3.2699957 0 1 1 -6.53999136,0 3.2699957,3.2699957 0 1 1 6.53999136,0 z" - transform="matrix(0.66271924,0.17757508,-0.17757508,0.66271924,3.5731874,1036.6101)" - id="path3025" - style="fill:none;stroke:#7fca9b;stroke-width:2.67028236;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - inkscape:connector-curvature="0" /> - </g> -</svg> diff --git a/src/images/icon_mask-busy.svg b/src/images/icon_mask-busy.svg deleted file mode 100644 index 1e7dce11dc6c72cccc1c14d827832b1c5742afb2..0000000000000000000000000000000000000000 --- a/src/images/icon_mask-busy.svg +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - width="64" - height="64" - id="svg2" - inkscape:version="0.92.2 2405546, 2018-03-11" - sodipodi:docname="icon-busy-mask.svg"> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="3757" - inkscape:window-height="2099" - id="namedview14" - showgrid="false" - inkscape:zoom="7.0588728" - inkscape:cx="-11.157819" - inkscape:cy="19.523057" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="svg2" /> - <defs - id="defs3" /> - <metadata - id="metadata6"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <path - inkscape:connector-curvature="0" - style="fill:none;stroke:#000000;stroke-width:7.32829571;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98453611" - id="path3813" - d="M 34.035847,18.600798 A 8.9741427,8.9741427 0 1 0 51.475401,14.357815 8.9741427,8.9741427 0 1 0 34.035847,18.600798 Z" /> - <path - inkscape:connector-curvature="0" - style="fill:none;stroke:#000000;stroke-width:7.32829571;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98453611" - id="path3025" - d="M 30.377128,18.650303 A 8.974143,8.974143 0 1 1 13.040415,14.004945 8.974143,8.974143 0 1 1 30.377128,18.650303 Z" /> -</svg> diff --git a/utils/linux_make_icons.sh b/utils/linux_make_icons.sh index a4e721456a935dc84516f9ccbec02fdef576b46e..6e57360b28d34ddb83f4de32c231540aefc1bbab 100755 --- a/utils/linux_make_icons.sh +++ b/utils/linux_make_icons.sh @@ -17,4 +17,3 @@ make_icons() cd src/images make_icons icon.svg icon -make_icons icon-busy.svg icon-busy