Browse Source

Adjust settings for Windows

Enable dir chooser by default.
Also, treat menu as true if menuGroup is not null.
pull/28/head
Alexey Tsvetkov 4 years ago committed by Alexey Tsvetkov
parent
commit
d0859c665c
  1. 3
      examples/imageviewer/desktop/build.gradle.kts
  2. 3
      gradle-plugins/compose-desktop-application/src/main/kotlin/org/jetbrains/compose/desktop/application/dsl/PlatformSettings.kt

3
examples/imageviewer/desktop/build.gradle.kts

@ -36,6 +36,9 @@ compose.desktop {
} }
windows { windows {
iconFile.set(iconsRoot.resolve("icon-windows.ico")) 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"
} }
linux { linux {
iconFile.set(iconsRoot.resolve("icon-linux.png")) iconFile.set(iconsRoot.resolve("icon-linux.png"))

3
gradle-plugins/compose-desktop-application/src/main/kotlin/org/jetbrains/compose/desktop/application/dsl/PlatformSettings.kt

@ -45,10 +45,11 @@ open class LinuxPlatformSettings @Inject constructor(objects: ObjectFactory): Pl
open class WindowsPlatformSettings @Inject constructor(objects: ObjectFactory): PlatformSettings(objects) { open class WindowsPlatformSettings @Inject constructor(objects: ObjectFactory): PlatformSettings(objects) {
var console: Boolean = false var console: Boolean = false
var dirChooser: Boolean = false var dirChooser: Boolean = true
var perUserInstall: Boolean = false var perUserInstall: Boolean = false
var shortcut: Boolean = false var shortcut: Boolean = false
var menu: Boolean = false var menu: Boolean = false
get() = field || menuGroup != null
var menuGroup: String? = null var menuGroup: String? = null
var upgradeUuid: String? = null var upgradeUuid: String? = null
} }
Loading…
Cancel
Save