Changeset 78

Show
Ignore:
Timestamp:
12/12/07 15:43:48 (1 year ago)
Author:
altglass
Message:

Group editing and adding can be undone/redone

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/vlcskineditor/items/Checkbox.java

    r77 r78  
    322322      tooltiptext1_l.setBounds(5,135,75,24); 
    323323      tooltiptext1_tf.setBounds(85,135,150,24); 
    324       state1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.DARK_GRAY), "If state is false:")); 
     324      state1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "If state is false:")); 
    325325      state1.setMinimumSize(new Dimension(240,165)); 
    326326      state1.setPreferredSize(new Dimension(240,165)); 
    …… 
    351351      tooltiptext2_l.setBounds(5,135,75,24); 
    352352      tooltiptext2_tf.setBounds(85,135,150,24); 
    353       state2.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.DARK_GRAY), "If state is true:")); 
     353      state2.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "If state is true:")); 
    354354      state2.setMinimumSize(new Dimension(240,165)); 
    355355      state2.setPreferredSize(new Dimension(240,165)); 

  • trunk/src/vlcskineditor/items/Group.java

    r71 r78  
    2424 
    2525import vlcskineditor.*; 
     26import vlcskineditor.history.*; 
    2627import java.util.*; 
    2728import java.awt.event.*; 
    …… 
    114115  } 
    115116  public void update() { 
    116     id=id_tf.getText(); 
    117     x=Integer.parseInt(x_tf.getText()); 
    118     y=Integer.parseInt(y_tf.getText()); 
    119     for(Item i:items) { 
    120       i.setOffset(x,y); 
    121     } 
    122     s.updateItems();     
    123     s.expandItem(id); 
    124     frame.setDefaultCloseOperation(frame.HIDE_ON_CLOSE); 
    125     created = true; 
     117    if(!created) { 
     118      id=id_tf.getText(); 
     119      x=Integer.parseInt(x_tf.getText()); 
     120      y=Integer.parseInt(y_tf.getText()); 
     121      for(Item i:items) { 
     122        i.setOffset(x,y); 
     123      } 
     124      s.updateItems();     
     125      s.expandItem(id); 
     126      frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); 
     127      created = true; 
     128       
     129      GroupAddEvent gaa = new GroupAddEvent(s.getParentListOf(id),this); 
     130      s.m.hist.addEvent(gaa); 
     131    } 
     132    else { 
     133      GroupEditEvent gee = new GroupEditEvent(this); 
     134      id=id_tf.getText(); 
     135      x=Integer.parseInt(x_tf.getText()); 
     136      y=Integer.parseInt(y_tf.getText()); 
     137      for(Item i:items) { 
     138        i.setOffset(x,y); 
     139      } 
     140      s.updateItems();     
     141      s.expandItem(id); 
     142       
     143      gee.setNew(); 
     144      s.m.hist.addEvent(gee); 
     145    } 
    126146  } 
    127147  public void showOptions() { 
    …… 
    130150      frame.setResizable(false); 
    131151      frame.setLayout(new FlowLayout()); 
    132       if(!created) frame.setDefaultCloseOperation(frame.DO_NOTHING_ON_CLOSE); 
     152      if(!created) frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); 
    133153      JLabel id_l = new JLabel("ID*:"); 
    134154      id_tf = new JTextField();