From 86f4e9c75951153ae9825f4772633e45698cb602 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 16 Dec 2018 21:21:43 -0500
Subject: [PATCH] Timeflow clean-up.
---
timeflow/app/TimeflowApp.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/timeflow/app/TimeflowApp.java b/timeflow/app/TimeflowApp.java
index 1bdc790..a057ddb 100755
--- a/timeflow/app/TimeflowApp.java
+++ b/timeflow/app/TimeflowApp.java
@@ -25,7 +25,7 @@
public class TimeflowApp extends JFrame
{
- public TFModel model = new TFModel();
+ public TimeflowModel model = new TimeflowModel();
public JFileChooser fileChooser;
AboutWindow splash;
String[][] examples;
@@ -84,6 +84,7 @@
examples[i][0] = s;
examples[i][1] = "settings/examples/" + ex[i];
}
+
templates = getVisibleFiles("settings/templates");
fileChooser = new JFileChooser(state.getCurrentFile());
@@ -137,18 +138,18 @@
AbstractView[] views =
{
timeline,
- new CalendarView(model),
+ //new CalendarView(model),
new ListView(model),
new TableView(model),
new BarGraphView(model),
- intro,
- new DescriptionView(model),
+ //intro,
new SummaryView(model),
+ new DescriptionView(model),
};
for (int i = 0; i < views.length; i++)
{
- center.addTab(views[i], views[i].getName(), i < 5);
+ center.addTab(views[i], views[i].getName(), true); // i < 5);
displayPanel.addLocalControl(views[i].getName(), views[i].getControls());
}
@@ -180,7 +181,9 @@
JMenu fileMenu = new JMenu("File");
menubar.add(fileMenu);
- fileMenu.add(new NewDataAction(this));
+ TimeflowAction tlAction = new NewDataAction(this);
+ fileMenu.add(tlAction);
+ tlAction.actionPerformed(null);
fileMenu.add(new CopySchemaAction(this));
JMenu templateMenu = new JMenu("New From Template");
@@ -202,7 +205,6 @@
}
fileMenu.addSeparator();
-
JMenuItem open = new JMenuItem("Open...");
fileMenu.add(open);
--
Gitblit v1.6.2