diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/ModuleDependenciesComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/ModuleDependenciesComponent.kt index 3110a65e823..355d86c2efa 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/ModuleDependenciesComponent.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/ModuleDependenciesComponent.kt @@ -84,7 +84,7 @@ private class AddModulesPopUp( private val onChosenCallBack: (Module) -> Unit ) : BaseListPopupStep(null, modules) { override fun getIconFor(value: Module?): Icon? = value?.icon - override fun getTextFor(value: Module): String = value.text + override fun getTextFor(value: Module): String = value.fullTextHtml override fun onChosen(selectedValue: Module?, finalChoice: Boolean): PopupStep<*>? { diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/ui.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/ui.kt index 45abb58aa6f..a343f5c1356 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/ui.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/ui.kt @@ -1,7 +1,6 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard.ui import com.intellij.icons.AllIcons -import com.intellij.ide.plugins.newui.TagComponent import com.intellij.openapi.actionSystem.ActionManager import com.intellij.openapi.actionSystem.ActionPlaces import com.intellij.openapi.actionSystem.DefaultActionGroup @@ -24,7 +23,10 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.DisplayableSettingItem import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.ModuleKind import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.UiConstants.GAP_BORDER_SIZE -import java.awt.* +import java.awt.BorderLayout +import java.awt.Cursor +import java.awt.Font +import java.awt.LayoutManager import java.awt.event.MouseAdapter import java.awt.event.MouseEvent import javax.swing.* @@ -176,4 +178,16 @@ fun runWithProgressBar(title: String, action: () -> T): T = object UiConstants { const val GAP_BORDER_SIZE = 5 -} \ No newline at end of file +} + + +val DisplayableSettingItem.fullTextHtml + get() = buildString { + append(text) + greyText?.let { grey -> + append(" ") + append("""""") + append(grey) + append("") + } + }.asHtml() diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/DisplayableSettingItem.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/DisplayableSettingItem.kt index 2e4cd6f10a9..fa9bd143574 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/DisplayableSettingItem.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/DisplayableSettingItem.kt @@ -5,6 +5,3 @@ interface DisplayableSettingItem { val greyText: String? get() = null } - -val DisplayableSettingItem.fullText - get() = text + greyText?.let { "($it)" }.orEmpty()