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

IDEA-140303 Improve debugger settings popup wording - removed show tooltip from java settings

Browse Source
This commit is contained in:
Egor.Ushakov
2015-05-27 16:25:12 +03:00
parent b05d71903a
commit 2c4e03e55e
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/settings/DebuggerDataViewsConfigurable.java
+1 -12
View File
@@ -24,8 +24,6 @@ import com.intellij.debugger.ui.tree.render.ToStringRenderer;
import com.intellij.openapi.options.OptionsBundle;
import com.intellij.openapi.options.SearchableConfigurable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.registry.ui.RegistryCheckBox;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.StateRestoringCheckBox;
import com.intellij.ui.classFilter.ClassFilterEditor;
@@ -65,7 +63,6 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
private ClassFilterEditor myToStringFilterEditor;
private Project myProject;
private RegistryCheckBox myAutoTooltip;
public DebuggerDataViewsConfigurable(@Nullable Project project) {
myProject = project;
@@ -152,11 +149,6 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
panel.add(myCbAutoscroll, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 0, 0, 0), 0, 0));
myAutoTooltip = new RegistryCheckBox(Registry.get("debugger.valueTooltipAutoShow"),
DebuggerBundle.message("label.base.renderer.configurable.autoTooltip"),
DebuggerBundle.message("label.base.renderer.configurable.autoTooltip.description",
Registry.stringValue("ide.forcedShowTooltip")));
panel.add(myAutoTooltip, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(4, 0, 0, 0), 0, 0));
final JPanel showPanel = new JPanel(new GridBagLayout());
showPanel.setBorder(IdeBorderFactory.createTitledBorder("Show", true));
@@ -219,8 +211,6 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
PrimitiveRenderer primitiveRenderer = rendererSettings.getPrimitiveRenderer();
primitiveRenderer.setShowHexValue(myCbHexValue.isSelected());
myAutoTooltip.save();
rendererSettings.fireRenderersChanged();
}
@@ -273,8 +263,7 @@ public class DebuggerDataViewsConfigurable implements SearchableConfigurable {
private boolean areGeneralSettingsModified() {
ViewsGeneralSettings generalSettings = ViewsGeneralSettings.getInstance();
return generalSettings.AUTOSCROLL_TO_NEW_LOCALS != myCbAutoscroll.isSelected() ||
generalSettings.HIDE_NULL_ARRAY_ELEMENTS != myCbHideNullArrayElements.isSelected() ||
myAutoTooltip.isChanged();
generalSettings.HIDE_NULL_ARRAY_ELEMENTS != myCbHideNullArrayElements.isSelected();
}
private boolean areDefaultRenderersModified() {
platform/platform-resources-en/src/messages/XDebuggerBundle.properties
+1
View File
@@ -132,3 +132,4 @@ settings.show.values.inline=Show values inline
settings.show.value.tooltip=Show value tooltip.
settings.show.tooltip.on.selection=Show value tooltip on code selection
settings.scroll.to.center=Scroll execution point to center
settings.tooltip.label=If disabled, use "{0}" to show/hide tooltips
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DataViewsConfigurableUi.form
+12 -2
View File
@@ -29,7 +29,7 @@
<text resource-bundle="messages/XDebuggerBundle" key="setting.sort.alphabetically.label"/>
</properties>
</component>
<grid id="a4cab" binding="myEditorSettingsPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="a4cab" binding="myEditorSettingsPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -55,7 +55,7 @@
</component>
<component id="be332" class="javax.swing.JCheckBox" binding="myShowValueTooltipOnCheckBox" default-binding="true">
<constraints>
<grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/XDebuggerBundle" key="settings.show.tooltip.on.selection"/>
@@ -77,6 +77,16 @@
<text resource-bundle="messages/XDebuggerBundle" key="setting.value.tooltip.delay.label"/>
</properties>
</component>
<component id="e0c23" class="com.intellij.ui.components.JBLabel" binding="myTooltipLabel">
<constraints>
<grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
</constraints>
<properties>
<componentStyle value="REGULAR"/>
<enabled value="false"/>
<text resource-bundle="messages/XDebuggerBundle" key="settings.tooltip.label"/>
</properties>
</component>
</children>
</grid>
</children>
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DataViewsConfigurableUi.java
+4
View File
@@ -19,7 +19,9 @@ import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtilRt;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.border.IdeaTitledBorder;
import com.intellij.ui.components.JBLabel;
import com.intellij.util.ui.UIUtil;
import com.intellij.xdebugger.XDebuggerBundle;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -37,6 +39,7 @@ public class DataViewsConfigurableUi {
private JCheckBox myShowValuesInlineCheckBox;
private JCheckBox myShowValueTooltipCheckBox;
private JCheckBox myShowValueTooltipOnCheckBox;
private JBLabel myTooltipLabel;
public DataViewsConfigurableUi() {
UIUtil.configureNumericFormattedTextField(valueTooltipDelayTextField);
@@ -69,6 +72,7 @@ public class DataViewsConfigurableUi {
myShowValuesInlineCheckBox.setSelected(Registry.is(IDE_DEBUGGER_INLINE_KEY));
myShowValueTooltipCheckBox.setSelected(Registry.is(DEBUGGER_VALUE_TOOLTIP_AUTO_SHOW_KEY));
myShowValueTooltipOnCheckBox.setSelected(Registry.is(DEBUGGER_VALUE_TOOLTIP_AUTO_SHOW_ON_SELECTION_KEY));
myTooltipLabel.setText(XDebuggerBundle.message("settings.tooltip.label", Registry.stringValue("ide.forcedShowTooltip")));
}
public void apply(@NotNull XDebuggerDataViewSettings settings) {
resources-en/src/messages/DebuggerBundle.properties
-2
View File
@@ -186,8 +186,6 @@ label.base.renderer.configurable.autoscroll=Autoscroll to new &local variables
label.base.renderer.configurable.show.synthetic.fields=S&ynthetic fields
label.base.renderer.configurable.show.val.fields.as.locals=$val fields as local &variables
label.base.renderer.configurable.sort.alphabetically=Sort a&lphabetically
label.base.renderer.configurable.autoTooltip=Auto &tooltips for values
label.base.renderer.configurable.autoTooltip.description=If disabled, use "{0}" to show/hide tooltips
label.base.renderer.configurable.hide.null.array.elements=Hide &null array elements
label.base.renderer.configurable.show.static.fields=&Static fields
label.base.renderer.configurable.show.static.final.fields=Static &final fields