Navigation

Changeset 74

Timestamp:

08/11/07 13:54:34 (1 year ago)

Author:

altglass

Message:

History events limited to 50, Item movement through mouse can be undone

Files:

r71	r74
453	453	items.setVisible(true);
454	454
455		pvwin = new PreviewWindow();
	455	pvwin = new PreviewWindow(this);
456	456
457	457	jdesk.add(resources);

r68	r74
27	27	import java.awt.event.*;
28	28	import javax.swing.*;
	29	import vlcskineditor.history.*;
29	30
30	31
…	…
46	47
47	48	JMenuItem up, down, right, left;
	49	ItemMoveEvent ime = null;
	50	Main m;
48	51
49	52	/**
50	53	* Creates a new PreviewWindow that is initially hidden.
51	54	*/
52		public PreviewWindow() {
	55	public PreviewWindow(Main m_) {
	56	m = m_;
53	57	frame = new JInternalFrame("No Layout selected");
54	58	frame.add(this);
…	…
136	140	dragstartx=e.getX();
137	141	dragstarty=e.getY();
	142	ime = new ItemMoveEvent(selected_item);
138	143	dragstartitemx=selected_item.x;
139	144	dragstartitemy=selected_item.y;
…	…
168	173	public void mouseReleased(MouseEvent e) {
169	174	fu.fps=5;
	175	if(starteddragging) {
	176	ime.setNew();
	177	m.hist.addEvent(ime);
	178	}
170	179	starteddragging=false;
171	180	if(selected_item!=null) selected_item.setClicked(false);

r72	r74
32	32	public class History {
33	33
34		private HistoryEvent ~~main~~, current;
	34	private HistoryEvent root, current;
35	35	private Main m;
36	36
…	…
41	41	m.setUndoEnabled(false);
42	42	m.setRedoEnabled(false);
43		~~main~~ = new DummyEvent();
44		current = ~~main~~;
	43	root = new DummyEvent();
	44	current = root;
45	45	}
46	46	/** Adds an Event at the current point in the history list and removes any actions that could be redone*/
…	…
50	50	current = current.getNext();
51	51	m.setRedoEnabled(false);
	52	m.setRedoString("");
52	53	m.setUndoEnabled(true);
53	54	m.setUndoString(current.getDescription());
	55
	56	//Remove any link to an event that is more than 50 edits ago
	57	HistoryEvent he = current.getPrevious();
	58	for (int i=1;i<50;i++) {
	59	if(he.getPrevious()==null) break;
	60	he = he.getPrevious();
	61	}
	62	if(he!=root) he.setPrevious(root);
54	63	}
55	64	/** Redoes the action that is next in the history list */
…	…
66	75	/** Undoes the current action */
67	76	public void undo() {
68		if(current==~~main~~) return;
	77	if(current==root) return;
69	78	current.undo();
70	79	current = current.getPrevious();
71	80	m.setRedoEnabled(true);
72	81	m.setRedoString(current.getNext().getDescription());
73		m.setUndoEnabled(current!=~~main~~);
	82	m.setUndoEnabled(current!=root);
74	83	m.setUndoString(current.getDescription());
75	84	}