MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Registry: remove "ide.settings.old.style" property

Browse Source
This commit is contained in:
Sergey Malenkov
2016-09-15 21:52:36 +03:00
parent 2c55b3cdff
commit 5c95d50407
2 changed files with 20 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java
+20 -46
View File
@@ -26,10 +26,8 @@ import com.intellij.openapi.options.ex.ConfigurableWrapper;
import com.intellij.openapi.options.ex.Settings;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.LoadingDecorator;
import com.intellij.openapi.ui.OnePixelDivider;
import com.intellij.openapi.util.ActionCallback;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.ui.OnePixelSplitter;
@@ -191,50 +189,26 @@ final class SettingsEditor extends AbstractEditor implements DataProvider {
myLoadingDecorator = new LoadingDecorator(myEditor, this, 10, true);
myBanner = new Banner(myEditor.getResetAction());
mySearchPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
JComponent left = myTreeView;
JComponent right = myLoadingDecorator.getComponent();
if (Registry.is("ide.settings.old.style")) {
myBanner.setBorder(BorderFactory.createEmptyBorder(5, 10, 0, 10));
mySearch.setBackground(UIUtil.SIDE_PANEL_BACKGROUND);
mySearchPanel.setBackground(UIUtil.SIDE_PANEL_BACKGROUND);
mySearchPanel.addComponentListener(new ComponentAdapter() {
@Override
public void componentResized(ComponentEvent event) {
Dimension size = myBanner.getPreferredSize();
size.height = mySearchPanel.getHeight() - 5;
myBanner.setPreferredSize(size);
myBanner.setSize(size);
myBanner.revalidate();
myBanner.repaint();
}
});
left = new JPanel(new BorderLayout());
left.add(BorderLayout.NORTH, mySearchPanel);
left.add(BorderLayout.CENTER, myTreeView);
right = new JPanel(new BorderLayout());
right.add(BorderLayout.NORTH, myBanner);
right.add(BorderLayout.CENTER, myLoadingDecorator.getComponent());
}
else {
myBanner.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
myTreeView.addComponentListener(new ComponentAdapter() {
@Override
public void componentResized(ComponentEvent event) {
Dimension size = mySearchPanel.getPreferredSize();
size.width = myTreeView.getWidth();
mySearchPanel.setPreferredSize(size);
mySearchPanel.setSize(size);
mySearchPanel.revalidate();
mySearchPanel.repaint();
}
});
JPanel panel = new JPanel(new BorderLayout());
panel.add(BorderLayout.WEST, mySearchPanel);
panel.add(BorderLayout.CENTER, myBanner);
panel.setBorder(JBUI.Borders.customLine(OnePixelDivider.BACKGROUND, 0, 0, 1, 0));
add(BorderLayout.NORTH, panel);
}
myBanner.setBorder(BorderFactory.createEmptyBorder(5, 10, 0, 10));
mySearch.setBackground(UIUtil.SIDE_PANEL_BACKGROUND);
mySearchPanel.setBackground(UIUtil.SIDE_PANEL_BACKGROUND);
mySearchPanel.addComponentListener(new ComponentAdapter() {
@Override
public void componentResized(ComponentEvent event) {
Dimension size = myBanner.getPreferredSize();
size.height = mySearchPanel.getHeight() - 5;
myBanner.setPreferredSize(size);
myBanner.setSize(size);
myBanner.revalidate();
myBanner.repaint();
}
});
JComponent left = new JPanel(new BorderLayout());
left.add(BorderLayout.NORTH, mySearchPanel);
left.add(BorderLayout.CENTER, myTreeView);
JComponent right = new JPanel(new BorderLayout());
right.add(BorderLayout.NORTH, myBanner);
right.add(BorderLayout.CENTER, myLoadingDecorator.getComponent());
mySplitter = new OnePixelSplitter(false, myProperties.getFloat(SPLITTER_PROPORTION, .2f));
mySplitter.setHonorComponentsMinimumSize(true);
mySplitter.setFirstComponent(left);
platform/util/resources/misc/registry.properties
-1
View File
@@ -598,7 +598,6 @@ ide.settings.configurable.loading.threshold=0
ide.settings.configurable.loading.threshold.description=A positive number of milliseconds starts debugging of Settings loading.
ide.settings.replace.group.with.single.configurable=true
ide.settings.old.style=true
commonjs.complete.required.filename.with.extension=false
commonjs.complete.required.filename.with.extension.description=If checked, required filenames are completed with extension