snow placeobject tags in definesprite tags, too. allow removing placeobject tags

This commit is contained in:
Honfika
2014-03-16 20:17:37 +01:00
parent 98ca15621a
commit 1ab54546d9
19 changed files with 180 additions and 74 deletions
@@ -99,6 +99,10 @@ public class TimelineBodyPanel extends JPanel implements MouseListener {
end_f = max_f;
}
if (end_d - start_d + 1 < 0) {
return;
}
boolean keyfound[] = new boolean[end_d - start_d + 1];
for (int f = start_f; f <= end_f; f++) {
@@ -16,9 +16,9 @@
*/
package com.jpexs.decompiler.flash.gui.timeline;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.gui.AppFrame;
import com.jpexs.decompiler.flash.gui.View;
import com.jpexs.decompiler.flash.timeline.Timelined;
import java.awt.BorderLayout;
import java.awt.Container;
import java.awt.Image;
@@ -32,14 +32,14 @@ public class TimelineFrame extends AppFrame {
public TimelinePanel timeline;
public TimelineFrame(SWF swf) {
public TimelineFrame(Timelined timelined) {
setSize(800, 600);
View.setWindowIcon(this);
View.centerScreen(this);
setTitle(translate("dialog.title"));
Container cnt = getContentPane();
cnt.setLayout(new BorderLayout());
cnt.add(timeline = new TimelinePanel(swf), BorderLayout.CENTER);
cnt.add(timeline = new TimelinePanel(timelined), BorderLayout.CENTER);
java.util.List<Image> images = new ArrayList<>();
images.add(View.loadImage("timeline16"));
@@ -16,8 +16,8 @@
*/
package com.jpexs.decompiler.flash.gui.timeline;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.timeline.Timeline;
import com.jpexs.decompiler.flash.timeline.Timelined;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
@@ -44,8 +44,8 @@ public class TimelinePanel extends JPanel {
public static Color selectedBorderColor = new Color(0xcc, 0, 0);
public static Color backgroundColor = new Color(0xee, 0xee, 0xee);
public TimelinePanel(SWF swf) {
timeline = new Timeline(swf);
public TimelinePanel(Timelined timelined) {
timeline = timelined.getTimeline();
timelineBodyPanel = new TimelineBodyPanel(timeline);
setLayout(new BorderLayout());