Normand Briere
2018-10-27 d34fd9341c61d13677e029cb187d4dacff5e44ea
timeflow/app/TimeflowApp.java
....@@ -35,7 +35,8 @@
3535 public JMenu filterMenu;
3636 JMenuItem save = new JMenuItem("Save");
3737 FilterControlPanel filterControlPanel;
38
- LinkTabPane leftPanel;
38
+ //LinkTabPane
39
+ JTabbedPane leftPanel;
3940 TFListener filterMenuMaker = new TFListener()
4041 {
4142 @Override
....@@ -90,14 +91,15 @@
9091
9192 // left tab area, with vertical gray divider.
9293 JPanel leftHolder = new JPanel();
93
- container.add(leftHolder, BorderLayout.WEST);
94
+ container.add(leftHolder, BorderLayout.EAST); // WEST);
9495
9596 leftHolder.setLayout(new BorderLayout());
9697 JPanel pad = new Pad(3, 3);
9798 pad.setBackground(Color.gray);
9899 leftHolder.add(pad, BorderLayout.EAST);
99100
100
- leftPanel = new LinkTabPane();//JTabbedPane();
101
+ leftPanel = new //LinkTabPane();
102
+ JTabbedPane();
101103 leftHolder.add(leftPanel, BorderLayout.CENTER);
102104
103105 JPanel configPanel = new JPanel();
....@@ -112,9 +114,9 @@
112114 configPanel.add(legend, BorderLayout.CENTER);
113115 legend.add(new SizeLegendPanel(model), BorderLayout.NORTH);
114116 legend.add(new ColorLegendPanel(model), BorderLayout.CENTER);
115
- leftPanel.addTab(configPanel, "Display", true);
117
+ leftPanel.add(configPanel, "Display"); //, true);
116118
117
- leftPanel.addTab(filterControlPanel, "Filter", true);
119
+ leftPanel.add(filterControlPanel, "Filter"); //, true);
118120
119121 // center tab area
120122
....@@ -135,18 +137,18 @@
135137 AbstractView[] views =
136138 {
137139 timeline,
138
- new CalendarView(model),
140
+ //new CalendarView(model),
139141 new ListView(model),
140142 new TableView(model),
141143 new BarGraphView(model),
142
- intro,
143
- new DescriptionView(model),
144
+ //intro,
144145 new SummaryView(model),
146
+ new DescriptionView(model),
145147 };
146148
147149 for (int i = 0; i < views.length; i++)
148150 {
149
- center.addTab(views[i], views[i].getName(), i < 5);
151
+ center.addTab(views[i], views[i].getName(), true); // i < 5);
150152 displayPanel.addLocalControl(views[i].getName(), views[i].getControls());
151153 }
152154