Blimp

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.0 date 2005-03-24

+ * version 1.1 date 2005-04-16

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

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

  * a blinkenarea.org project

@@ -36,24 +36,27 @@ public class Blimp extends JApplet

   JFrame frame; //main window (if running as full application)

   Component dialogParent; //parent to use for dialogs

   JMenuBar menubar; //menubar in main window

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

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

   JMenuItem menuFileNew, menuFileLoad, menuFileSave, menuFileSaveAs, menuFileQuit;

   JMenuItem menuInfoShow, menuInfoAdd, menuInfoDelete;

   JMenuItem menuEditResize, menuEditScale;

   JMenuItem menuEditInsertFrame, menuEditDuplicateFrame, menuEditDeleteFrame;

-  JMenuItem menuEditImportFrame;

+  JMenuItem menuFrameSelNone, menuFrameSelSingle, menuFrameSelStart, menuFrameSelEnd;

+  JMenuItem menuFrameSelCopy, menuFrameSelMove, menuFrameSelReverse, menuFrameSelDelete;

+  JMenuItem menuEditImportImages, menuEditImportMovie;

   JMenuItem menuPlayStart, menuPlayStop;

   JCheckBoxMenuItem menuPlayBegin, menuPlayLoop;

   JMenuItem menuHelpAbout;

   JPanel panel, panelStatus, panelMain, panelFrames, panelOuterFrame; //panels of main window

   JPanel panelMiddleFrame, panelFrame, panelDuration, panelColors;

-  JLabel labelStatus, labelFrames, labelFrameInfo, labelDuration;

+  JLabel labelStatus, labelFrames, labelSelFrames, labelFrameInfo, labelDuration;

   JScrollBar scrollFrames;

   JSlider sliderFrameZoom;

   BlinkenFrameEditor frameEditor;

   JScrollPane scrollpaneFrame;

   JTextField textDuration;

   JPanel panelOuterTools, panelMiddleTools, panelTools, panelActions;

+  JPanel panelOuterEdit, panelMiddleEdit, panelEdit;

   JToggleButton buttonToolsNone, buttonToolsColorPicker, buttonToolsDot, buttonToolsLine;

   JToggleButton buttonToolsRect, buttonToolsFilledRect, buttonToolsCircle, buttonToolsFilledCircle;

   JToggleButton buttonToolsCopy, buttonToolsPaste;

@@ -62,6 +65,7 @@ public class Blimp extends JApplet

   JButton buttonActionsMirrorHor, buttonActionsMirrorVer, buttonActionsMirrorDiag, buttonActionsMirrorDiag2;

   JButton buttonActionsRollLeft, buttonActionsRollRight, buttonActionsRollUp, buttonActionsRollDown;

   JButton buttonActionsUndo, buttonActionsRedo;

+  JButton buttonEditInsertFrame, buttonEditDuplicateFrame, buttonEditDeleteFrame;

   JPanel panelColorsChoose, panelColorsSettings, panelColorsColor, panelColorsAlpha;

   JToggleButton buttonsColor[];

   ButtonGroup groupColor;

@@ -81,6 +85,7 @@ public class Blimp extends JApplet

   BlinkenMovie curMovie = null; //current movie

   boolean curMovieChanged = false; //if changes have been made to current movie

   BlinkenFrame curFrame = null; //current frame

+  int frameSelStart = -1, frameSelEnd = -1; //selected frames (none selected yet)

   //constructor for applet

   public Blimp( )

@@ -145,7 +150,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.0 date 2005-03-24)" );

+    curMovie.insertInfo( 0, "creator", "Blimp (version 1.1 date 2005-04-16)" );

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

     curMovieChanged = false;

@@ -462,7 +467,7 @@ public class Blimp extends JApplet

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

   }

-  //"Edit Insert Frame" was chosen from menu

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

   private void actionEditInsertFrame( )

   {

     BlinkenFrame frame;

@@ -472,6 +477,9 @@ public class Blimp extends JApplet

     frame = new BlinkenFrame( curMovie.getHeight( ), curMovie.getWidth( ),

                               curMovie.getChannels( ), curMovie.getMaxval( ), defDuration );

     frame.clear( );

+    //copy duration if there is a current frame

+    if( curFrame != null )

+      frame.setDuration( curFrame.getDuration( ) );

     //insert frame behind current position

     frameCnt = curMovie.getFrameCnt( );

@@ -487,7 +495,7 @@ public class Blimp extends JApplet

     updateFrames( frameNo );

   }

-  //"Edit Duplicate Frame" was chosen from menu

+  //"Edit Duplicate Frame" was chosen from menu / Duplicate Frame button was pressed

   private void actionEditDuplicateFrame( )

   {

     BlinkenFrame frame;

@@ -514,7 +522,7 @@ public class Blimp extends JApplet

     updateFrames( frameNo );

   }

-  //"Edit Delete Frame" was chosen from menu

+  //"Edit Delete Frame" was chosen from menu / Delete Frame button was pressed

   private void actionEditDeleteFrame( )

   {

     int frameNo;

@@ -533,19 +541,21 @@ public class Blimp extends JApplet

     updateFrames( frameNo );

   }

-  //"Edit Import Frame..." was chosen from menu

-  private void actionEditImportFrame( )

+  //"Edit Import Images..." was chosen from menu

+  private void actionEditImportImages( )

   {

     JFileChooser fileChooser;

+    File files[];

     ImageIcon icon;

     Image image;

     BufferedImage bufferedImage;

     BlinkenFrame frame;

-    int width, height, x, y, frameCnt, frameNo;

+    int width, height, x, y, i, frameCnt, frameNo;

     //show file select dialog

     fileChooser = new JFileChooser( );

-    fileChooser.setDialogTitle( "Blimp - Import Frame..." );

+    fileChooser.setDialogTitle( "Blimp - Import Images..." );

+    fileChooser.setMultiSelectionEnabled( true );

     if( curDir != null )

       fileChooser.setCurrentDirectory( curDir );

     if( fileChooser.showOpenDialog( dialogParent ) != JFileChooser.APPROVE_OPTION ) //not successful

@@ -553,20 +563,25 @@ public class Blimp extends JApplet

     //save current directory

     curDir = fileChooser.getCurrentDirectory( );

+    //get selected files

+    files = fileChooser.getSelectedFiles( );

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

+    {

+

       //load image

-    icon = new ImageIcon( fileChooser.getSelectedFile( ).getPath( ) );

+      icon = new ImageIcon( files[i].getPath( ) );

       if( icon == null )

       {

-      labelStatus.setText( "could not import frame from \"" + fileChooser.getSelectedFile( ).getPath( ) +  "\"..." );

-      return;

+        labelStatus.setText( "could not import image \"" + files[i].getPath( ) +  "\"..." );

+        break;

       }

       width = icon.getIconWidth( );

       height = icon.getIconHeight( );

       image = icon.getImage( );

       if( width <= 0 || height <= 0 || image == null )

       {

-      labelStatus.setText( "could not import frame from \"" + fileChooser.getSelectedFile( ).getPath( ) +  "\"..." );

-      return;

+        labelStatus.setText( "could not import image \"" + files[i].getPath( ) +  "\"..." );

+        break;

       }

       //convert image to a buffered one

       bufferedImage = new BufferedImage( width, height, BufferedImage.TYPE_INT_ARGB );

@@ -578,6 +593,9 @@ public class Blimp extends JApplet

       height = frame.getHeight( ); //dimensions might have been invalid and thus been adapted

       width = frame.getWidth( );

       frame.clear( );

+      //copy duration if there is a current frame

+      if( curFrame != null )

+        frame.setDuration( curFrame.getDuration( ) );

       //put pixels of image into frame

       for( y = 0; y < height; y++ )

@@ -595,7 +613,252 @@ public class Blimp extends JApplet

       curMovieChanged = true;

       //show status message

-    labelStatus.setText( "frame was sucessfully imported from \"" + fileChooser.getSelectedFile( ).getPath( ) +  "\"..." );

+      labelStatus.setText( "image \"" + files[i].getPath( ) +  "\" was successfully imported..." );

+

+      //update controls

+      updateFrames( frameNo );

+    }

+  }

+

+  //"Edit Import Movie..." was chosen from menu

+  private void actionEditImportMovie( )

+  {

+    JFileChooser fileChooser;

+    BlinkenMovie movie;

+    BlinkenFrame frame;

+    int frameCnt, frameNo, cnt, i;

+

+    //show file select dialog

+    fileChooser = new JFileChooser( );

+    fileChooser.setDialogTitle( "Blimp - Import Movie..." );

+    fileChooser.setFileFilter( new BlinkenFileFilter( ) );

+    if( curDir != null )

+      fileChooser.setCurrentDirectory( curDir );

+    if( fileChooser.showOpenDialog( dialogParent ) != JFileChooser.APPROVE_OPTION ) //not successful

+      return;

+    //save current directory

+    curDir = fileChooser.getCurrentDirectory( );

+

+    //load movie

+    movie = new BlinkenMovie( 0, 0, 0, 0 );

+    if( ! movie.load( fileChooser.getSelectedFile( ).getPath( ) ) )

+    {

+      //some error

+      labelStatus.setText( "movie \"" + fileChooser.getSelectedFile( ).getPath( ) +  "\" could not be imported..." );

+    }

+

+    //insert frames of movie behind current position

+    frameCnt = curMovie.getFrameCnt( );

+    frameNo = scrollFrames.getValue( ) + 1;

+    if( frameNo < 0 )

+      frameNo = 0;

+    if( frameNo > frameCnt )

+      frameNo = frameCnt;

+    cnt = movie.getFrameCnt( );

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

+    {

+      frame = new BlinkenFrame( movie.getFrame( i ) );

+      curMovie.insertFrame( frameNo + i, frame ); //this resizes the frame to fit the movie dimensions

+    }

+    curMovieChanged = true;

+

+    //success

+    labelStatus.setText( "movie \"" + fileChooser.getSelectedFile( ).getPath( ) +  "\" was successfully imported..." );

+

+    //update controls

+    updateFrames( frameNo );

+  }

+

+  //"Frame-Selection Select None" was chosen from menu

+  private void actionFrameSelNone( )

+  {

+    //remove frame selection

+    frameSelStart = -1;

+    frameSelEnd = -1;

+    stateFrameSel( );

+  }

+

+  //"Frame-Selection Select Single Frame" was chosen from menu

+  private void actionFrameSelSingle( )

+  {

+    //do nothing if there is no current frame

+    if( curFrame == null )

+      return;

+

+    //select current frame

+    frameSelStart = scrollFrames.getValue( );

+    frameSelEnd = frameSelStart;

+    stateFrameSel( );

+  }

+

+  //"Frame-Selection Start of Selection" was chosen from menu

+  private void actionFrameSelStart( )

+  {

+    //do nothing if there is no current frame

+    if( curFrame == null )

+      return;

+

+    //set start of frame selection to current frame

+    frameSelStart = scrollFrames.getValue( );

+    if( frameSelEnd >= curMovie.getFrameCnt( ) || frameSelEnd < frameSelStart )

+      frameSelEnd = frameSelStart;

+    stateFrameSel( );

+  }

+

+  //"Frame-Selection End of Selection" was chosen from menu

+  private void actionFrameSelEnd( )

+  {

+    //do nothing if there is no current frame

+    if( curFrame == null )

+      return;

+

+    //set end of frame selection to current frame

+    frameSelEnd = scrollFrames.getValue( );

+    if( frameSelStart < 0 || frameSelStart > frameSelEnd )

+      frameSelStart = frameSelEnd;

+    stateFrameSel( );

+  }

+

+  //"Frame-Selection Copy" was chosen from menu

+  private void actionFrameSelCopy( )

+  {

+    int frameCnt, frameNo, cnt, i;

+

+    //do nothing if selection is invalid

+    frameCnt = curMovie.getFrameCnt( );

+    if( 0 > frameSelStart || frameSelStart > frameSelEnd || frameSelEnd >= frameCnt )

+      return;

+

+    //get copies of selected frames

+    cnt = frameSelEnd - frameSelStart + 1;

+    BlinkenFrame frames[] = new BlinkenFrame[cnt];

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

+      frames[i] = new BlinkenFrame( curMovie.getFrame( frameSelStart + i ) );

+

+    //insert frames behind current position

+    frameNo = scrollFrames.getValue( ) + 1;

+    if( frameNo < 0 )

+      frameNo = 0;

+    if( frameNo > frameCnt )

+      frameNo = frameCnt;

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

+      curMovie.insertFrame( frameNo + i, frames[i] );

+    curMovieChanged = true;

+

+    //update controls

+    updateFrames( frameNo );

+

+    //select newly inserted frames

+    frameSelStart = frameNo;

+    frameSelEnd = frameSelStart + cnt - 1;

+    stateFrameSel( );

+  }

+

+  //"Frame-Selection Move" was chosen from menu

+  private void actionFrameSelMove( )

+  {

+    int frameCnt, frameNo, cnt, i;

+

+    //do nothing if selection is invalid

+    frameCnt = curMovie.getFrameCnt( );

+    if( 0 > frameSelStart || frameSelStart > frameSelEnd || frameSelEnd >= frameCnt )

+      return;

+

+    //get selected frames

+    cnt = frameSelEnd - frameSelStart + 1;

+    BlinkenFrame frames[] = new BlinkenFrame[cnt];

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

+      frames[i] = curMovie.getFrame( frameSelStart + i );

+

+    //delete selected frames

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

+      curMovie.deleteFrame( frameSelStart );

+

+    //update number of frames and current position

+    frameCnt -= cnt; //cnt frames were deleted

+    frameNo = scrollFrames.getValue( ); //old position

+    if( frameNo > frameSelEnd ) //was behind last frame of selection

+      frameNo -= cnt;

+    else if( frameNo >= frameSelStart) //was in selection

+      frameNo = frameSelStart - 1;

+

+    //insert frames behind current position

+    frameNo++;

+    if( frameNo < 0 )

+      frameNo = 0;

+    if( frameNo > frameCnt )

+      frameNo = frameCnt;

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

+      curMovie.insertFrame( frameNo + i, frames[i] );

+    curMovieChanged = true;

+

+    //update controls

+    updateFrames( frameNo );

+

+    //select moved frames

+    frameSelStart = frameNo;

+    frameSelEnd = frameSelStart + cnt - 1;

+    stateFrameSel( );

+  }

+

+  //"Frame-Selection Reverse" was chosen from menu

+  private void actionFrameSelReverse( )

+  {

+    int frameCnt, frameNo, cnt, i;

+

+    //do nothing if selection is invalid

+    frameCnt = curMovie.getFrameCnt( );

+    if( 0 > frameSelStart || frameSelStart > frameSelEnd || frameSelEnd >= frameCnt )

+      return;

+

+    //get selected frames

+    cnt = frameSelEnd - frameSelStart + 1;

+    BlinkenFrame frames[] = new BlinkenFrame[cnt];

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

+      frames[i] = curMovie.getFrame( frameSelStart + i );

+

+    //delete selected frames

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

+      curMovie.deleteFrame( frameSelStart );

+

+    //insert selected frames in reverse order

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

+      curMovie.insertFrame( frameSelStart, frames[i] );

+    curMovieChanged = true;

+

+    //update controls - go to reversed frames

+    frameNo = frameSelStart;

+    updateFrames( frameNo );

+

+    //select reversed frames

+    frameSelStart = frameNo;

+    frameSelEnd = frameSelStart + cnt - 1;

+    stateFrameSel( );

+  }

+

+  //"Frame-Selection Delete" was chosen from menu

+  private void actionFrameSelDelete( )

+  {

+    int frameCnt, frameNo, cnt, i;

+

+    //do nothing if selection is invalid

+    frameCnt = curMovie.getFrameCnt( );

+    if( 0 > frameSelStart || frameSelStart > frameSelEnd || frameSelEnd >= frameCnt )

+      return;

+

+    //delete selected frames

+    cnt = frameSelEnd - frameSelStart + 1;

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

+      curMovie.deleteFrame( frameSelStart );

+    curMovieChanged = true;

+

+    //update number of frames and current position

+    frameCnt -= cnt; //cnt frames were deleted

+    frameNo = scrollFrames.getValue( ); //old position

+    if( frameNo > frameSelEnd ) //was behind last frame of selection

+      frameNo -= cnt;

+    else if( frameNo >= frameSelStart) //was in selection

+      frameNo = frameSelStart - 1;

     //update controls

     updateFrames( frameNo );

@@ -681,7 +944,7 @@ public class Blimp extends JApplet

   {

     JOptionPane.showMessageDialog( dialogParent,

                                    "BlinkenLightsInteractiveMovieProgram\n" +

-                                   "version 1.0 date 2005-03-24\n" +

+                                   "version 1.1 date 2005-04-16\n" +

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

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

                                    "a blinkenarea.org project\n" +

@@ -693,14 +956,14 @@ public class Blimp extends JApplet

   //update frames controls (and go to certaint frame)

   private void updateFrames( int frameNo )

   {

-    int frameCnt, frameInc;

+    int frameCnt;

     //update frames scrollbar range

     frameCnt = curMovie.getFrameCnt( );

     if( frameCnt <= 0 )

     {

+      frameNo = 0;

       scrollFrames.setValues( 0, 0, 0, 0 );

-      scrollFrames.setBlockIncrement( 1 );

     }

     else

     {

@@ -709,18 +972,21 @@ public class Blimp extends JApplet

       if( frameNo >= frameCnt )

         frameNo = frameCnt - 1;

       scrollFrames.setValues( frameNo, 1, 0, frameCnt );

-      frameInc = (int)Math.sqrt( frameCnt );

-      if( frameInc < 1 )

-        frameInc = 1;

-      scrollFrames.setBlockIncrement( frameInc );

     }

-    //simulate frames scrollbar change to propagate update

-    stateFrames( );

+    //select no frames

+    frameSelStart = -1;

+    frameSelEnd = -1;

+    stateFrameSel( );

-    //enable disable some menu commands which need a current frame

+    //enable/disable some menu commands and buttons which need a current frame

     menuEditDuplicateFrame.setEnabled( frameCnt > 0 );

     menuEditDeleteFrame.setEnabled( frameCnt > 0 );

+    buttonEditDuplicateFrame.setEnabled( frameCnt > 0 );

+    buttonEditDeleteFrame.setEnabled( frameCnt > 0 );

+    menuFrameSelSingle.setEnabled( frameCnt > 0 );

+    menuFrameSelStart.setEnabled( frameCnt > 0 );

+    menuFrameSelEnd.setEnabled( frameCnt > 0 );

   }

   //frames scrollbar changed

@@ -729,10 +995,10 @@ public class Blimp extends JApplet

     int frameCnt, frameNo;

     //update frames scrollbar label

-    //get current frame

     frameCnt = curMovie.getFrameCnt( );

     if( frameCnt <= 0 )

     {

+      frameNo = 0;

       labelFrames.setText( "frame: -/0" );

       curFrame = null;

     }

@@ -743,6 +1009,16 @@ public class Blimp extends JApplet

       curFrame = curMovie.getFrame( frameNo );

     }

+    //update selected frames label

+    if( 0 > frameSelStart || frameSelStart > frameSelEnd || frameSelEnd >= frameCnt )

+      labelSelFrames.setText( "selected: -/-" );

+    else if( frameSelStart > frameNo )

+      labelSelFrames.setText( "selected: -/" + (frameSelEnd - frameSelStart + 1) );

+    else if( frameNo > frameSelEnd )

+      labelSelFrames.setText( "selected: +/" + (frameSelEnd - frameSelStart + 1) );

+    else

+      labelSelFrames.setText( "selected: " + (frameNo - frameSelStart + 1) + "/" + (frameSelEnd - frameSelStart + 1) );

+

     //update frame

     frameEditor.setFrame( curFrame );

@@ -763,6 +1039,26 @@ public class Blimp extends JApplet

     }

   }

+  //frame selection changed

+  private void stateFrameSel( )

+  {

+    boolean valid;

+    int frameCnt;

+

+    //simulate frames scrollbar change to propagate update

+    stateFrames( );

+

+    //check if selection is valid

+    frameCnt = curMovie.getFrameCnt( );

+    valid = (0 <= frameSelStart && frameSelStart <= frameSelEnd && frameSelEnd < frameCnt);

+

+    //enable/disable some menu commands which need a selection

+    menuFrameSelCopy.setEnabled( valid );

+    menuFrameSelMove.setEnabled( valid );

+    menuFrameSelReverse.setEnabled( valid );

+    menuFrameSelDelete.setEnabled( valid );

+  }

+

   //frame zoom changed

   private void stateFrameZoom( )

   {

@@ -1137,8 +1433,26 @@ public class Blimp extends JApplet

       actionEditDuplicateFrame( );

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

       actionEditDeleteFrame( );

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

-      actionEditImportFrame( );

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

+      actionEditImportImages( );

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

+      actionEditImportMovie( );

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

+      actionFrameSelNone( );

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

+      actionFrameSelSingle( );

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

+      actionFrameSelStart( );

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

+      actionFrameSelEnd( );

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

+      actionFrameSelCopy( );

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

+      actionFrameSelMove( );

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

+      actionFrameSelReverse( );

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

+      actionFrameSelDelete( );

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

       actionPlayStart( );

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

@@ -1197,6 +1511,12 @@ public class Blimp extends JApplet

       frameEditor.actionUndo( );

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

       frameEditor.actionRedo( );

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

+      actionEditInsertFrame( );

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

+      actionEditDuplicateFrame( );

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

+      actionEditDeleteFrame( );

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

       actionColorsColor( );

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

@@ -1317,7 +1637,7 @@ public class Blimp extends JApplet

     //initialize current movie, frame

     curDir = new File( "." );

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

-    curMovie.insertInfo( 0, "creator", "Blimp (version 1.0 date 2005-03-24)" );

+    curMovie.insertInfo( 0, "creator", "Blimp (version 1.1 date 2005-04-16)" );

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

     curFrame = null;

@@ -1356,83 +1676,175 @@ public class Blimp extends JApplet

     //create menus

     //file menu

     menuFile = new JMenu( "File" );

+    menuFile.setMnemonic( KeyEvent.VK_F );

     menubar.add( menuFile );

     menuFileNew = new JMenuItem( "New" );

+    menuFileNew.setMnemonic( KeyEvent.VK_N );

+    menuFileNew.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_N, KeyEvent.CTRL_MASK ) );

     menuFileNew.addActionListener( this );

     menuFile.add( menuFileNew );

     menuFileLoad = new JMenuItem( "Load..." );

+    menuFileLoad.setMnemonic( KeyEvent.VK_L );

+    menuFileLoad.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_L, KeyEvent.CTRL_MASK ) );

     menuFileLoad.addActionListener( this );

     menuFile.add( menuFileLoad );

     menuFileSave = new JMenuItem( "Save" );

+    menuFileSave.setMnemonic( KeyEvent.VK_S );

+    menuFileSave.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_S, KeyEvent.CTRL_MASK ) );

     menuFileSave.addActionListener( this );

     menuFile.add( menuFileSave );

     menuFileSaveAs = new JMenuItem( "Save as..." );

+    menuFileSaveAs.setMnemonic( KeyEvent.VK_A );

+    menuFileSaveAs.setDisplayedMnemonicIndex( 5 );

+    menuFileSaveAs.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_A, KeyEvent.CTRL_MASK ) );

     menuFileSaveAs.addActionListener( this );

     menuFile.add( menuFileSaveAs );

     if( isFullApp )

       menuFile.addSeparator( );

     menuFileQuit = new JMenuItem( "Quit" );

+    menuFileQuit.setMnemonic( KeyEvent.VK_Q );

     menuFileQuit.addActionListener( this );

     if( isFullApp )

       menuFile.add( menuFileQuit );

     //information menu

     menuInfo = new JMenu( "Information" );

+    menuInfo.setMnemonic( KeyEvent.VK_I );

     menubar.add( menuInfo );

     menuInfoShow = new JMenuItem( "Show..." );

+    menuInfoShow.setMnemonic( KeyEvent.VK_S );

     menuInfoShow.addActionListener( this );

     menuInfo.add( menuInfoShow );

     menuInfoAdd = new JMenuItem( "Add..." );

+    menuInfoAdd.setMnemonic( KeyEvent.VK_A );

     menuInfoAdd.addActionListener( this );

     menuInfo.add( menuInfoAdd );

     menuInfoDelete = new JMenuItem( "Delete..." );

+    menuInfoDelete.setMnemonic( KeyEvent.VK_D );

     menuInfoDelete.addActionListener( this );

     menuInfo.add( menuInfoDelete );

     //edit menu

     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 );

     menuEdit.add( menuEditResize );

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

+    menuEditScale.setMnemonic( KeyEvent.VK_S );

     menuEditScale.addActionListener( this );

     menuEdit.add( menuEditScale );

     menuEdit.addSeparator( );

     menuEditInsertFrame = new JMenuItem( "Insert Frame" );

+    menuEditInsertFrame.setMnemonic( KeyEvent.VK_I );

+    menuEditInsertFrame.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_I, KeyEvent.CTRL_MASK ) );

     menuEditInsertFrame.addActionListener( this );

     menuEdit.add( menuEditInsertFrame );

     menuEditDuplicateFrame = new JMenuItem( "Duplicate Frame" );

+    menuEditDuplicateFrame.setMnemonic( KeyEvent.VK_D );

+    menuEditDuplicateFrame.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_D, KeyEvent.CTRL_MASK ) );

     menuEditDuplicateFrame.setEnabled( false );

     menuEditDuplicateFrame.addActionListener( this );

     menuEdit.add( menuEditDuplicateFrame );

     menuEditDeleteFrame = new JMenuItem( "Delete Frame" );

+    menuEditDeleteFrame.setMnemonic( KeyEvent.VK_L );

+    menuEditDeleteFrame.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_X, KeyEvent.CTRL_MASK ) );

     menuEditDeleteFrame.setEnabled( false );

     menuEditDeleteFrame.addActionListener( this );

     menuEdit.add( menuEditDeleteFrame );

     menuEdit.addSeparator( );

-    menuEditImportFrame = new JMenuItem( "Import Frame..." );

-    menuEditImportFrame.addActionListener( this );

-    menuEdit.add( menuEditImportFrame );

+    menuEditImportImages = new JMenuItem( "Import Images..." );

+    menuEditImportImages.setMnemonic( KeyEvent.VK_P );

+    menuEditImportImages.setDisplayedMnemonicIndex( 7 );

+    menuEditImportImages.addActionListener( this );

+    menuEdit.add( menuEditImportImages );

+    menuEditImportMovie = new JMenuItem( "Import Movie..." );

+    menuEditImportMovie.setMnemonic( KeyEvent.VK_M );

+    menuEditImportMovie.setDisplayedMnemonicIndex( 7 );

+    menuEditImportMovie.addActionListener( this );

+    menuEdit.add( menuEditImportMovie );

+    //frame selection menu

+    menuFrameSel = new JMenu( "Frame-Selection" );

+    menuFrameSel.setMnemonic( KeyEvent.VK_S );

+    menubar.add( menuFrameSel );

+    menuFrameSelNone = new JMenuItem( "Select None" );

+    menuFrameSelNone.setMnemonic( KeyEvent.VK_N );

+    menuFrameSelNone.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_N, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK ) );

+    menuFrameSelNone.addActionListener( this );

+    menuFrameSel.add( menuFrameSelNone );

+    menuFrameSelSingle = new JMenuItem( "Select Single Frame" );

+    menuFrameSelSingle.setMnemonic( KeyEvent.VK_F );

+    menuFrameSelSingle.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_F, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK ) );

+    menuFrameSelSingle.setEnabled( false );

+    menuFrameSelSingle.addActionListener( this );

+    menuFrameSel.add( menuFrameSelSingle );

+    menuFrameSelStart = new JMenuItem( "Start of Selection" );

+    menuFrameSelStart.setMnemonic( KeyEvent.VK_S );

+    menuFrameSelStart.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_S, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK ) );

+    menuFrameSelStart.setEnabled( false );

+    menuFrameSelStart.addActionListener( this );

+    menuFrameSel.add( menuFrameSelStart );

+    menuFrameSelEnd = new JMenuItem( "End of Selection" );

+    menuFrameSelEnd.setMnemonic( KeyEvent.VK_E );

+    menuFrameSelEnd.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_E, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK ) );

+    menuFrameSelEnd.setEnabled( false );

+    menuFrameSelEnd.addActionListener( this );

+    menuFrameSel.add( menuFrameSelEnd );

+    menuFrameSel.addSeparator( );

+    menuFrameSelCopy = new JMenuItem( "Copy" );

+    menuFrameSelCopy.setMnemonic( KeyEvent.VK_C );

+    menuFrameSelCopy.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_C, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK ) );

+    menuFrameSelCopy.setEnabled( false );

+    menuFrameSelCopy.addActionListener( this );

+    menuFrameSel.add( menuFrameSelCopy );

+    menuFrameSelMove = new JMenuItem( "Move" );

+    menuFrameSelMove.setMnemonic( KeyEvent.VK_M );

+    menuFrameSelMove.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_M, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK ) );

+    menuFrameSelMove.setEnabled( false );

+    menuFrameSelMove.addActionListener( this );

+    menuFrameSel.add( menuFrameSelMove );

+    menuFrameSelReverse = new JMenuItem( "Reverse" );

+    menuFrameSelReverse.setMnemonic( KeyEvent.VK_R );

+    menuFrameSelReverse.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_R, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK ) );

+    menuFrameSelReverse.setEnabled( false );

+    menuFrameSelReverse.addActionListener( this );

+    menuFrameSel.add( menuFrameSelReverse );

+    menuFrameSelDelete = new JMenuItem( "Delete" );

+    menuFrameSelDelete.setMnemonic( KeyEvent.VK_L );

+    menuFrameSelDelete.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_X, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK ) );

+    menuFrameSelDelete.setEnabled( false );

+    menuFrameSelDelete.addActionListener( this );

+    menuFrameSel.add( menuFrameSelDelete );

     //play menu

     menuPlay = new JMenu( "Play" );

+    menuPlay.setMnemonic( KeyEvent.VK_P );

     menubar.add( menuPlay );

     menuPlayStart = new JMenuItem( "Start" );

+    menuPlayStart.setMnemonic( KeyEvent.VK_S );

+    menuPlayStart.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_F11, 0 ) );

     menuPlayStart.addActionListener( this );

     menuPlay.add( menuPlayStart );

     menuPlayStop = new JMenuItem( "Stop" );

+    menuPlayStop.setMnemonic( KeyEvent.VK_P );

+    menuPlayStop.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_F12, 0 ) );

     menuPlayStop.setEnabled( false );

     menuPlayStop.addActionListener( this );

     menuPlay.add( menuPlayStop );

     menuPlay.addSeparator( );

     menuPlayBegin = new JCheckBoxMenuItem( "From Begin", false );

+    menuPlayBegin.setMnemonic( KeyEvent.VK_B );

     menuPlayBegin.addActionListener( this );

     menuPlay.add( menuPlayBegin );

     menuPlayLoop = new JCheckBoxMenuItem( "Looped", false );

+    menuPlayLoop.setMnemonic( KeyEvent.VK_L );

     menuPlayLoop.addActionListener( this );

     menuPlay.add( menuPlayLoop );

     //help menu

     menuHelp = new JMenu( "Help" );

+    menuHelp.setMnemonic( KeyEvent.VK_H );

     menubar.add( menuHelp );

     menuHelpAbout = new JMenuItem( "About..." );

+    menuHelpAbout.setMnemonic( KeyEvent.VK_A );

     menuHelpAbout.addActionListener( this );

     menuHelp.add( menuHelpAbout );

@@ -1452,12 +1864,14 @@ public class Blimp extends JApplet

     panelFrames = new JPanel( new BorderLayout( 5, 5 ) );

     panelMain.add( panelFrames, BorderLayout.SOUTH );

     scrollFrames = new JScrollBar( SwingConstants.HORIZONTAL, 0, 0, 0, 0 );

-    scrollFrames.setBlockIncrement( 1 );

     scrollFrames.addAdjustmentListener( this );

     panelFrames.add( scrollFrames, BorderLayout.CENTER );

     labelFrames = new JLabel( "frame: -/0" );

     labelFrames.setLabelFor( scrollFrames );

     panelFrames.add( labelFrames, BorderLayout.WEST );

+    labelSelFrames = new JLabel( "selected: -/-" );

+    labelSelFrames.setLabelFor( scrollFrames );

+    panelFrames.add( labelSelFrames, BorderLayout.EAST );

     //outer and middle frame panel

     panelOuterFrame = new JPanel( new BorderLayout( 5, 5 ) );

     panelMain.add( panelOuterFrame, BorderLayout.CENTER );

@@ -1495,9 +1909,11 @@ public class Blimp extends JApplet

     labelDuration.setLabelFor( textDuration );

     panelDuration.add( labelDuration );

     panelDuration.add( textDuration );

-    //tool and action panels

+    //tool, action and edit panels

+    panelOuterEdit = new JPanel( new BorderLayout( 5, 5 ) );

+    panelOuterFrame.add( panelOuterEdit, BorderLayout.WEST );

     panelOuterTools = new JPanel( new GridLayout( 2, 1, 5, 5 ) );

-    panelOuterFrame.add( panelOuterTools, BorderLayout.WEST );

+    panelOuterEdit.add( panelOuterTools, BorderLayout.CENTER );

     panelMiddleTools = new JPanel( new BorderLayout( 5, 5 ) );

     panelOuterTools.add( panelMiddleTools );

     panelTools = new JPanel( new GridLayout( 4, 3, 5, 5 ) );

@@ -1505,6 +1921,11 @@ public class Blimp extends JApplet

     panelMiddleTools.add( new JSeparator( JSeparator.HORIZONTAL ), BorderLayout.SOUTH );

     panelActions = new JPanel( new GridLayout( 5, 3, 5, 5 ) );

     panelOuterTools.add( panelActions );

+    panelMiddleEdit = new JPanel( new BorderLayout( 5, 5 ) );

+    panelOuterEdit.add( panelMiddleEdit, BorderLayout.SOUTH );

+    panelMiddleEdit.add( new JSeparator( JSeparator.HORIZONTAL ), BorderLayout.NORTH );

+    panelEdit = new JPanel( new GridLayout( 1, 3, 5, 5 ) );

+    panelMiddleEdit.add( panelEdit, BorderLayout.CENTER );

     //tool buttons

     groupTools = new ButtonGroup( );

     buttonToolsNone = new JToggleButton( );

@@ -1645,6 +2066,22 @@ public class Blimp extends JApplet

     buttonActionsRedo.setEnabled( false );

     buttonActionsRedo.addActionListener( this );

     panelActions.add( buttonActionsRedo );

+    //edit buttons

+    buttonEditInsertFrame = new JButton( loadImageIcon( "InsertFrame.png" ) );

+    buttonEditInsertFrame.setMargin( smallMargin );

+    buttonEditInsertFrame.setToolTipText( "Insert Frame" );

+    buttonEditInsertFrame.addActionListener( this );

+    panelEdit.add( buttonEditInsertFrame );

+    buttonEditDuplicateFrame = new JButton( loadImageIcon( "DuplicateFrame.png" ) );

+    buttonEditDuplicateFrame.setMargin( smallMargin );

+    buttonEditDuplicateFrame.setToolTipText( "Duplicate Frame" );

+    buttonEditDuplicateFrame.addActionListener( this );

+    panelEdit.add( buttonEditDuplicateFrame );

+    buttonEditDeleteFrame = new JButton( loadImageIcon( "DeleteFrame.png" ) );

+    buttonEditDeleteFrame.setMargin( smallMargin );

+    buttonEditDeleteFrame.setToolTipText( "Delete Frame" );

+    buttonEditDeleteFrame.addActionListener( this );

+    panelEdit.add( buttonEditDeleteFrame );

     //color panel

     panelColors = new JPanel( new GridLayout( 2, 1, 5, 5 ) );

     panelOuterFrame.add( panelColors, BorderLayout.EAST );

@@ -1783,7 +2220,7 @@ public class Blimp extends JApplet

     //running as command line tool

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

-                        "version 1.0 date 2005-03-24\n" +

+                        "version 1.1 date 2005-04-16\n" +

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

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

                         "a blinkenarea.org project\n" +

@@ -1795,7 +2232,7 @@ public class Blimp extends JApplet

     //get initial movie

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

-    movie.insertInfo( 0, "creator", "Blimp (version 1.0 date 2005-03-24)" );

+    movie.insertInfo( 0, "creator", "Blimp (version 1.1 date 2005-04-16)" );

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

     //process parameters

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.0 date 2005-03-24

+ * version 1.1 date 2005-04-16

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

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

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.0 date 2005-03-24

+ * version 1.1 date 2005-04-16

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

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

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.0 date 2005-03-24

+ * version 1.1 date 2005-04-16

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

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

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.0 date 2005-03-24

+ * version 1.1 date 2005-04-16

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

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

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.0 date 2005-03-24

+ * version 1.1 date 2005-04-16

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

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

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.0 date 2005-03-24

+ * version 1.1 date 2005-04-16

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

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

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.0 date 2005-03-24

+ * version 1.1 date 2005-04-16

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

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

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.0 date 2005-03-24

+ * version 1.1 date 2005-04-16

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

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

  * a blinkenarea.org project

@@ -4,6 +4,18 @@ Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 a blinkenarea.org project

 powered by eventphone.de

+version 1.1 date 2005-04-16

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

+ - frame scroll bar now has block increment of 1

+ - added buttons to insert, duplicate and delete frames

+ - added keyboard shortcuts for menu commands

+ - extended image import function for importing multiple images

+ - when inserting or importing a frame, duration of current frame is copied

+ - added function to import BlinkenLights movies

+ - added frame-selection stuff

+   - selecting sequences of frames

+   - copying, moving, reversing, delting

+

 version 1.0 date 2005-02-24

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

  - now considered stable

@@ -1,5 +1,5 @@

 # BlinkenLightsInteractiveMovieProgram

-# version 1.0 date 2005-03-24

+# version 1.1 date 2005-04-16

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

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

 # a blinkenarea.org project

@@ -25,7 +25,8 @@ IMAGE_FILES=images/ColorPicker.png images/Dot.png images/Line.png \

             images/Rotate90.png images/MirrorVer.png images/RollRight.png \

             images/Rotate180.png images/MirrorDiag.png images/RollUp.png \

             images/Rotate270.png images/MirrorDiag2.png images/RollDown.png \

-            images/Undo.png images/Redo.png

+            images/Undo.png images/Redo.png \

+            images/InsertFrame.png images/DuplicateFrame.png images/DeleteFrame.png

 .phony: all clean jar run