Changeset 107

Timestamp:

20/09/08 17:30:25 (2 months ago)

Author:

altglass

Message:

V.0.7 FINAL

Files:

• trunk/VLCSkinEditor.jestart (deleted)
• trunk/make-targz-nix.bat (added)
• trunk/src/vlcskineditor/Item.java (modified) (1 diff)
• trunk/src/vlcskineditor/Main.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Button.java (modified) (2 diffs)
• trunk/src/vlcskineditor/items/Checkbox.java (modified) (2 diffs)
• trunk/src/vlcskineditor/items/Image.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Playtree.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Slider.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/Item.java

@@ -78 +78 @@
-  /** Creates the XML code representing the item */
-  public abstract String returnCode(String indent);
-
+
+
+
+
-  public abstract void draw(Graphics2D g, int z);
-
+
+
+
+
+
+
-  public abstract void draw(Graphics2D g, int x, int y, int z);
-  /** Creates a DefaultMutableTreeNode to be displayed in the items tree */

trunk/src/vlcskineditor/Main.java

@@ -763 +763 @@
-      }      
-      setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));      
-     
+
-    pwin.setText("Parsing XML...");
-    pwin.setVisible(true);

trunk/src/vlcskineditor/items/Button.java

@@ -397 +397 @@
-  }
-  public void draw(Graphics2D g, int x_, int y_, int z) {
-
-
+
-    java.awt.image.BufferedImage bi;
-    if(!hovered || ( (over.equals("none") && !clicked)||(clicked && down.equals("none")) ) ) {
@@ -409 +408 @@
-      bi = s.getBitmapImage(down);
-    }
-
+if(s.gvars.parseBoolean(visible)==true) 
-    if(selected) {
-      g.setColor(Color.RED);

trunk/src/vlcskineditor/items/Checkbox.java

@@ -537 +537 @@
-  }
-  public void draw(Graphics2D g, int x_, int y_, int z) {
-
-
+
-    java.awt.image.BufferedImage bi = null; 
-    if(s.gvars.parseBoolean(state)) {      
@@ -550 +549 @@
-      else bi = s.getBitmapImage(down2);
-    }
-
+if(s.gvars.parseBoolean(visible)==true )
-    if(selected) {
-      g.setColor(Color.RED);

trunk/src/vlcskineditor/items/Image.java

@@ -380 +380 @@
-  }
-  public void draw(Graphics2D g,int x_, int y_, int z) {
-
-
+
-    java.awt.image.BufferedImage bi = s.getBitmapImage(image);
-
+if(s.gvars.parseBoolean(visible)==true) 
-    if(selected) {
-      g.setColor(Color.RED);

trunk/src/vlcskineditor/items/Playtree.java

@@ -643 +643 @@
-    g.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON );
-    if(!created) return;
-false) return;
-
-
-
-
-
-
-else {      
-
-
-
-
-
-
-
-int liney = 0;    
-
-
-
-int lineheight = fm.getHeight();    
-
-
-
-
-
-
-
-
-
-
-
-iti_offset = (lineheight-iti.getHeight())/2; 
-
-int text_offset = (lineheight-fm.getAscent())/2;      
-
-
-if(cfi!=null && !flat) {        
-
-
-g.drawString("Closed folder",0+cfi.getWidth()+2,liney-text_offset);          
-
-
-
-
-g.drawString("Open folder",0+ofi.getWidth()+2,liney-text_offset);          
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+true) {
+  
+  
+  
+  
+  
+  
+  else {
+  
+  
+  
+  
+  
+  
+  
+  int liney = 0;
+  
+  
+  
+  int lineheight = fm.getHeight();
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  iti_offset = (lineheight-iti.getHeight())/2;
+  
+  int text_offset = (lineheight-fm.getAscent())/2;
+
+  
+  if(cfi!=null && !flat) {
+  
+  
+  g.drawString("Closed folder",0+cfi.getWidth()+2,liney-text_offset);
+  
+  
+  
+  
+  g.drawString("Open folder",0+ofi.getWidth()+2,liney-text_offset);
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+}
-    if(selected) {
-      g_.setColor(Color.RED);

trunk/src/vlcskineditor/items/Slider.java

@@ -553 +553 @@
-    offsetx=x_;
-    offsety=y_;
-if(s.gvars.parseBoolean(visible)==false) return;        
-
+boolean vis = s.gvars.parseBoolean(visible);
+ && vis
-      sbg.draw(g,x+x_,y+y_,z);
-      sbg.setOffset(x+offsetx,y+offsety);
-    }    
-
-
+
-    Point2D.Float p = b.getPoint(s.gvars.getSliderValue());
-
+if(vis && si!=null) 
-    if(selected) {
-      g.setColor(Color.RED);

trunk/src/vlcskineditor/items/Text.java

@@ -410 +410 @@
-  public void draw(Graphics2D g, int x_, int y_, int z) {
-    if(!created || font==null) return;
-if(s.gvars.parseBoolean(visible)==false) return;
+
-    Font f = s.getFont(font);
-    if(f==null) {
@@ -422 +422 @@
-      }      
-    }    
-g.setFont(f);
-g.setColor(Color.decode(color))
-BufferedImage bi
-String ptext = s.gvars.parseString(text);
-if(width==0) {
-bi = new BufferedImage((int)g.getFontMetrics().getStringBounds(ptext,g).getWidth(),g.getFontMetrics().getHeight(),BufferedImage.TYPE_INT_ARGB);
-}
-else bi = new BufferedImage(width,g.getFontMetrics().getHeight(),BufferedImage.TYPE_INT_ARGB
-Graphics2D g2d = bi.createGraphics();    
-g2d.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON 
-g2d.setFont(f
-g2d.setColor(Color.decode(color));
-if(width!=0 && alignment.equals("right")) {
-g2d.drawString(ptext,(int)(width-g2d.getFontMetrics().getStringBounds(ptext,g).getWidth()),0+g2d.getFontMetrics().getAscent());
-}    
-else if(width!=0 && alignment.equals("center")) {
-g2d.drawString(ptext,(int)((width-g2d.getFontMetrics().getStringBounds(ptext,g).getWidth())/2),0+g2d.getFontMetrics().getAscent());
-}
-else {
-g2d.drawString(ptext,0,0+g2d.getFontMetrics().getAscent());  
-}   
-g.drawImage(bi,(x+x_)*z,(y+y_)*z,bi.getWidth()*z, bi.getHeight()*z,null);  
+if(s.gvars.parseBoolean(visible)==true) {
+  BufferedImage bi
+  String ptext = s.gvars.parseString(text)
+  if(width==0) {
+    bi = new BufferedImage((int)g.getFontMetrics().getStringBounds(ptext,g).getWidth(),g.getFontMetrics().getHeight(),BufferedImage.TYPE_INT_ARGB);
+}
+  else bi = new BufferedImage(width,g.getFontMetrics().getHeight(),BufferedImage.TYPE_INT_ARGB);
+  Graphics2D g2d = bi.createGraphics(
+  g2d.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON );
+  g2d.setFont(f
+  g2d.setColor(Color.decode(color)
+  if(width!=0 && alignment.equals("right")) {
+    g2d.drawString(ptext,(int)(width-g2d.getFontMetrics().getStringBounds(ptext,g).getWidth()),0+g2d.getFontMetrics().getAscent());
+}
+  else if(width!=0 && alignment.equals("center")) {
+    g2d.drawString(ptext,(int)((width-g2d.getFontMetrics().getStringBounds(ptext,g).getWidth())/2),0+g2d.getFontMetrics().getAscent());
+}
+  else {
+    g2d.drawString(ptext,0,0+g2d.getFontMetrics().getAscent());
+}
+  g.drawImage(bi,(x+x_)*z,(y+y_)*z,bi.getWidth()*z, bi.getHeight()*z,null);
+}
-    if(selected) {
-      g.setColor(Color.RED);

trunk/src/vlcskineditor/items/Video.java

@@ -351 +351 @@
-  public void draw(Graphics2D g, int x_, int y_, int z) {
-    if(!created) return;
-if(s.gvars.parseBoolean(visible)==false) return;
+
-    g.setColor(Color.BLACK);
-g.fillRect((x+x_)*z,(y+y_)*z,width*z,height*z);   
+if(s.gvars.parseBoolean(visible)==true) g.fillRect((x+x_)*z,(y+y_)*z,width*z,height*z);
-    if(selected) {
-      g.setColor(Color.RED);