Changeset 104

Timestamp:

06/24/08 15:31:44 (3 months ago)

Author:

altglass

Message:

-New SpringLayout? for Resources, Window & Layout editing dialogs finished and perfected
-README.TXT : updated changelog in

Files:

• trunk/README.TXT (modified) (5 diffs)
• trunk/src/vlcskineditor/Layout.java (modified) (4 diffs)
• trunk/src/vlcskineditor/Window.java (modified) (5 diffs)
• trunk/src/vlcskineditor/resources/Bitmap.java (modified) (3 diffs)
• trunk/src/vlcskineditor/resources/Font.java (modified) (2 diffs)
• trunk/src/vlcskineditor/resources/SubBitmap.java (modified) (7 diffs)

trunk/README.TXT

@@ -1 @@
-b
+
------------------------------------------------------------
-Changelog:
------------------------------------------------------------
-b
+ 
-       - Improved SubBitmap editing
-       - Resources/windows/layouts can be duplicated easily
@@ -9 +9 @@
-       - Slider backgrounds can be generated in a wizard
-       - Improved preview of skin (can be zoomed now)
+       - Improved cross platform behaviour
+       - Improved online help
+       - Some (critical) bugs were fixed
+       
-0.6.1b - Critical bufix for the Preview Window 
-       - Bugfix for slider points parsing and XML parsing
+       
-0.6.0b - Resources/windows/layouts/items can be edited by
-         doubleclicking on them in the hiearchy trees
@@ -21 +26 @@
-       - Many actions can be undone/redone
-       - SubBitmaps can be edited visually
+       
-0.5.0a - Boolean variables are interpreted in the preview
-       - Global variables can be edited (boolean only atm)
@@ -27 +33 @@
-       - Some bugfixes
-       - New icons
+       
-0.4.5a - Several bugfixes
-       - Text variables are interpreted in the preview
+       
-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
+       
-0.3.5a - Preview of Layouts
-       - XML parsing/generating fixes
+       
-0.3.0b - All items can be edited
-       - Theme attributes can be edited
@@ -42 +53 @@
-       - The open/save dialog will point by default to the
-         VLC Skins directory on Windows and Linux
+         
-0.3.0a - Items can be added
-       - Items can be deleted
-       - All items except SliderBGs, Playlists, Playtrees
-         can be edited
+         
-0.2.8a - Improved trees
-       - Groups, Panels and Images can be edited
-       - Several PNG files can be added at once
-       - Confirmation of exiting if skin is unsafed
+       
-0.2.5a - Windows and Layouts can be edited
-       - Bitmaps, SubBitmaps and Fonts can be added
+       
-0.2.0a - Now files can be saved
-       - Font, Bitmap and SubBitmap resources can be edited
+       
-0.1.0b - Initial Release
-       - Complete XML parsing of a skins2 file

trunk/src/vlcskineditor/Layout.java

@@ -236 +236 @@
-      ok_btn = new JButton("OK");
-      ok_btn.addActionListener(this);
-      ok_btn.setPreferredSize(new Dimension(70,25));
-      cancel_btn = new JButton("Cancel");
-      cancel_btn.addActionListener(this);
-      cancel_btn.setPreferredSize(new Dimension(70,25));
-      help_btn = new JButton("Help");
-      help_btn.addActionListener(this);
-
+
+
+
+
+
+
+
-      
-      JPanel general = new JPanel(null);
-      general.add(id_l);
-
-
-
+
+
-      general.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "General Attributes"));
-
-
-
+
+
+
+
+
+
+
+
-      frame.add(general);
-      
-      JPanel dim = new JPanel(null);
-      dim.add(width_l);
-
-
-
+
+
-      dim.add(height_l);
-      dim.add(height_tf);
-
-
-
+
+
-      dim.add(minwidth_tf);
-
-
+
-      dim.add(minheight_l);
-      dim.add(minheight_tf);
-
-
+
-      dim.add(maxwidth_l);
-      dim.add(maxwidth_tf);
-
-
+
-      dim.add(maxheight_l);
-      dim.add(maxheight_tf);
-
-
+
-      dim.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "Dimensions"));
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      frame.add(dim);
-      
@@ -289 +334 @@
-      frame.add(cancel_btn);
-      frame.add(help_btn);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    id_tf.setText(id);
@@ -335 +405 @@
-            desktop = Desktop.getDesktop();
-            try {
-s2-create.html#Layout
+edhlp/layout.html
-            }
-            catch (Exception ex) {
@@ -342 +412 @@
-      }
-      else {
-s2-create
+edhlp/layout
-      }
-    }

trunk/src/vlcskineditor/Window.java

@@ -185 +185 @@
-      general_layout.putConstraint(SpringLayout.WEST, id_l, 5, SpringLayout.WEST, general);  
-      
-WEST, id_tf, tf_dx, SpringLayout.WEST, genera
-NORTH, id_tf, 0, SpringLayout.NORTH, id_
- 
+VERTICAL_CENTER, id_tf, 0, SpringLayout.VERTICAL_CENTER, id_
+WEST, id_tf, tf_dx, SpringLayout.WEST, genera
+
-      
-      general_layout.putConstraint(SpringLayout.NORTH, x_l, 10, SpringLayout.SOUTH, id_l);
-      general_layout.putConstraint(SpringLayout.WEST, x_l, 5, SpringLayout.WEST, general);
-      
-WEST, x_tf, tf_dx, SpringLayout.WEST, genera
-NORTH, x_tf, 0, SpringLayout.NORTH, x_l);
+VERTICAL_CENTER, x_tf, 0, SpringLayout.VERTICAL_CENTER, x_
+WEST, x_tf, tf_dx, SpringLayout.WEST, general);      
-      general_layout.putConstraint(SpringLayout.EAST, x_tf, 0, SpringLayout.EAST, id_tf);
-      
@@ -199 +199 @@
-      general_layout.putConstraint(SpringLayout.WEST, y_l, 5, SpringLayout.WEST, general);
-      
-WEST, y_tf, tf_dx, SpringLayout.WEST, genera
-NORTH, y_tf, 0, SpringLayout.NORTH, y_l);
+VERTICAL_CENTER, y_tf, 0, SpringLayout.VERTICAL_CENTER, y_
+WEST, y_tf, tf_dx, SpringLayout.WEST, general);      
-      general_layout.putConstraint(SpringLayout.EAST, y_tf, 0, SpringLayout.EAST, id_tf);
-      
@@ -206 +206 @@
-      general_layout.putConstraint(SpringLayout.WEST, visible_l, 5, SpringLayout.WEST, general);
-      
-WEST, visible_tf, tf_dx, SpringLayout.WEST, genera
-NORTH, visible_tf, 0, SpringLayout.NORTH, visible_l);
+VERTICAL_CENTER, visible_tf, 0, SpringLayout.VERTICAL_CENTER, visible_
+WEST, visible_tf, tf_dx, SpringLayout.WEST, general);      
-      general_layout.putConstraint(SpringLayout.EAST, visible_tf, 0, SpringLayout.EAST, id_tf);
-      
@@ -226 +226 @@
-      options_layout.putConstraint(SpringLayout.WEST, dragdrop_l, 5, SpringLayout.WEST, options);
-      
-WEST, dragdrop_tf, tf_dx, SpringLayout.WEST, options
-NORTH, dragdrop_tf, 0, SpringLayout.NORTH, dragdrop_l);
+VERTICAL_CENTER, dragdrop_tf, 0, SpringLayout.VERTICAL_CENTER, dragdrop_l
+WEST, dragdrop_tf, tf_dx, SpringLayout.WEST, options);      
-      options_layout.putConstraint(SpringLayout.EAST, options, 5, SpringLayout.EAST, dragdrop_tf);
-      
@@ -233 +233 @@
-      options_layout.putConstraint(SpringLayout.WEST, playondrop_l, 5, SpringLayout.WEST, options);
-      
-WEST, playondrop_tf, tf_dx, SpringLayout.NORTH, options
-NORTH, playondrop_tf, 0, SpringLayout.NORTH, playondrop_l);
+VERTICAL_CENTER, playondrop_tf, 0, SpringLayout.VERTICAL_CENTER, playondrop_l
+WEST, playondrop_tf, tf_dx, SpringLayout.NORTH, options);      
-      options_layout.putConstraint(SpringLayout.EAST, playondrop_tf, 0, SpringLayout.EAST, dragdrop_tf);
-      

trunk/src/vlcskineditor/resources/Bitmap.java

@@ -239 +239 @@
-      JLabel attr_l = new JLabel("* Attributes marked with a star must be specified.");
-      
+      //Distance of textfields to WEST edge of container
+      Component[] labels = { id_l, file_l, alphacolor_l, nbframes_l, fps_l};
+      int tf_dx = Helper.maxWidth(labels)+10;
+      //Max. textfield width
+      int tf_wd = 200;
+      //Width of buttons
+      Component[] btns = { file_btn, alphacolor_btn };
+      int btn_wd = Helper.maxWidth(btns);      
+      
-      JPanel general = new JPanel(null);
-      general.add(id_l);
@@ -248 +257 @@
-      general.add(alphacolor_tf);
-      general.add(alphacolor_btn);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-      SpringLayout general_layout = new SpringLayout();
-      general.setLayout(general_layout);      
-      
-      general_layout.putConstraint(SpringLayout.NORTH, id_l, 5, SpringLayout.NORTH, general);
-
+
+
+
-      general_layout.putConstraint(SpringLayout.WEST, id_tf, tf_dx, SpringLayout.WEST, general);
-      general_layout.putConstraint(SpringLayout.NORTH, id_tf, 0, SpringLayout.NORTH, id_l);
-      general_layout.putConstraint(SpringLayout.EAST, id_tf, 0, SpringLayout.EAST, file_btn);
-      
-      general_layout.putConstraint(SpringLayout.NORTH, file_l, 10, SpringLayout.SOUTH, id_l);
-
+
+
+
-      general_layout.putConstraint(SpringLayout.WEST, file_tf, tf_dx, SpringLayout.WEST, general);
-
-
-
+
+
-      general_layout.putConstraint(SpringLayout.WEST, file_btn, 5, SpringLayout.EAST, file_tf);
-      general_layout.putConstraint(SpringLayout.NORTH, file_btn, 0, SpringLayout.NORTH, file_l);
-      general_layout.putConstraint(SpringLayout.EAST, general, 5, SpringLayout.EAST, file_btn);
-      
-      general_layout.putConstraint(SpringLayout.NORTH, alphacolor_l, 10, SpringLayout.SOUTH, file_l);
-
+
+
+
-      general_layout.putConstraint(SpringLayout.WEST, alphacolor_tf, tf_dx, SpringLayout.WEST, general);
-
-
-
+
+
-      general_layout.putConstraint(SpringLayout.WEST, alphacolor_btn, 5, SpringLayout.EAST, alphacolor_tf);
-      general_layout.putConstraint(SpringLayout.NORTH, alphacolor_btn, 0, SpringLayout.NORTH, alphacolor_l);
-      general_layout.putConstraint(SpringLayout.EAST, general, 5, SpringLayout.EAST, alphacolor_btn);
-      
-      general_layout.putConstraint(SpringLayout.SOUTH, general, 10, SpringLayout.SOUTH, alphacolor_l);
+      frame.add(general);
-      
-      JPanel animation = new JPanel(null);
@@ -304 +308 @@
-      
-      ani_layout.putConstraint(SpringLayout.NORTH, nbframes_l, 5, SpringLayout.NORTH, animation);
-
+
+
+
-      ani_layout.putConstraint(SpringLayout.WEST, nbframes_tf, tf_dx, SpringLayout.WEST, animation);
-      ani_layout.putConstraint(SpringLayout.NORTH, nbframes_tf, 0, SpringLayout.NORTH, nbframes_l);
-      ani_layout.putConstraint(SpringLayout.EAST, animation, 5, SpringLayout.EAST, nbframes_tf);
-      
-      ani_layout.putConstraint(SpringLayout.NORTH, fps_l, 10, SpringLayout.SOUTH, nbframes_l);
-
+
+
+
-      ani_layout.putConstraint(SpringLayout.WEST, fps_tf, tf_dx, SpringLayout.WEST, animation);
-      ani_layout.putConstraint(SpringLayout.NORTH, fps_tf, 0, SpringLayout.NORTH, fps_l);
-      ani_layout.putConstraint(SpringLayout.EAST, fps_tf, 0, SpringLayout.EAST, nbframes_tf);
-      

trunk/src/vlcskineditor/resources/Font.java

@@ -180 +180 @@
-      JLabel attr_l = new JLabel("* Attributes marked with a star must be specified.");
-      
-      JPanel general = new JPanel(null);      
-      general.add(id_l);
-      general.add(id_tf);     
-      general.add(file_l);
-      general.add(file_tf);
-      general.add(file_btn);
-      general.add(size_l);
-      general.add(size_tf);
-      
-      general.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "General Attributes"));       
-      
-      SpringLayout general_layout = new SpringLayout();
-      general.setLayout(general_layout);
-      
-      //Textfield distance to WEST border of container
-      Component[] labels = { id_l, file_l, size_l };
@@ -202 +188 @@
-      int btn_wd = file_btn.getPreferredSize().width;
-      
+      JPanel general = new JPanel(null);      
+      general.add(id_l);
+      general.add(id_tf);     
+      general.add(file_l);
+      general.add(file_tf);
+      file_tf.setPreferredSize(new Dimension(tf_wd-btn_wd,file_tf.getPreferredSize().height));
+      general.add(file_btn);
+      general.add(size_l);
+      general.add(size_tf);
+      
+      general.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "General Attributes"));       
+      
+      SpringLayout general_layout = new SpringLayout();
+      general.setLayout(general_layout);
+      
-      general_layout.putConstraint(SpringLayout.NORTH, id_l, 5, SpringLayout.NORTH, general);
-
+
+
+
-      general_layout.putConstraint(SpringLayout.WEST, id_tf, tf_dx, SpringLayout.WEST, general);
-      general_layout.putConstraint(SpringLayout.NORTH, id_tf, 0, SpringLayout.NORTH, id_l);
-      general_layout.putConstraint(SpringLayout.EAST, id_tf, 0, SpringLayout.EAST, file_btn);
-      
-      general_layout.putConstraint(SpringLayout.NORTH, file_l, 10, SpringLayout.SOUTH, id_l);
-
+
+
+
-      general_layout.putConstraint(SpringLayout.WEST, file_tf, tf_dx, SpringLayout.WEST, general);
-general_layout.putConstraint(SpringLayout.NORTH, file_tf, 0, SpringLayout.NORTH, file_l);      
-file_tf.setPreferredSize(new Dimension(tf_wd-btn_wd,file_tf.getPreferredSize().height)
+
+general_layout.putConstraint(SpringLayout.VERTICAL_CENTER, file_btn, 0, SpringLayout.VERTICAL_CENTER, file_l
-      general_layout.putConstraint(SpringLayout.WEST, file_btn, 5, SpringLayout.EAST, file_tf);
-      general_layout.putConstraint(SpringLayout.NORTH, file_btn, 0, SpringLayout.NORTH, file_l);
-      general_layout.putConstraint(SpringLayout.EAST, general, 5, SpringLayout.EAST, file_btn);
-      
-      general_layout.putConstraint(SpringLayout.NORTH, size_l, 10, SpringLayout.SOUTH, file_l);
-
+
+
+
-      general_layout.putConstraint(SpringLayout.WEST, size_tf, tf_dx, SpringLayout.WEST, general);
-      general_layout.putConstraint(SpringLayout.NORTH, size_tf, 0, SpringLayout.NORTH, size_l);
-      general_layout.putConstraint(SpringLayout.EAST, size_tf, 0, SpringLayout.EAST, file_btn);
-      

trunk/src/vlcskineditor/resources/SubBitmap.java

@@ -155 +155 @@
-      id_tf = new JTextField();
-      id_tf.setToolTipText("Identifiant of the font that will be used with controls..");
-x
+X
-      x_tf = new JTextField();
-      x_tf.setDocument(new NumbersOnlyDocument(false));
-y
+Y
-      y_tf = new JTextField();
-      y_tf.setDocument(new NumbersOnlyDocument(false));
@@ -198 +198 @@
-      general_layout.putConstraint(SpringLayout.NORTH, id_l, 5, SpringLayout.NORTH, general);
-      general_layout.putConstraint(SpringLayout.WEST, id_l, 5, SpringLayout.WEST, general);      
-WEST, id_tf, tf_dx, SpringLayout.WEST, genera
-NORTH, id_tf, 0, SpringLayout.NORTH, id_l);
+VERTICAL_CENTER, id_tf, 0, SpringLayout.VERTICAL_CENTER, id_
+WEST, id_tf, tf_dx, SpringLayout.WEST, general);      
-      general_layout.putConstraint(SpringLayout.EAST, general, 5, SpringLayout.EAST, id_tf);
-      general_layout.putConstraint(SpringLayout.SOUTH, general, 10, SpringLayout.SOUTH, id_l);
@@ -223 +223 @@
-      bounds_layout.putConstraint(SpringLayout.WEST, x_l, 5, SpringLayout.WEST, bounds);
-      
+      bounds_layout.putConstraint(SpringLayout.VERTICAL_CENTER, x_tf, 0, SpringLayout.VERTICAL_CENTER, x_l);
-      bounds_layout.putConstraint(SpringLayout.WEST, x_tf, tf_dx, SpringLayout.WEST, bounds);
-      bounds_layout.putConstraint(SpringLayout.NORTH, x_tf, 0, SpringLayout.NORTH, x_l);
-      bounds_layout.putConstraint(SpringLayout.EAST, bounds, 5, SpringLayout.EAST, x_tf);
-      
@@ -230 +230 @@
-      bounds_layout.putConstraint(SpringLayout.WEST, y_l, 5, SpringLayout.WEST, bounds);
-      
+      bounds_layout.putConstraint(SpringLayout.VERTICAL_CENTER, y_tf, 0, SpringLayout.VERTICAL_CENTER, y_l);
-      bounds_layout.putConstraint(SpringLayout.WEST, y_tf, tf_dx, SpringLayout.WEST, bounds);
-      bounds_layout.putConstraint(SpringLayout.NORTH, y_tf, 0, SpringLayout.NORTH, y_l);
-      bounds_layout.putConstraint(SpringLayout.EAST, y_tf, 0, SpringLayout.EAST, x_tf);
-      
@@ -237 +237 @@
-      bounds_layout.putConstraint(SpringLayout.WEST, width_l, 5, SpringLayout.WEST, bounds);
-      
+      bounds_layout.putConstraint(SpringLayout.VERTICAL_CENTER, width_tf, 0, SpringLayout.VERTICAL_CENTER, width_l);
-      bounds_layout.putConstraint(SpringLayout.WEST, width_tf, tf_dx, SpringLayout.WEST, bounds);
-      bounds_layout.putConstraint(SpringLayout.NORTH, width_tf, 0, SpringLayout.NORTH, width_l);
-      bounds_layout.putConstraint(SpringLayout.EAST, width_tf, 0, SpringLayout.EAST, x_tf);
-      
@@ -244 +244 @@
-      bounds_layout.putConstraint(SpringLayout.WEST, height_l, 5, SpringLayout.WEST, bounds);
-      
+      bounds_layout.putConstraint(SpringLayout.VERTICAL_CENTER, height_tf, 0, SpringLayout.VERTICAL_CENTER, height_l);
-      bounds_layout.putConstraint(SpringLayout.WEST, height_tf, tf_dx, SpringLayout.WEST, bounds);
-      bounds_layout.putConstraint(SpringLayout.NORTH, height_tf, 0, SpringLayout.NORTH, height_l);
-      bounds_layout.putConstraint(SpringLayout.EAST, height_tf, 0, SpringLayout.EAST, x_tf);
-      
@@ -261 +261 @@
-      nbframes_tf.setPreferredSize(new Dimension(tf_wd,nbframes_tf.getPreferredSize().height));
-      ani_layout.putConstraint(SpringLayout.NORTH, nbframes_l, 5, SpringLayout.NORTH, animation);
-
+
+
+
-      ani_layout.putConstraint(SpringLayout.WEST, nbframes_tf, tf_dx, SpringLayout.WEST, animation);
-      ani_layout.putConstraint(SpringLayout.NORTH, nbframes_tf, 0, SpringLayout.NORTH, nbframes_l);
-      ani_layout.putConstraint(SpringLayout.EAST, animation, 5, SpringLayout.EAST, nbframes_tf);
+      
-      ani_layout.putConstraint(SpringLayout.NORTH, fps_l, 10, SpringLayout.SOUTH, nbframes_l);
-
+
+
+
-      ani_layout.putConstraint(SpringLayout.WEST, fps_tf, tf_dx, SpringLayout.WEST, animation);
-      ani_layout.putConstraint(SpringLayout.NORTH, fps_tf, 0, SpringLayout.NORTH, fps_l);
-      ani_layout.putConstraint(SpringLayout.EAST, fps_tf, 0, SpringLayout.EAST, nbframes_tf);
+      
-      ani_layout.putConstraint(SpringLayout.SOUTH, animation, 10, SpringLayout.SOUTH, fps_l);     
-      frame.add(animation);