From 87a78f23a89a0bd180e3ad7d88f3a3c914edf7ef Mon Sep 17 00:00:00 2001 From: hneemann Date: Mon, 12 Aug 2019 11:30:01 +0200 Subject: [PATCH] makes the wire tool tips optional, closes #297 --- .../de/neemann/digital/core/element/Keys.java | 6 +++++ .../java/de/neemann/digital/gui/Settings.java | 1 + .../gui/components/CircuitComponent.java | 25 ++++++++++--------- src/main/resources/lang/lang_de.xml | 2 ++ src/main/resources/lang/lang_en.xml | 2 ++ 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/neemann/digital/core/element/Keys.java b/src/main/java/de/neemann/digital/core/element/Keys.java index d629a7e68..98a974087 100644 --- a/src/main/java/de/neemann/digital/core/element/Keys.java +++ b/src/main/java/de/neemann/digital/core/element/Keys.java @@ -795,5 +795,11 @@ public final class Keys { public static final Key SETTINGS_SHOW_TUTORIAL = new Key<>("showTutorial", true).setSecondary(); + /** + * Enables the wire tool tips + */ + public static final Key SETTINGS_WIRETOOLTIP = + new Key<>("wireToolTips", false); + } diff --git a/src/main/java/de/neemann/digital/gui/Settings.java b/src/main/java/de/neemann/digital/gui/Settings.java index 28ac9bbb9..d3957f21b 100644 --- a/src/main/java/de/neemann/digital/gui/Settings.java +++ b/src/main/java/de/neemann/digital/gui/Settings.java @@ -52,6 +52,7 @@ public final class Settings implements AttributeListener { intList.add(Keys.SETTINGS_GRID); intList.add(Keys.SETTINGS_SHOW_WIRE_BITS); intList.add(Keys.SETTINGS_NOTOOLTIPS); + intList.add(Keys.SETTINGS_WIRETOOLTIP); intList.add(Keys.SETTINGS_LIBRARY_PATH); intList.add(Keys.SETTINGS_JAR_PATH); intList.add(Keys.SETTINGS_ATF1502_FITTER); diff --git a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java index 04d663862..c2e172ef6 100644 --- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java +++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java @@ -551,20 +551,21 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib if (v != null) return v.getValueString(); else { - if (highLighted == null || highLighted.isEmpty() || toolTipHighlighted) { - try { - if (toolTipNetList == null) - toolTipNetList = new NetList(getCircuit()); - Net n = toolTipNetList.getNetOfPos(w.p1); - if (n != null) { - removeHighLighted(); - addHighLighted(n.getWires()); - toolTipHighlighted = true; + if (Settings.getInstance().get(Keys.SETTINGS_WIRETOOLTIP)) + if (highLighted == null || highLighted.isEmpty() || toolTipHighlighted) { + try { + if (toolTipNetList == null) + toolTipNetList = new NetList(getCircuit()); + Net n = toolTipNetList.getNetOfPos(w.p1); + if (n != null) { + removeHighLighted(); + addHighLighted(n.getWires()); + toolTipHighlighted = true; + } + } catch (PinException e) { + e.printStackTrace(); } - } catch (PinException e) { - e.printStackTrace(); } - } } } diff --git a/src/main/resources/lang/lang_de.xml b/src/main/resources/lang/lang_de.xml index add4ee7f2..8ea623e50 100644 --- a/src/main/resources/lang/lang_de.xml +++ b/src/main/resources/lang/lang_de.xml @@ -1213,6 +1213,8 @@ Sind evtl. die Namen der Variablen nicht eindeutig? Raster anzeigen Zeigt im Hauptfenster ein Raster an, um das platzieren der Elemente zu erleichtern. + Leitungen als ToolTip + Wenn gesetzt, werden Leitungen hervorgehoben, wenn die Maus darauf zeigt. Auf Tastatur legen Taste wird durch die Tastatur bedienbar. Um die Cursor-Tasten zu nutzen, kann als Bezeichnung UP, DOWN, LEFT oder RIGHT verwendet werden. diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml index 913c89b37..5a3384694 100644 --- a/src/main/resources/lang/lang_en.xml +++ b/src/main/resources/lang/lang_en.xml @@ -1200,6 +1200,8 @@ It must be ensured that the names of all files in this folder and all subfolders are unique. Show Grid Shows a grid in the main window. + Wire tool tips + If set, lines are highlighted when the mouse hovers over them. Map to keyboard Button is mapped to the keyboard. To use the cursor keys use UP, DOWN, LEFT or RIGHT as label.