Changeset 171
- Timestamp:
- 03/07/08 22:32:17 (9 months ago)
- Files:
-
- MediAnnotate/trunk/src/org/mediannotate/app/MediAnnotater.java (modified) (4 diffs)
- MediAnnotate/trunk/src/org/mediannotate/app/PlayerPanel.java (modified) (4 diffs)
- MediAnnotate/trunk/src/org/mediannotate/ui/ToolButtonPanel.java (added)
- MediAnnotate/trunk/src/org/mediannotate/ui/markIn.png (added)
- MediAnnotate/trunk/src/org/mediannotate/ui/markOut.png (added)
- MediAnnotate/trunk/src/org/mediannotate/ui/media_annotation_icon.png (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
MediAnnotate/trunk/src/org/mediannotate/app/MediAnnotater.java
r144 r171 23 23 static Object lock = new Object(); 24 24 public static List<File> tempFiles = new LinkedList<File>(); 25 private static JApplet applet; 26 27 25 28 /** 26 29 * @param args … … 36 39 new WindowGUI(myPlayerPanel, myController); 37 40 } 38 41 39 42 public static String getTime() { 40 43 String timeXML = ""; … … 87 90 { 88 91 synchronized(MediAnnotater.lock) { 92 applet = this; 89 93 if(runningApplets == null) runningApplets = new Stack<MediAnnotater>(); 90 94 if(runningApplets.contains(this)) destroy(); … … 136 140 } 137 141 142 public static JApplet getApplet() { 143 return applet; 144 } 145 138 146 } MediAnnotate/trunk/src/org/mediannotate/app/PlayerPanel.java
r155 r171 21 21 import org.mediannotate.dom.Movie; 22 22 import org.mediannotate.ui.TimeLinePanel; 23 import org.mediannotate.ui.ToolButtonPanel; 23 24 import org.mediannotate.ui.listener.PlayButtonListener; 24 25 import org.mediannotate.ui.listener.StopButtonListener; … … 44 45 private Time durationTime; 45 46 private TimeLinePanel timeLinePanel = new TimeLinePanel(); 47 private ToolButtonPanel toolButtonPanel = new ToolButtonPanel(this); 46 48 47 49 private Component currentMovieComponent; … … 64 66 65 67 JPanel jp_outter = new JPanel(); 66 jp_outter.setLayout(new GridLayout(2, 1)); 67 jp_outter.add(timeLinePanel, 0); 68 jp_outter.setLayout(new GridLayout(3, 1)); 69 jp_outter.add(toolButtonPanel, 0); 70 71 jp_outter.add(timeLinePanel, 1); 68 72 timeLinePanel.addMouseMotionListener(time_line_listener); 69 73 timeLinePanel.addMouseListener(time_line_listener); … … 75 79 76 80 JPanel jp = new JPanel(); 77 jp_outter.add(jp, 1);81 jp_outter.add(jp, 2); 78 82 minute = new JTextField("0", 2); 79 83 second = new JTextField("0", 2);
