[DESKTOP] Add initial desktop icons

kamgurgul · Jul 28, 2024 · 9fbca97 · 9fbca97
1 parent 7bbb492
commit 9fbca97
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
@@ -25,19 +25,18 @@ compose.desktop {
             packageName = "CPUInfo"
             packageVersion = "1.0.0"
 
-            /* val iconsRoot = project.file("desktop-icons")
+            val iconsRoot = project.file("desktop-icons")
              macOS {
                  iconFile.set(iconsRoot.resolve("icon-mac.icns"))
              }
              windows {
                  iconFile.set(iconsRoot.resolve("icon-windows.ico"))
-                 menuGroup = "Compose Examples"
-                 // see https://wixtoolset.org/documentation/manual/v3/howtos/general/generate_guids.html
-                 upgradeUuid = "18159995-d967-4CD2-8885-77BFA97CFA9F"
+                 menuGroup = "CPU Info"
+                 upgradeUuid = "d4a688eb-758f-44e8-81bb-8367880c5c95"
              }
              linux {
                  iconFile.set(iconsRoot.resolve("icon-linux.png"))
-             }*/
+             }
         }
     }
 }
diff --git a/desktopApp/desktop-icons/icon-linux.png b/desktopApp/desktop-icons/icon-linux.png
diff --git a/desktopApp/desktop-icons/icon-mac.icns b/desktopApp/desktop-icons/icon-mac.icns
diff --git a/desktopApp/desktop-icons/icon-windows.ico b/desktopApp/desktop-icons/icon-windows.ico
diff --git a/desktopApp/src/jvmMain/kotlin/com/kgurgul/cpuinfo/main.kt b/desktopApp/src/jvmMain/kotlin/com/kgurgul/cpuinfo/main.kt
@@ -3,13 +3,17 @@ package com.kgurgul.cpuinfo
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import com.kgurgul.cpuinfo.di.initKoin
+import com.kgurgul.cpuinfo.shared.Res
+import com.kgurgul.cpuinfo.shared.desktop_icon
+import org.jetbrains.compose.resources.painterResource
 
 fun main() {
     initKoin()
     return application {
         Window(
             onCloseRequest = ::exitApplication,
             title = "CPU Info",
+            icon = painterResource(Res.drawable.desktop_icon),
         ) {
             DesktopApp()
         }

diff --git a/shared/src/commonMain/composeResources/drawable/desktop-icon.png b/shared/src/commonMain/composeResources/drawable/desktop-icon.png