From a9e12f6c508810604c8c91ee15451776b08ce1a1 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 07:41:56 -0400
Subject: [PATCH] Camera capslock fix

---
 timeflow/app/TimeflowApp.java |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/timeflow/app/TimeflowApp.java b/timeflow/app/TimeflowApp.java
index 4c1f460..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;
@@ -35,7 +35,8 @@
         public JMenu filterMenu;
         JMenuItem save = new JMenuItem("Save");
         FilterControlPanel filterControlPanel;
-        LinkTabPane leftPanel;
+        //LinkTabPane
+                JTabbedPane leftPanel;
         TFListener filterMenuMaker = new TFListener()
         {
                 @Override
@@ -68,7 +69,7 @@
                 }
         };
 
-        public void TimeFlowWindow(Container container, JFrame frame) throws HeadlessException
+        public JMenuBar TimeFlowWindow(Container container) throws HeadlessException
         {
                 // read example directory
                 String[] ex = getVisibleFiles("settings/examples");
@@ -83,6 +84,7 @@
                         examples[i][0] = s;
                         examples[i][1] = "settings/examples/" + ex[i];
                 }
+                
                 templates = getVisibleFiles("settings/templates");
                 fileChooser = new JFileChooser(state.getCurrentFile());
 
@@ -90,14 +92,15 @@
 
                 // left tab area, with vertical gray divider.
                 JPanel leftHolder = new JPanel();
-                container.add(leftHolder, BorderLayout.WEST);
+                container.add(leftHolder, BorderLayout.EAST); // WEST);
 
                 leftHolder.setLayout(new BorderLayout());
                 JPanel pad = new Pad(3, 3);
                 pad.setBackground(Color.gray);
                 leftHolder.add(pad, BorderLayout.EAST);
 
-                leftPanel = new LinkTabPane();//JTabbedPane();
+                leftPanel = new //LinkTabPane();
+                                JTabbedPane();
                 leftHolder.add(leftPanel, BorderLayout.CENTER);
 
                 JPanel configPanel = new JPanel();
@@ -112,9 +115,9 @@
                 configPanel.add(legend, BorderLayout.CENTER);
                 legend.add(new SizeLegendPanel(model), BorderLayout.NORTH);
                 legend.add(new ColorLegendPanel(model), BorderLayout.CENTER);
-                leftPanel.addTab(configPanel, "Display", true);
+                leftPanel.add(configPanel, "Display"); //, true);
 
-                leftPanel.addTab(filterControlPanel, "Filter", true);
+                leftPanel.add(filterControlPanel, "Filter"); //, true);
 
                 // center tab area
 
@@ -135,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());
                 }
 
@@ -172,12 +175,15 @@
                 });
 
                 JMenuBar menubar = new JMenuBar();
-                frame.setJMenuBar(menubar);
+                
+                // frame.setJMenuBar(menubar);
 
                 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");
@@ -199,7 +205,6 @@
                 }
 
                 fileMenu.addSeparator();
-
 
                 JMenuItem open = new JMenuItem("Open...");
                 fileMenu.add(open);
@@ -340,7 +345,7 @@
                 }
 
                 JMenu helpMenu = new JMenu("Help");
-                menubar.add(helpMenu);
+                //menubar.add(helpMenu);
 
                 helpMenu.add(new WebDocAction(this));
 
@@ -372,6 +377,8 @@
                                 }
                         }
                 });
+                
+                return menubar;
         }
 
         void splash(boolean visible)
@@ -404,7 +411,7 @@
 
                 Container container = getContentPane();
 
-                TimeFlowWindow(container, this);
+                TimeFlowWindow(container);
         }
 
         void makeRecentFileMenu()

--
Gitblit v1.6.2