Changeset 32

Timestamp:

10/09/07 11:37:25 (1 year ago)

Author:

altglass

Message:

Release 0.4.0a finished
Trees automatically expand themselves to the changed element after being updated

Files:

• trunk/README.TXT (modified) (1 diff)
• trunk/src/vlcskineditor/Item.java (modified) (1 diff)
• 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/Group.java (modified) (4 diffs)
• trunk/src/vlcskineditor/Items/Image.java (modified) (1 diff)
• trunk/src/vlcskineditor/Items/Panel.java (modified) (4 diffs)
• trunk/src/vlcskineditor/Items/Playlist.java (modified) (1 diff)
• trunk/src/vlcskineditor/Items/Playtree.java (modified) (3 diffs)
• trunk/src/vlcskineditor/Items/Slider.java (modified) (3 diffs)
• trunk/src/vlcskineditor/Layout.java (modified) (3 diffs)
• trunk/src/vlcskineditor/Main.java (modified) (13 diffs)
• trunk/src/vlcskineditor/Resource.java (modified) (1 diff)
• trunk/src/vlcskineditor/Resources/Bitmap.java (modified) (4 diffs)
• trunk/src/vlcskineditor/Resources/Font.java (modified) (2 diffs)
• trunk/src/vlcskineditor/Resources/SubBitmap.java (modified) (1 diff)
• trunk/src/vlcskineditor/Skin.java (modified) (4 diffs)

trunk/README.TXT

@@ -1 @@
-3.5b
+4.0a
------------------------------------------------------------
-Changelog:
------------------------------------------------------------
+0.4.0a - Items can be positioned with the mouse
+       - Trees don't collapse anymore completely when an
+         element in it is updated, they automatically
+         expand the path to the updated item and select it
-0.3.5b - NullPointerException fix for Playtree rendering
-       - VLT files can be imported

trunk/src/vlcskineditor/Item.java

@@ -85 +85 @@
-  }
-  /** If an item contains a subitem of the given id the list containing the subitem is returned **/
-
+
+
+
+
+
-    return null;
-  }

trunk/src/vlcskineditor/Items/Anchor.java

@@ -75 +75 @@
-    range=r_;
-    s.updateItems();
+    s.expandItem(id);
-  }
-  public void showOptions() {

trunk/src/vlcskineditor/Items/Button.java

@@ -92 +92 @@
-    
-    s.updateItems();    
+    s.expandItem(id);
-  }
-  public void showOptions() {

trunk/src/vlcskineditor/Items/Checkbox.java

@@ -117 +117 @@
-    state = state_tf.getText();
-    
-
+
+
-  }
-  public void showOptions() {

trunk/src/vlcskineditor/Items/Group.java

@@ -103 +103 @@
-    s=s_;
-    id = "Unnamed group #"+s.getNewId();
-
-
-
-
+
+
+
-  }
-  public void update(String id_, int x_, int y_) {
@@ -116 +115 @@
-    }
-    s.updateItems();    
+    s.expandItem(id);
-  }
-  public void showOptions() {
@@ -242 +242 @@
-    return null;
-  }
-
+List
-    for(int x=0;x<items.size();x++) {
-      Item i = items.get(x);
-
-
+
-        return items;        
-      }
-      if (i.type.equals("Group")||i.type.equals("Panel")) {
-
+List
-        if (p!=null) return p;
-      }
@@ -256 +255 @@
-    return null;
-  }
+  public Item getParentOf(String id_) {
+    for(int x=0;x<items.size();x++) {
+      Item i = items.get(x);
+      if(i.id.equals(id_)) {        
+        return this;        
+      }
+      Item it = i.getParentOf(id_);
+      if (it!=null) return it;      
+    }
+    return null;
+  }
-}

trunk/src/vlcskineditor/Items/Image.java

@@ -88 +88 @@
-    action2 = action2_tf.getText();   
-    
-
+
+
-  }
-  public void showOptions() {

trunk/src/vlcskineditor/Items/Panel.java

@@ -117 +117 @@
-    id = "Unnamed panel #"+s.getNewId();
-    showOptions();
-
-
-
+
+
-  }
-  public void update() {
@@ -136 +135 @@
-    
-    s.updateItems();    
+    s.expandItem(id);
-    for(Item i:items) {
-      i.setOffset(x,y);
@@ -347 +347 @@
-    return null;
-  }
-
+List
-    for(int x=0;x<items.size();x++) {
-      Item i = items.get(x);
-
-
+
-        return items;        
-      }
-      if (i.type.equals("Group")||i.type.equals("Panel")) {
-
+List
-        if (p!=null) return p;
-      }
@@ -361 +360 @@
-    return null;
-  }
+  public Item getParentOf(String id_) {
+    for(int x=0;x<items.size();x++) {
+      Item i = items.get(x);
+      if(i.id.equals(id_)) {        
+        return this;        
+      }
+      Item it = i.getParentOf(id_);
+      if (it!=null) return it;      
+    }
+    return null;
+  }
-}

trunk/src/vlcskineditor/Items/Playlist.java

@@ -31 +31 @@
- * Playlist item
- * @author Daniel Dreibrodt
+ * @Deprecated All Playlists are automatically converted to flat playtrees
- */
-
+@Deprecated 
-  
-  /** Creates a new instance of Playlist */

trunk/src/vlcskineditor/Items/Playtree.java

@@ -130 +130 @@
-    showOptions();
-    s.updateItems();
+    s.expandItem(id);
-  }
-  public void update()  {
@@ -155 +156 @@
-    bgcolor2 = bgcolor2_tf.getText();
-    flat = (Boolean)flat_cb.getSelectedItem();
+    
+    s.updateItems();
+    s.expandItem(id);
-  }
-  public void showOptions() {
@@ -655 +659 @@
-    else return slider.getItem(id_);
-  }
+  public Item getParentOf(String id_) {
+   if(slider!=null) {
+     if(slider.id.equals(id_)) return this;
+     else return slider.getParentOf(id_);
+   }
+   else return null;
+  }
-}

trunk/src/vlcskineditor/Items/Slider.java

@@ -126 +126 @@
-    id = "Unnamed slider #"+s.getNewId();
-    showOptions();
+    s.updateItems();
+    s.expandItem(id);
-  }
-  public Slider(Skin s_, boolean ipt) {
@@ -153 +155 @@
-    tooltiptext = tooltiptext_tf.getText();
-    
-
+
+
-  }
-  public void showOptions() {
@@ -481 +484 @@
-    else return null;
-  }
+  public Item getParentOf(String id_) {
+   if(sbg!=null) {
+     if(sbg.id.equals(id_)) return this;
+     else return null;
+   }
+   else return null;
+  }
-}

trunk/src/vlcskineditor/Layout.java

@@ -151 +151 @@
-    maxheight=maxh_;
-    s.updateWindows();
+    s.expandLayout(id);
-  }
-  public void showOptions() {
@@ -319 +320 @@
-    return null;
-  }
-
+List
-    for(int x=0;x<items.size();x++) {
-      Item i = items.get(x);
-
-
+
-        return items;        
-      }
-      if (i.type.equals("Group")||i.type.equals("Panel")) {
-
+List
-        if (p!=null) return p;
-      }
@@ -333 +333 @@
-    return null;
-  }
+  public Item getParentOf(String id_) {
+    for(int x=0;x<items.size();x++) {
+      Item i = items.get(x);
+      if(i.id.equals(id_)) {        
+        return null;        
+      }
+      Item it = i.getParentOf(id_);
+      if (it!=null) return it;      
+    }
+    return null;
+  }
-}

trunk/src/vlcskineditor/Main.java

@@ -922 +922 @@
-      w.layouts.set(index,w.layouts.set(index-1,l));
-      s.updateWindows();
+      s.expandLayout(l.id);
-    }
-    else if(e.getSource().equals(win_layout_down)) {
@@ -931 +932 @@
-      w.layouts.set(index,w.layouts.set(index+1,l));
-      s.updateWindows();
+      s.expandLayout(l.id);
-    }
-    //</editor-fold>
@@ -993 +995 @@
-      Item i = s.getItem(selected_item);
-      if(i==null) return;
-
+
+
-      int index = l.indexOf(i);
-      if(index<=0) return;      
-      l.set(index,l.set(index-1,i));
-
+
+
-    }
-    else if(e.getSource().equals(items_down)) {
-      Item i = s.getItem(selected_item);
-      if(i==null) return;
-
+List
-      int index = l.indexOf(i);
-      if(index>=l.size()-1) return;      
-      l.set(index,l.set(index+1,i));
-
+
+
-    }
-    //</editor-fold>
@@ -1020 +1025 @@
-    else if(e.getSource().equals(items_add_pu_anchor)) {      
-      java.util.List<Item> i;
-
+List
-      else i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-      i.add(new Anchor(s));           
@@ -1026 +1031 @@
-    else if(e.getSource().equals(items_add_pu_button)) {      
-      java.util.List<Item> i;
-
+List
-      else i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-      i.add(new vlcskineditor.Items.Button(s));           
@@ -1032 +1037 @@
-    else if(e.getSource().equals(items_add_pu_checkbox)) {      
-      java.util.List<Item> i;
-
+List
-      else i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-      i.add(new vlcskineditor.Items.Checkbox(s));           
@@ -1038 +1043 @@
-    else if(e.getSource().equals(items_add_pu_panel)) {      
-      java.util.List<Item> i;
-
+List
-      else i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-      i.add(new vlcskineditor.Items.Panel(s));           
@@ -1044 +1049 @@
-    else if(e.getSource().equals(items_add_pu_image)) {      
-      java.util.List<Item> i;
-
+List
-      else i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-      i.add(new vlcskineditor.Items.Image(s));           
@@ -1050 +1055 @@
-    else if(e.getSource().equals(items_add_pu_playtree)) {      
-      java.util.List<Item> i;
-
+List
-      else i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-      i.add(new Playtree(s));           
@@ -1056 +1061 @@
-    else if(e.getSource().equals(items_add_pu_slider)) {      
-      java.util.List<Item> i;
-
+List
-      else i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-      i.add(new Slider(s));           
@@ -1062 +1067 @@
-    else if(e.getSource().equals(items_add_pu_text)) {      
-      java.util.List<Item> i;
-
+List
-      else i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-      i.add(new Text(s));           
@@ -1068 +1073 @@
-    else if(e.getSource().equals(items_add_pu_video)) {      
-      java.util.List<Item> i;
-
+List
-      else i = s.getWindow(selected_window).getLayout(selected_layout).items;       
-      i.add(new Video(s));           
@@ -1112 +1117 @@
-    else if(e.getSource().equals(items_del)) {
-      if(selected_item!=null) {
-
+List
-        if(p!=null) {
-          Object[] options= {"Yes","No"};

trunk/src/vlcskineditor/Resource.java

@@ -44 +44 @@
-  /** Creates a DefaultMutableTreeNode to be displayed in the resources tree */
-  public abstract DefaultMutableTreeNode getTreeNode();  
+  /** If an Resource does contain another Resource of the given id (e.g. a SubBitmap) the containing Resource is returned **/
+  public Resource getParentOf(String id_) {
+    return null;
+  }
-}

trunk/src/vlcskineditor/Resources/Bitmap.java

@@ -96 +96 @@
-    id = f_.getName().substring(0,f_.getName().lastIndexOf("."));
-    file = f_.getPath().replace(s.skinfolder,"");
-
+    
-    update();
-  }
@@ -105 +105 @@
-    file = "";
-    s.updateResources();
+    s.expandResource(id);
-    showOptions();
-  }
@@ -142 +143 @@
-      id=id_;
-      s.updateResources();
+      s.expandResource(id);
-    }
-    update();
@@ -323 +325 @@
-    return node;
-  }
-
+
+
+
+
+
+
-}

trunk/src/vlcskineditor/Resources/Font.java

@@ -142 +142 @@
-    file="";
-    s.updateResources();
+    s.expandResource(id);
-    showOptions();
-  }
@@ -147 +148 @@
-    type="Font";    
-    file=file_tf.getText();
-
-
+
-    if(!id_tf.getText().equals(id)) {
-      id=id_tf.getText();
-      s.updateResources();
+      s.expandResource(id);
-    }
-    try {      

trunk/src/vlcskineditor/Resources/SubBitmap.java

@@ -75 +75 @@
-    image = parent.getSubimage(x,y,width,height);    
-    s.updateResources();    
+    s.expandResource(id);
-  }
-  public void update(BufferedImage parent_) {

trunk/src/vlcskineditor/Skin.java

@@ -450 +450 @@
-  }
-  /** Returns the parent element that contains the item of the given id **/
-
-
+List
+List
-  }
-  /** Returns the list of the given Group/Panel that contains the items **/
@@ -559 +559 @@
-  }
-  /** Recreates the resource hierarchies **/
-  
-    
+
+
-    m.saved=false;
+  }
+  /** Make an Resource of the given id visible in the tree (expand the TreePath) **/
+  public void expandResource(String id) {   
+    Resource r = getResource(id);
+    if(r==null) return;
+    if(r.type.equals("Bitmap")) {
+      TreePath tp = findInTree(m.res_tree,"Root: Bitmaps");
+      m.res_tree.expandPath(tp);
+    }
+    else if(r.type.equals("Font")) {
+      TreePath tp = findInTree(m.res_tree,"Root: Fonts");
+      m.res_tree.expandPath(tp);
+    }
+    else {
+      System.err.println("Resource of the given id is neither a Font nor a Bitmap its a "+r.type);
+      return;
+    }   
+    java.util.List<String> parents = new ArrayList<String>();
+    
+    Resource pr = r;
+    while(pr!=null) {
+      for(Resource res:resources) {
+        pr = res.getParentOf(r.id);
+        if(pr!=null) {
+          parents.add(pr.id);
+          break;
+        }        
+      }
+    }
+    for(int i=parents.size()-1;i>=0;i--) {      
+      TreePath tp = findInTree(m.res_tree,parents.get(i));
+      if(tp==null) {
+        System.err.println("Could not find Parent: "+parents.get(i));
+        return;
+      }
+      m.res_tree.expandPath(tp);
+      TreePath stp = findInTree(m.res_tree,id);
+      if(stp==null) return;
+      m.res_tree.setSelectionPath(stp);
+    }    
+  }
+  /** Make a Layout of the given id visible **/
+  public void expandLayout(String id) {   
+    TreePath wtp = findInTree(m.win_tree,active_window.id);
+    if(wtp==null) return;
+    m.win_tree.expandPath(wtp);
+    
+    TreePath ltp = findInTree(m.win_tree,id);
+    if(ltp==null) return;
+    m.win_tree.setSelectionPath(ltp);
-  }
-  /** Recreates the window hierarchies **/
@@ -569 +619 @@
-  }
-  /** Recreates the item hierarchies **/
-    
+
-    m.items_tree_model.setRoot(getItemsTree());
-    m.saved=false;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  /** Updates everything **/
@@ -583 +658 @@
-    updateResources();
-    updateWindows();
-
-
+
-    m.saved=false;
-  }