azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-28910: Extract labels from scratch editor to KotlinBundle messages

Browse Source
This commit is contained in:
Roman Golyshev
2019-08-27 14:58:13 +03:00
committed by Roman Golyshev
parent 72b68ee683
commit f0f2fd5684
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties
+4
View File
@@ -256,4 +256,8 @@ scratch.run.button=Run Scratch File
scratch.run.from.here.button=Run Scratch From Here scratch.run.from.here.button=Run Scratch From Here
scratch.stop.button=Stop scratch execution scratch.stop.button=Stop scratch execution
scratch.clear.button=Clear results scratch.clear.button=Clear results
scratch.module.combobox=Use classpath of module
scratch.is.repl.checkbox=Use REPL
scratch.is.interactive.checkbox=Interactive mode
scratch.make.before.run.checkbox=Make module before Run
idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt
+2 -1
View File
@@ -16,13 +16,14 @@ import com.intellij.openapi.project.DumbAwareAction
import com.intellij.openapi.vcs.changes.committed.LabeledComboBoxAction import com.intellij.openapi.vcs.changes.committed.LabeledComboBoxAction
import com.intellij.util.ui.UIUtil import com.intellij.util.ui.UIUtil
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.idea.caches.project.productionSourceInfo import org.jetbrains.kotlin.idea.caches.project.productionSourceInfo
import org.jetbrains.kotlin.idea.caches.project.testSourceInfo import org.jetbrains.kotlin.idea.caches.project.testSourceInfo
import org.jetbrains.kotlin.idea.scratch.ScratchFile import org.jetbrains.kotlin.idea.scratch.ScratchFile
import org.jetbrains.kotlin.idea.scratch.isKotlinWorksheet import org.jetbrains.kotlin.idea.scratch.isKotlinWorksheet
import javax.swing.JComponent import javax.swing.JComponent
class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledComboBoxAction("Use classpath of module") { class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledComboBoxAction(KotlinBundle.message("scratch.module.combobox")) {
override fun createPopupActionGroup(button: JComponent): DefaultActionGroup { override fun createPopupActionGroup(button: JComponent): DefaultActionGroup {
val actionGroup = DefaultActionGroup() val actionGroup = DefaultActionGroup()
actionGroup.add(ModuleIsNotSelectedAction(ConfigurationModuleSelector.NO_MODULE_TEXT)) actionGroup.add(ModuleIsNotSelectedAction(ConfigurationModuleSelector.NO_MODULE_TEXT))
idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ModulesComboBoxAction.kt.183
+2 -1
View File
@@ -16,13 +16,14 @@ import com.intellij.openapi.project.DumbAwareAction
import com.intellij.openapi.vcs.changes.committed.LabeledComboBoxAction import com.intellij.openapi.vcs.changes.committed.LabeledComboBoxAction
import com.intellij.util.ui.UIUtil import com.intellij.util.ui.UIUtil
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.idea.caches.project.productionSourceInfo import org.jetbrains.kotlin.idea.caches.project.productionSourceInfo
import org.jetbrains.kotlin.idea.caches.project.testSourceInfo import org.jetbrains.kotlin.idea.caches.project.testSourceInfo
import org.jetbrains.kotlin.idea.scratch.ScratchFile import org.jetbrains.kotlin.idea.scratch.ScratchFile
import org.jetbrains.kotlin.idea.scratch.isKotlinWorksheet import org.jetbrains.kotlin.idea.scratch.isKotlinWorksheet
import javax.swing.JComponent import javax.swing.JComponent
class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledComboBoxAction("Use classpath of module") { class ModulesComboBoxAction(private val scratchFile: ScratchFile) : LabeledComboBoxAction(KotlinBundle.message("scratch.module.combobox")) {
override fun createPopupActionGroup(button: JComponent): DefaultActionGroup { override fun createPopupActionGroup(button: JComponent): DefaultActionGroup {
val actionGroup = DefaultActionGroup() val actionGroup = DefaultActionGroup()
actionGroup.add(ModuleIsNotSelectedAction(ConfigurationModuleSelector.NO_MODULE_TEXT)) actionGroup.add(ModuleIsNotSelectedAction(ConfigurationModuleSelector.NO_MODULE_TEXT))
idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchTopPanel.kt
+4 -7
View File
@@ -17,17 +17,14 @@
package org.jetbrains.kotlin.idea.scratch.ui package org.jetbrains.kotlin.idea.scratch.ui
import com.intellij.openapi.Disposable
import com.intellij.openapi.actionSystem.* import com.intellij.openapi.actionSystem.*
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.util.messages.Topic import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.idea.scratch.ScratchFile import org.jetbrains.kotlin.idea.scratch.ScratchFile
import org.jetbrains.kotlin.idea.scratch.actions.ClearScratchAction import org.jetbrains.kotlin.idea.scratch.actions.ClearScratchAction
import org.jetbrains.kotlin.idea.scratch.actions.RunScratchAction import org.jetbrains.kotlin.idea.scratch.actions.RunScratchAction
import org.jetbrains.kotlin.idea.scratch.actions.StopScratchAction import org.jetbrains.kotlin.idea.scratch.actions.StopScratchAction
import org.jetbrains.kotlin.idea.scratch.output.ScratchOutputHandlerAdapter import org.jetbrains.kotlin.idea.scratch.output.ScratchOutputHandlerAdapter
import javax.swing.JComponent
class ScratchTopPanel(val scratchFile: ScratchFile) { class ScratchTopPanel(val scratchFile: ScratchFile) {
private val moduleChooserAction: ModulesComboBoxAction = ModulesComboBoxAction(scratchFile) private val moduleChooserAction: ModulesComboBoxAction = ModulesComboBoxAction(scratchFile)
@@ -79,7 +76,7 @@ class ScratchTopPanel(val scratchFile: ScratchFile) {
} }
} }
private inner class IsMakeBeforeRunAction : SmallBorderCheckboxAction("Make module before Run") { private inner class IsMakeBeforeRunAction : SmallBorderCheckboxAction(KotlinBundle.message("scratch.make.before.run.checkbox")) {
override fun update(e: AnActionEvent) { override fun update(e: AnActionEvent) {
super.update(e) super.update(e)
e.presentation.isVisible = scratchFile.module != null e.presentation.isVisible = scratchFile.module != null
@@ -94,7 +91,7 @@ class ScratchTopPanel(val scratchFile: ScratchFile) {
} }
} }
private inner class IsInteractiveCheckboxAction : SmallBorderCheckboxAction("Interactive mode") { private inner class IsInteractiveCheckboxAction : SmallBorderCheckboxAction(KotlinBundle.message("scratch.is.interactive.checkbox")) {
override fun isSelected(e: AnActionEvent): Boolean { override fun isSelected(e: AnActionEvent): Boolean {
return scratchFile.options.isInteractiveMode return scratchFile.options.isInteractiveMode
} }
@@ -104,7 +101,7 @@ class ScratchTopPanel(val scratchFile: ScratchFile) {
} }
} }
private inner class IsReplCheckboxAction : SmallBorderCheckboxAction("Use REPL") { private inner class IsReplCheckboxAction : SmallBorderCheckboxAction(KotlinBundle.message("scratch.is.repl.checkbox")) {
override fun isSelected(e: AnActionEvent): Boolean { override fun isSelected(e: AnActionEvent): Boolean {
return scratchFile.options.isRepl return scratchFile.options.isRepl
} }