From 10a5a0216c93cf402e2f69d0fcd0dcf2556b2928 Mon Sep 17 00:00:00 2001
From: Fabien Tessier <fabien.tessier@telecom-paristech.fr>
Date: Wed, 18 Oct 2017 10:46:39 +0200
Subject: [PATCH] Issue #67: Keep the last opened tab when TTool is closing
---
src/main/java/common/SpecConfigTTool.java | 8 +++++++-
src/main/java/ui/MainGUI.java | 7 +++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/main/java/common/SpecConfigTTool.java b/src/main/java/common/SpecConfigTTool.java
index 204bb585db..25d5c81c02 100644
--- a/src/main/java/common/SpecConfigTTool.java
+++ b/src/main/java/common/SpecConfigTTool.java
@@ -16,6 +16,13 @@ import myutil.FileUtils;
import myutil.MalformedConfigurationException;
import myutil.TraceManager;
+/**
+ * Specific configuration for ttool project
+ * Creation: 13/10/2017
+ * @version 1.0
+ * @author Fabien Tessier
+ *
+ */
public class SpecConfigTTool {
public static String SystemCCodeDirectory="";
public static String SystemCCodeCompileCommand="";
@@ -117,7 +124,6 @@ public class SpecConfigTTool {
}
loadConfigurationFromXML(data);
- SpecConfigTTool.loadConfiguration();
}
public static void loadConfigurationFromXML(String data) throws MalformedConfigurationException {
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 3d960a124e..e9605270f1 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -2537,6 +2537,13 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
gtm.enableUndo(true);
gtm.saveOperation(getCurrentSelectedPoint());
dtree.forceUpdate();
+ if (SpecConfigTTool.lastTab > -1 && SpecConfigTTool.lastPanel > -1) {
+ this.mainTabbedPane.setSelectedIndex(SpecConfigTTool.lastTab);
+ activetdp = tabs.get(SpecConfigTTool.lastTab).getPanels().elementAt(SpecConfigTTool.lastPanel);
+ activetdp.selectTab(activetdp.name);
+ }
+ this.basicActivateDrawing();
+
}
public void saveAsLibrary(String data) {
--
GitLab