From 6982db7d02b45fe8a9e5c5a0548f6165f59c26a5 Mon Sep 17 00:00:00 2001 From: Pavel Semyonov Date: Wed, 19 Feb 2020 11:53:30 +0300 Subject: [PATCH] chore: improved UI texts for new project wizard --- .../wizard/NewProjectWizardModuleType.kt | 2 +- idea/resources/META-INF/extensions/ide.xml | 4 ++-- .../idea/configuration/ExperimentalFeatures.kt | 4 ++-- .../projectTemplates/ProjectTemplate.kt | 18 +++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleType.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleType.kt index 91e9055af03..a0ff253dc8b 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleType.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleType.kt @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.idea.KotlinIcons import javax.swing.Icon class NewProjectWizardModuleType : ModuleType(NewProjectWizardModuleBuilder.MODULE_BUILDER_ID) { - override fun getName(): String = "Experimental Project Generator" + override fun getName(): String = "Kotlin (Experimental Wizard)" override fun getDescription(): String = name override fun getNodeIcon(isOpened: Boolean): Icon = KotlinIcons.SMALL_LOGO override fun createModuleBuilder(): NewProjectWizardModuleBuilder = NewProjectWizardModuleBuilder() diff --git a/idea/resources/META-INF/extensions/ide.xml b/idea/resources/META-INF/extensions/ide.xml index a673325201d..7e614e321b4 100644 --- a/idea/resources/META-INF/extensions/ide.xml +++ b/idea/resources/META-INF/extensions/ide.xml @@ -133,11 +133,11 @@ restartRequired="false"/> diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt index 09414de39d4..bf8b0a0420a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ExperimentalFeatures.kt @@ -19,13 +19,13 @@ import javax.swing.JPanel object ExperimentalFeatures { val NewJ2k = ExperimentalFeature( - title = "New Java to Kotlin Converter", + title = "New Java to Kotlin converter", registryKey = "kotlin.experimental.new.j2k", enabledByDefault = true ) val NewWizard = ExperimentalFeature( - title = "New Experimental Project Wizard", + title = "New Kotlin project wizard", registryKey = "kotlin.experimental.project.wizard", enabledByDefault = false, shouldBeShown = { diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt index d0dfcf205eb..0d4ce99d448 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt @@ -98,7 +98,7 @@ private fun ModuleType.createDefaultTarget( ) = MultiplatformTargetModule(name, defaultTarget, createDefaultSourcesets()) object CustomSingleplatformProjectTemplate : ProjectTemplate() { - override val title = "Empty JVM Project" + override val title = "Empty Kotlin/JVM Project" override val htmlDescription = title override val suggestedProjectName = "myKotlinJvmProject" override val projectKind = ProjectKind.Singleplatform @@ -111,8 +111,8 @@ object CustomSingleplatformProjectTemplate : ProjectTemplate() { } object CustomMultiplatformProjectTemplate : ProjectTemplate() { - override val title = "Empty MultiPlatform Project" - override val htmlDescription = title + override val title = "Empty Kotlin Multiplatform Project" + override val htmlDescription = "Multiplatform Gradle project without predefined targets" override val suggestedProjectName = "myKotlinMultiplatformProject" override val projectKind = ProjectKind.Multiplatform @@ -125,7 +125,7 @@ object CustomMultiplatformProjectTemplate : ProjectTemplate() { } object JvmConsoleApplication : ProjectTemplate() { - override val title = "Kotlin Console JVM Application" + override val title = "Kotlin/JVM Console Application" override val htmlDescription = title override val suggestedProjectName = "myConsoleApplication" override val projectKind = ProjectKind.Singleplatform @@ -144,7 +144,7 @@ object JvmConsoleApplication : ProjectTemplate() { } object MultiplatformLibrary : ProjectTemplate() { - override val title = "Multiplatform Library" + override val title = "Kotlin Multiplatform Library" @Language("HTML") override val htmlDescription = """ Multiplatform Gradle project allowing reuse of the same Kotlin code between all three main platforms @@ -170,9 +170,9 @@ object MultiplatformLibrary : ProjectTemplate() { } object JvmServerJsClient : ProjectTemplate() { - override val title: String = "JS client and JVM server" + override val title: String = "Web Application with Kotlin/JS Client and Kotlin/JVM Server" override val htmlDescription: String = - "Multiplatform Gradle project allowing reuse of the same Kotlin code between JS Client and JVM Server" + "Multiplatform Gradle project with client module running on Kotlin/JS and server module on Kotlin/JVM" override val suggestedProjectName: String = "myFullStackApplication" override val projectKind: ProjectKind = ProjectKind.Multiplatform override val setsPluginSettings: List> = listOf( @@ -221,7 +221,7 @@ object AndroidApplication : ProjectTemplate() { } object NativeConsoleApplication : ProjectTemplate() { - override val title = "Native Console Application" + override val title = "Kotlin/Native Console Application" override val htmlDescription = title override val suggestedProjectName = "myNativeConsoleApp" override val projectKind = ProjectKind.Multiplatform @@ -247,7 +247,7 @@ object NativeConsoleApplication : ProjectTemplate() { object JsBrowserApplication : ProjectTemplate() { override val title = "Kotlin/JS Frontend Application" - override val htmlDescription = title + override val htmlDescription = "Gradle project for a Kotlin/JS frontend web application" override val suggestedProjectName = "myKotlinJsApplication" override val projectKind = ProjectKind.Multiplatform