Blimp

@@ -1,8 +1,13 @@

 BlinkenLightsInteractiveMovieProgram

-Copyright (C) 2004-2006: Stefan Schuermans <1stein@schuermans.info>

+Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

 Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 a blinkenarea.org project

-powered by eventphone.de

+

+version 1.3.2 date 2008-02-23

+-----------------------------

+ - added menu items for known formats

+   - thanks to Christian Heimke for the idea and the first implementation

+ - added buttons to initialize color buttons to gray and to color

 version 1.3.1 date 2006-10-17

 -----------------------------

@@ -1,9 +1,8 @@

 # BlinkenLightsInteractiveMovieProgram

-# version 1.3.1 date 2006-10-17

-# Copyright (C) 2004-2006: Stefan Schuermans <1stein@schuermans.info>

+# version 1.3.2 date 2008-02-23

+# Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

 # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 # a blinkenarea.org project

-# powered by eventphone.de

 BLINKEN_LIB=../BlinkenLibJava/BlinkenLib.jar

@@ -1,9 +1,8 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.1 date 2006-10-17

- * Copyright (C) 2004-2006: Stefan Schuermans <1stein@schuermans.info>

+ * version 1.3.2 date 2008-02-23

+ * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

- * powered by eventphone.de

  */

 package org.blinkenarea.Blimp;

@@ -32,6 +31,30 @@ public class Blimp extends JApplet

   static final int defHeight = 8, defWidth = 8, defChannels = 1, defMaxval = 127, defDuration = 100;

   static final int ZoomAspectResolution = 30;

+  //known formats

+  static final String[] knownFormats =

+  {

+    "Blinkenlights (18x8-1/2)",

+    "Blinkenlights Arcade (26x20-1/16)",

+    "Blinkenlights reloaded (18x8-1/16)",

+    "bluebox (98x7-1/128)",

+    "PixelCurtain (18x8-3/256)",

+    "TROIA big walls (104x32-1/128)",

+    "TROIA ceiling (104x80-1/128)",

+    "TROIA small walls (80x32-1/128)",

+  };

+

+  //known sizes

+  static final String[] knownSizes =

+  {

+    "Blinkenlights (18x8)",

+    "Blinkenlights Arcade (26x20)",

+    "bluebox (98x7)",

+    "TROIA big walls (104x32)",

+    "TROIA ceiling (104x80)",

+    "TROIA small walls (80x32)",

+  };

+

   //configuration variables

   boolean isFullApp = false; //if running as full application

   String initialFile = null;

@@ -43,7 +66,9 @@ public class Blimp extends JApplet

   JMenu menuFile, menuInfo, menuEdit, menuFrameSel, menuPlay, menuHelp; //menus

   JMenuItem menuFileNew, menuFileLoad, menuFileSave, menuFileSaveAs, menuFileQuit;

   JMenuItem menuInfoShow, menuInfoAdd, menuInfoDelete;

-  JMenuItem menuEditResize, menuEditScale;

+  JMenu menuEditResize, menuEditScale;

+  JMenuItem menuEditResizeUser, menuEditScaleUser;

+  JMenuItem menuEditResizeKnown[], menuEditScaleKnown[];

   JMenuItem menuEditInsertFrame, menuEditDuplicateFrame, menuEditDeleteFrame;

   JMenuItem menuFrameSelNone, menuFrameSelSingle, menuFrameSelStart, menuFrameSelEnd;

   JMenuItem menuFrameSelCopy, menuFrameSelMove, menuFrameSelReverse, menuFrameSelDelete;

@@ -73,7 +98,8 @@ public class Blimp extends JApplet

   JButton buttonActionsRollLeft, buttonActionsRollRight, buttonActionsRollUp, buttonActionsRollDown;

   JButton buttonActionsUndo, buttonActionsRedo;

   JButton buttonEditInsertFrame, buttonEditDuplicateFrame, buttonEditDeleteFrame;

-  JPanel panelColorsChoose, panelColorsSettings, panelColorsColor, panelColorsAlpha;

+  JButton buttonColorsPredefGray, buttonColorsPredefColor;

+  JPanel panelColorsChoose, panelColorsSettings, panelColorsPredef, panelColorsColor, panelColorsAlpha;

   JToggleButton buttonsColor[];

   ButtonGroup groupColor;

   JLabel labelColorsColor, labelColorsAlpha;

@@ -175,7 +201,7 @@ public class Blimp extends JApplet

     labelStatus.setText( "new movie..." );

     curFile = null;

     curMovie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval );

-    curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.1 date 2006-10-17)" );

+    curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.2 date 2008-02-23)" );

     curMovie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) );

     curMovieChanged = false;

@@ -398,115 +424,133 @@ public class Blimp extends JApplet

     }

   }

-  //"Edit Resize Movie..." was chosen from menu

-  private void actionEditResize( )

+  //get format or size from bracket in string

+  private String getFormatOrSize( String str )

   {

-    Pattern sizePattern;

-    String curSize;

-    Object size;

-    Matcher sizeMatcher;

+    Pattern pattern;

+    Matcher matcher;

-    //initialize size pattern

-    sizePattern = Pattern.compile( "^([0-9]+)x([0-9]+)-([0-9]+)/([0-9]+)$" );

+    pattern = Pattern.compile( "^.*\\(([^()]*)\\)$" );

+    if( (matcher = pattern.matcher( str )).find( ) )

+      return matcher.group( 1 );

+    else

+      return "";

+  }

-    //get string with current movie size

-    curSize = curMovie.getWidth( ) + "x" +

+  //resize to format

+  private boolean actionEditResizeToFormat( String format )

+  {

+    Pattern formatPattern;

+    Matcher formatMatcher;

+

+    //initialize format pattern

+    formatPattern = Pattern.compile( "^([0-9]+)x([0-9]+)-([0-9]+)/([0-9]+)$" );

+

+    //check format

+    if( ! (formatMatcher = formatPattern.matcher( format )).find( ) ) //abort and return error if format not valid

+      return false;

+

+    //resize movie

+    curMovie.resize( Integer.parseInt( formatMatcher.group( 2 ) ),

+                     Integer.parseInt( formatMatcher.group( 1 ) ),

+                     Integer.parseInt( formatMatcher.group( 3 ) ),

+                     Integer.parseInt( formatMatcher.group( 4 ) ) - 1 );

+    curMovieChanged = true;

+

+    //update controls

+    updateFrames( scrollFrames.getValue( ) );

+

+    //update status

+    labelStatus.setText( "movie resized successfully to " + format + "..." );

+

+    return true;

+  }

+

+  //"Edit Resize Movie user defined format..." was chosen from menu

+  private void actionEditResizeUser( )

+  {

+    String curFormat;

+    Object format;

+

+    //get string with current movie format

+    curFormat = curMovie.getWidth( ) + "x" +

                 curMovie.getHeight( ) + "-" + 

                 curMovie.getChannels( ) + "/" + 

                 (curMovie.getMaxval( ) + 1);

     //ask until cancel or answer is valid

-    size = curSize;

+    format = curFormat;

     do

     {

-      //ask for new size

-      size = JOptionPane.showInputDialog( dialogParent,

-                                          "Current movie size is:   " + curSize + "\n\n" +

-                                          "The format is:   <width>x<height>-<channels>/<colors>\n" + 

-                                          "     18x8-1/2     (Blinkenlights)\n" + 

-                                          "     18x8-1/16     (Blinkenlights Reloaded)\n" + 

-                                          "     26x20-1/16     (Blinkenlights Arcade)\n" + 

-                                          "     104x32-1/128     (TROIA big walls)\n" + 

-                                          "     80x32-1/128     (TROIA small walls)\n" + 

-                                          "     104x80-1/128     (TROIA floor + ceiling)\n" +

-                                          "     98x7-1/128     (bluebox)\n\n" +

-                                          "Please enter the new movie size:",

+      //ask for new format

+      format = JOptionPane.showInputDialog( dialogParent,

+                                            "Current movie format is:   " + curFormat + "\n\n" +

+                                            "The format is:   <width>x<height>-<channels>/<colors>\n\n" +

+                                            "Please enter the new movie format:",

                                             "Blimp - Resize Movie...",

                                             JOptionPane.QUESTION_MESSAGE,

-                                          null, null, size );

+                                            null, null, format );

       //dialog was cancelled

-      if( size == null )

+      if( format == null )

         return;

     }

-    while( ! (sizeMatcher = sizePattern.matcher( size.toString( ) )).find( ) ); //repeat question if answer not valid

+    while( ! actionEditResizeToFormat( format.toString( ) ) ); //repeat question if answer not valid

+  }

-    //resize movie

-    curMovie.resize( Integer.parseInt( sizeMatcher.group( 2 ) ),

-                     Integer.parseInt( sizeMatcher.group( 1 ) ),

-                     Integer.parseInt( sizeMatcher.group( 3 ) ),

-                     Integer.parseInt( sizeMatcher.group( 4 ) ) - 1 );

+  // scale to size

+  private boolean actionEditScaleToSize( String size )

+  {

+    Pattern sizePattern;

+    Matcher sizeMatcher;

+

+    //initialize size pattern

+    sizePattern = Pattern.compile( "^([0-9]+)x([0-9]+)$" );

+

+    //ask until cancel or answer is valid

+    if( ! (sizeMatcher = sizePattern.matcher( size.toString( ) )).find( ) ) //abort and return error if size not valid

+      return false;

+

+    //scale movie

+    curMovie.scale( Integer.parseInt( sizeMatcher.group( 2 ) ),

+                    Integer.parseInt( sizeMatcher.group( 1 ) ) );

     curMovieChanged = true;

     //update controls

     updateFrames( scrollFrames.getValue( ) );

     //update status

-    labelStatus.setText( "movie resized successfully to " + size.toString( ) + "..." );

+    labelStatus.setText( "movie scaled successfully to " + size + "..." );

+

+    return true;

   }

-  //"Edit Scale Movie..." was chosen from menu

-  private void actionEditScale( )

+  //"Edit Scale Movie user defined size..." was chosen from menu

+  private void actionEditScaleUser( )

   {

-    Pattern dimPattern;

-    String curDim, curSize;

-    Object dim;

-    Matcher dimMatcher;

-

-    //initialize dimension pattern

-    dimPattern = Pattern.compile( "^([0-9]+)x([0-9]+)$" );

+    String curSize;

+    Object size;

     //get string with current movie size

-    curDim = curMovie.getWidth( ) + "x" +

-             curMovie.getHeight( );

     curSize = curMovie.getWidth( ) + "x" +

-              curMovie.getHeight( ) + "-" + 

-              curMovie.getChannels( ) + "/" + 

-              (curMovie.getMaxval( ) + 1);

+              curMovie.getHeight( );

     //ask until cancel or answer is valid

-    dim = curDim;

+    size = curSize;

     do

     {

       //ask for new size

-      dim = JOptionPane.showInputDialog( dialogParent,

-                                         "Current movie dimension is:   " + curDim + " (" + curSize + ")\n\n" +

-                                         "The format is:   <width>x<height>\n" + 

-                                         "     18x8     (Blinkenlights, Blinkenlights Reloaded)\n" + 

-                                         "     26x20     (Blinkenlights Arcade)\n" + 

-                                         "     104x32     (TROIA big walls)\n" + 

-                                         "     80x32     (TROIA small walls)\n" + 

-                                         "     104x80     (TROIA floor + ceiling)\n" +

-                                         "     98x7     (bluebox)\n\n" +

+      size = JOptionPane.showInputDialog( dialogParent,

+                                          "Current movie dimension is:   " + curSize + "\n\n" +

+                                          "The format is:   <width>x<height>\n\n" + 

                                           "Please enter the new movie dimension:",

                                           "Blimp - Scale Movie...",

                                           JOptionPane.QUESTION_MESSAGE,

-                                         null, null, dim );

+                                          null, null, size );

       //dialog was cancelled

-      if( dim == null )

+      if( size == null )

         return;

     }

-    while( ! (dimMatcher = dimPattern.matcher( dim.toString( ) )).find( ) ); //repeat question if answer not valid

-

-    //scale movie

-    curMovie.scale( Integer.parseInt( dimMatcher.group( 2 ) ),

-                    Integer.parseInt( dimMatcher.group( 1 ) ) );

-    curMovieChanged = true;

-

-    //update controls

-    updateFrames( scrollFrames.getValue( ) );

-

-    //update status

-    labelStatus.setText( "movie scaled successfully to " + dim.toString( ) + "..." );

+    while( ! actionEditScaleToSize( size.toString( ) ) ); //repeat question if answer not valid

   }

   //"Edit Insert Frame" was chosen from menu / Insert Frame button was pressed

@@ -986,11 +1030,10 @@ public class Blimp extends JApplet

   {

     JOptionPane.showMessageDialog( dialogParent,

                                    "BlinkenLightsInteractiveMovieProgram\n" +

-                                   "version 1.3.1 date 2006-10-17\n" +

-                                   "Copyright (C) 2004-2006: Stefan Schuermans <1stein@schuermans.info>\n" +

+                                   "version 1.3.2 date 2008-02-23\n" +

+                                   "Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>\n" +

                                    "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" +

-                                   "a blinkenarea.org project\n" +

-                                   "powered by eventphone.de",

+                                   "a blinkenarea.org project",

                                    "Blimp - About...",

                                    JOptionPane.INFORMATION_MESSAGE );

   }

@@ -1307,11 +1350,10 @@ public class Blimp extends JApplet

     showDuration( );

   }

-  //generate a color icon from a color

-  private void iconFromColor( ImageIcon icon, Color color )

+  //generate a gray gradient icon

+  private void iconGradientGray( ImageIcon icon )

   {

-    int height, width, y, x;

-    boolean yy, xx;

+    int height, width, val, x;

     Graphics graphics;

     //get size

@@ -1321,22 +1363,59 @@ public class Blimp extends JApplet

     //get graphics context of icon's image

     graphics = icon.getImage( ).getGraphics( );

-    //draw background

-    graphics.setColor( new Color( color.getRed( ), color.getGreen( ), color.getBlue( ) ) );

-    graphics.fillRect( 0, 0, width / 2, height );

-    for( y = 0, yy = false; y < height; y += height / 4, yy = ! yy )

-    {

-      for( x = width / 2, xx = yy; x < width; x += width / 6, xx = ! xx )

+    //draw gradient to icon

+    for( x = 0; x < width; x++ ) {

+      val = x * 255 / (width - 1);

+      graphics.setColor( new Color( val, val, val ) );

+      graphics.drawLine( x, 0, x, height );

+    }

+  }

+

+  //generate a color gradient icon

+  private void iconGradientColor( ImageIcon icon )

   {

-        if( xx )

-          graphics.setColor( Color.white );

-        else

-          graphics.setColor( Color.black );

-        graphics.fillRect( x, y, width / 6, height / 4 );

+    int height, width, val, step, x;

+    Graphics graphics;

+

+    //get size

+    height = icon.getIconHeight( );

+    width = icon.getIconWidth( );

+

+    //get graphics context of icon's image

+    graphics = icon.getImage( ).getGraphics( );

+

+    //draw gradient to icon

+    for( x = 0; x < width; x++ ) {

+      val = x * 6 * 255 / (width - 1);

+      step = val / 255;

+      val %= 255;

+      switch( step ) {

+        case 0: graphics.setColor( new Color( 255, val, 0 ) ); break;

+        case 1: graphics.setColor( new Color( 255 - val, 255, 0 ) ); break;

+        case 2: graphics.setColor( new Color( 0, 255, val ) ); break;

+        case 3: graphics.setColor( new Color( 0, 255 - val, 255 ) ); break;

+        case 4: graphics.setColor( new Color( val, 0, 255 ) ); break;

+        case 5: graphics.setColor( new Color( 255, 0, 255 - val ) ); break;

       }

+      graphics.drawLine( x, 0, x, height );

     }

+  }

+

+  //generate a color icon from a color

+  private void iconFromColor( ImageIcon icon, Color color )

+  {

+    int height, width, y, x;

+    boolean yy, xx;

+    Graphics graphics;

+

+    //get size

+    height = icon.getIconHeight( );

+    width = icon.getIconWidth( );

-    //draw foreground in specified color

+    //get graphics context of icon's image

+    graphics = icon.getImage( ).getGraphics( );

+

+    //fill icon in specified color

     graphics.setColor( color );

     graphics.fillRect( 0, 0, width, height );

   }

@@ -1394,6 +1473,60 @@ public class Blimp extends JApplet

     textColorsColor.setText( hex.toUpperCase( ) );

   }

+  //gray predefined colors have been chosen

+  private void actionColorsPredefGray( )

+  {

+    int i, val;

+

+    //update color buttons

+    for( i = 0; i < constColorCnt; i++ )

+    {

+      val = (constColorCnt - 1 - i) * 255 / (constColorCnt - 1);

+      colors[i] = new Color( val, val, val );

+      iconFromColor( iconsColor[i], colors[i] );

+      buttonsColor[i].repaint( );

+    }

+

+    //update current color

+    showColorsColor( );

+    frameEditor.setColor( colors[colorIdx] );

+  }

+

+  //colorful predefined colors have been chosen

+  private void actionColorsPredefColor( )

+  {

+    int i, val, step;

+

+    //update color buttons

+    for( i = 0; i < constColorCnt; i++ )

+    {

+      if( i == 0 )

+        colors[i] = new Color( 255, 255, 255 );

+      else if( i == 1 )

+        colors[i] = new Color( 0, 0, 0 );

+      else

+      {

+        val = (i - 2) * 6 * 255 / (constColorCnt - 2);

+        step = val / 255;

+        val %= 255;

+        switch( step ) {

+          case 0: colors[i] = new Color( 255, val, 0 ); break;

+          case 1: colors[i] = new Color( 255 - val, 255, 0 ); break;

+          case 2: colors[i] = new Color( 0, 255, val ); break;

+          case 3: colors[i] = new Color( 0, 255 - val, 255 ); break;

+          case 4: colors[i] = new Color( val, 0, 255 ); break;

+          case 5: colors[i] = new Color( 255, 0, 255 - val ); break;

+        }

+      }

+      iconFromColor( iconsColor[i], colors[i] );

+      buttonsColor[i].repaint( );

+    }

+

+    //update current color

+    showColorsColor( );

+    frameEditor.setColor( colors[colorIdx] );

+  }

+

   //color select button was pressed

   private void actionColorsColor( )

   {

@@ -1619,10 +1752,10 @@ public class Blimp extends JApplet

       actionInfoAdd( );

     else if( e.getSource( ) == menuInfoDelete )

       actionInfoDelete( );

-    else if( e.getSource( ) == menuEditResize )

-      actionEditResize( );

-    else if( e.getSource( ) == menuEditScale )

-      actionEditScale( );

+    else if( e.getSource( ) == menuEditResizeUser )

+      actionEditResizeUser( );

+    else if( e.getSource( ) == menuEditScaleUser )

+      actionEditScaleUser( );

     else if( e.getSource( ) == menuEditInsertFrame )

       actionEditInsertFrame( );

     else if( e.getSource( ) == menuEditDuplicateFrame )

@@ -1717,6 +1850,10 @@ public class Blimp extends JApplet

       actionEditDuplicateFrame( );

     else if( e.getSource( ) == buttonEditDeleteFrame )

       actionEditDeleteFrame( );

+    else if( e.getSource( ) == buttonColorsPredefGray )

+      actionColorsPredefGray( );

+    else if( e.getSource( ) == buttonColorsPredefColor )

+      actionColorsPredefColor( );

     else if( e.getSource( ) == buttonColorsColor )

       actionColorsColor( );

     else if( e.getSource( ) == textColorsColor )

@@ -1725,11 +1862,35 @@ public class Blimp extends JApplet

       validateColorsAlpha( );

     else

     {

+      do //abuse of break

+      {

+        for( i = 0; i < menuEditResizeKnown.length; i++ )

+          if( e.getSource( ) == menuEditResizeKnown[i] )

+            break;

+        if( i < menuEditResizeKnown.length )

+        {

+          actionEditResizeToFormat( getFormatOrSize( knownFormats[i] ) );

+          break;

+        }

+

+        for( i = 0; i < menuEditScaleKnown.length; i++ )

+          if( e.getSource( ) == menuEditScaleKnown[i] )

+            break;

+        if( i < menuEditScaleKnown.length )

+        {

+          actionEditScaleToSize( getFormatOrSize( knownSizes[i] ) );

+          break;

+        }

+

         for( i = 0; i < constColorCnt; i++ )

           if( e.getSource( ) == buttonsColor[i] )

             break;

         if( i < constColorCnt )

+        {

           actionColorIdx( i );

+          break;

+        }

+      } while( false ); //end abuse of break

     }

   }

@@ -1846,12 +2007,13 @@ public class Blimp extends JApplet

   {

     int i, val;

     Dimension size;

+    ImageIcon icon;

     Insets smallMargin;

     //initialize current movie, frame

     curDir = new File( "." );

     curMovie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval );

-    curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.1 date 2006-10-17)" );

+    curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.2 date 2008-02-23)" );

     curMovie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) );

     curFrame = null;

@@ -1940,14 +2102,34 @@ public class Blimp extends JApplet

     menuEdit = new JMenu( "Edit" );

     menuEdit.setMnemonic( KeyEvent.VK_E );

     menubar.add( menuEdit );

-    menuEditResize = new JMenuItem( "Resize Movie..." );

-    menuEditResize.setMnemonic( KeyEvent.VK_R );

-    menuEditResize.addActionListener( this );

+    menuEditResize = new JMenu("Resize Movie");

     menuEdit.add( menuEditResize );

-    menuEditScale = new JMenuItem( "Scale Movie..." );

-    menuEditScale.setMnemonic( KeyEvent.VK_S );

-    menuEditScale.addActionListener( this );

+    menuEditResize.setMnemonic( KeyEvent.VK_R );

+    menuEditResizeUser = new JMenuItem( "user defined format..." );

+    menuEditResizeUser.addActionListener( this );

+    menuEditResize.add( menuEditResizeUser );

+    menuEditResize.addSeparator( );

+    menuEditResizeKnown = new JMenuItem[knownFormats.length];

+    for( i = 0; i < knownFormats.length; i++ )

+    {

+      menuEditResizeKnown[i] = new JMenuItem( knownFormats[i] );

+      menuEditResizeKnown[i].addActionListener( this );

+      menuEditResize.add( menuEditResizeKnown[i] );

+    }

+    menuEditScale = new JMenu ( "Scale Movie" );

     menuEdit.add( menuEditScale );

+    menuEditScale.setMnemonic( KeyEvent.VK_S );

+    menuEditScaleUser = new JMenuItem( "user defined size..." );

+    menuEditScaleUser.addActionListener( this );

+    menuEditScale.add( menuEditScaleUser );

+    menuEditScale.addSeparator( );

+    menuEditScaleKnown = new JMenuItem[knownSizes.length];

+    for( i = 0; i < knownSizes.length; i++ )

+    {

+      menuEditScaleKnown[i] = new JMenuItem( knownSizes[i] );

+      menuEditScaleKnown[i].addActionListener( this );

+      menuEditScale.add( menuEditScaleKnown[i] );

+    }

     menuEdit.addSeparator( );

     menuEditInsertFrame = new JMenuItem( "Insert Frame" );

     menuEditInsertFrame.setMnemonic( KeyEvent.VK_I );

@@ -2346,8 +2528,18 @@ public class Blimp extends JApplet

       panelColorsChoose.add( buttonsColor[i] );

     }

     //color panel - settings

-    panelColorsSettings = new JPanel( new GridLayout( 4, 1, 5, 0 ) );

+    panelColorsSettings = new JPanel( new GridLayout( 5, 1, 5, 0 ) );

     panelColors.add( panelColorsSettings );

+    panelColorsPredef = new JPanel( new GridLayout( 1, 2, 5, 5 ) );

+    buttonColorsPredefGray = new JButton( );

+    buttonColorsPredefGray.addActionListener( this );

+    buttonColorsPredefGray.setToolTipText( "gray" );

+    panelColorsPredef.add( buttonColorsPredefGray );

+    buttonColorsPredefColor = new JButton( );

+    buttonColorsPredefColor.addActionListener( this );

+    buttonColorsPredefColor.setToolTipText( "color" );

+    panelColorsPredef.add( buttonColorsPredefColor );

+    panelColorsSettings.add( panelColorsPredef );

     labelColorsColor = new JLabel( "color:" );

     labelColorsColor.setVerticalAlignment( JLabel.BOTTOM );

     panelColorsSettings.add( labelColorsColor );

@@ -2381,24 +2573,29 @@ public class Blimp extends JApplet

     textColorsAlpha.addFocusListener( this );

     panelColorsAlpha.add( textColorsAlpha );

     labelColorsAlpha.setLabelFor( panelColorsAlpha );

-    //color panel - color icons

+

+    //initialize colors

     colorIdx = 0;

     colors = new Color[constColorCnt];

-    size = textColorsAlpha.getPreferredSize( );

     iconsColor = new ImageIcon[constColorCnt];

+    size = textColorsAlpha.getPreferredSize( );

     for( i = 0; i < constColorCnt; i++ )

     {

       iconsColor[i] = new ImageIcon( new BufferedImage( size.width, size.height, BufferedImage.TYPE_INT_RGB ) );

-      val = (constColorCnt - 1 - i) * 255 / (constColorCnt - 1);

-      colors[i] = new Color( val, val, val );

-      iconFromColor( iconsColor[i], colors[i] );

+      buttonsColor[i].setIcon( iconsColor[i] );

       buttonsColor[i].setIcon( iconsColor[i] );

     }

+    icon = new ImageIcon( new BufferedImage( size.width, size.height, BufferedImage.TYPE_INT_RGB ) );

+    iconGradientGray( icon );

+    buttonColorsPredefGray.setIcon( icon );

+    icon = new ImageIcon( new BufferedImage( size.width, size.height, BufferedImage.TYPE_INT_RGB ) );

+    iconGradientColor( icon );

+    buttonColorsPredefColor.setIcon( icon );

     iconColorsColor = new ImageIcon( new BufferedImage( size.width, size.height, BufferedImage.TYPE_INT_RGB ) );

-    iconFromColor( iconColorsColor, colors[colorIdx] );

     buttonColorsColor.setIcon( iconColorsColor );

     buttonsColor[colorIdx].setSelected( true );

     frameEditor.setColor( colors[colorIdx] );

+    actionColorsPredefGray( );

     //create play timer

     timerPlay = new javax.swing.Timer( 100, this );

@@ -2471,11 +2668,10 @@ public class Blimp extends JApplet

     //running as command line tool

     System.out.println( "BlinkenLightsInteractiveMovieProgram\n" +

-                        "version 1.3.1 date 2006-10-17\n" +

-                        "Copyright (C) 2004-2006: Stefan Schuermans <1stein@schuermans.info>\n" +

+                        "version 1.3.2 date 2008-02-23\n" +

+                        "Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>\n" +

                         "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" +

-                        "a blinkenarea.org project\n" +

-                        "powered by eventphone.de\n" );

+                        "a blinkenarea.org project\n" );

     //initialize patterns

     sizePattern = Pattern.compile( "^([0-9]+)x([0-9]+)-([0-9]+)/([0-9]+)$" );

@@ -2483,7 +2679,7 @@ public class Blimp extends JApplet

     //get initial movie

     movie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval );

-    movie.insertInfo( 0, "creator", "Blimp (version 1.3.1 date 2006-10-17)" );

+    movie.insertInfo( 0, "creator", "Blimp (version 1.3.2 date 2008-02-23)" );

     movie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) );

     //process parameters

@@ -1,9 +1,8 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.1 date 2006-10-17

- * Copyright (C) 2004-2006: Stefan Schuermans <1stein@schuermans.info>

+ * version 1.3.2 date 2008-02-23

+ * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

- * powered by eventphone.de

  */

 package org.blinkenarea.Blimp;

@@ -1,9 +1,8 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.1 date 2006-10-17

- * Copyright (C) 2004-2006: Stefan Schuermans <1stein@schuermans.info>

+ * version 1.3.2 date 2008-02-23

+ * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

- * powered by eventphone.de

  */

 package org.blinkenarea.Blimp;

@@ -1,9 +1,8 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.1 date 2006-10-17

- * Copyright (C) 2004-2006: Stefan Schuermans <1stein@schuermans.info>

+ * version 1.3.2 date 2008-02-23

+ * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

- * powered by eventphone.de

  */

 package org.blinkenarea.Blimp;

@@ -1,9 +1,8 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.1 date 2006-10-17

- * Copyright (C) 2004-2006: Stefan Schuermans <1stein@schuermans.info>

+ * version 1.3.2 date 2008-02-23

+ * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

- * powered by eventphone.de

  */

 package org.blinkenarea.Blimp;

@@ -1,9 +1,8 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.1 date 2006-10-17

- * Copyright (C) 2004-2006: Stefan Schuermans <1stein@schuermans.info>

+ * version 1.3.2 date 2008-02-23

+ * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

- * powered by eventphone.de

  */

 package org.blinkenarea.Blimp;

@@ -1,9 +1,8 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.1 date 2006-10-17

- * Copyright (C) 2004-2006: Stefan Schuermans <1stein@schuermans.info>

+ * version 1.3.2 date 2008-02-23

+ * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

- * powered by eventphone.de

  */

 package org.blinkenarea.Blimp;