From 3ee54ba143d63e13aa36184655ebac2fd30ab0f3 Mon Sep 17 00:00:00 2001
From: satan <satan@satan-Latitude-E6530>
Date: Wed, 13 Sep 2017 14:15:42 +0200
Subject: [PATCH] Issue #62: Provide quick navigation to main diagram
---
src/main/java/ui/MainGUI.java | 3 ++-
src/main/java/ui/TDiagramPanel.java | 16 +++++++++++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index eaa11693af..49d2c6b0f1 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -8403,7 +8403,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
/**
* This adapter is constructed to handle mouse over component events.
*/
- private class MouseHandler extends MouseAdapter {
+ private class MouseHandler extends MouseAdapter {
private JLabel label;
@@ -8420,6 +8420,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
this.label = label;
}
+ @Override
public void mouseEntered(MouseEvent evt) {
if (evt.getSource() instanceof AbstractButton) {
AbstractButton button = (AbstractButton)evt.getSource();
diff --git a/src/main/java/ui/TDiagramPanel.java b/src/main/java/ui/TDiagramPanel.java
index 2299563731..b743fbc219 100755
--- a/src/main/java/ui/TDiagramPanel.java
+++ b/src/main/java/ui/TDiagramPanel.java
@@ -126,7 +126,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
protected JMenuItem remove, edit, clone, bringFront, bringBack, makeSquare, setJavaCode, removeJavaCode, setInternalComment, removeInternalComment, attach, detach, hide, unhide,search, enableDisable, setAsCryptoBlock, setAsRegularBlock;
protected JMenuItem checkAccessibility, checkInvariant, checkMasterMutex, checkLatency;
protected JMenuItem breakpoint;
- protected JMenuItem paste, insertLibrary, upX, upY, downX, downY, fitToContent;
+ protected JMenuItem paste, insertLibrary, upX, upY, downX, downY, fitToContent, backToMainDiagram;
protected JMenuItem cut, copy, saveAsLibrary, captureSelected;
//author:huytruong
//search dialog
@@ -1398,6 +1398,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
diagramMenu.add(downX);
diagramMenu.add(downY);
diagramMenu.add(fitToContent);
+ diagramMenu.add(backToMainDiagram);
}
private void buildSelectedPopupMenu() {
@@ -1520,6 +1521,16 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
fitDiagramSizeToContent();
}
});
+
+ //Issue #62: Provide quick navigation to main diagram
+ backToMainDiagram = new JMenuItem("Back to main diagram");
+ backToMainDiagram.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ tp.tabbedPane.setSelectedIndex(0);
+ }
+ });
// Selected Menu
cut = new JMenuItem("Cut");
@@ -2021,6 +2032,9 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
// }
fitToContent.setEnabled( canFitDiagramSizeToContent() );
+
+ //Issue #62: Provide quick navigation to main diagram
+ backToMainDiagram.setEnabled(tp.tabbedPane.getSelectedIndex() != 0);
}
private void setSelectedPopupMenu() {
--
GitLab