Changeset 25

Timestamp:

07/09/07 12:31:21 (1 year ago)

Author:

altglass

Message:

Release 0.3.5a finished
All items are rendered more or less properly (except sliders, there only the background is rendered)

Files:

• trunk/README.TXT (modified) (3 diffs)
• trunk/src/vlcskineditor/Items/Playtree.java (modified) (4 diffs)
• trunk/src/vlcskineditor/Items/Text.java (modified) (1 diff)
• trunk/src/vlcskineditor/Resources/Bitmap.java (modified) (1 diff)
• trunk/src/vlcskineditor/Resources/Font.java (modified) (4 diffs)
• trunk/src/vlcskineditor/Resources/SubBitmap.java (modified) (2 diffs)
• trunk/src/vlcskineditor/Skin.java (modified) (2 diffs)

trunk/README.TXT

@@ -1 @@
-0b
+5a
------------------------------------------------------------
-Changelog:
------------------------------------------------------------
+0.3.5a - Preview of Layouts
+       - XML parsing/generating fixes
-0.3.0b - All items can be edited
-       - Theme attributes can be edited
@@ -26 +28 @@
-System Requirements
------------------------------------------------------------
-Runtime Environment 6+ (
-t least 256MB RAM and a half-decent cpu
+SE RE 6 or later (DL at 
+pproximately at least 256MB RAM and a 500-1000MHz CPU
------------------------------------------------------------
-Usage:
@@ -33 +35 @@
-To run the skin editor simply open the jar file.
-Or manually run "java -jar VLCSkinEditor.jar".
-
-To edit things select the item in the trees and click on
-the edit button. To add things use the add buttons. Self-
-explanatory isn't it?
------------------------------------------------------------
-Copyright:
------------------------------------------------------------
-
+
+
-See LICENSE.TXT for further details

trunk/src/vlcskineditor/Items/Playtree.java

@@ -26 +26 @@
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.image.*;
-import javax.swing.*;
-import javax.swing.tree.*;
@@ -66 +67 @@
-  
-  Slider slider = null;
-  
-  
-  JFrame frame = null;
@@ -547 +547 @@
-    g.setFont(f);
-    FontMetrics fm = g.getFontMetrics();
-startsWith
+equals
-      g.drawImage(s.getBitmapImage(bgimage),x+x_,y+y_,null);
-    }
@@ -558 +558 @@
-      }
-    }
+    int liney = y+y_;    
+    BufferedImage cfi = s.getBitmapImage(closedimage);
+    BufferedImage ofi = s.getBitmapImage(openimage);
+    BufferedImage iti = s.getBitmapImage(itemimage);
+    int lineheight = fm.getHeight();    
+    if(cfi!=null) {
+      if(cfi.getHeight()>lineheight) lineheight=cfi.getHeight();
+    }
+    if(ofi!=null) {
+      if(ofi.getHeight()>lineheight) lineheight=ofi.getHeight();
+    }
+    if(iti!=null) {
+      if(iti.getHeight()>lineheight) lineheight=iti.getHeight();
+    }
+    int text_offset = (lineheight-fm.getAscent())/2;
+    int cfi_offset = (lineheight-cfi.getHeight())/2;
+    int ofi_offset = (lineheight-ofi.getHeight())/2;
+    int iti_offset = (lineheight-iti.getHeight())/2;    
+    
+    g.setColor(Color.decode(fgcolor));
+    if(cfi!=null && !flat) {        
+      g.drawImage(cfi,x+x_,liney+cfi_offset,null);
+      liney+=lineheight;
+      g.drawString("Closed folder",x+x_+cfi.getWidth()+2,liney-text_offset);          
+    }
+    if(ofi!=null && !flat) {
+      g.drawImage(ofi,x+x_,liney+ofi_offset,null);
+      liney+=lineheight;
+      g.drawString("Open folder",x+x_+ofi.getWidth()+2,liney-text_offset);          
+    }
+    if(ofi!=null && iti!=null && !flat) {
+      g.drawImage(iti,x+x_+ofi.getWidth()+2,liney+iti_offset,null);
+      liney+=lineheight;
+      g.drawString("Normal item",x+x_+ofi.getWidth()+iti.getWidth()+4,liney-text_offset);
+    }
+    else if(iti!=null) {
+      g.drawImage(iti,x+x_,liney+iti_offset,null);
+      liney+=fm.getHeight();
+      g.drawString("Normal item",x+x_+iti.getWidth()+4,liney-text_offset);
+    }
+    else {
+      liney+=fm.getHeight();
+      g.drawString("Normal item",x+x_,liney-text_offset);
+    }
+    g.setColor(Color.decode(playcolor));
+    if(ofi!=null && iti!=null && !flat) {
+      g.drawImage(iti,x+x_+ofi.getWidth()+2,liney+iti_offset,null);
+      liney+=lineheight;
+      g.drawString("Playing item",x+x_+ofi.getWidth()+iti.getWidth()+4,liney-text_offset);
+    }
+    else if(iti!=null) {
+      g.drawImage(iti,x+x_,liney+iti_offset,null);
+      liney+=lineheight;
+      g.drawString("Playing item",x+x_+iti.getWidth()+2,liney-text_offset);
+    }
+    else {
+      liney+=lineheight;
+      g.drawString("Playing item",x+x_,liney-text_offset);
+    }
+    g.setColor(Color.decode(selcolor));
+    g.fillRect(x+x_,liney,width,lineheight);
+    g.setColor(Color.decode(fgcolor));
+    if(ofi!=null && iti!=null && !flat) {
+      g.drawImage(iti,x+x_+ofi.getWidth()+2,liney+iti_offset,null);
+      liney+=lineheight;
+      g.drawString("Selected item",x+x_+ofi.getWidth()+iti.getWidth()+4,liney-text_offset);
+    }
+    else if(iti!=null) {
+      g.drawImage(iti,x+x_,liney+iti_offset,null);
+      liney+=lineheight;
+      g.drawString("Selected item",x+x_+iti.getWidth()+2,liney-text_offset);
+    }
+    else {
+      liney+=lineheight;
+      g.drawString("Selected item",x+x_,liney-text_offset);
+    }
+    
-    slider.draw(g);
-  }

trunk/src/vlcskineditor/Items/Text.java

@@ -349 +349 @@
-    else {
-      g2d.drawString(text,0,0+g2d.getFontMetrics().getAscent());  
-
-
-
-
-
-
-
+
+
-  }
-  public DefaultMutableTreeNode getTreeNode() {

trunk/src/vlcskineditor/Resources/Bitmap.java

@@ -110 +110 @@
-    try {
-      image = ImageIO.read(new File(s.skinfolder+file)); 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      for(int i=0;i<SubBitmaps.size();i++) {
-        SubBitmaps.get(i).update(image);

trunk/src/vlcskineditor/Resources/Font.java

@@ -67 +67 @@
-      }
-      else {
- 
+\n
-        try {      
-          f = java.awt.Font.createFont(java.awt.Font.TRUETYPE_FONT,new File(Main.class.getResource("FreeSans.ttf").toString()));
@@ -91 +91 @@
-    catch(Exception e) {
-      e.printStackTrace();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }
@@ -106 +119 @@
-    catch(Exception e) {
-      e.printStackTrace();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }
@@ -133 +159 @@
-    catch(Exception e) {
-      e.printStackTrace();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    

trunk/src/vlcskineditor/Resources/SubBitmap.java

@@ -63 +63 @@
-    s=s_;
-    parent=parent_;
+    type="Bitmap";
-    id = "Unnamed subbitmap #"+s.getNewId();
-    x = 0;
@@ -72 +73 @@
-  }
-  public void update() {
-
+    
-    s.updateResources();    
-  }

trunk/src/vlcskineditor/Skin.java

@@ -26 +26 @@
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.image.*;
-import java.io.*;
-import javax.swing.*;
@@ -380 +381 @@
-  }
-  /** Returns the image object of a bitmap **/
-
+Buffered
-    Resource r = getResource(id);
-    if(r==null) {