Changeset 92

Timestamp:

31/12/07 15:43:11 (11 months ago)

Author:

altglass

Message:

Attempt to make the use of window handles as minimal as possible.

Files:

• trunk/src/vlcskineditor/Main.java (modified) (1 diff)
• trunk/src/vlcskineditor/Skin.java (modified) (9 diffs)
• trunk/src/vlcskineditor/items/Anchor.java (modified) (6 diffs)
• trunk/src/vlcskineditor/items/Button.java (modified) (3 diffs)
• trunk/src/vlcskineditor/items/Checkbox.java (modified) (3 diffs)
• trunk/src/vlcskineditor/items/Group.java (modified) (2 diffs)
• trunk/src/vlcskineditor/items/Image.java (modified) (3 diffs)
• trunk/src/vlcskineditor/items/Panel.java (modified) (3 diffs)
• trunk/src/vlcskineditor/items/Playtree.java (modified) (2 diffs)
• trunk/src/vlcskineditor/items/Slider.java (modified) (3 diffs)
• trunk/src/vlcskineditor/items/SliderBackground.java (modified) (3 diffs)
• trunk/src/vlcskineditor/items/Text.java (modified) (3 diffs)
• trunk/src/vlcskineditor/items/Video.java (modified) (3 diffs)
• trunk/src/vlcskineditor/resources/Bitmap.java (modified) (3 diffs)
• trunk/src/vlcskineditor/resources/Font.java (modified) (2 diffs)
• trunk/src/vlcskineditor/resources/SubBitmap.java (modified) (5 diffs)

trunk/src/vlcskineditor/Main.java

@@ -114 +114 @@
-  public History hist;
-  
-
+ 
-   * Launches the skin editor and initializes the GUI.
-   * @param args Command line arguments passed by the console.

trunk/src/vlcskineditor/Skin.java

@@ -34 +34 @@
-import javax.swing.tree.*;
-import java.util.*;
+import javax.swing.border.EtchedBorder;
-
-/**
@@ -76 +77 @@
-  public GlobalVariables gvars = new GlobalVariables();
-  
+  //Central window handle for all editing dialogs of res/win/layout/items
+  public JFrame edit_frame; 
+  
-  public Skin(Main m_) {
-
+    
-  }
-  /** Creates the file in which to save the new skin **/
-  public void createNew(File f) {
-    skinfile=f;
-f
+File
-    try {
-      skinfile.createNewFile();
@@ -95 +99 @@
-    windows.clear();
-    skinfile=f;
-f
+File
-    try {
-      //System.out.println("Creating Buffered Reader...");
@@ -233 +237 @@
-      theme_frame.setResizable(false);
-      theme_frame.setLayout(new FlowLayout());
-theme_f
+JF
-      
-      JLabel themeinfo_name_l = new JLabel("Name:");
@@ -282 +286 @@
-      themeinfo_webpage_l.setBounds(5,105,150,24);
-      themeinfo_webpage_tf.setBounds(160,105,150,24);      
-LineBorder(Color.DARK_GRAY
+EtchedBorder(EtchedBorder.LOWERED
-      themeinfo_p.setMinimumSize(new Dimension(315,135));
-      themeinfo_p.setMaximumSize(new Dimension(315,135));
@@ -301 +305 @@
-      theme_movealpha_l.setBounds(5,75,150,24);
-      theme_movealpha_tf.setBounds(160,75,150,24);
-LineBorder(Color.DARK_GRAY
+EtchedBorder(EtchedBorder.LOWERED
-      theme_p.setMinimumSize(new Dimension(315,105));
-      theme_p.setMaximumSize(new Dimension(315,105));
@@ -345 +349 @@
-      theme_movealpha = Integer.parseInt(theme_movealpha_tf.getText());
-      theme_frame.setVisible(false);
+      theme_frame.dispose();
+      theme_frame = null;
-      tee.setNew();
-      m.hist.addEvent(tee);
@@ -363 +369 @@
-      }
-    }
-
+
+
+
+
+
-  }
-  /** Generates a new number for unnamed items so that every id is unique **/  
@@ -537 +547 @@
-    code += HEADER+"\n";
-    code += "<Theme version=\""+theme_version+"\"";
-theme_tooltipfont!=THEME_TOOLTIPFONT_DEFAULT
+!theme_tooltipfont.equals(THEME_TOOLTIPFONT_DEFAULT)
-    if(theme_magnet!=THEME_MAGNET_DEFAULT) code+=" magnet=\""+String.valueOf(theme_magnet)+"\"";
-    if(theme_alpha!=THEME_ALPHA_DEFAULT) code+=" alpha=\""+String.valueOf(theme_alpha)+"\"";

trunk/src/vlcskineditor/items/Anchor.java

@@ -108 +108 @@
-      s.updateItems();
-      s.expandItem(id);
-f
+JF
-      created = true;
-      ItemAddEvent aae = new ItemAddEvent(s.getParentListOf(id),this);
@@ -134 +134 @@
-      frame.setResizable(false);
-      frame.setLayout(new FlowLayout());
-f
+JF
-      JLabel id_l = new JLabel("ID:");
-      id_tf = new JTextField();
@@ -240 +240 @@
-        }
-      }
+      update();
-      frame.setVisible(false);
-
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -264 +266 @@
-      }
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-    }
-  }
@@ -271 +275 @@
-    if (y!=Y_DEFAULT) code+=" y=\""+String.valueOf(y)+"\"";
-    code+=" priority=\""+String.valueOf(priority)+"\"";
-lefttop!=LEFTTOP_DEFAULT
+!lefttop.equals(LEFTTOP_DEFAULT)
-    code+="/>";
-    //if (id!=ID_DEFAULT) code+="<!-- id=\""+id+"\" -->";
@@ -293 +297 @@
-    }
-  }
+  @Override
-  public boolean contains(int x_, int y_) {
-
+
+
-    int w = b.getWidth();
-  
+*/
-  }
-  public DefaultMutableTreeNode getTreeNode() {

trunk/src/vlcskineditor/items/Button.java

@@ -320 +320 @@
-      }
-      update();
-
+
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -362 +364 @@
-      }
-      frame.setVisible(false);
-
-
+
+
+
+
+
-  public void actionWasEdited(ActionEditor ae) {
-    if(ae==action_ae) action_tf.setText(ae.getCode());
@@ -370 +375 @@
-    String code = "<Button";
-    code+=" up=\""+up+"\"";
-down!=DOWN_DEFAULT
-over!=OVER_DEFAULT
-action!=ACTION_DEFAULT
-id!=ID_DEFAULT
+!down.equals(DOWN_DEFAULT)
+!over.equals(OVER_DEFAULT)
+!action.equals(ACTION_DEFAULT)
+!id.equals(ID_DEFAULT)
-    if (x!=X_DEFAULT) code+=" x=\""+String.valueOf(x)+"\"";
-    if (y!=Y_DEFAULT) code+=" y=\""+String.valueOf(y)+"\"";
-lefttop!=LEFTTOP_DEFAULT
-rightbottom!=RIGHTBOTTOM_DEFAULT
+!lefttop.equals(LEFTTOP_DEFAULT)
+!rightbottom.equals(RIGHTBOTTOM_DEFAULT)
-    if (xkeepratio!=XKEEPRATIO_DEFAULT) code+=" xkeepratio=\""+String.valueOf(xkeepratio)+"\"";
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-help!=HELP_DEFAULT
-visible!=VISIBLE_DEFAULT
-tooltiptext!=TOOLTIPTEXT_DEFAULT
+!help.equals(HELP_DEFAULT)
+!visible.equals(VISIBLE_DEFAULT)
+!tooltiptext.equals(TOOLTIPTEXT_DEFAULT)
-    code+="/>";
-    return code;

trunk/src/vlcskineditor/items/Checkbox.java

@@ -436 +436 @@
-      }
-      update();
-
+
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -497 +499 @@
-      }
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-    }
-  }
@@ -507 +511 @@
-    String code = "<Checkbox";
-    code+=" state=\""+state+"\" up1=\""+up1+"\" up2=\""+up2+"\"";
-down1!=ID_DEFAULT
-down2!=ID_DEFAULT
-over1!=ID_DEFAULT
-over2!=ID_DEFAULT
-action1!=ID_DEFAULT
-action2!=ID_DEFAULT
-tooltiptext1!=ID_DEFAULT
-tooltiptext2!=ID_DEFAULT
-id!=ID_DEFAULT
+!down1.equals(ID_DEFAULT)
+!down2.equals(ID_DEFAULT)
+!over1.equals(ID_DEFAULT)
+!over2.equals(ID_DEFAULT)
+!action1.equals(ID_DEFAULT)
+!action2.equals(ID_DEFAULT)
+!tooltiptext1.equals(ID_DEFAULT)
+!tooltiptext2.equals(ID_DEFAULT)
+!id.equals(ID_DEFAULT)
-    if (x!=X_DEFAULT) code+=" x=\""+String.valueOf(x)+"\"";
-    if (y!=Y_DEFAULT) code+=" y=\""+String.valueOf(y)+"\"";
-lefttop!=LEFTTOP_DEFAULT
-rightbottom!=RIGHTBOTTOM_DEFAULT
+!lefttop.equals(LEFTTOP_DEFAULT)
+!rightbottom.equals(RIGHTBOTTOM_DEFAULT)
-    if (xkeepratio!=XKEEPRATIO_DEFAULT) code+=" xkeepratio=\""+String.valueOf(xkeepratio)+"\"";
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-help!=HELP_DEFAULT
-visible!=VISIBLE_DEFAULT
+!help.equals(HELP_DEFAULT)
+!visible.equals(VISIBLE_DEFAULT)
-    code+="/>";
-    return code;

trunk/src/vlcskineditor/items/Group.java

@@ -216 +216 @@
-        }
-      }
+      update();
-      frame.setVisible(false);
-
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -240 +242 @@
-      }
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-    }
-  }

trunk/src/vlcskineditor/items/Image.java

@@ -306 +306 @@
-      }
-      update();
-
+
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -345 +347 @@
-      }
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-    }
-  }
@@ -352 +356 @@
-  }
-  public String returnCode() {
-
-
-
-
-
+
+
-    if (x!=X_DEFAULT) code+=" x=\""+String.valueOf(x)+"\"";
-    if (y!=Y_DEFAULT) code+=" y=\""+String.valueOf(y)+"\"";
-
-
+
+
+
+
+
+
+
-    if (xkeepratio!=XKEEPRATIO_DEFAULT) code+=" xkeepratio=\""+String.valueOf(xkeepratio)+"\"";
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-help!=HELP_DEFAULT
-visible!=VISIBLE_DEFAULT
+!help.equals(HELP_DEFAULT)
+!visible.equals(VISIBLE_DEFAULT)
-    code+="/>";
-    return code;

trunk/src/vlcskineditor/items/Panel.java

@@ -324 +324 @@
-      }
-      update();
-
+
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -347 +349 @@
-      }
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-    }
-  }
@@ -354 +358 @@
-    if (y!=Y_DEFAULT) code+=" y=\""+String.valueOf(y)+"\"";
-    code+=" width=\""+String.valueOf(width)+"\" height=\""+String.valueOf(height)+"\"";
-lefttop!=LEFTTOP_DEFAULT
-rightbottom!=RIGHTBOTTOM_DEFAULT
+!lefttop.equals(LEFTTOP_DEFAULT)
+!rightbottom.equals(RIGHTBOTTOM_DEFAULT)
-    if (xkeepratio!=XKEEPRATIO_DEFAULT) code+=" xkeepratio=\""+String.valueOf(xkeepratio)+"\"";
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-    code+=">";
-id!=ID_DEFAULT
+!id.equals(ID_DEFAULT)
-    for (int i=0;i<items.size();i++) {
-      code+="\n"+items.get(i).returnCode();

trunk/src/vlcskineditor/items/Playtree.java

@@ -491 +491 @@
-      }
-      update();
-
+
+
+
-    }
-    else if (e.getSource().equals(bgcolor1_btn)) {
@@ -596 +598 @@
-      }
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-    }
-  }
-  public String returnCode() {
-    String code = "<Playtree";
-id!=ID_DEFAULT
+!id.equals(ID_DEFAULT)
-    code+=" font=\""+font+"\"";
-bgcolor1!=BGCOLOR1_DEFAULT
-bgcolor2!=BGCOLOR2_DEFAULT
-fgcolor!=FGCOLOR_DEFAULT
-selcolor!=SELCOLOR_DEFAULT
-playcolor!=PLAYCOLOR_DEFAULT
-bgimage!=BGIMAGE_DEFAULT
-itemimage!=ITEMIMAGE_DEFAULT
-openimage!=OPENIMAGE_DEFAULT
-closedimage!=CLOSEDIMAGE_DEFAULT
-var!=VAR_DEFAULT
+!bgcolor1.equals(BGCOLOR1_DEFAULT)
+!bgcolor2.equals(BGCOLOR2_DEFAULT)
+!fgcolor.equals(FGCOLOR_DEFAULT)
+!selcolor.equals(SELCOLOR_DEFAULT)
+!playcolor.equals(PLAYCOLOR_DEFAULT)
+!bgimage.equals(BGIMAGE_DEFAULT)
+!itemimage.equals(ITEMIMAGE_DEFAULT)
+!openimage.equals(OPENIMAGE_DEFAULT)
+!closedimage.equals(CLOSEDIMAGE_DEFAULT)
+!var.equals(VAR_DEFAULT)
-    if(flat!=FLAT_DEFAULT) code+=" flat=\""+String.valueOf(flat)+"\"";
-    if (x!=X_DEFAULT) code+=" x=\""+String.valueOf(x)+"\"";
-    if (y!=Y_DEFAULT) code+=" y=\""+String.valueOf(y)+"\"";
-
-
-
-
+
+
-    if (xkeepratio!=XKEEPRATIO_DEFAULT) code+=" xkeepratio=\""+String.valueOf(xkeepratio)+"\"";
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-help!=HELP_DEFAULT
-visible!=VISIBLE_DEFAULT) code+=" visible=\""+visible+"\"";
+!help.equals(HELP_DEFAULT)
+!visible.equals(VISIBLE_DEFAULT)) code+=" visible=\""+visible+"\"";    
-    code+=">\n";    
-    code+=slider.returnCode();

trunk/src/vlcskineditor/items/Slider.java

@@ -453 +453 @@
-      }
-      update();
-
+
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -504 +506 @@
-      }
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-    }
-  }
@@ -514 +518 @@
-  public String returnCode() {
-    String code = "<Slider";
-id!=ID_DEFAULT
+!id.equals(ID_DEFAULT)
-    if (x!=X_DEFAULT) code+=" x=\""+String.valueOf(x)+"\"";
-    if (y!=Y_DEFAULT) code+=" y=\""+String.valueOf(y)+"\"";
-    code+=" points=\""+points+"\"";
-    if (thickness!=THICKNESS_DEFAULT) code+=" thickness=\""+String.valueOf(thickness)+"\"";
-value!=VALUE_DEFAULT
-tooltiptext!=TOOLTIPTEXT_DEFAULT
+!value.equals(VALUE_DEFAULT)
+!tooltiptext.equals(TOOLTIPTEXT_DEFAULT)
-    code+=" up=\""+up+"\"";
-down!=DOWN_DEFAULT
-over!=OVER_DEFAULT
-lefttop!=LEFTTOP_DEFAULT
-rightbottom!=RIGHTBOTTOM_DEFAULT
+!down.equals(DOWN_DEFAULT)
+!over.equals(OVER_DEFAULT)
+!lefttop.equals(LEFTTOP_DEFAULT)
+!rightbottom.equals(RIGHTBOTTOM_DEFAULT)
-    if (xkeepratio!=XKEEPRATIO_DEFAULT) code+=" xkeepratio=\""+String.valueOf(xkeepratio)+"\"";
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-help!=HELP_DEFAULT
-visible!=VISIBLE_DEFAULT
+!help.equals(HELP_DEFAULT)
+!visible.equals(VISIBLE_DEFAULT)
-    if (sbg==null) {
-      code+="/>";

trunk/src/vlcskineditor/items/SliderBackground.java

@@ -219 +219 @@
-      }
-      update();
-
+
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -241 +243 @@
-    else if(e.getSource().equals(cancel_btn)) {
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-      if(!created) sl.removeBG();      
-    }
@@ -246 +250 @@
-  public String returnCode() {
-    String code = "<SliderBackground";
-id!=ID_DEFAULT
+!id.equals(ID_DEFAULT)
-    code+=" image=\""+image+"\"";
-    if (nbhoriz!=NBHORIZ_DEFAULT) code+=" nbhoriz=\""+String.valueOf(nbhoriz)+"\"";

trunk/src/vlcskineditor/items/Text.java

@@ -327 +327 @@
-      }
-      update();
-
+
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -378 +380 @@
-      }
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-    }
-  }
@@ -384 +388 @@
-    code+=" text=\""+text+"\"";
-    code+=" font=\""+font+"\"";
-(alignment!=ALIGNMENT_DEFAULT
-color!=COLOR_DEFAULT
-id!=ID_DEFAULT
+ (!alignment.equals(ALIGNMENT_DEFAULT)
+!color.equals(COLOR_DEFAULT)
+!id.equals(ID_DEFAULT)
-    if (x!=X_DEFAULT) code+=" x=\""+String.valueOf(x)+"\"";
-    if (y!=Y_DEFAULT) code+=" y=\""+String.valueOf(y)+"\"";
-    if (width!=WIDTH_DEFAULT) code+=" width=\""+String.valueOf(width)+"\"";
-lefttop!=LEFTTOP_DEFAULT
-rightbottom!=RIGHTBOTTOM_DEFAULT
+!lefttop.equals(LEFTTOP_DEFAULT)
+!rightbottom.equals(RIGHTBOTTOM_DEFAULT)
-    if (xkeepratio!=XKEEPRATIO_DEFAULT) code+=" xkeepratio=\""+String.valueOf(xkeepratio)+"\"";
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-help!=HELP_DEFAULT
-visible!=VISIBLE_DEFAULT
+!help.equals(HELP_DEFAULT)
+!visible.equals(VISIBLE_DEFAULT)
-    code+="/>";
-    return code;

trunk/src/vlcskineditor/items/Video.java

@@ -283 +283 @@
-      }      
-      update();
-
+
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -321 +323 @@
-      }
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-    }
-  }
-  public String returnCode() {
-    String code = "<Video";
-id!=ID_DEFAULT
+!id.equals(ID_DEFAULT)
-    if (x!=X_DEFAULT) code+=" x=\""+String.valueOf(x)+"\"";
-    if (y!=Y_DEFAULT) code+=" y=\""+String.valueOf(y)+"\"";
@@ -331 +335 @@
-    if (height!=HEIGHT_DEFAULT) code+=" height=\""+String.valueOf(height)+"\"";
-    if (autoresize!=AUTORESIZE_DEFAULT) code+=" autoresize=\""+String.valueOf(autoresize)+"\"";
-lefttop!=LEFTTOP_DEFAULT
-rightbottom!=RIGHTBOTTOM_DEFAULT
+!lefttop.equals(LEFTTOP_DEFAULT)
+!rightbottom.equals(RIGHTBOTTOM_DEFAULT)
-    if (xkeepratio!=XKEEPRATIO_DEFAULT) code+=" xkeepratio=\""+String.valueOf(xkeepratio)+"\"";
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-help!=HELP_DEFAULT
-visible!=VISIBLE_DEFAULT
+!help.equals(HELP_DEFAULT)
+!visible.equals(VISIBLE_DEFAULT)
-    code+="/>";
-    return code;

trunk/src/vlcskineditor/resources/Bitmap.java

@@ -324 +324 @@
-        return;
-      }      
+      update();    
-      frame.setVisible(false);
-
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -344 +346 @@
-    else if(e.getSource().equals(cancel_btn)) {
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-    }
-  }
@@ -370 +374 @@
-    return node;
-  }
+  @Override
-  public Resource getParentOf(String id_) {
-    for(SubBitmap sbmp:SubBitmaps) {

trunk/src/vlcskineditor/resources/Font.java

@@ -241 +241 @@
-        return;
-      }
+      update(); 
-      frame.setVisible(false);
-
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -261 +263 @@
-    else if(e.getSource().equals(cancel_btn)) {
-      frame.setVisible(false);
+      frame.dispose();
+      frame = null;
-    }
-  }

trunk/src/vlcskineditor/resources/SubBitmap.java

@@ -108 +108 @@
-      nbframes=Integer.parseInt(nbframes_tf.getText());
-      fps=Integer.parseInt(fps_tf.getText());   
-
+//
-      updateImage();
-      s.updateResources();
@@ -124 +124 @@
-      nbframes=Integer.parseInt(nbframes_tf.getText());
-      fps=Integer.parseInt(fps_tf.getText());   
-
+//
-      updateImage();
-      s.updateResources();
@@ -273 +273 @@
-        return;
-      }
-
+
+
-      destroyEditWindow();
-
+
+
-    }
-    else if(e.getSource().equals(help_btn)) {
@@ -293 +295 @@
-    }
-    else if(e.getSource().equals(cancel_btn)) {
-
+      
-      destroyEditWindow();
+      frame.dispose();
+      frame = null;
-      if(!created) parent.SubBitmaps.remove(this);      
-    }
@@ -305 +309 @@
-    height_tf.removeKeyListener(sbew);
-    frame.removeWindowListener(sbew);
+    sbew.frame.dispose();
-    sbew.frame = null;
-    sbew = null;