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/ui/GlobalDisplayPanel.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/timeflow/app/ui/GlobalDisplayPanel.java b/timeflow/app/ui/GlobalDisplayPanel.java
index 59f4c8a..8f4e6c5 100755
--- a/timeflow/app/ui/GlobalDisplayPanel.java
+++ b/timeflow/app/ui/GlobalDisplayPanel.java
@@ -21,7 +21,7 @@
JPanel globalControls = new JPanel();
CardLayout localCards = new CardLayout();
- public GlobalDisplayPanel(TFModel model, FilterControlPanel filterControls)
+ public GlobalDisplayPanel(TimeflowModel model, FilterControlPanel filterControls)
{
super(model);
setBackground(Color.white);
@@ -56,12 +56,12 @@
};
label.setBackground(Color.lightGray);
label.setForeground(Color.darkGray);
- globalLabel.add(label, BorderLayout.CENTER);
+ //globalLabel.add(label, BorderLayout.CENTER);
p.add(globalLabel, BorderLayout.NORTH);
JPanel global = new JPanel();
global.setLayout(new BorderLayout());
- global.add(new StatusPanel(model, filterControls), BorderLayout.NORTH);
+ //global.add(new StatusPanel(model, filterControls), BorderLayout.NORTH);
encodings.setLayout(new GridLayout(4, 1));
encodings.setBackground(Color.white);
@@ -74,12 +74,13 @@
public void showLocalControl(String name)
{
- localCards.show(localControls, name);
+ //localCards.show(localControls, name);
}
public void addLocalControl(String name, JComponent control)
{
- localControls.add(control, name);
+ if (name.equals("Timeline"))
+ localControls.add(control, name);
}
void makeEncodingPanel()
--
Gitblit v1.6.2