Changeset 37

Timestamp:

11/09/07 19:35:18 (1 year ago)

Author:

altglass

Message:

alphacolor/transparency interpretation improvement
XML parsing/generating fixes
font display rework => build scripts modified

Files:

• trunk/build.bat (modified) (1 diff)
• trunk/build.sh (modified) (1 diff)
• trunk/src/vlcskineditor/FreeSans.ttf (deleted)
• trunk/src/vlcskineditor/Items/Anchor.java (modified) (1 diff)
• trunk/src/vlcskineditor/Items/Button.java (modified) (1 diff)
• trunk/src/vlcskineditor/Items/Checkbox.java (modified) (1 diff)
• trunk/src/vlcskineditor/Items/Image.java (modified) (2 diffs)
• trunk/src/vlcskineditor/Items/Playlist.java (deleted)
• trunk/src/vlcskineditor/Items/Playtree.java (modified) (1 diff)
• trunk/src/vlcskineditor/Items/RadialSlider.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/Main.java (modified) (1 diff)
• trunk/src/vlcskineditor/Resources/Bitmap.java (modified) (2 diffs)
• trunk/src/vlcskineditor/Resources/Font.java (modified) (7 diffs)
• trunk/src/vlcskineditor/Skin.java (modified) (2 diffs)

trunk/build.bat

@@ -3 +3 @@
-javac -d ../build vlcskineditor/Main.java
-cd ..
-copy src\vlcskineditor\FreeSans.ttf build\vlcskineditor\FreeSans.ttf
-md build\vlcskineditor\icons
-copy src\vlcskineditor\icons build\vlcskineditor\icons\

trunk/build.sh

@@ -5 +5 @@
-`javac -d ../build vlcskineditor/Main.java`
-cd ..
-cp src/vlcskineditor/FreeSans.ttf build/vlcskineditor/
-cp src/vlcskineditor/icons/* build/vlcskineditor/icons
-echo "Main-Class: vlcskineditor.Main" > manifest_no_nb

trunk/src/vlcskineditor/Items/Anchor.java

@@ -208 +208 @@
-    if (lefttop!=LEFTTOP_DEFAULT) code+=" lefttop=\""+lefttop+"\"";    
-    code+="/>";
-
+//
-    return code;
-  }

trunk/src/vlcskineditor/Items/Button.java

@@ -300 +300 @@
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-    if (help!=HELP_DEFAULT) code+=" help=\""+help+"\"";
+    if (visible!=VISIBLE_DEFAULT) code+=" visible=\""+visible+"\"";
-    if (tooltiptext!=TOOLTIPTEXT_DEFAULT) code+=" tooltiptext=\""+tooltiptext+"\"";
-    code+="/>";

trunk/src/vlcskineditor/Items/Checkbox.java

@@ -405 +405 @@
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-    if (help!=HELP_DEFAULT) code+=" help=\""+help+"\"";
+    if (visible!=VISIBLE_DEFAULT) code+=" visible=\""+visible+"\"";
-    code+="/>";
-    return code;

trunk/src/vlcskineditor/Items/Image.java

@@ -278 +278 @@
-    if (id!=ID_DEFAULT) code+=" id=\""+id+"\"";    
-    code+=" image=\""+image+"\"";
-id=\""+id
-id=\""+id
+action=\""+action
+action2=\""+action2
-    if (x!=X_DEFAULT) code+=" x=\""+String.valueOf(x)+"\"";
-    if (y!=Y_DEFAULT) code+=" y=\""+String.valueOf(y)+"\"";
@@ -287 +287 @@
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-    if (help!=HELP_DEFAULT) code+=" help=\""+help+"\"";
+    if (visible!=VISIBLE_DEFAULT) code+=" visible=\""+visible+"\"";
-    code+="/>";
-    return code;

trunk/src/vlcskineditor/Items/Playtree.java

@@ -539 +539 @@
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-    if (help!=HELP_DEFAULT) code+=" help=\""+help+"\"";
+    if (visible!=VISIBLE_DEFAULT) code+=" visible=\""+visible+"\"";
-    code+=">\n";    
-    code+=slider.returnCode();

trunk/src/vlcskineditor/Items/RadialSlider.java

@@ -88 +88 @@
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-    if (help!=HELP_DEFAULT) code+=" help=\""+help+"\"";
+    if (visible!=VISIBLE_DEFAULT) code+=" visible=\""+visible+"\"";
-    code+="/>";
-    return code;

trunk/src/vlcskineditor/Items/Slider.java

@@ -426 +426 @@
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-    if (help!=HELP_DEFAULT) code+=" help=\""+help+"\"";
+    if (visible!=VISIBLE_DEFAULT) code+=" visible=\""+visible+"\"";
-    if (sbg==null) {
-      code+="/>";

trunk/src/vlcskineditor/Items/Text.java

@@ -322 +322 @@
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-    if (help!=HELP_DEFAULT) code+=" help=\""+help+"\"";
+    if (visible!=VISIBLE_DEFAULT) code+=" visible=\""+visible+"\"";
-    code+="/>";
-    return code;
@@ -331 +332 @@
-    if(s.gvars.parseBoolean(visible)==false) return;
-    Font f = s.getFont(font);
+    if(f==null) {
+      Resource fr = s.getResource(font);
+      if(fr.type.equals("Font")) {
+        vlcskineditor.Resources.Font fnt = (vlcskineditor.Resources.Font)fr;
+        f = new Font(Font.SANS_SERIF,Font.PLAIN,fnt.size);
+      }
+      else {
+        f = new Font(Font.SANS_SERIF,Font.PLAIN,12);
+      }      
+    }
-    g.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON );
-    g.setFont(f);

trunk/src/vlcskineditor/Items/Video.java

@@ -266 +266 @@
-    if (ykeepratio!=YKEEPRATIO_DEFAULT) code+=" ykeepratio=\""+String.valueOf(ykeepratio)+"\"";
-    if (help!=HELP_DEFAULT) code+=" help=\""+help+"\"";
+    if (visible!=VISIBLE_DEFAULT) code+=" visible=\""+visible+"\"";
-    code+="/>";
-    return code;

trunk/src/vlcskineditor/Main.java

@@ -828 +828 @@
-          s.resources.add(new vlcskineditor.Resources.Bitmap(s,files[i]));
-        }
+        s.updateResources();
-      }      
-    }

trunk/src/vlcskineditor/Resources/Bitmap.java

@@ -111 +111 @@
-    try {
-      image = ImageIO.read(new File(s.skinfolder+file));       
-
-Bitmap "+id+" is of type:
+  
+Loaded "+file+" as "+id+" with the image type
-      if(image.getType()!=13) { //If PNG is not indexed
-        BufferedImage bi = new BufferedImage(image.getWidth(),image.getHeight(),BufferedImage.TYPE_INT_ARGB);
@@ -119 +119 @@
-        for(int x=0;x<image.getWidth();x++) {
-          for(int y=0;y<image.getHeight();y++) {
-
+
+
+
+
+
+
-              g2d.setColor(new Color(image.getRGB(x,y)));
-              g2d.drawRect(x,y,0,0);
-
+             
-          }        
-        }

trunk/src/vlcskineditor/Resources/Font.java

@@ -64 +64 @@
-      if(file.indexOf(".otf")==-1) {
-        JOptionPane.showMessageDialog(frame,"Error while loading font file!\n Please choose another file\n","Font file not valid",JOptionPane.ERROR_MESSAGE);
+        f = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size);
-        showOptions();
-      }
-      else {
-In the Skin Editor you will see instead of the chosen font the default font FreeSans
+You will see another font instead.
-        try {      
-java.awt.Font.createFont(java.awt.Font.TRUETYPE_FONT,new File(Main.class.getResource("FreeSans.ttf").toURI())
+new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size
-          f = f.deriveFont(12);
-        }
-        catch(Exception ex) {
-          ex.printStackTrace();
-=null
+ = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size)
-        }
-      }      
@@ -93 +94 @@
-      if(file.indexOf(".otf")==-1) {
-        JOptionPane.showMessageDialog(frame,"Error while loading font file!\n Please choose another file\n","Font file not valid",JOptionPane.ERROR_MESSAGE);
+        f = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size);
-        showOptions();
-      }
@@ -103 +105 @@
-        catch(Exception ex) {
-          ex.printStackTrace();
-=null
+ = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size)
-        }
-      }  
@@ -121 +123 @@
-      if(file.indexOf(".otf")==-1) {
-        JOptionPane.showMessageDialog(frame,"Error while loading font file!\n Please choose another file\n","Font file not valid",JOptionPane.ERROR_MESSAGE);
+        f = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size);
-        showOptions();
-      }
@@ -131 +134 @@
-        catch(Exception ex) {
-          ex.printStackTrace();
-=null
+ = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size)
-        }
-      }  
@@ -162 +165 @@
-      if(file.indexOf(".otf")==-1) {
-        JOptionPane.showMessageDialog(frame,"Error while loading font file!\n Please choose another file\n","Font file not valid",JOptionPane.ERROR_MESSAGE);
+        f = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size);
-        showOptions();
-      }
@@ -172 +176 @@
-        catch(Exception ex) {
-          ex.printStackTrace();
-=null
+ = new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,size)
-        }
-      }  

trunk/src/vlcskineditor/Skin.java

@@ -411 +411 @@
-  public java.awt.Font getFont(String id) {
-    if(id.equals("defaultfont")) {
-
-
-
-
-
-
-
-
-
-
+
-    }
-    Resource r = getResource(id);
-null
+(new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,12))
-    try {
-      if(r.type.equals("Font")) {
@@ -432 +423 @@
-    catch(Exception e) {
-      e.printStackTrace();
-null
-
-null
+(new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,12))
+
+(new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,12))
-  }
-  /** Returns the window represented by the given id **/