From f08438c53cd681bbeb979b9a3d7d9c2b92b7163f Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 13 May 2015 11:58:29 +0300 Subject: [PATCH] Move: Fix dialog layout (member selection panel should take as much space as possible) #KT-7696 In Progress --- .../MoveKotlinTopLevelDeclarationsDialog.form | 192 ++++++++++-------- .../MoveKotlinTopLevelDeclarationsDialog.java | 17 +- 2 files changed, 106 insertions(+), 103 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.form b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.form index 12aa6c7ce98..84bbf6f1dbd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.form +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.form @@ -1,7 +1,6 @@
- - + @@ -10,100 +9,113 @@ - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java index ee740ad7ef5..76e7b57526f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java @@ -92,12 +92,11 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { } private JCheckBox cbSearchInComments; - private JCheckBox cbSearchTextOccurences; + private JCheckBox cbSearchTextOccurrences; private JPanel mainPanel; private ReferenceEditorComboWithBrowseButton classPackageChooser; private ComboboxWithBrowseButton destinationFolderCB; private JPanel targetPanel; - private JLabel targetDestinationLabel; private JRadioButton rbMoveToPackage; private JRadioButton rbMoveToFile; private TextFieldWithBrowseButton fileChooser; @@ -184,7 +183,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { private void initSearchOptions(boolean searchInComments, boolean searchForTextOccurences) { cbSearchInComments.setSelected(searchInComments); - cbSearchTextOccurences.setSelected(searchForTextOccurences); + cbSearchTextOccurrences.setSelected(searchForTextOccurences); } private void initMoveToButtons(boolean moveToPackage) { @@ -365,20 +364,12 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { @Override protected JComponent createCenterPanel() { - boolean isDestinationVisible = hasAnySourceRoots(); - destinationFolderCB.setVisible(isDestinationVisible); - targetDestinationLabel.setVisible(isDestinationVisible); - return null; - } - - @Override - protected JComponent createNorthPanel() { return mainPanel; } @Override protected String getDimensionServiceKey() { - return "#com.intellij.refactoring.move.moveClassesOrPackages.MoveKotlinTopLevelDeclarationsDialog.classes"; + return "#" + getClass().getName(); } protected final String getTargetPackage() { @@ -426,7 +417,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { } private boolean isSearchInNonJavaFiles() { - return cbSearchTextOccurences.isSelected(); + return cbSearchTextOccurrences.isSelected(); } private boolean isSearchInComments() {