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

Switch on the new Settings view for Internal mode.

Browse Source
This commit is contained in:
Sergey Malenkov
2014-09-26 17:28:29 +04:00
parent ad68ba1afc
commit be51818993
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.intellij.openapi.ui;
import com.intellij.CommonBundle;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurationException;
@@ -140,7 +141,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom
}
private boolean isNewProjectSettings() {
if (Registry.is("ide.new.settings.view")) {
if (ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")) {
return true;
}
if (!Registry.is("ide.new.project.settings")) {
platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
+5 -4
View File
@@ -17,6 +17,7 @@ package com.intellij.ide.actions;
import com.intellij.ide.ui.search.SearchUtil;
import com.intellij.openapi.actionSystem.DataProvider;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.options.*;
import com.intellij.openapi.options.ex.*;
@@ -57,7 +58,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
project = getProject(project);
final ConfigurableGroup[] filteredGroups = filterEmptyGroups(groups);
if (Registry.is("ide.new.settings.dialog")) {
return Registry.is("ide.new.settings.view")
return ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")
? new SettingsDialog(project, filteredGroups, toSelect, null)
: new IdeSettingsDialog(project, filteredGroups, toSelect);
}
@@ -165,7 +166,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
group = filterEmptyGroups(group);
final Configurable configurable2Select = findConfigurable2Select(id2Select, group);
if (Registry.is("ide.new.settings.view")) {
if (ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")) {
new SettingsDialog(getProject(project), group, configurable2Select, filter).show();
return;
}
@@ -278,12 +279,12 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
boolean showApplyButton) {
final DialogWrapper editor;
if (parent == null) {
editor = Registry.is("ide.new.settings.view")
editor = ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")
? new SettingsDialog(project, dimensionKey, configurable, showApplyButton)
: new SingleConfigurableEditor(project, configurable, dimensionKey, showApplyButton);
}
else {
editor = Registry.is("ide.new.settings.view")
editor = ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")
? new SettingsDialog(parent, dimensionKey, configurable, showApplyButton)
: new SingleConfigurableEditor(parent, configurable, dimensionKey, showApplyButton);
}
platform/util/resources/misc/registry.properties
+1 -1
View File
@@ -417,7 +417,7 @@ console.too.much.text.buffer.ratio=10
console.too.much.text.buffer.ratio.description=Used for disabling of console processing(console filters for highlights, foldings...),\n\
when there is too much of text to process.\n\
The ratio is used against the console cycle buffer size (idea.cycle.buffer.size/theRatio=maxTextLength).
ide.new.settings.view=false
ide.new.settings.view=true
ide.new.settings.view.description=New view for the Settings dialog
ide.new.settings.dialog=true
ide.new.settings.dialog.description=New settings dialog