Remove busy icon

Signed-off-by: Lukas Holecek <[email protected]>
sv158 · May 17, 2020 · aae6e05 · aae6e05
1 parent cb813f1
commit aae6e05
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 171 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/src/images/icon_mask-busy.svg b/src/images/icon_mask-busy.svg
diff --git 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,3 @@ make_icons()

		cd src/images
		make_icons icon.svg icon
		make_icons icon-busy.svg icon-busy