Changeset 71

Timestamp:

06/11/07 20:38:12 (1 year ago)

Author:

altglass

Message:

Renaming items and resources package to lowercase. First history implementation for resources.

Files:

• trunk/src/vlcskineditor/Layout.java (modified) (3 diffs)
• trunk/src/vlcskineditor/Main.java (modified) (22 diffs)
• trunk/src/vlcskineditor/Resource.java (modified) (1 diff)
• trunk/src/vlcskineditor/Skin.java (modified) (4 diffs)
• trunk/src/vlcskineditor/SliderBGGen.java (modified) (5 diffs)
• trunk/src/vlcskineditor/history (added)
• trunk/src/vlcskineditor/history/BitmapEditEvent.java (added)
• trunk/src/vlcskineditor/history/DummyEvent.java (added)
• trunk/src/vlcskineditor/history/FontEditEvent.java (added)
• trunk/src/vlcskineditor/history/History.java (added)
• trunk/src/vlcskineditor/history/HistoryEvent.java (added)
• trunk/src/vlcskineditor/history/SubBitmapAddEvent.java (added)
• trunk/src/vlcskineditor/history/SubBitmapEditEvent.java (added)
• trunk/src/vlcskineditor/icons/edit-redo.png (added)
• trunk/src/vlcskineditor/icons/edit-undo.png (added)
• trunk/src/vlcskineditor/items/Anchor.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Button.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Checkbox.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Group.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Image.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Panel.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Playtree.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/RadialSlider.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Slider.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/SliderBackground.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Text.java (modified) (2 diffs)
• trunk/src/vlcskineditor/items/Video.java (modified) (1 diff)
• trunk/src/vlcskineditor/resources/Bitmap.java (modified) (3 diffs)
• trunk/src/vlcskineditor/resources/BitmapFont.java (modified) (1 diff)
• trunk/src/vlcskineditor/resources/Font.java (modified) (4 diffs)
• trunk/src/vlcskineditor/resources/SubBitmap.java (modified) (4 diffs)

trunk/src/vlcskineditor/Layout.java

@@ -23 +23 @@
-package vlcskineditor;
-
-I
+i
-import java.util.*;
-import java.awt.*;
@@ -84 +84 @@
-      }
-      else if(code[i].startsWith("<Anchor")) items.add(new Anchor(code[i],s));
-I
-I
-I
+i
+i
+i
-      else if(code[i].startsWith("<Text")) items.add(new Text(code[i],s));
-      else if(code[i].startsWith("<Video")) items.add(new Video(code[i],s));
@@ -108 +108 @@
-        }
-        itemcode += "\n"+code[i];
-I
+i
-      }
-      else if(code[i].startsWith("<Playlist")) {

trunk/src/vlcskineditor/Main.java

@@ -35 +35 @@
-import java.util.zip.*;
-import javax.imageio.*;
-Items.*
-Resource
+resources.Bitmap
+item
-import com.ice.tar.*;
-import com.ice.jni.registry.*;
+import vlcskineditor.history.*;
-
-
@@ -55 +56 @@
-  JMenu m_file, m_edit, m_help;
-  JMenuItem m_file_new, m_file_open, m_file_save, m_file_test, m_file_vlt, m_file_quit;
-
+undo, m_edit_redo, m_edit_
-  JMenuItem m_help_doc, m_help_about;  
-  JDesktopPane jdesk;
@@ -78 +79 @@
-  public ImageIcon add_font_icon = createIcon("icons/add_font.png");
-  public ImageIcon edit_icon = createIcon("icons/edit.png");
+  public ImageIcon edit_undo_icon = createIcon("icons/edit-undo.png");
+  public ImageIcon edit_redo_icon = createIcon("icons/edit-redo.png");
-  public ImageIcon editor_icon = createIcon("icons/editor.png");
-  public ImageIcon delete_icon = createIcon("icons/delete.png");
@@ -107 +110 @@
-  boolean opened = false;
-  
+  public History hist;
+  
-  /**
-   * Launches the skin editor and initializes the GUI.
@@ -129 +134 @@
-    m_file_open = new JMenuItem("Open");
-    m_file_open.setIcon(open_icon);
-"O".charAt(0)
+'O'
-    m_file_open.setAccelerator(KeyStroke.getKeyStroke("ctrl O"));
-    m_file_open.addActionListener(this);    
-    m_file_save = new JMenuItem("Save");
-    m_file_save.setIcon(save_icon);
-"S".charAt(0)
+'S'
-    m_file_save.setAccelerator(KeyStroke.getKeyStroke("ctrl S"));   
-    m_file_save.addActionListener(this);
-    m_file_test = new JMenuItem("Test skin in VLC...");
-"T".charAt(0)
+'T'
-    m_file_test.addActionListener(this);
-    m_file_vlt = new JMenuItem("Export as VLT...");
-"V".charAt(0)
+'V'
-    m_file_vlt.setAccelerator(KeyStroke.getKeyStroke("ctrl v"));   
-    m_file_vlt.addActionListener(this);
-    m_file_quit = new JMenuItem("Quit");
-    m_file_quit.setIcon(exit_icon);
-"Q".charAt(0)
+'Q'
-    m_file_quit.setAccelerator(KeyStroke.getKeyStroke("ctrl Q"));
-    m_file_quit.addActionListener(this);
@@ -162 +167 @@
-    m_edit = new JMenu("Edit");
-    m_edit.setMnemonic("E".charAt(0));
+    m_edit_undo = new JMenuItem("Undo");
+    m_edit_undo.setIcon(edit_undo_icon);
+    m_edit_undo.setMnemonic('U');
+    m_edit_undo.setAccelerator(KeyStroke.getKeyStroke("ctrl Z"));
+    m_edit_undo.addActionListener(this);
+    m_edit_redo = new JMenuItem("Redo");
+    m_edit_redo.setIcon(edit_redo_icon);
+    m_edit_redo.setMnemonic('R');    
+    m_edit_redo.setAccelerator(KeyStroke.getKeyStroke("ctrl Y"));
+    m_edit_redo.addActionListener(this);
-    m_edit_theme = new JMenuItem("Theme settings");
-    m_edit_theme.setIcon(edit_icon);
-"I".charAt(0)
+'I'
-    m_edit_theme.setAccelerator(KeyStroke.getKeyStroke("ctrl I"));
-    m_edit_theme.addActionListener(this);
-    m_edit_global = new JMenuItem("Global variables");
-"G".charAt(0)
+'G'
-    m_edit_global.setAccelerator(KeyStroke.getKeyStroke("ctrl G"));
-    m_edit_global.addActionListener(this);
@@ -184 +199 @@
-    m_edit_right.addActionListener(this);
-    
+    m_edit.add(m_edit_undo);
+    m_edit.add(m_edit_redo);
+    m_edit.addSeparator();
-    m_edit.add(m_edit_theme);
-    m_edit.addSeparator();
@@ -194 +212 @@
-        
-    m_help = new JMenu("Help");
-"H".charAt(0)
+'H'
-    m_help_doc = new JMenuItem("Skins2 documentation");    
-    m_help_doc.setIcon(help_icon);
-"D".charAt(0)
+'D'
-    m_help_doc.addActionListener(this);
-    m_help_doc.setAccelerator(KeyStroke.getKeyStroke("F1"));    
-    m_help_about = new JMenuItem("About");
-"H".charAt(0)
+'A'
-    m_help_about.addActionListener(this);
-    
@@ -682 +700 @@
-        opening=false;
-        return;
-
-
+      
+      
-    }     
-    pwin.setText("Parsing XML...");
@@ -698 +716 @@
-    opened = true;
-    pwin.setVisible(false);    
+    hist = new History(this);
-  }
-  /**
@@ -719 +738 @@
-        saved = false;
-        opened = true;
+        hist = new History(this);
-      }
-  }
@@ -813 +833 @@
-          else if(s.resources.get(i).type.equals("Font")) {
-            try {
-Resources.Font fnt = (vlcskineditor.R
+resources.Font fnt = (vlcskineditor.r
-              String fn = s.skinfolder+fnt.file;              
-              if(!files.contains(fn)) { //To avoid double files (e.g. one font file used by several font objects)
@@ -922 +942 @@
-        File[] files = bitmap_adder.getSelectedFiles();
-        for(int i=0;i<files.length;i++) {
-R
+r
-        }
-        s.updateResources();
@@ -934 +954 @@
-        if(r!=null) {
-          if(r.type.equals("Bitmap")) {
-Resources.Bitmap b = (vlcskineditor.R
-R
+resources.Bitmap b = (vlcskineditor.r
+r
-          }
-          else {
@@ -964 +984 @@
-        File[] files = font_adder.getSelectedFiles();
-        for(int i=0;i<files.length;i++) {
-R
+r
-        }
-        s.updateResources();
@@ -1132 +1152 @@
-      if(selected_item!=null ) i = s.getParentListOf(selected_item);
-      if(i==null) i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_checkbox)) {      
@@ -1138 +1158 @@
-      if(selected_item!=null ) i = s.getParentListOf(selected_item);
-      if(i==null) i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_panel)) {      
@@ -1144 +1164 @@
-      if(selected_item!=null ) i = s.getParentListOf(selected_item);
-      if(i==null) i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_image)) {      
@@ -1150 +1170 @@
-      if(selected_item!=null ) i = s.getParentListOf(selected_item);
-      if(i==null) i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_playtree)) {      
@@ -1178 +1198 @@
-    else if(e.getSource().equals(items_add_pu_tp_anchor)) {      
-      java.util.List<Item> l = s.getListOf(selected_item);
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_tp_button)) {      
-      java.util.List<Item> l = s.getListOf(selected_item);
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_tp_checkbox)) {      
-      java.util.List<Item> l = s.getListOf(selected_item);
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_tp_image)) {      
-      java.util.List<Item> l = s.getListOf(selected_item);
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_tp_panel)) {      
-      java.util.List<Item> l = s.getListOf(selected_item);
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_tp_playtree)) {      
-      java.util.List<Item> l = s.getListOf(selected_item);
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_tp_slider)) {      
-      java.util.List<Item> l = s.getListOf(selected_item);
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_tp_text)) {      
-      java.util.List<Item> l = s.getListOf(selected_item);
-I
+i
-    }
-    else if(e.getSource().equals(items_add_pu_tp_video)) {      
-      java.util.List<Item> l = s.getListOf(selected_item);
-I
+i
-    }
-    //</editor-fold>
@@ -1235 +1255 @@
-    else if(e.getSource().equals(m_edit_left)) pvwin.moveItem(-1,0);
-    // </editor-fold>
+    else if(e.getSource().equals(m_edit_undo)) {
+      if(hist!=null) hist.undo();
+    }
+    else if(e.getSource().equals(m_edit_redo)) {
+      if(hist!=null) hist.redo();
+    }
-  }
-  
@@ -1336 +1362 @@
-  public void mouseEntered(MouseEvent e) {}
-  public void mouseExited(MouseEvent e) {}
+  /** Sets the activity state of the undo menu item to the given argument */
+  public void setUndoEnabled(boolean enabled) {
+    m_edit_undo.setEnabled(enabled);
+  }
+  /** Sets the activity state of the redo menu item to the given argument */
+  public void setRedoEnabled(boolean enabled) {
+    m_edit_redo.setEnabled(enabled);
+  }
+  /** Sets the action description that can be undone */
+  public void setUndoString(String s) {
+    if(s.isEmpty()) m_edit_undo.setText("Undo");
+    else m_edit_undo.setText("Undo: "+s);
+  }
+  /** Sets the action description that can be redone */
+  public void setRedoString(String s) {
+    if(s.isEmpty()) m_edit_redo.setText("Redo");
+    else m_edit_redo.setText("Redo: "+s);
+  }
-  /**
-   * Creates an ImageIcon of an image included in the JAR

trunk/src/vlcskineditor/Resource.java

@@ -46 +46 @@
-  /** Creates a DefaultMutableTreeNode to be displayed in the resources tree */
-  public abstract DefaultMutableTreeNode getTreeNode();  
-n
+
-  public Resource getParentOf(String id_) {
-    return null;

trunk/src/vlcskineditor/Skin.java

@@ -23 +23 @@
-package vlcskineditor;
-
-
+
+
+
-import java.awt.*;
-import java.awt.event.*;
@@ -172 +174 @@
-        }
-        //</editor-fold>
-R
+r
-        else if(line.startsWith("<BitmapFont")) resources.add(new BitmapFont(line,this));        
-        //<editor-fold defaultstate="collapsed" desc=" Window tag "> 
@@ -428 +430 @@
-    try {
-      if(r.type.equals("Font")) {
-Resources.Font fr = (vlcskineditor.R
+resources.Font fr = (vlcskineditor.r
-        return fr.f;
-      }
@@ -462 +464 @@
-    java.util.List<Item> l = null;          
-    try {
-Items.Panel p = (vlcskineditor.I
+items.Panel p = (vlcskineditor.i
-      l = p.items;
-    }
-    catch(Exception ex1) {
-      try {
-Items.Group g = (vlcskineditor.I
+items.Group g = (vlcskineditor.i
-        l = g.items;
-      }

trunk/src/vlcskineditor/SliderBGGen.java

@@ -26 +26 @@
-import java.awt.event.*;
-import javax.swing.*;
-I
+i
-
-/**
-SliderBGGen
+A wizard that generates a slider background from several image files.
- * @author Daniel Dreibrodt
- */
@@ -51 +51 @@
-  JPanel card_step2;
-  
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  JButton bg_btn, e1_btn, md_btn, e2_btn;
-  JFileChooser bg_fc, e1_fc, md_fc, e2_fc;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  public SliderBGGen(SliderBackground sbg_, Skin s_) {    
-    sbg=sbg_;
@@ -79 +98 @@
-    
-    String header_str = "<html><body style=\"background:"+header_bgh+";color:#FFFFFF;width:540px;\"><h1>&nbsp;Slider Background Generator</h1></body></html>";
-    
-    
-    
-    card_step1 = new JPanel(null);    
@@ -157 +174 @@
-    card_step2.add(header2_l); 
-    
+    JPanel bg_p = new JPanel(null);
+    JLabel bg_l = new JLabel("Image file:");
+    bg_tf = new JTextField("");
+    bg_btn = new JButton("Open...");
+    
+    
-    JSeparator step2_horz_s = new JSeparator(JSeparator.HORIZONTAL);
-    step2_prev_btn = new JButton("< Previous");
@@ -196 +219 @@
-  /**
-   * Creates an ImageIcon of an image included in the JAR
- 
-        
+
+
-   */
-  public ImageIcon createIcon(String filename) {      

trunk/src/vlcskineditor/items/Anchor.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import vlcskineditor.*;

trunk/src/vlcskineditor/items/Button.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import vlcskineditor.*;

trunk/src/vlcskineditor/items/Checkbox.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import vlcskineditor.*;

trunk/src/vlcskineditor/items/Group.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import vlcskineditor.*;

trunk/src/vlcskineditor/items/Image.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import vlcskineditor.*;

trunk/src/vlcskineditor/items/Panel.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import vlcskineditor.*;

trunk/src/vlcskineditor/items/Playtree.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import vlcskineditor.*;

trunk/src/vlcskineditor/items/RadialSlider.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import vlcskineditor.*;

trunk/src/vlcskineditor/items/Slider.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import java.util.Collection;

trunk/src/vlcskineditor/items/SliderBackground.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import vlcskineditor.*;

trunk/src/vlcskineditor/items/Text.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import vlcskineditor.*;
@@ -375 +375 @@
-      Resource fr = s.getResource(font);
-      if(fr.type.equals("Font")) {
-Resources.Font fnt = (vlcskineditor.R
+resources.Font fnt = (vlcskineditor.r
-        f = new Font(Font.SANS_SERIF,Font.PLAIN,fnt.size);
-      }

trunk/src/vlcskineditor/items/Video.java

@@ -21 +21 @@
- *****************************************************************************/
-
-I
+i
-
-import vlcskineditor.*;

trunk/src/vlcskineditor/resources/Bitmap.java

@@ -21 +21 @@
- *****************************************************************************/
-
-R
+r
-
-import vlcskineditor.*;
+import vlcskineditor.history.*;
-import java.util.*;
-import javax.swing.*;
@@ -168 +169 @@
-  }
-  public void update() {
+    BitmapEditEvent be = new BitmapEditEvent(this);
-    file=file_tf.getText();
-    alphacolor=alphacolor_tf.getText();
@@ -178 +180 @@
-    }
-    updateImage();
+    be.setNew();
+    s.m.hist.addEvent(be);
-  }
-  public void showOptions() {

trunk/src/vlcskineditor/resources/BitmapFont.java

@@ -21 +21 @@
- *****************************************************************************/
-
-R
+r
-
-import vlcskineditor.*;

trunk/src/vlcskineditor/resources/Font.java

@@ -21 +21 @@
- *****************************************************************************/
-
-R
+r
-
-import vlcskineditor.*;
+import vlcskineditor.history.*;
-import java.util.*;
-import javax.swing.*;
@@ -64 +65 @@
-      size = Integer.parseInt(XML.getValue(xmlcode,"size"));
-    }
+    updateFont();
+  }
+  /**
+   * Creates a new Font from the given attributes.
+   * @param id_ The ID of the Font.
+   * @param file_ The relative path to the font file.
+   * @param size_ The Font's size.
+   * @param s_ The Skin in which the Font is used.
+   */
+  public Font(String id_,String file_,int size_, Skin s_) {
+    type="Font";
+    s=s_;
+    id=id_;
+    file=file_;
+    size=size_;
+    updateFont();
+  }
+  /**
+   * Creates a new Font from a given file.
+   * @param s_ The skin in which the Font is used.
+   * @param f_ The font file. TrueType or OpenType. Notice that only OpenType fonts in a TrueType container
+   * can be displayed by the Skin Editor. VLC can display both.
+   */
+  public Font(Skin s_, File f_) {
+    s = s_;
+    type = "Font";
+    String id_t = f_.getName().substring(0,f_.getName().lastIndexOf("."));
+    if(s.idExists(id_t)) id_t += "_"+s.getNewId();
+    id = id_t;
+    file = f_.getPath().replace(s.skinfolder,"");    
+    s.updateResources();
+    s.expandResource(id);
+    updateFont();
+  }
+  /**
+   * Creates a new Font from user input.
+   * @param s_ The skin in which the Font is used.
+   */
+  public Font(Skin s_) {
+    s=s_;
+    type="Font";
+    id = "Unnamed font #"+s.getNewId();
+    file="";
+    s.updateResources();
+    s.expandResource(id);
+    showOptions();
+  }
+  public void updateFont() {
-    try {      
-      f = java.awt.Font.createFont(java.awt.Font.TRUETYPE_FONT,new File(s.skinfolder+file));
@@ -88 +137 @@
-    }
-  }
-  /**
-   * Creates a new Font from the given attributes.
-   * @param id_ The ID of the Font.
-   * @param file_ The relative path to the font file.
-   * @param size_ The Font's size.
-   * @param s_ The Skin in which the Font is used.
-   */
-  public Font(String id_,String file_,int size_, Skin s_) {
-    type="Font";
-    s=s_;
-    id=id_;
-    file=file_;
-    size=size_;
-    try {      
-      f = java.awt.Font.createFont(java.awt.Font.TRUETYPE_FONT,new File(s.skinfolder+file));
-      f = f.deriveFont((float)size);
-    }
-    catch(Exception e) {
-      e.printStackTrace();
-      if(file.indexOf(".otf")==-1) {
-        JOptionPane.showMessageDialog(frame,"Error while loading font file!\n Please choose another file\n","Font file not valid",JOptionPane.ERROR_MESSAGE);
-        f = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size);
-        showOptions();
-      }
-      else {
-        JOptionPane.showMessageDialog(frame,"You have chosen an OpenType font, VLC will display it correctly but the Skin Editor can not display it.\nIn the Skin Editor you will see instead of the chosen font the default font FreeSans","Notice",JOptionPane.INFORMATION_MESSAGE);
-        try {      
-          f = java.awt.Font.createFont(java.awt.Font.TRUETYPE_FONT,new File(Main.class.getResource("FreeSans.ttf").toURI()));
-          f = f.deriveFont(12);
-        }
-        catch(Exception ex) {
-          ex.printStackTrace();
-          f = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size);
-        }
-      }  
-    }
-  }
-  /**
-   * Creates a new Font from a given file.
-   * @param s_ The skin in which the Font is used.
-   * @param f_ The font file. TrueType or OpenType. Notice that only OpenType fonts in a TrueType container
-   * can be displayed by the Skin Editor. VLC can display both.
-   */
-  public Font(Skin s_, File f_) {
-    s = s_;
-    type = "Font";
-    String id_t = f_.getName().substring(0,f_.getName().lastIndexOf("."));
-    if(s.idExists(id_t)) id_t += "_"+s.getNewId();
-    id = id_t;
-    file = f_.getPath().replace(s.skinfolder,"");    
-    s.updateResources();
-    s.expandResource(id);
-    try {      
-      f = java.awt.Font.createFont(java.awt.Font.TRUETYPE_FONT,new File(s.skinfolder+file));
-      f = f.deriveFont((float)size);
-    }
-    catch(Exception e) {
-      e.printStackTrace();
-      if(file.indexOf(".otf")==-1) {
-        JOptionPane.showMessageDialog(frame,"Error while loading font file!\n Please choose another file\n","Font file not valid",JOptionPane.ERROR_MESSAGE);
-        f = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size);
-        showOptions();
-      }
-      else {
-        JOptionPane.showMessageDialog(frame,"You have chosen an OpenType font, VLC will display it correctly but the Skin Editor can not display it.\nIn the Skin Editor you will see instead of the chosen font the default font FreeSans","Notice",JOptionPane.INFORMATION_MESSAGE);
-        try {      
-          f = java.awt.Font.createFont(java.awt.Font.TRUETYPE_FONT,new File(Main.class.getResource("FreeSans.ttf").toURI()));
-          f = f.deriveFont(12);
-        }
-        catch(Exception ex) {
-          ex.printStackTrace();
-          f = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size);
-        }
-      }  
-    }    
-  }
-  /**
-   * Creates a new Font from user input.
-   * @param s_ The skin in which the Font is used.
-   */
-  public Font(Skin s_) {
-    s=s_;
-    type="Font";
-    id = "Unnamed font #"+s.getNewId();
-    file="";
-    s.updateResources();
-    s.expandResource(id);
-    showOptions();
-  }
-  public void update() {
+    FontEditEvent fe = new FontEditEvent(this);
-    type="Font";    
-    file=file_tf.getText();
@@ -184 +145 @@
-    s.updateResources();
-    s.expandResource(id);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-  }
-  public void showOptions() {

trunk/src/vlcskineditor/resources/SubBitmap.java

@@ -21 +21 @@
- *****************************************************************************/
-
-R
+r
-
-import vlcskineditor.*;
@@ -33 +33 @@
-import java.awt.event.*;
-import java.io.*;
+import vlcskineditor.history.SubBitmapAddEvent;
-/**
- * Handles SubBitmap resources
@@ -40 +41 @@
-public class SubBitmap extends Resource implements ActionListener{
-  
-
+public 
-  final int NBFRAMES_DEFAULT = 1;
-
+public 
-  final int FPS_DEFAULT = 0;
-
+public 
-  //The image represented by the SubBitmap
-  public BufferedImage image; 
@@ -97 +98 @@
-  }  
-  public void update() {    
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+