Changeset 91

Timestamp:

29/12/07 18:56:49 (11 months ago)

Author:

altglass

Message:

Bugfixes, code improvements, resources can be cloned, mime-type fixes in SVN repository

Files:

• trunk/src/vlcskineditor/Main.java (modified) (9 diffs)
• trunk/src/vlcskineditor/Resource.java (modified) (1 diff)
• trunk/src/vlcskineditor/Skin.java (modified) (4 diffs)
• trunk/src/vlcskineditor/icons/copy.png (added)
• trunk/src/vlcskineditor/icons/edit-redo.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/edit-undo.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/editor.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/exit.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/help.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/items.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/new.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/open.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/preview.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/resources.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/save.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/sliderbg_btt.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/sliderbg_ltr.png (modified) (1 prop)
• trunk/src/vlcskineditor/resources/Bitmap.java (modified) (1 diff)
• trunk/src/vlcskineditor/resources/SubBitmap.java (modified) (1 diff)
• trunk/src/vlcskineditor/resources/SubBitmapEditWindow.java (modified) (1 diff)

trunk/src/vlcskineditor/Main.java

@@ -33 +33 @@
-import javax.swing.border.*;
-import java.util.zip.*;
-
-
+
-import vlcskineditor.items.*;
-import com.ice.tar.*;
-import com.ice.jni.registry.*;
-import vlcskineditor.history.*;
+import vlcskineditor.resources.Bitmap;
+import vlcskineditor.resources.SubBitmap;
-
-
@@ -62 +63 @@
-  JTree res_tree,win_tree,items_tree;  
-  DefaultTreeModel res_tree_model, win_tree_model, items_tree_model;
-
+duplicate, res_
-  JPopupMenu res_add_bitmap_pu;
-  JMenuItem res_add_bitmap_pu_b, res_add_bitmap_pu_s;
@@ -78 +79 @@
-  public ImageIcon add_bitmap_icon = createIcon("icons/add_bitmap.png");  
-  public ImageIcon add_font_icon = createIcon("icons/add_font.png");
+  public ImageIcon copy_icon = createIcon("icons/copy.png");
-  public ImageIcon edit_icon = createIcon("icons/edit.png");
-  public ImageIcon edit_undo_icon = createIcon("icons/edit-undo.png");
@@ -268 +270 @@
-    res_add_font.setPreferredSize(new Dimension(24,24));
-    res_add_font.addActionListener(this);
+    res_duplicate = new JButton("",copy_icon);
+    res_duplicate.setToolTipText("Create copy of the selected item");
+    res_duplicate.setPreferredSize(new Dimension(24,24));
+    res_duplicate.addActionListener(this);
-    res_edit = new JButton("",edit_icon);
-    res_edit.setToolTipText("Edit the selected item");
@@ -280 +286 @@
-    resources.add(res_add_bitmap);
-    resources.add(res_add_font);
+    resources.add(res_duplicate);
-    resources.add(res_edit);
-    resources.add(res_del);        
@@ -287 +294 @@
-    res_layout.putConstraint(SpringLayout.NORTH, res_add_bitmap,5,SpringLayout.SOUTH, res_tree_sp);
-    res_layout.putConstraint(SpringLayout.NORTH, res_add_font,5,SpringLayout.SOUTH, res_tree_sp);
+    res_layout.putConstraint(SpringLayout.NORTH, res_duplicate,5,SpringLayout.SOUTH, res_tree_sp);
-    res_layout.putConstraint(SpringLayout.NORTH, res_edit,5,SpringLayout.SOUTH, res_tree_sp);
-    res_layout.putConstraint(SpringLayout.NORTH, res_del,5,SpringLayout.SOUTH, res_tree_sp);    
@@ -295 +303 @@
-    res_layout.putConstraint(SpringLayout.WEST, res_add_bitmap,5,SpringLayout.WEST, resources.getContentPane());
-    res_layout.putConstraint(SpringLayout.WEST, res_add_font,5,SpringLayout.EAST, res_add_bitmap);
-
+
+
-    res_layout.putConstraint(SpringLayout.WEST, res_del,5,SpringLayout.EAST, res_edit);    
-    res_layout.putConstraint(SpringLayout.SOUTH, resources.getContentPane(),24+5+5,SpringLayout.SOUTH, res_tree_sp);
@@ -971 +980 @@
-        Resource r = s.getResource(selected_resource);
-        if(r!=null) {
-
-
+
+
+
+
+
+
+
-            b.SubBitmaps.add(new vlcskineditor.resources.SubBitmap(s,b));  
-          }
-          else {
-No parent bitmap selected!","Could not add sub 
+The selected resource is no bitmap!","Could not add sub
-          }
-        }
-        else {
- 
+
-        }
-      }
-      else {
- 
+
-      }
-    }
@@ -1006 +1020 @@
-        s.updateResources();
-      }    
+    }
+    // </editor-fold>
+    // <editor-fold defaultstate="collapsed" desc="Duplicate resource">
+    else if(e.getSource().equals(res_duplicate)) {
+      if(selected_resource==null) return;
+      Resource r = s.getResource(selected_resource);
+      if(r==null) return;
+      if(r.getClass()==Bitmap.class) {
+        Bitmap b = (Bitmap)r;        
+        Bitmap b2 = new Bitmap(b.returnCode(),s);
+        b2.renameForCopy();
+        s.resources.add(b2);
+        s.updateResources();
+        s.expandResource(b.id);
+      }
+      else if(r.getClass()==SubBitmap.class) {
+        SubBitmap sb = (SubBitmap)r;        
+        SubBitmap sb2 = new SubBitmap(sb.returnCode(),s,sb.getParentBitmap());
+        sb2.renameForCopy();
+        sb.getParentBitmap().SubBitmaps.add(sb2);
+        s.updateResources();
+        s.expandResource(sb.id);
+      }
+      else {
+        vlcskineditor.resources.Font f = (vlcskineditor.resources.Font)r;        
+        vlcskineditor.resources.Font f2 = new vlcskineditor.resources.Font(f.returnCode(),s);
+        f2.renameForCopy();
+        s.resources.add(f2);
+        s.updateResources();
+        s.expandResource(f.id);
+      }
-    }
-    // </editor-fold>

trunk/src/vlcskineditor/Resource.java

@@ -50 +50 @@
-    return null;
-  }
+  /** Renames the Resource after the copy process **/
+  public void renameForCopy() {
+    if(id.indexOf("_copy")!=-1) {
+      id = id.substring(0,id.indexOf("_copy"));
+    } 
+    String newid_base = id+="_copy";     
+    String newid = newid_base;
+    int i = 1;
+    while(s.idExists(newid)) {
+      i++;
+      newid = newid_base+"_"+String.valueOf(i);
+    }
+    id = newid;
+  }
-}

trunk/src/vlcskineditor/Skin.java

@@ -372 +372 @@
-  /** Checks whether an id exists already **/
-  public boolean idExists(String id) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-      }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  }
-  /** Returns the image object of a bitmap **/
@@ -407 +402 @@
-    }
-    else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-      }
-      else return null;
-    }
-    return null;
-  }
-  public java.awt.Font getFont(String id) {
@@ -433 +420 @@
-    if(r==null) return (new java.awt.Font(java.awt.Font.SANS_SERIF,java.awt.Font.PLAIN,12));
-    try {
-type.equals("Font")
+getClass()==vlcskineditor.resources.Font.class
-        vlcskineditor.resources.Font fr = (vlcskineditor.resources.Font)r;
-        return fr.f;
@@ -506 +493 @@
-    DefaultMutableTreeNode bitmaps_node = new DefaultMutableTreeNode("Root: Bitmaps");
-    DefaultMutableTreeNode fonts_node = new DefaultMutableTreeNode("Root: Fonts");
-int i=0;i<resources.size();i++
-esources.get(i).type=="Bitmap"
-esources.get(i)
-
-
-int i=0;i<resources.size();i++
-esources.get(i).type=="Font"
-esources.get(i)
+Resource r:resources
+.getClass()==Bitmap.class
+
+
+
+Resource r:resources
+.getClass()==vlcskineditor.resources.Font.class
+
-        fonts_node.add(node);
-      }

trunk/src/vlcskineditor/resources/Bitmap.java

@@ -376 +376 @@
-    return null;
-  }
+  @Override
+  public void renameForCopy() {
+    super.renameForCopy();
+    for(SubBitmap sb:SubBitmaps) sb.renameForCopy();
+  }
-}

trunk/src/vlcskineditor/resources/SubBitmap.java

@@ -320 +320 @@
-    return top;
-  }
+  public Bitmap getParentBitmap() {
+    return parent;
+  }
-}

trunk/src/vlcskineditor/resources/SubBitmapEditWindow.java

@@ -91 +91 @@
-  public void paint(Graphics g) {    
-    if(b.image==null) return;
-4
+3
-    g.clearRect(0,0,getWidth(),getHeight());
-
-
+
-    g.setColor(Color.RED);
-    int[] x = new int[4];