Changeset 105

Timestamp:

06/24/08 16:46:42 (2 months ago)

Author:

altglass

Message:

Bugfix: SubBitmap? width saving repaired
Interface: OK button is default button of item editing dialogs
SliderBGGen: Overlay image function added

Files:

• trunk/src/vlcskineditor/SliderBGBuilder.java (modified) (1 diff)
• trunk/src/vlcskineditor/SliderBGGen.java (modified) (12 diffs)
• 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) (1 diff)
• trunk/src/vlcskineditor/items/Image.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Panel.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/SliderBackground.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Text.java (modified) (1 diff)
• trunk/src/vlcskineditor/items/Video.java (modified) (1 diff)
• trunk/src/vlcskineditor/resources/SubBitmap.java (modified) (1 diff)

trunk/src/vlcskineditor/SliderBGBuilder.java

@@ -81 +81 @@
-    }
-    useoverlay = true;
-/**
-ull);       
+
+ew File(sbgg.ol_tf.getText()));
-    }
-    catch (Exception e) {
-      useoverlay = false;
-
-
+
-    if(usee1=false) {
-      e1 = middle;      

trunk/src/vlcskineditor/SliderBGGen.java

@@ -63 +63 @@
-  /** Contains the path to the image file for the right or bottom edge of the bar */
-  JTextField e2_tf;
+  /** Contains the path to the image file for the overlay image */
+  JTextField ol_tf;
-  /** Sets whether the background image should be tiled to fill the slider background size */
-  JRadioButton bgt_rb;
@@ -71 +73 @@
-  /** Sets whether the middle image should be stretched to fill the slider background size */
-  JRadioButton mds_rb;  
-
-
-
-
-
+
+
+
+
-  
-  JButton step2_prev_btn, step2_finish_btn, step2_cancel_btn;  
@@ -244 +245 @@
-    card_step1.add(step1_cancel_btn);
-    
-5
-400,75,20
-400,75,20
+0
+395,75,25
+395,75,25
-    
-    card_step1.setSize(540,400);   
@@ -257 +258 @@
-    card_step2.add(header2_l); 
-    
-
+ 
-    bg_l = new JLabel("Image file:",bg_h,JLabel.TRAILING);
-    bg_tf = new JTextField("");
-    bg_btn = new JButton("Open...");
-    bg_btn.addActionListener(this);
-
+,JLabel.TRAILING
-    ButtonGroup bg_rs_g = new ButtonGroup();
-    bgt_rb = new JRadioButton("",true);
@@ -280 +281 @@
-    bg_p.add(bgs_rb);
-    bg_p.add(bgs_l);    
-10
-1
-2
-10,6
-15,6
-40,6
-20,6
-50,6
+9
+0
+1
+0,5
+05,5
+30,5
+10,5
+40,5
-    bg_p.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "Background"));    
-    card_step2.add(bg_p);
-60,530,9
+50,520,8
-    
-    e1_p = new JPanel(null);
@@ -300 +301 @@
-    e1_p.add(e1_tf);
-    e1_p.add(e1_btn);
-10,20,10
-1
-2
+0,20,9
+0
+1
-    e1_p.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "Left edge"));    
-    card_step2.add(e1_p);
-60,53
+35,52
-    
-    md_p = new JPanel(null);
@@ -312 +313 @@
-    md_btn = new JButton("Open...");
-    md_btn.addActionListener(this);
-
+,JLabel.TRAILING
-    ButtonGroup md_rs_g = new ButtonGroup();
-    mdt_rb = new JRadioButton("",true);
@@ -330 +331 @@
-    md_p.add(mds_rb);
-    md_p.add(mds_l);    
-10,20,10
-1
-2
-10,6
-15,6
-40,6
-20,6
-50,6
+0,20,9
+0
+1
+0,5
+05,5
+30,5
+10,5
+40,5
-    md_p.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "Middle part"));    
-    card_step2.add(md_p);
-220,530,9
+190,520,8
-    
-    e2_p = new JPanel(null);
@@ -350 +351 @@
-    e2_p.add(e2_tf);
-    e2_p.add(e2_btn);
-10,20,10
-1
-2
+0,20,9
+0
+1
-    e2_p.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "Right edge"));    
-    card_step2.add(e2_p);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    JSeparator step2_horz_s = new JSeparator(JSeparator.HORIZONTAL);
@@ -370 +386 @@
-    card_step2.add(step2_cancel_btn);
-    
-5
-400,90,20
-400,75,20
-400,75,20
+0
+ 395,90,25
+395,75,25
+395,75,25
-  
-    add(card_step2,STEP2);    
@@ -392 +408 @@
-    }
-    else if (e.getSource().equals(step2_finish_btn)) {
-
+_tf.getText()
-      int i = 1;
-      while(f.exists()) {
-
+_tf.getText()
-          i++;
-      }
@@ -455 +471 @@
-        if(i==JFileChooser.APPROVE_OPTION && fc.getSelectedFile().exists()) {
-            e2_tf.setText(fc.getSelectedFile().getPath());
+        }        
+    }
+    else if(e.getSource().equals(ol_btn)) {
+        JFileChooser fc = new JFileChooser(new File(s.skinfolder));
+        int i = fc.showOpenDialog(this);
+        if(i==JFileChooser.APPROVE_OPTION && fc.getSelectedFile().exists()) {
+            ol_tf.setText(fc.getSelectedFile().getPath());
-        }        
-    }

trunk/src/vlcskineditor/items/Anchor.java

@@ -218 +218 @@
-      frame.setPreferredSize(new Dimension(250,345));
-      frame.setMaximumSize(new Dimension(250,345));
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);

trunk/src/vlcskineditor/items/Button.java

@@ -276 +276 @@
-      
-      frame.pack();
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);    

trunk/src/vlcskineditor/items/Checkbox.java

@@ -370 +370 @@
-      
-      frame.pack();
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);    

trunk/src/vlcskineditor/items/Group.java

@@ -199 +199 @@
-      
-      frame.pack();
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);

trunk/src/vlcskineditor/items/Image.java

@@ -271 +271 @@
-      
-      frame.pack();
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);    

trunk/src/vlcskineditor/items/Panel.java

@@ -296 +296 @@
-      
-      frame.pack();
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);    

trunk/src/vlcskineditor/items/Playtree.java

@@ -431 +431 @@
-      
-      frame.pack();
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);    

trunk/src/vlcskineditor/items/Slider.java

@@ -401 +401 @@
-      
-      frame.pack();
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);    

trunk/src/vlcskineditor/items/SliderBackground.java

@@ -193 +193 @@
-      frame.pack();
-      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);

trunk/src/vlcskineditor/items/Text.java

@@ -290 +290 @@
-      
-      frame.pack();
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);    

trunk/src/vlcskineditor/items/Video.java

@@ -253 +253 @@
-      
-      frame.pack();
+      
+      frame.getRootPane().setDefaultButton(ok_btn);
-    }
-    id_tf.setText(id);    

trunk/src/vlcskineditor/resources/SubBitmap.java

@@ -399 +399 @@
-  public String returnCode(String indent) {
-    String code=indent+"<SubBitmap id=\""+id+"\" x=\""+String.valueOf(x)+"\" y=\""+String.valueOf(y)+"\"";
- height=\""+String.valueOf(height)+"\"";
+width=\""+String.valueOf(width)+"\"";    
-    if (nbframes!=NBFRAMES_DEFAULT) code+=" nbframes=\""+String.valueOf(nbframes)+"\"";
-    if (fps!=FPS_DEFAULT) code+=" fps=\""+String.valueOf(fps)+"\"";