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

better place for J2K options

Browse Source 
#KT-10513 Fixed
This commit is contained in:
Dmitry Jemerov
2016-02-02 14:43:26 +01:00
parent 45298e0bad
commit db5191041f
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -601,7 +601,7 @@
<applicationService serviceInterface="org.jetbrains.kotlin.idea.editor.KotlinEditorOptions" <applicationService serviceInterface="org.jetbrains.kotlin.idea.editor.KotlinEditorOptions"
serviceImplementation="org.jetbrains.kotlin.idea.editor.KotlinEditorOptions"/> serviceImplementation="org.jetbrains.kotlin.idea.editor.KotlinEditorOptions"/>
<editorAppearanceConfigurable instance="org.jetbrains.kotlin.idea.editor.KotlinEditorOptionsConfigurable"/> <editorSmartKeysConfigurable instance="org.jetbrains.kotlin.idea.editor.KotlinEditorOptionsConfigurable"/>
<statementUpDownMover id="jetExpression" <statementUpDownMover id="jetExpression"
implementation="org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover" implementation="org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover"
idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java
+12 -2
View File
@@ -18,11 +18,21 @@ package org.jetbrains.kotlin.idea.editor;
import com.intellij.openapi.options.BeanConfigurable; import com.intellij.openapi.options.BeanConfigurable;
import com.intellij.openapi.options.UnnamedConfigurable; import com.intellij.openapi.options.UnnamedConfigurable;
import com.intellij.ui.IdeBorderFactory;
import javax.swing.*;
public class KotlinEditorOptionsConfigurable extends BeanConfigurable<KotlinEditorOptions> implements UnnamedConfigurable { public class KotlinEditorOptionsConfigurable extends BeanConfigurable<KotlinEditorOptions> implements UnnamedConfigurable {
public KotlinEditorOptionsConfigurable() { public KotlinEditorOptionsConfigurable() {
super(KotlinEditorOptions.getInstance()); super(KotlinEditorOptions.getInstance());
checkBox("enableJavaToKotlinConversion", "Enable Java To Kotlin Conversion"); checkBox("enableJavaToKotlinConversion", "Convert pasted Java code to Kotlin");
checkBox("donTShowConversionDialog", "Don't show Java to Kotlin conversion dialog"); checkBox("donTShowConversionDialog", "Don't show Java to Kotlin conversion dialog on paste");
}
@Override
public JComponent createComponent() {
JComponent component = super.createComponent();
component.setBorder(IdeBorderFactory.createTitledBorder("Kotlin"));
return component;
} }
} }