From 2696ee75a09f20f0f49a62a69daf19a92eefc2e5 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 20 Mar 2020 14:23:22 +0300 Subject: [PATCH] Wizard: update project & module templates texts --- .../wizard/ui/firstStep/ProjectTemplateSettingComponent.kt | 6 ++++-- .../wizard/ui/secondStep/ModuleSettingsComponent.kt | 2 +- .../templates/ConsoleJvmApplicationTemplate.kt | 6 ++---- .../tools/projectWizard/templates/KtorServerTemplate.kt | 4 ++-- .../templates/NativeConsoleApplicationTemplate.kt | 4 ++-- .../tools/projectWizard/templates/SimpleJsClientTemplate.kt | 4 ++-- .../kotlin/tools/projectWizard/templates/Template.kt | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt index 192278625cf..f01b4c130c8 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.setting.SettingCompone import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.setting.ValidationIndicator import java.awt.Dimension import javax.swing.JComponent +import javax.swing.SwingConstants class ProjectTemplateSettingComponent( context: Context @@ -38,7 +39,7 @@ class ProjectTemplateSettingComponent( override val component: JComponent = borderPanel { addToCenter(borderPanel { addToCenter(list) }.addBorder(JBUI.Borders.empty(0,/*left*/ 3, 0, /*right*/ 3))) - addToBottom(templateDescriptionComponent.component.addBorder(JBUI.Borders.empty(/*top*/8,/*left*/ 3, /*bottom*/10, 0))) + addToBottom(templateDescriptionComponent.component.addBorder(JBUI.Borders.empty(/*top*/8,/*left*/ 3, 0, 0))) } private fun applySelectedTemplate() = modify { @@ -65,7 +66,8 @@ class ProjectTemplateSettingComponent( class TemplateDescriptionComponent : Component() { private val descriptionLabel = label("").apply { fontColor = UIUtil.FontColor.BRIGHTER - preferredSize = Dimension(preferredSize.width, 50) + preferredSize = Dimension(preferredSize.width, 55) + verticalAlignment = SwingConstants.TOP } fun setTemplate(template: ProjectTemplate) { diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/ModuleSettingsComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/ModuleSettingsComponent.kt index c414d99b95a..f200daadaf3 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/ModuleSettingsComponent.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/ModuleSettingsComponent.kt @@ -123,7 +123,7 @@ private class ModuleTemplateComponent( private object NoneTemplate : Template() { override val title = "None" - override val htmlDescription: String = "" + override val description: String = "" override val moduleTypes: Set = ModuleType.ALL override val id: String = "none" } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/ConsoleJvmApplicationTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/ConsoleJvmApplicationTemplate.kt index 8e3365dd376..b6c417696bb 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/ConsoleJvmApplicationTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/ConsoleJvmApplicationTemplate.kt @@ -13,10 +13,8 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.SourcesetTy class ConsoleJvmApplicationTemplate : Template() { override val id: String = "consoleJvmApp" - override val title: String = "Console JVM Module with main method" - override val htmlDescription: String = """ - Console JVM module with main method and run task generated - """.trimIndent() + override val title: String = "Console Application" + override val description: String = """Simple “Hello World!” Kotlin/JVM application that works in the console""" override val moduleTypes: Set = setOf(ModuleType.jvm) override fun Writer.getIrsToAddToBuildFile( diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt index c95ba9bac9d..8e63e721363 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt @@ -24,8 +24,8 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.InterceptionPoint class KtorServerTemplate : Template() { - override val title: String = "Ktor-based Server" - override val htmlDescription: String = title + override val title: String = "Ktor Server" + override val description: String = "Configurable Ktor web server for building web applications" override val moduleTypes: Set = setOf(ModuleType.jvm) override val id: String = "ktorServer" diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/NativeConsoleApplicationTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/NativeConsoleApplicationTemplate.kt index a1fb78e744e..99124f9fe75 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/NativeConsoleApplicationTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/NativeConsoleApplicationTemplate.kt @@ -17,8 +17,8 @@ import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleType import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.SourcesetType class NativeConsoleApplicationTemplate : Template() { - override val title: String = "Native Console Application" - override val htmlDescription: String = title + override val title: String = "Native Application" + override val description: String = "Simple Kotlin/Native application for your operating system" override val moduleTypes: Set = setOf(ModuleType.native) override val id: String = "nativeConsoleApp" diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt index d877b9f78e9..253708e3041 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt @@ -27,8 +27,8 @@ import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.Templa import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.interceptTemplate class SimpleJsClientTemplate : Template() { - override val title: String = "JS client" - override val htmlDescription: String = title + override val title: String = "Frontend Application" + override val description: String = "Configurable Kotlin/JS frontend application" override val moduleTypes: Set = setOf(ModuleType.js) override val id: String = "simpleJsClient" diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/Template.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/Template.kt index bcef1edde80..1e04d93f8a2 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/Template.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/Template.kt @@ -67,7 +67,7 @@ abstract class Template : SettingsOwner, EntitiesOwnerDescriptor, DisplayableSet } abstract val title: String - abstract val htmlDescription: String + abstract val description: String abstract val moduleTypes: Set override val text: String get() = title