From ecaf579303705545735450cbc8b8014d7e062329 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 07 Jul 2018 18:44:29 -0400
Subject: [PATCH] Timeline integrated
---
timeflow/app/TimeflowApp.java | 89 ++++++++++++++++++++------------------------
1 files changed, 40 insertions(+), 49 deletions(-)
diff --git a/timeflow/app/TimeflowApp.java b/timeflow/app/TimeflowApp.java
index b7b8442..4c1f460 100755
--- a/timeflow/app/TimeflowApp.java
+++ b/timeflow/app/TimeflowApp.java
@@ -25,7 +25,6 @@
public class TimeflowApp extends JFrame
{
-
public TFModel model = new TFModel();
public JFileChooser fileChooser;
AboutWindow splash;
@@ -39,7 +38,6 @@
LinkTabPane leftPanel;
TFListener filterMenuMaker = new TFListener()
{
-
@Override
public void note(TFEvent e)
{
@@ -70,35 +68,8 @@
}
};
- void splash(boolean visible)
+ public void TimeFlowWindow(Container container, JFrame frame) throws HeadlessException
{
- splash.setVisible(visible);
- }
-
- public void init() throws Exception
- {
- Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
- setBounds(0, 0, Math.min(d.width, 1200), Math.min(d.height, 900));
- setTitle(Display.version());
- setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
- final QuitAction quitAction = new QuitAction(this, model);
- addWindowListener(new WindowAdapter()
- {
-
- @Override
- public void windowClosing(WindowEvent e)
- {
- quitAction.quit();
- }
-
- public void windowStateChanged(WindowEvent e)
- {
- repaint();
- }
- });
- Image icon = Toolkit.getDefaultToolkit().getImage("images/icon.gif");
- setIconImage(icon);
-
// read example directory
String[] ex = getVisibleFiles("settings/examples");
int n = ex.length;
@@ -115,11 +86,11 @@
templates = getVisibleFiles("settings/templates");
fileChooser = new JFileChooser(state.getCurrentFile());
- getContentPane().setLayout(new BorderLayout());
+ container.setLayout(new BorderLayout());
// left tab area, with vertical gray divider.
JPanel leftHolder = new JPanel();
- getContentPane().add(leftHolder, BorderLayout.WEST);
+ container.add(leftHolder, BorderLayout.WEST);
leftHolder.setLayout(new BorderLayout());
JPanel pad = new Pad(3, 3);
@@ -148,11 +119,10 @@
// center tab area
final LinkTabPane center = new LinkTabPane();
- getContentPane().add(center, BorderLayout.CENTER);
+ container.add(center, BorderLayout.CENTER);
center.addPropertyChangeListener(new PropertyChangeListener()
{
-
@Override
public void propertyChange(PropertyChangeEvent evt)
{
@@ -187,7 +157,6 @@
// but then, once data is loaded, switch directly to the timeline view.
model.addListener(new TFListener()
{
-
@Override
public void note(TFEvent e)
{
@@ -203,7 +172,7 @@
});
JMenuBar menubar = new JMenuBar();
- setJMenuBar(menubar);
+ frame.setJMenuBar(menubar);
JMenu fileMenu = new JMenu("File");
menubar.add(fileMenu);
@@ -236,7 +205,6 @@
fileMenu.add(open);
open.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -254,7 +222,6 @@
fileMenu.add(impDel);
impDel.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -273,7 +240,6 @@
save.setEnabled(false);
save.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -283,7 +249,6 @@
});
model.addListener(new TFListener()
{
-
@Override
public void note(TFEvent e)
{
@@ -295,7 +260,6 @@
fileMenu.add(saveAs);
saveAs.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -309,7 +273,6 @@
fileMenu.add(exportTSV);
exportTSV.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -320,7 +283,6 @@
fileMenu.add(exportCSV);
exportCSV.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -331,15 +293,14 @@
fileMenu.add(exportHTML);
exportHTML.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
exportHtml();
}
});
- fileMenu.addSeparator();
- fileMenu.add(quitAction);
+// fileMenu.addSeparator();
+// fileMenu.add(quitAction);
JMenu editMenu = new JMenu("Edit");
menubar.add(editMenu);
@@ -370,7 +331,6 @@
final String file = examples[i][1];
example.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -388,7 +348,6 @@
helpMenu.add(about);
about.addActionListener(new ActionListener()
{
-
@Override
public void actionPerformed(ActionEvent e)
{
@@ -398,7 +357,6 @@
model.addListener(new TFListener()
{
-
@Override
public void note(TFEvent e)
{
@@ -416,6 +374,39 @@
});
}
+ void splash(boolean visible)
+ {
+ splash.setVisible(visible);
+ }
+
+ public void init() throws Exception
+ {
+ Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+ setBounds(0, 0, Math.min(d.width, 1200), Math.min(d.height, 900));
+ setTitle(Display.version());
+ setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+// final QuitAction quitAction = new QuitAction(this, model);
+// addWindowListener(new WindowAdapter()
+// {
+// @Override
+// public void windowClosing(WindowEvent e)
+// {
+// quitAction.quit();
+// }
+//
+// public void windowStateChanged(WindowEvent e)
+// {
+// repaint();
+// }
+// });
+ Image icon = Toolkit.getDefaultToolkit().getImage("images/icon.gif");
+ setIconImage(icon);
+
+ Container container = getContentPane();
+
+ TimeFlowWindow(container, this);
+ }
+
void makeRecentFileMenu()
{
openRecent.removeAll();
--
Gitblit v1.6.2