/[svn]/jsampler/trunk/src/org/jsampler/view/fantasia/MainFrame.java
ViewVC logotype

Diff of /jsampler/trunk/src/org/jsampler/view/fantasia/MainFrame.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1784 by iliev, Sun Sep 28 20:38:36 2008 UTC revision 1785 by iliev, Tue Oct 7 00:07:14 2008 UTC
# Line 72  import org.jsampler.view.JSChannelsPane; Line 72  import org.jsampler.view.JSChannelsPane;
72  import org.jsampler.view.JSMainFrame;  import org.jsampler.view.JSMainFrame;
73  import org.jsampler.view.LscpFileFilter;  import org.jsampler.view.LscpFileFilter;
74    
75    import org.jsampler.view.fantasia.basic.FantasiaPainter;
76    import org.jsampler.view.fantasia.basic.FantasiaPanel;
77    import org.jsampler.view.fantasia.basic.FantasiaSubPanel;
78    
79  import org.jsampler.view.std.JSConnectDlg;  import org.jsampler.view.std.JSConnectDlg;
80  import org.jsampler.view.std.JSDetailedErrorDlg;  import org.jsampler.view.std.JSDetailedErrorDlg;
81  import org.jsampler.view.std.JSQuitDlg;  import org.jsampler.view.std.JSQuitDlg;
# Line 92  public class MainFrame extends JSMainFra Line 96  public class MainFrame extends JSMainFra
96          private final FantasiaMenuBar menuBar = new FantasiaMenuBar();          private final FantasiaMenuBar menuBar = new FantasiaMenuBar();
97          private final JPanel rootPane = new RootPane();          private final JPanel rootPane = new RootPane();
98          private final BottomPane bottomPane;          private final BottomPane bottomPane;
99          private final MainPane mainPane = new MainPane();          private final MainPane mainPane;
100          private final PianoKeyboardPane pianoKeyboardPane;          private final PianoKeyboardPane pianoKeyboardPane;
101                    
102          private final JMenu recentScriptsMenu =          private final JMenu recentScriptsMenu =
# Line 100  public class MainFrame extends JSMainFra Line 104  public class MainFrame extends JSMainFra
104                    
105          private final JSplitPane hSplitPane;          private final JSplitPane hSplitPane;
106                    
107          private final LeftSidePane leftSidePane = new LeftSidePane();          private final LeftSidePane leftSidePane;
108          private final RightSidePane rightSidePane = new RightSidePane();          private final RightSidePane rightSidePane;
109          private final JPanel rightPane;          private final JPanel rightPane;
110                    
111          //private final StatusBar statusBar = new StatusBar();          //private final StatusBar statusBar = new StatusBar();
# Line 131  public class MainFrame extends JSMainFra Line 135  public class MainFrame extends JSMainFra
135                  //setUndecorated(true);                  //setUndecorated(true);
136                  if(Res.iconAppIcon != null) setIconImage(Res.iconAppIcon.getImage());                  if(Res.iconAppIcon != null) setIconImage(Res.iconAppIcon.getImage());
137                                    
138                    CC.setMainFrame(this); // TODO:
139                    mainPane = new MainPane();
140                    leftSidePane = new LeftSidePane();
141                    rightSidePane = new RightSidePane();
142                    
143                    setSelectedChannelsPane(mainPane.getChannelsPane(0));
144                    
145                  getContentPane().add(standardBar, BorderLayout.NORTH);                  getContentPane().add(standardBar, BorderLayout.NORTH);
146                                    
147                  rightPane = createRightPane();                  rightPane = createRightPane();
# Line 142  public class MainFrame extends JSMainFra Line 153  public class MainFrame extends JSMainFra
153                  );                  );
154                  hSplitPane.setResizeWeight(0.5);                  hSplitPane.setResizeWeight(0.5);
155                                    
                 addChannelsPane(mainPane.getChannelsPane());  
                   
156                  pianoKeyboardPane = new PianoKeyboardPane();                  pianoKeyboardPane = new PianoKeyboardPane();
157                  getChannelsPane(0).addListSelectionListener(pianoKeyboardPane);                  
158                    for(int i = 0; i < mainPane.getChannelsPaneCount(); i++) {
159                            addChannelsPane(mainPane.getChannelsPane(i));
160                            getChannelsPane(i).addListSelectionListener(pianoKeyboardPane);
161                    }
162                    
163                    
164                  int h = preferences().getIntProperty("midiKeyboard.height");                  int h = preferences().getIntProperty("midiKeyboard.height");
165                  setMidiKeyboardHeight(h);                  setMidiKeyboardHeight(h);
166                                    
# Line 495  public class MainFrame extends JSMainFra Line 510  public class MainFrame extends JSMainFra
510          getRightSidePane() { return rightSidePane; }          getRightSidePane() { return rightSidePane; }
511                    
512          /**          /**
513           * This method does nothing, because <b>Fantasia</b> has exactly           * This method does nothing, because <b>Fantasia</b> has constant
514           * one pane containing sampler channels, which can not be changed.           * number of panes containing sampler channels, which can not be changed.
515           */           */
516          @Override          @Override
517          public void          public void
# Line 504  public class MainFrame extends JSMainFra Line 519  public class MainFrame extends JSMainFra
519                                    
520          }          }
521                    
         /**  
          * This method always returns the <code>JSChannelsPane</code> at index 0,  
          * because the <b>Fantasia</b> view has exactly one pane containing sampler channels.  
          * @return The <code>JSChannelsPane</code> at index 0.  
          */  
522          @Override          @Override
523          public JSChannelsPane          public JSChannelsPane
524          getSelectedChannelsPane() { return getChannelsPane(0); }          getSelectedChannelsPane() { return mainPane.getSelectedChannelsPane(); }
525                    
         /**  
          * This method does nothing because the <b>Fantasia</b> view has  
          * exactly one pane containing sampler channels which is always shown.  
          */  
526          @Override          @Override
527          public void          public void
528          setSelectedChannelsPane(JSChannelsPane pane) { }          setSelectedChannelsPane(JSChannelsPane pane) {
529                    mainPane.setSelectedChannelsPane(pane);
530                    fireChannelsPaneSelectionChanged();
531            }
532                    
533          @Override          @Override
534          public void          public void

Legend:
Removed from v.1784  
changed lines
  Added in v.1785

  ViewVC Help
Powered by ViewVC