From c1af17fab4c8cd519f54f572851fc93e7ee8f84a Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Sat, 21 Jul 2018 13:13:35 -0400 Subject: [PATCH] timeline mouse over --- timeflow/app/TimeflowApp.java | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/timeflow/app/TimeflowApp.java b/timeflow/app/TimeflowApp.java index 4c1f460..c579393 100755 --- a/timeflow/app/TimeflowApp.java +++ b/timeflow/app/TimeflowApp.java @@ -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"); @@ -90,14 +91,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 +114,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 +137,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,7 +174,8 @@ }); JMenuBar menubar = new JMenuBar(); - frame.setJMenuBar(menubar); + + // frame.setJMenuBar(menubar); JMenu fileMenu = new JMenu("File"); menubar.add(fileMenu); @@ -340,7 +343,7 @@ } JMenu helpMenu = new JMenu("Help"); - menubar.add(helpMenu); + //menubar.add(helpMenu); helpMenu.add(new WebDocAction(this)); @@ -372,6 +375,8 @@ } } }); + + return menubar; } void splash(boolean visible) @@ -404,7 +409,7 @@ Container container = getContentPane(); - TimeFlowWindow(container, this); + TimeFlowWindow(container); } void makeRecentFileMenu() -- Gitblit v1.6.2