Changeset 94

Timestamp:

02/02/08 17:51:20 (10 months ago)

Author:

altglass

Message:

Slider BG Generator finished (atm only horizontal sliders w/o overlay image option)

Files:

• trunk/src/vlcskineditor/ProgressWindow.java (modified) (1 diff)
• trunk/src/vlcskineditor/SliderBGBuilder.java (added)
• trunk/src/vlcskineditor/SliderBGGen.java (modified) (14 diffs)
• trunk/src/vlcskineditor/icons/sbg_bg_h.png (added)
• trunk/src/vlcskineditor/icons/sbg_bg_v.png (added)
• trunk/src/vlcskineditor/icons/sbg_bottom.png (added)
• trunk/src/vlcskineditor/icons/sbg_height.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/sbg_left.png (added)
• trunk/src/vlcskineditor/icons/sbg_margin_b.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/sbg_margin_l.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/sbg_margin_r.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/sbg_margin_t.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/sbg_middle_h.png (added)
• trunk/src/vlcskineditor/icons/sbg_middle_v.png (added)
• trunk/src/vlcskineditor/icons/sbg_right.png (added)
• trunk/src/vlcskineditor/icons/sbg_stretch.png (added)
• trunk/src/vlcskineditor/icons/sbg_tile.png (added)
• trunk/src/vlcskineditor/icons/sbg_top.png (added)
• trunk/src/vlcskineditor/icons/sbg_width.png (modified) (1 prop)
• trunk/src/vlcskineditor/icons/windows.png (modified) (1 prop)
• trunk/src/vlcskineditor/items/SliderBackground.java (modified) (5 diffs)

trunk/src/vlcskineditor/ProgressWindow.java

@@ -48 +48 @@
-    pbar.setIndeterminate(true);
-  }  
+  public void setProgress(int i) {
+      pbar.setIndeterminate(false);
+      pbar.setMaximum(1000);
+      pbar.setMinimum(0);
+      pbar.setValue(i);
+  }
-  /** Sets the text displayed on the progress bar */
-  public void setText(String s) {

trunk/src/vlcskineditor/SliderBGGen.java

@@ -25 +25 @@
-import java.awt.*;
-import java.awt.event.*;
+import java.io.File;
-import javax.swing.*;
+import javax.swing.border.EtchedBorder;
-import vlcskineditor.items.SliderBackground;
+import vlcskineditor.resources.Bitmap;
-
-/**
@@ -70 +73 @@
-  JButton bg_btn, e1_btn, md_btn, e2_btn;
-  JFileChooser bg_fc, e1_fc, md_fc, e2_fc;
+  
+  JLabel bg_l, e1_l, md_l, e2_l;
+  JPanel bg_p, e1_p, md_p, e2_p;
+  
-  JButton step2_prev_btn, step2_finish_btn, step2_cancel_btn;  
-  
@@ -81 +88 @@
-  ImageIcon margin_t_i = createIcon("icons/sbg_margin_t.png");
-  ImageIcon margin_b_i = createIcon("icons/sbg_margin_b.png");
+  ImageIcon bg_h = createIcon("icons/sbg_bg_h.png");
+  ImageIcon bg_v = createIcon("icons/sbg_bg_v.png");
+  ImageIcon left = createIcon("icons/sbg_left.png");
+  ImageIcon right = createIcon("icons/sbg_right.png");
+  ImageIcon top = createIcon("icons/sbg_top.png");
+  ImageIcon bottom = createIcon("icons/sbg_bottom.png");
+  ImageIcon middle_h = createIcon("icons/sbg_middle_h.png");
+  ImageIcon middle_v = createIcon("icons/sbg_middle_v.png");
+  ImageIcon tile = createIcon("icons/sbg_tile.png");
+  ImageIcon stretch = createIcon("icons/sbg_stretch.png");
-  
-  /**
@@ -111 +128 @@
-    card_step1.add(header1_l); 
-    
-
+ It will help you to create a neat slider from your images, in just a few steps.
-                                  "As a first step, please choose whether the slider is going from left to right or from the bottom to the top and what size the background should have.</div></html>");    
-    card_step1.add(welcome_l);    
-25
+30
-    ltr_rb = new JRadioButton("");    
-    card_step1.add(ltr_rb);
-05,20,10
+25,20,6
-    ltr_rb.setSelected(true);
-    JLabel ltr_l = new JLabel(ltr_icon);
-    ltr_l.setLabelFor(ltr_rb);
-    card_step1.add(ltr_l);
-05,100,10
+25,100,6
-    
-    btt_rb = new JRadioButton("");
-    card_step1.add(btt_rb);
-05,20,10
+25,20,6
-    JLabel btt_l = new JLabel(btt_icon);
-    btt_l.setLabelFor(btt_rb);
@@ -132 +149 @@
-    btt_l.setBounds(280,105,100,100);
-    
+    btt_rb.setEnabled(false);
+    btt_l.setEnabled(false);
+    
-    ButtonGroup dir_bg = new ButtonGroup();
-    dir_bg.add(ltr_rb);
+    ltr_rb.addActionListener(this);
-    dir_bg.add(btt_rb);
+    btt_rb.addActionListener(this);
-    
-    JSeparator horz2_s = new JSeparator(JSeparator.HORIZONTAL);
@@ -140 +162 @@
-    horz2_s.setBounds(5,215,525,215);    
-    
-
+
+
-    width_tf = new JTextField();    
-    width_tf.setDocument(new NumbersOnlyDocument(false));
@@ -150 +173 @@
-    width_tf.setBounds(90,230,50,25);    
-    
-
+
+
-    height_tf = new JTextField();
-    height_tf.setDocument(new NumbersOnlyDocument(false));
@@ -160 +184 @@
-    height_tf.setBounds(90,265,50,25);
-    
-
+
+
-    margin_l_tf = new JTextField();
-    margin_l_tf.setDocument(new NumbersOnlyDocument(false));
-    margin_l_l.setLabelFor(margin_l_tf);
-
+
+
-    margin_r_tf = new JTextField();
-    margin_r_tf.setDocument(new NumbersOnlyDocument(false));
-    margin_r_l.setLabelFor(margin_r_tf);
-
+
+
-    margin_t_tf = new JTextField();
-    margin_t_tf.setDocument(new NumbersOnlyDocument(false));
-    margin_t_l.setLabelFor(margin_t_tf);
-
+
+
-    margin_b_tf = new JTextField();
-    margin_b_tf.setDocument(new NumbersOnlyDocument(false));
@@ -194 +222 @@
-    margin_b_tf.setBounds(445,265,50,25);
-    
+    JSeparator separator2 = new JSeparator(JSeparator.HORIZONTAL);
+    JLabel info_l = new JLabel("<html>In the following step you have to choose the correct image files associated" +
+            " to the different parts of your slider.<br>Note that the icons are just examples to illustrate" +
+            " what the different parts represent. They are not a preview of the images that will be used in" +
+            " the background generation.</html>");
+    
+    card_step1.add(separator2);
+    card_step1.add(info_l);
+    
+    separator2.setBounds(5,300,525,5);
+    info_l.setBounds(5,310,525,80);
+    
-    step1_horz_s = new JSeparator(JSeparator.HORIZONTAL);   
-    step1_next_btn = new JButton("Next >");
@@ -204 +244 @@
-    card_step1.add(step1_cancel_btn);
-    
-4
-35
-35
+9
+ 40
+40
-    
-    card_step1.setSize(540,400);   
@@ -217 +257 @@
-    card_step2.add(header2_l); 
-    
- JPanel 
-JLabel bg_l = new JLabel("Image file:"
+
+bg_l = new JLabel("Image file:",bg_h,JLabel.TRAILING
-    bg_tf = new JTextField("");
-    bg_btn = new JButton("Open...");
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    JSeparator step2_horz_s = new JSeparator(JSeparator.HORIZONTAL);
@@ -236 +370 @@
-    card_step2.add(step2_cancel_btn);
-    
-4
-35
-35
-35
+9
+40
+40
+40
-  
-    add(card_step2,STEP2);    
-    
-0
+5
-    setResizable(false);
-  }
-  public void actionPerformed(ActionEvent e) {
-    if(e.getActionCommand().equals("Cancel")) {
-
+
+
-    }
-    else if (e.getSource().equals(step1_next_btn)) {
@@ -257 +392 @@
-    }
-    else if (e.getSource().equals(step2_finish_btn)) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }
@@ -271 +469 @@
-        //img = ImageIO.read(file);
-        return new ImageIcon(img);  
-
+        
-        System.out.println(e);
-        return null;

trunk/src/vlcskineditor/items/SliderBackground.java

@@ -50 +50 @@
-  
-  JFrame frame;
-
+public 
-  JButton gen_btn, ok_btn, cancel_btn, help_btn;
-  BufferedImage bi = null;
@@ -86 +86 @@
-      padhoriz = Integer.parseInt(padhoriz_tf.getText());
-      padvert = Integer.parseInt(padvert_tf.getText());
-HID
+DISPOS
-      created = true;
-      
@@ -219 +219 @@
-      }
-      update();
+      s.updateItems();
+      s.expandItem(id);
-      frame.setVisible(false);
-      frame.dispose();
@@ -239 +241 @@
-    }
-    else if(e.getSource().equals(gen_btn)) {
-
+
+
+
-    }
-    else if(e.getSource().equals(cancel_btn)) {
@@ -246 +250 @@
-      frame = null;
-      if(!created) sl.removeBG();      
-
-
+    
+  
-  public String returnCode() {
-    String code = "<SliderBackground";