new settings (very initial)
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 3.0 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 287 B |
|
After Width: | Height: | Size: 397 B |
|
After Width: | Height: | Size: 396 B |
|
After Width: | Height: | Size: 285 B |
|
After Width: | Height: | Size: 939 B |
|
After Width: | Height: | Size: 2.3 KiB |
|
After Width: | Height: | Size: 2.3 KiB |
|
After Width: | Height: | Size: 914 B |
|
After Width: | Height: | Size: 784 B |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 784 B |
|
After Width: | Height: | Size: 588 B |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 621 B |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 3.6 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 3.0 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 4.2 KiB |
|
After Width: | Height: | Size: 4.2 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
@@ -26,6 +26,7 @@ import com.intellij.openapi.options.ex.ProjectConfigurablesGroup;
|
||||
import com.intellij.openapi.options.ex.SingleConfigurableEditor;
|
||||
import com.intellij.openapi.options.newEditor.OptionsEditor;
|
||||
import com.intellij.openapi.options.newEditor.OptionsEditorDialog;
|
||||
import com.intellij.openapi.options.newEditor.PreferencesDialog;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.project.ProjectManager;
|
||||
import com.intellij.openapi.util.registry.Registry;
|
||||
@@ -64,7 +65,11 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
|
||||
if (Registry.is("ide.mac.modalDialogsOnFullscreen")) {
|
||||
new OptionsEditorDialog(project, group, toSelect, true).show();
|
||||
} else {
|
||||
new OptionsEditorDialog(project, group, toSelect).show();
|
||||
if (Registry.is("ide.new.preferences")) {
|
||||
new PreferencesDialog(project, group).show();
|
||||
} else {
|
||||
new OptionsEditorDialog(project, group, toSelect).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Copyright 2000-2013 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.intellij.openapi.options.newEditor;
|
||||
|
||||
import com.intellij.openapi.options.ConfigurableGroup;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.ui.DialogWrapper;
|
||||
import com.intellij.openapi.util.SystemInfo;
|
||||
import com.intellij.ui.Gray;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.border.LineBorder;
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* @author Konstantin Bulenkov
|
||||
*/
|
||||
public class PreferencesDialog extends DialogWrapper {
|
||||
public PreferencesDialog(@Nullable Project project, ConfigurableGroup[] groups) {
|
||||
super(project);
|
||||
setSize(800, 600);
|
||||
init();
|
||||
((JDialog)getPeer().getWindow()).setUndecorated(true);
|
||||
((JComponent)((JDialog)getPeer().getWindow()).getContentPane()).setBorder(new LineBorder(Gray._140, 1));
|
||||
|
||||
setTitle("Preferences");
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
protected JComponent createCenterPanel() {
|
||||
final JPanel panel = new JPanel();
|
||||
panel.setPreferredSize(new Dimension(800, 600));
|
||||
return panel;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
protected JComponent createSouthPanel() {
|
||||
if (SystemInfo.isMac) {
|
||||
return null;
|
||||
}
|
||||
return super.createSouthPanel();
|
||||
}
|
||||
}
|
||||
@@ -137,6 +137,8 @@ ide.mac.modalDialogsOnFullscreen.description=New modality approach. All dialogs
|
||||
|
||||
ide.mac.retina.disableDrawingFix=false
|
||||
|
||||
ide.new.preferences=false
|
||||
|
||||
debugger.valueTooltipAutoShow=true
|
||||
# suppress inspection "UnusedProperty"
|
||||
debugger.valueTooltipAutoShow.description=Auto show tooltip on mouse over.
|
||||
|
||||
@@ -880,6 +880,21 @@ public class AllIcons {
|
||||
|
||||
}
|
||||
|
||||
public static class Preferences {
|
||||
public static final Icon Appearance = IconLoader.getIcon("/preferences/Appearance.png"); // 32x32
|
||||
public static final Icon CodeStyle = IconLoader.getIcon("/preferences/CodeStyle.png"); // 32x32
|
||||
public static final Icon Compiler = IconLoader.getIcon("/preferences/Compiler.png"); // 32x32
|
||||
public static final Icon Editor = IconLoader.getIcon("/preferences/Editor.png"); // 32x32
|
||||
public static final Icon FileColors = IconLoader.getIcon("/preferences/FileColors.png"); // 32x32
|
||||
public static final Icon FileTypes = IconLoader.getIcon("/preferences/FileTypes.png"); // 32x32
|
||||
public static final Icon General = IconLoader.getIcon("/preferences/General.png"); // 32x32
|
||||
public static final Icon Keymap = IconLoader.getIcon("/preferences/Keymap.png"); // 32x32
|
||||
public static final Icon Plugins = IconLoader.getIcon("/preferences/Plugins.png"); // 32x32
|
||||
public static final Icon Updates = IconLoader.getIcon("/preferences/Updates.png"); // 32x32
|
||||
public static final Icon VersionControl = IconLoader.getIcon("/preferences/VersionControl.png"); // 32x32
|
||||
|
||||
}
|
||||
|
||||
public static class Process {
|
||||
|
||||
public static class Big {
|
||||
|
||||