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

Changed UI layout

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-19 14:14:55 +03:00
parent 872af51c99
commit 33d206ab22
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt
+12 -16
View File
@@ -70,8 +70,8 @@ class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPane
}
private val starImportPackageTable = ImportLayoutPanel.createTableForPackageEntries(starImportPackageEntryTable, dummyImportLayoutPanel)
private val nameCountToUseStarImportSelector = NameCountToUseStarImportSelector("Top-level symbols:")
private val nameCountToUseStarImportForMembersSelector = NameCountToUseStarImportSelector("Java statics and enum members:")
private val nameCountToUseStarImportSelector = NameCountToUseStarImportSelector("Top-level Symbols")
private val nameCountToUseStarImportForMembersSelector = NameCountToUseStarImportSelector("Java Statics and Enum Members")
init {
setLayout(BorderLayout())
@@ -79,27 +79,24 @@ class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPane
val constraints = GridBagConstraints().apply {
weightx = 1.0
insets = Insets(0, 10, 10, 10)
}
add(createGeneralOptionsPanel(), constraints.apply {
fill = GridBagConstraints.HORIZONTAL
gridy = 0
})
}
add(nameCountToUseStarImportSelector.createPanel(), constraints.apply { gridy++ })
add(nameCountToUseStarImportForMembersSelector.createPanel(), constraints.apply { gridy++ })
add(OptionGroup("Other").apply { add(cbImportNestedClasses) }.createPanel(), constraints.apply { gridy++ })
add(PackagePanel.createPackagesPanel(starImportPackageTable, starImportPackageEntryTable), constraints.apply {
gridy = 1
gridy++
fill = GridBagConstraints.BOTH
weighty = 1.0
})
}), BorderLayout.CENTER)
}
private fun createGeneralOptionsPanel(): JPanel {
return OptionGroup(ApplicationBundle.message("title.general")).apply {
add(nameCountToUseStarImportSelector.createPanel(), nameCountToUseStarImportForMembersSelector.createPanel())
add(cbImportNestedClasses)
}.createPanel()
}
fun reset(settings: JetCodeStyleSettings) {
nameCountToUseStarImportSelector.value = settings.NAME_COUNT_TO_USE_STAR_IMPORT
nameCountToUseStarImportForMembersSelector.value = settings.NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS
@@ -132,7 +129,7 @@ class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPane
return root.getChildren().isNotEmpty()
}
private class NameCountToUseStarImportSelector(label: String) : OptionGroup() {
private class NameCountToUseStarImportSelector(title: String) : OptionGroup(title) {
private val rbUseSingleImports = JRadioButton("Use single name import")
private val rbUseStarImports = JRadioButton("Use import with '*'")
private val rbUseStarImportsIfAtLeast = JRadioButton("Use import with '*' when at least ")
@@ -146,7 +143,6 @@ class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPane
add(rbUseStarImportsIfAtLeast)
}
add(JLabel(label))
add(rbUseSingleImports, true)
add(rbUseStarImports, true)
val jPanel: JPanel = JPanel(GridBagLayout())