Changeset 80

Show
Ignore:
Timestamp:
12/12/07 16:18:04 (1 year ago)
Author:
altglass
Message:

Image adding/editing supported by history. Minor bugfix and code style changes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk

    • Property svn:ignore changed from
      dist
      registry-3.13-win32-src
      src_bak
      build
      no_svn
      VLCSkinEditor.jar
      *.zip
       to
      dist
      registry-3.13-win32-src
      src_bak
      build
      no_svn
      VLCSkinEditor.jar
      *.zip
      nbproject

  • trunk/src/vlcskineditor/history/ButtonEditEvent.java

    r75 r80  
    5353    x_old = b.x; 
    5454    y_old = b.y; 
     55    help_old = b.help; 
    5556     
    5657    up_old = b.up; 
    …… 
    6970    x_new = b.x; 
    7071    y_new = b.y; 
     72    help_new = b.help; 
    7173     
    7274    up_new = b.up; 
    …… 
    8587    b.x = x_old; 
    8688    b.y = y_old; 
     89    b.help = help_old; 
    8790     
    8891    b.up = up_old; 
    …… 
    101104    b.x = x_new; 
    102105    b.y = y_new; 
     106    b.help = help_new; 
    103107     
    104108    b.up = up_new; 

  • trunk/src/vlcskineditor/history/CheckboxEditEvent.java

    r77 r80  
    5757    x_old = c.x; 
    5858    y_old = c.y; 
     59    help_old = c.help; 
    5960     
    6061    down1_old = c.down1; 
    …… 
    7980    x_new = c.x; 
    8081    y_new = c.y; 
     82    help_new = c.help; 
    8183     
    8284    down1_new = c.down1; 
    …… 
    101103    c.x = x_old; 
    102104    c.y = y_old;     
     105    c.help = help_old; 
    103106     
    104107    c.down1 = down1_old; 
    …… 
    122125    c.ykeepratio = ykeepratio_new; 
    123126    c.x = x_new; 
    124     c.y = y_new;     
     127    c.y = y_new;   
     128    c.help = help_new; 
    125129     
    126130    c.down1 = down1_new; 

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

    r71 r80  
    2424 
    2525import vlcskineditor.*; 
     26import vlcskineditor.history.*; 
    2627import java.awt.event.*; 
    2728import java.awt.*; 
    …… 
    7879  } 
    7980  public void update() { 
    80     id = id_tf.getText(); 
    81     x = Integer.parseInt(x_tf.getText()); 
    82     y = Integer.parseInt(y_tf.getText()); 
    83     lefttop = lefttop_cb.getSelectedItem().toString(); 
    84     rightbottom = rightbottom_cb.getSelectedItem().toString(); 
    85     xkeepratio = Boolean.parseBoolean(xkeepratio_cb.getSelectedItem().toString()); 
    86     ykeepratio = Boolean.parseBoolean(ykeepratio_cb.getSelectedItem().toString()); 
    87     visible = visible_tf.getText(); 
    88     help = help_tf.getText(); 
    89      
    90     image = image_tf.getText(); 
    91     resize = resize_cb.getSelectedItem().toString(); 
    92     action = action_cb.getSelectedItem().toString(); 
    93     action2 = action2_tf.getText();    
    94      
    95     s.updateItems();       
    96     s.expandItem(id); 
    97     frame.setDefaultCloseOperation(frame.HIDE_ON_CLOSE); 
    98     created = true; 
     81    if(!created) { 
     82      id = id_tf.getText(); 
     83      x = Integer.parseInt(x_tf.getText()); 
     84      y = Integer.parseInt(y_tf.getText()); 
     85      lefttop = lefttop_cb.getSelectedItem().toString(); 
     86      rightbottom = rightbottom_cb.getSelectedItem().toString(); 
     87      xkeepratio = Boolean.parseBoolean(xkeepratio_cb.getSelectedItem().toString()); 
     88      ykeepratio = Boolean.parseBoolean(ykeepratio_cb.getSelectedItem().toString()); 
     89      visible = visible_tf.getText(); 
     90      help = help_tf.getText(); 
     91 
     92      image = image_tf.getText(); 
     93      resize = resize_cb.getSelectedItem().toString(); 
     94      action = action_cb.getSelectedItem().toString(); 
     95      action2 = action2_tf.getText();    
     96 
     97      s.updateItems();       
     98      s.expandItem(id); 
     99      frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); 
     100      created = true; 
     101       
     102      ImageAddEvent iae = new ImageAddEvent(s.getParentListOf(id),this); 
     103      s.m.hist.addEvent(iae); 
     104    } 
     105    else { 
     106      ImageEditEvent iee = new ImageEditEvent(this); 
     107       
     108      id = id_tf.getText(); 
     109      x = Integer.parseInt(x_tf.getText()); 
     110      y = Integer.parseInt(y_tf.getText()); 
     111      lefttop = lefttop_cb.getSelectedItem().toString(); 
     112      rightbottom = rightbottom_cb.getSelectedItem().toString(); 
     113      xkeepratio = Boolean.parseBoolean(xkeepratio_cb.getSelectedItem().toString()); 
     114      ykeepratio = Boolean.parseBoolean(ykeepratio_cb.getSelectedItem().toString()); 
     115      visible = visible_tf.getText(); 
     116      help = help_tf.getText(); 
     117 
     118      image = image_tf.getText(); 
     119      resize = resize_cb.getSelectedItem().toString(); 
     120      action = action_cb.getSelectedItem().toString(); 
     121      action2 = action2_tf.getText();    
     122       
     123      iee.setNew(); 
     124      s.m.hist.addEvent(iee); 
     125    } 
    99126  } 
    100127  public void showOptions() { 
    …… 
    103130      frame.setResizable(false); 
    104131      frame.setLayout(new FlowLayout()); 
    105       if(!created) frame.setDefaultCloseOperation(frame.DO_NOTHING_ON_CLOSE); 
     132      if(!created) frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); 
    106133      JLabel id_l = new JLabel("ID*:"); 
    107134      id_tf = new JTextField();       
    …… 
    206233      frame.add(general); 
    207234       
    208       JPanel image = new JPanel(null); 
    209       image.add(image_l); 
    210       image.add(image_tf); 
     235      JPanel image_settings = new JPanel(null); 
     236      image_settings.add(image_l); 
     237      image_settings.add(image_tf); 
    211238      image_l.setBounds(5,15,75,24); 
    212239      image_tf.setBounds(85,15,150,24); 
    213       image.add(resize_l); 
    214       image.add(resize_cb); 
     240      image_settings.add(resize_l); 
     241      image_settings.add(resize_cb); 
    215242      resize_l.setBounds(5,45,75,24); 
    216243      resize_cb.setBounds(85,45,150,24); 
    217       image.add(action_l); 
    218       image.add(action_cb);       
     244      image_settings.add(action_l); 
     245      image_settings.add(action_cb);       
    219246      action_l.setBounds(5,75,75,24); 
    220247      action_cb.setBounds(85,75,150,24); 
    221       image.add(action2_l); 
    222       image.add(action2_tf); 
    223       image.add(action2_btn); 
     248      image_settings.add(action2_l); 
     249      image_settings.add(action2_tf); 
     250      image_settings.add(action2_btn); 
    224251      action2_l.setBounds(5,105,75,24); 
    225252      action2_tf.setBounds(85,105,120,24); 
    226253      action2_btn.setBounds(210,105,24,24); 
    227       image.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "Image Attributes")); 
    228       image.setMinimumSize(new Dimension(240,135)); 
    229       image.setPreferredSize(new Dimension(240,135)); 
    230       image.setMaximumSize(new Dimension(240,135)); 
    231       frame.add(image); 
     254      image_settings.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "Image Attributes")); 
     255      image_settings.setMinimumSize(new Dimension(240,135)); 
     256      image_settings.setPreferredSize(new Dimension(240,135)); 
     257      image_settings.setMaximumSize(new Dimension(240,135)); 
     258      frame.add(image_settings); 
    232259       
    233260