[Kafenio-cvs-commit] kafenio_main/src/de/xeinfach/kafenio KafenioPanel.java,1.6,1.7

[<ne...@pr...>]

Update of /cvsroot/kafenio/kafenio_main/src/de/xeinfach/kafenio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10882/src/de/xeinfach/kafenio

Modified Files:
	KafenioPanel.java 
Log Message:
- fixed bug "Menu parameters being ignored" posted by jason.

Index: KafenioPanel.java
===================================================================
RCS file: /cvsroot/kafenio/kafenio_main/src/de/xeinfach/kafenio/KafenioPanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** KafenioPanel.java	26 Jan 2004 06:20:40 -0000	1.6
--- KafenioPanel.java	26 Jan 2004 16:31:12 -0000	1.7
***************
*** 211,215 ****
  		htmlPane.getDocument().addUndoableEditListener(new CustomUndoableEditListener());
  
! 		/* create menubar and toolbars before loading the document
  		 * (we need the styles-combo-box for registering a document) */
  		kafenioMenuBar = new KafenioMenuBar(this);
--- 211,215 ----
  		htmlPane.getDocument().addUndoableEditListener(new CustomUndoableEditListener());
  
! 		/* create menubar and toolbar objects before loading the document
  		 * (we need the styles-combo-box for registering a document) */
  		kafenioMenuBar = new KafenioMenuBar(this);
***************
*** 217,238 ****
  		kafenioToolBar2 = new KafenioToolBar(this);
  
! 		/* create menubar */ 
! 		if (kafenioConfig.getCustomMenuItems() != null) {
! 			jMenuBar = kafenioMenuBar.createCustomMenuBar(kafenioConfig.getCustomMenuItems());
! 		} else {
! 			jMenuBar = kafenioMenuBar.createDefaultKafenioMenuBar();
  		}
- 		kafenioParent.setJMenuBar(jMenuBar);
  
  		/* create toolbars */ 
  		System.out.println("config: " + getConfig());
- 		toolbar1 = kafenioToolBar1.createToolbar(	getConfig().getCustomToolBar1(), getConfig().isShowToolbar());
- 		toolbar2 = kafenioToolBar2.createToolbar( getConfig().getCustomToolBar2(), getConfig().isShowToolbar2());
  		toolbarPanel.setLayout(new BorderLayout());
  		toolbarPanel.setBackground(config.getBgcolor());
! 		toolbarPanel.add(toolbar1, BorderLayout.NORTH);
! 		toolbarPanel.add(toolbar2, BorderLayout.SOUTH);
! 		toolbars.add(toolbar1);
! 		toolbars.add(toolbar2);
  		
  		/* Insert raw document, if exists */
--- 217,245 ----
  		kafenioToolBar2 = new KafenioToolBar(this);
  
! 		/* create menubar */
! 		if (getConfig().isShowMenuBar()) {
! 			if (kafenioConfig.getCustomMenuItems() != null) {
! 				jMenuBar = kafenioMenuBar.createCustomMenuBar(kafenioConfig.getCustomMenuItems());
! 			} else {
! 				jMenuBar = kafenioMenuBar.createDefaultKafenioMenuBar();
! 			}
! 			kafenioParent.setJMenuBar(jMenuBar);
  		}
  
  		/* create toolbars */ 
  		System.out.println("config: " + getConfig());
  		toolbarPanel.setLayout(new BorderLayout());
  		toolbarPanel.setBackground(config.getBgcolor());
! 		// TODO: refactor code - duplicate method calls are used...
! 		if (getConfig().isShowToolbar()) {
! 			toolbar1 = kafenioToolBar1.createToolbar(getConfig().getCustomToolBar1(), getConfig().isShowToolbar());
! 			toolbarPanel.add(toolbar1, BorderLayout.NORTH);
! 			toolbars.add(toolbar1);
! 		}
! 		if (getConfig().isShowToolbar2()) {
! 			toolbar2 = kafenioToolBar2.createToolbar(getConfig().getCustomToolBar2(), getConfig().isShowToolbar2());
! 			toolbarPanel.add(toolbar2, BorderLayout.SOUTH);
! 			toolbars.add(toolbar2);
! 		}
  		
  		/* Insert raw document, if exists */