diff --git a/linux/ckb-next.autostart.desktop.in b/linux/ckb-next.autostart.desktop.in index 9acbb3f7..ad364ae4 100644 --- a/linux/ckb-next.autostart.desktop.in +++ b/linux/ckb-next.autostart.desktop.in @@ -11,5 +11,5 @@ Keywords=ckb;corsair;keyboard;rgb; Categories=Settings;System; TryExec=@CMAKE_INSTALL_PREFIX@/bin/ckb-next Exec=@CMAKE_INSTALL_PREFIX@/bin/ckb-next --background -Icon=ckb-next-logo +Icon=ckb-next StartupNotify=true diff --git a/linux/ckb-next.desktop.in b/linux/ckb-next.desktop.in index 928a6b8f..21a31b1b 100644 --- a/linux/ckb-next.desktop.in +++ b/linux/ckb-next.desktop.in @@ -11,5 +11,5 @@ Keywords=ckb;corsair;keyboard;rgb; Categories=Settings;System; TryExec=@CMAKE_INSTALL_PREFIX@/bin/ckb-next Exec=@CMAKE_INSTALL_PREFIX@/bin/ckb-next -Icon=ckb-next-logo +Icon=ckb-next StartupNotify=true diff --git a/macos/ckb-next-logo.icns b/macos/ckb-next.icns similarity index 100% rename from macos/ckb-next-logo.icns rename to macos/ckb-next.icns diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index f8151b59..e277225b 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -250,18 +250,18 @@ endif () if (MACOS) # Import macOS icon - if (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/ckb-next-logo.icns") - message(STATUS "Importing ckb-next-logo.icns") + if (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/ckb-next.icns") + message(STATUS "Importing ckb-next.icns") configure_file( - "${ckb-next_SOURCE_DIR}/macos/ckb-next-logo.icns" - "${CMAKE_CURRENT_BINARY_DIR}/ckb-next-logo.icns" + "${ckb-next_SOURCE_DIR}/macos/ckb-next.icns" + "${CMAKE_CURRENT_BINARY_DIR}/ckb-next.icns" COPYONLY) endif () # Configure plist set(MACOSX_BUNDLE_EXECUTABLE_NAME "ckb-next") set(MACOSX_BUNDLE_INFO_STRING "ckb-next - version ${ckb-next_VERSION}") - set(MACOSX_BUNDLE_ICON_FILE "ckb-next-logo.icns") + set(MACOSX_BUNDLE_ICON_FILE "ckb-next.icns") set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.ckb-next") set(MACOSX_BUNDLE_LONG_VERSION_STRING "${ckb-next_VERSION}") set(MACOSX_BUNDLE_BUNDLE_NAME "ckb-next_v${ckb-next_VERSION_MAJOR}.${ckb-next_VERSION_MINOR}.${ckb-next_VERSION_PATCH}") @@ -430,7 +430,7 @@ if (MACOS) # Install icon file install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/ckb-next-logo.icns" + FILES "${CMAKE_CURRENT_BINARY_DIR}/ckb-next.icns" DESTINATION "ckb-next.app/Contents/Resources" PERMISSIONS OWNER_READ OWNER_WRITE @@ -446,7 +446,7 @@ elseif (LINUX) WORLD_READ) install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/ckb-next-logo.png" + FILES "${CMAKE_CURRENT_BINARY_DIR}/ckb-next.png" DESTINATION "share/icons/hicolor/512x512/apps" PERMISSIONS OWNER_READ OWNER_WRITE diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 71ee4c17..a714c228 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -89,14 +89,14 @@ MainWindow::MainWindow(QWidget *parent) : app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE); app_indicator_set_menu(indicator, GTK_MENU(indicatorMenu)); - app_indicator_set_icon(indicator, "ckb-next-logo"); + app_indicator_set_icon(indicator, "ckb-next"); } else #endif { trayIconMenu = new QMenu(this); trayIconMenu->addAction(restoreAction); trayIconMenu->addAction(closeAction); - trayIcon = new QSystemTrayIcon(QIcon(":/img/ckb-next-logo.png"), this); + trayIcon = new QSystemTrayIcon(QIcon(":/img/ckb-next.png"), this); trayIcon->setContextMenu(trayIconMenu); connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(iconClicked(QSystemTrayIcon::ActivationReason))); } diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index fcada322..6acb0d80 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -27,7 +27,7 @@ - :/img/ckb-next-logo.png:/img/ckb-next-logo.png + :/img/ckb-next.png:/img/ckb-next.png true diff --git a/src/gui/resources/ckb-next-logo.png b/src/gui/resources/ckb-next.png similarity index 100% rename from src/gui/resources/ckb-next-logo.png rename to src/gui/resources/ckb-next.png