TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-26 14:31:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

improved undo/redo tool tips

Browse Source
This commit is contained in:
Helmut.Neemann 2017-05-31 09:38:29 +02:00
parent 3ae68a36d5
commit 2f2a5d865e
8 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/de/neemann/digital/gui/components/modification/ModificationOfVisualElement.java
View File

@ -46,11 +46,16 @@ public abstract class ModificationOfVisualElement implements Modification {
* @param ve the element * @param ve the element
* @return translated name * @return translated name
*/ */
public static String getTranslatedName(VisualElement ve) { public static String getToolTipName(VisualElement ve) {
String s = Lang.get("elem_" + ve.getElementName()); String s = Lang.getNull("elem_" + ve.getElementName());
if (s == null) {
s = ve.getElementName();
if (s.endsWith(".dig"))
s = s.substring(0, s.length() - 4);
}
String l = ve.getElementAttributes().get(Keys.LABEL); String l = ve.getElementAttributes().get(Keys.LABEL);
if (l.length() > 0) if (l.length() > 0)
s += " ('" + l + "')"; s += " (" + l + ")";
return s; return s;
} }

2
src/main/java/de/neemann/digital/gui/components/modification/ModifyAttribute.java
View File

@ -24,7 +24,7 @@ public class ModifyAttribute<VALUE> extends ModificationOfVisualElement {
* @param value the new value * @param value the new value
*/ */
public ModifyAttribute(VisualElement ve, Key<VALUE> key, VALUE value) { public ModifyAttribute(VisualElement ve, Key<VALUE> key, VALUE value) {
super(ve, Lang.get("mod_setKey_N0_in_element_N1", key.getName(), getTranslatedName(ve))); super(ve, Lang.get("mod_setKey_N0_in_element_N1", key.getName(), getToolTipName(ve)));
this.key = key; this.key = key;
this.value = value; this.value = value;
} }

2
src/main/java/de/neemann/digital/gui/components/modification/ModifyAttributes.java
View File

@ -20,7 +20,7 @@ public class ModifyAttributes extends ModificationOfVisualElement {
* @param modified the new attributes * @param modified the new attributes
*/ */
public ModifyAttributes(VisualElement ve, ElementAttributes modified) { public ModifyAttributes(VisualElement ve, ElementAttributes modified) {
super(ve, Lang.get("mod_setAttributes")); super(ve, Lang.get("mod_setAttributesIn_N", getToolTipName(ve)));
attributes = modified; attributes = modified;
} }

2
src/main/java/de/neemann/digital/gui/components/modification/ModifyDeleteElement.java
View File

@ -18,7 +18,7 @@ public class ModifyDeleteElement extends ModificationOfVisualElement {
* @param initialPos its initial position * @param initialPos its initial position
*/ */
public ModifyDeleteElement(VisualElement ve, Vector initialPos) { public ModifyDeleteElement(VisualElement ve, Vector initialPos) {
super(ve, initialPos, Lang.get("mod_deletedElement_N", getTranslatedName(ve))); super(ve, initialPos, Lang.get("mod_deletedElement_N", getToolTipName(ve)));
} }
@Override @Override

4
src/main/java/de/neemann/digital/gui/components/modification/ModifyInsertElement.java
View File

@ -4,7 +4,7 @@ import de.neemann.digital.draw.elements.Circuit;
import de.neemann.digital.draw.elements.VisualElement; import de.neemann.digital.draw.elements.VisualElement;
import de.neemann.digital.lang.Lang; import de.neemann.digital.lang.Lang;
import static de.neemann.digital.gui.components.modification.ModificationOfVisualElement.getTranslatedName; import static de.neemann.digital.gui.components.modification.ModificationOfVisualElement.getToolTipName;
/** /**
* Modifier to insert an element * Modifier to insert an element
@ -29,6 +29,6 @@ public class ModifyInsertElement implements Modification {
@Override @Override
public String toString() { public String toString() {
return Lang.get("mod_insertedElement_N", getTranslatedName(element)); return Lang.get("mod_insertedElement_N", getToolTipName(element));
} }
} }

2
src/main/java/de/neemann/digital/gui/components/modification/ModifyMoveAndRotElement.java
View File

@ -20,7 +20,7 @@ public class ModifyMoveAndRotElement extends ModificationOfVisualElement {
* @param initialPos its initial position * @param initialPos its initial position
*/ */
public ModifyMoveAndRotElement(VisualElement ve, Vector initialPos) { public ModifyMoveAndRotElement(VisualElement ve, Vector initialPos) {
super(ve, initialPos, Lang.get("mod_movedOrRotatedElement_N", getTranslatedName(ve))); super(ve, initialPos, Lang.get("mod_movedOrRotatedElement_N", getToolTipName(ve)));
pos = ve.getPos(); pos = ve.getPos();
rotation = ve.getRotate(); rotation = ve.getRotate();
} }

2
src/main/resources/lang/lang_de.xml
View File

@ -648,7 +648,7 @@ Sind evtl. die Namen der Variablen nicht eindeutig?</string>
<string name="mod_insertWire">Leitung eingefügt.</string> <string name="mod_insertWire">Leitung eingefügt.</string>
<string name="mod_insertCopied">Aus Zwischenablage eingefügt.</string> <string name="mod_insertCopied">Aus Zwischenablage eingefügt.</string>
<string name="mod_setKey_N0_in_element_N1">Wert ''{0}'' in Element ''{1}'' verändert.</string> <string name="mod_setKey_N0_in_element_N1">Wert ''{0}'' in Element ''{1}'' verändert.</string>
<string name="mod_setAttributes">Attribute in Element verändert.</string> <string name="mod_setAttributesIn_N">Attribute in Element ''{0}'' verändert.</string>
<string name="mod_wireDeleted">Leitung gelöscht.</string> <string name="mod_wireDeleted">Leitung gelöscht.</string>
<string name="mod_movedOrRotatedElement_N">Element ''{0}'' verschoben oder rotiert.</string> <string name="mod_movedOrRotatedElement_N">Element ''{0}'' verschoben oder rotiert.</string>
<string name="mod_movedWire">Leitung verschoben.</string> <string name="mod_movedWire">Leitung verschoben.</string>

2
src/main/resources/lang/lang_en.xml
View File

@ -638,7 +638,7 @@ The names of the variables may not be unique.</string>
<string name="mod_insertWire">Inserted wire.</string> <string name="mod_insertWire">Inserted wire.</string>
<string name="mod_insertCopied">Insert from clipboard.</string> <string name="mod_insertCopied">Insert from clipboard.</string>
<string name="mod_setKey_N0_in_element_N1">Value ''{0}'' in component ''{1}'' modified.</string> <string name="mod_setKey_N0_in_element_N1">Value ''{0}'' in component ''{1}'' modified.</string>
<string name="mod_setAttributes">Attributes of component modified.</string> <string name="mod_setAttributesIn_N">Attributes of component ''{0}'' modified.</string>
<string name="mod_wireDeleted">Wire deleted.</string> <string name="mod_wireDeleted">Wire deleted.</string>
<string name="mod_movedOrRotatedElement_N">Component ''{0}'' moved or rotated.</string> <string name="mod_movedOrRotatedElement_N">Component ''{0}'' moved or rotated.</string>
<string name="mod_movedWire">Wire moved.</string> <string name="mod_movedWire">Wire moved.</string>