From 33d206ab225c138f3922d0725b33a1f957ad6146 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 19 Oct 2015 14:14:55 +0300 Subject: [PATCH] Changed UI layout --- .../idea/formatter/ImportSettingsPanel.kt | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt index 1533a94b4d9..cb3414c03bc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt +++ b/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt @@ -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())