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/views/TimelineView.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/timeflow/views/TimelineView.java b/timeflow/views/TimelineView.java
index 06190c6..983c2b6 100755
--- a/timeflow/views/TimelineView.java
+++ b/timeflow/views/TimelineView.java
@@ -5,6 +5,7 @@
import timeflow.data.db.DBUtils;
import timeflow.data.time.*;
import timeflow.model.*;
+
//import timeflow.views.CalendarView.CalendarPanel;
//import timeflow.views.CalendarView.ScrollingCalendar;
import timeflow.vis.Mouseover;
@@ -37,9 +38,10 @@
return controls;
}
- public TimelineView(TFModel model)
+ public TimelineView(TimeflowModel model)
{
super(model);
+
visuals = new TimelineVisuals(model);
grid = new AxisRenderer(visuals);
timeline = new TimelineRenderer(visuals);
@@ -55,21 +57,22 @@
TimelineSlider slider = new TimelineSlider(visuals, 24 * 60 * 60 * 1000L, new Runnable()
{
-
@Override
public void run()
{
redraw();
}
});
+
bottom.add(slider, BorderLayout.CENTER);
controls = new JPanel();
- controls.setBackground(Color.white);
+ controls.setBackground(Color.red);
controls.setLayout(new BorderLayout());//new GridLayout(2,1));
// top part of grid: zoom buttons.
ComponentCluster buttons = new ComponentCluster("Zoom");
+
//ImageIcon zoomOutIcon = new ImageIcon("images/zoom_out.gif");
JButton zoomIn = new JButton("In 1/2X");
buttons.addContent(zoomIn);
@@ -123,7 +126,7 @@
moveTime(visuals.getFitToVisibleRange());
}});
*/
- controls.add(buttons, BorderLayout.NORTH);
+ controls.add(buttons, BorderLayout.SOUTH);
// ok, now do second part of grid: layout style buttons.
ComponentCluster layoutPanel = new ComponentCluster("Layout");
@@ -151,7 +154,7 @@
graph.addActionListener(new LayoutSetter(TimelineVisuals.Layout.GRAPH));
layoutGroup.add(graph);
- controls.add(layoutPanel, BorderLayout.CENTER);
+ //controls.add(layoutPanel, BorderLayout.CENTER);
}
class LayoutSetter implements ActionListener
@@ -325,7 +328,7 @@
class TimelinePanel extends AbstractVisualizationView
{
- public TimelinePanel(TFModel model)
+ public TimelinePanel(TimeflowModel model)
{
super(model);
--
Gitblit v1.6.2