Menu
▾
▴
[Osmose-dev-devel] osmose/src/osmose/application/slideeditor OSMSlideEditorNavPanel.java, 1.2, 1.3 OSMSlideEditorNotesPanel.java, 1.2, 1.3 OSMSlideEditorNotesWritePanel.java, 1.2, 1.3 OSMSlideEditorPanel.java, 1.2, 1.3
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/slideeditor In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application/slideeditor Modified Files: OSMSlideEditorNavPanel.java OSMSlideEditorNotesPanel.java OSMSlideEditorNotesWritePanel.java OSMSlideEditorPanel.java Log Message: Added choice for putting bullet lists in notes (by Fatimatou) Index: OSMSlideEditorNavPanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/slideeditor/OSMSlideEditorNavPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMSlideEditorNavPanel.java 3 Oct 2007 21:31:15 -0000 1.2 --- OSMSlideEditorNavPanel.java 17 Feb 2008 22:11:51 -0000 1.3 *************** *** 25,29 **** import osmose.application.file.*; import osmose.application.user.*; ! /** --- 25,31 ---- import osmose.application.file.*; import osmose.application.user.*; ! import osmose.application.common.slidecomponent.*; ! import javax.swing.JOptionPane; ! import java.util.*; /** *************** *** 62,75 **** * @param frame Associated frame. */ public OSMSlideEditorNavPanel(OSMSlideEditorFrame frame) { ! super(); ! m_Frame = frame; ! setLayout(new GridLayout(2, 1, 5, 5)); ! m_ModelPanel = new OSMSlideEditorNavModelPanel(); ! add(m_ModelPanel); ! m_NavPanel = new OSMSlideEditorNavNavPanel(); ! add(m_NavPanel); ! } /** --- 64,157 ---- * @param frame Associated frame. */ + public OSMSlideEditorNavPanel(OSMSlideEditorFrame frame) { ! super(); ! m_Frame = frame; ! setLayout(new BorderLayout(0,5)); ! m_ModelPanel = new OSMSlideEditorNavModelPanel(); ! add(m_ModelPanel, BorderLayout.NORTH); ! m_NavPanel = new OSMSlideEditorNavNavPanel(); ! add(m_NavPanel, BorderLayout.CENTER); ! m_checkboxPanel = new JPanel(new BorderLayout()); ! ! if(OSMApplication.SlideEditor!=null) ! m_statebox = OSMApplication.SlideEditor.getCurrentSlide().getStateBox(); ! m_box = new JCheckBox(OSMApplication.Localisation.getString("SED_NotesCheckboxTitle"), m_statebox); ! m_slideEditorNavPanel = this; ! m_box.addItemListener(new ItemListener() ! { ! public void itemStateChanged (ItemEvent event) ! { ! boolean onTheLine = false; ! if(OSMApplication.SlideEditor.m_Body.isVisible()==true) ! onTheLine= OSMApplication.SlideEditor.getBodyComponent().getElement().isOnTheLine(); ! if(m_box.isSelected()){ ! m_statebox=true; ! if(OSMApplication.SlideEditor.getCurrentSlide().getType()==OSMSlide.NORMAL){ ! if(onTheLine==true && OSMApplication.SlideEditor.m_Number.isVisible()==true) ! OSMApplication.SlideEditor.getCurrentSlide().setStateBox(true); ! } ! else{ ! OSMApplication.SlideEditor.getCurrentSlide().setStateBox(true); ! } ! } ! else { ! m_statebox = false; ! if(OSMApplication.SlideEditor.getCurrentSlide()!=null){ ! if(OSMApplication.SlideEditor.getCurrentSlide().getType()== OSMSlide.NORMAL){ ! if(onTheLine==true && OSMApplication.SlideEditor.m_Number.isVisible()== true) ! OSMApplication.SlideEditor.getCurrentSlide().setStateBox(false); ! } ! else{ ! OSMApplication.SlideEditor.getCurrentSlide().setStateBox(false); ! } ! } ! } ! m_slideBody = OSMApplication.SlideEditor.getBodyComponent(); ! Vector textChipsList = m_slideBody.getSlideBodyLineList(); ! if (m_statebox) { ! m_slideBody.setTextBody(); ! m_textBody = m_slideBody.getTextBody(); ! m_slideEditorNotesWritePanel = OSMApplication.SlideEditor.getFrame().getNotesPanel().getNotesWritePanel(); ! m_slideEditorNotesWritePanel.setEnabled(true); ! m_slideEditorNotesWritePanel.addToListener(); ! m_slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),m_statebox); ! ! // To remove all the lines of the body ! m_slideBody.removeAllLines(); ! ! // To refresh the component ! m_slideBody.repaint(); ! ! // To disable the Notes panel ! m_slideEditorNotesWritePanel.setEnabled(false); ! m_slideEditorNotesWritePanel.removeToListener(); ! } ! ! else { ! if(m_slideBody.getSlideBodyLineList().size()== 0){ ! ! if(!m_slideEditorNotesWritePanel.m_TextArea.isEnabled()) ! m_slideEditorNotesWritePanel.setEnabled(true); ! m_slideEditorNotesWritePanel.addToListener(); ! m_slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),m_statebox); ! m_slideBody.addTextChipsList(textChipsList); ! m_slideBody.refreshText(); ! } ! } ! } ! }); ! m_checkboxPanel.add(m_box); ! add(m_checkboxPanel, BorderLayout.SOUTH); ! } + /** + * Return the text displayed in the body + * @return the text of the body + */ + public String getTextBody(){ + return m_textBody; + + } /** *************** *** 99,103 **** } ! /** * The model chooser. --- 181,222 ---- } ! ! /** ! * checkbox panel ! */ ! private JPanel m_checkboxPanel; ! ! /** ! * SlideEditorNav panel ! */ ! private OSMSlideEditorNavPanel m_slideEditorNavPanel; ! ! /** ! * To get the current OSMSlideEditorNotesWritePanel ! */ ! private OSMSlideEditorNotesWritePanel m_slideEditorNotesWritePanel; ! ! /** ! * To get the text of the body ! */ ! ! public String m_textBody; ! ! /** ! * To get the current body ! */ ! public OSMSlideBody m_slideBody; ! ! /** ! * The state of the checkbox ! */ ! private boolean m_statebox; ! ! /** ! * Checkbox which allows to put or not the text ! * of the Body in the Notes area ! */ ! public final JCheckBox m_box; ! /** * The model chooser. *************** *** 209,235 **** */ public void actionPerformed(ActionEvent e) { ! if("GO_FIRST".equals(e.getActionCommand())) OSMApplication.SlideEditor.onGoFirst(); else ! if("GO_PREV".equals(e.getActionCommand())) OSMApplication.SlideEditor.onGoPrevious(); else ! if("GO_NEXT".equals(e.getActionCommand())) OSMApplication.SlideEditor.onGoNext(); else ! if("GO_LAST".equals(e.getActionCommand())) OSMApplication.SlideEditor.onGoLast(); else ! if("DEF_MODEL".equals(e.getActionCommand())) OSMApplication.SlideEditor.onDefaultModelValues(); else ! if("GO_TITLE".equals(e.getActionCommand())) OSMApplication.SlideEditor.onGoTitle(); else ! if("GO_SUMMARY".equals(e.getActionCommand())) OSMApplication.SlideEditor.onGoSummary(); } - /** * To go to next slide. --- 328,674 ---- */ public void actionPerformed(ActionEvent e) { ! ! if("GO_FIRST".equals(e.getActionCommand())){ OSMApplication.SlideEditor.onGoFirst(); + boolean statebox = OSMApplication.SlideEditor.getCurrentSlide().getStateBox(); + OSMSlideBody slideBody = OSMApplication.SlideEditor.getBodyComponent(); + Vector textChipsList = slideBody.getSlideBodyLineList(); + OSMSlideEditorNotesWritePanel slideEditorNotesWritePanel = OSMApplication.SlideEditor.getFrame().getNotesPanel().getNotesWritePanel(); + OSMSlideEditorNavPanel slideEditorNavPanel =OSMApplication.SlideEditor.getFrame().getEditorNavPanel(); + m_box.setSelected(statebox); + slideEditorNavPanel.m_box.setEnabled(true); + if (statebox) { + slideBody.setTextBody(); + m_textBody = slideBody.getTextBody(); + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + + + // To remove all the lines of the body + slideBody.removeAllLines(); + + // To refresh the body + slideBody.repaint(); + + // To disable the Notes panel + slideEditorNotesWritePanel.setEnabled(false); + slideEditorNotesWritePanel.removeToListener(); + } + + else { + if(slideBody.getSlideBodyLineList().size()== 0){ + + if(!slideEditorNotesWritePanel.m_TextArea.isEnabled()) + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + slideBody.addTextChipsList(textChipsList); + slideBody.refreshText(); + } + else { + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + } + } + } else ! if("GO_PREV".equals(e.getActionCommand())){ OSMApplication.SlideEditor.onGoPrevious(); + boolean statebox = OSMApplication.SlideEditor.getCurrentSlide().getStateBox(); + OSMSlideBody slideBody = OSMApplication.SlideEditor.getBodyComponent(); + Vector textChipsList = slideBody.getSlideBodyLineList(); + OSMSlideEditorNotesWritePanel slideEditorNotesWritePanel = OSMApplication.SlideEditor.getFrame().getNotesPanel().getNotesWritePanel(); + OSMSlideEditorNavPanel slideEditorNavPanel =OSMApplication.SlideEditor.getFrame().getEditorNavPanel(); + m_box.setSelected(statebox); + int nbSons=-1; + if(slideBody.getType()== OSMSlide.NORMAL ||slideBody.getType()== OSMSlide.TITLE){ + nbSons =slideBody.getElement().getChildCount(); + } + if(OSMApplication.SlideEditor.getCurrentSlide()== OSMApplication.getPresentation().getFirstPage()){ + nbSons=1; + } + if(OSMApplication.SlideEditor.getCurrentSlide()== OSMApplication.getPresentation().getSummaryPage()){ + if(OSMApplication.getPresentation().getNumberOfPages()-2 > 0) + nbSons=1; + else + nbSons=0; + } + if(nbSons== 0) + slideEditorNavPanel.m_box.setEnabled(false); + if(nbSons> 0){ + slideEditorNavPanel.m_box.setEnabled(true); + if (statebox) { + slideBody.setTextBody(); + m_textBody = slideBody.getTextBody(); + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + + // To remove all the lines of the body + slideBody.removeAllLines(); + + // To refresh the body + slideBody.repaint(); + + // To disable the Notes panel + slideEditorNotesWritePanel.setEnabled(false); + slideEditorNotesWritePanel.removeToListener(); + if(OSMApplication.SlideEditor.getCurrentSlide().getElement().isOnTheLine()==false){ + slideEditorNavPanel.m_box.setSelected(false); + slideEditorNavPanel.m_box.setEnabled(false); + } + } + + else { + if(slideBody.getSlideBodyLineList().size()== 0){ + + if(!slideEditorNotesWritePanel.m_TextArea.isEnabled()) + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + slideBody.addTextChipsList(textChipsList); + slideBody.refreshText(); + } + else { + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + } + } + } + } else ! if("GO_NEXT".equals(e.getActionCommand())){ OSMApplication.SlideEditor.onGoNext(); + boolean statebox = OSMApplication.SlideEditor.getCurrentSlide().getStateBox(); + OSMSlideBody slideBody = OSMApplication.SlideEditor.getBodyComponent(); + Vector textChipsList = slideBody.getSlideBodyLineList(); + OSMSlideEditorNotesWritePanel slideEditorNotesWritePanel = OSMApplication.SlideEditor.getFrame().getNotesPanel().getNotesWritePanel(); + OSMSlideEditorNavPanel slideEditorNavPanel =OSMApplication.SlideEditor.getFrame().getEditorNavPanel(); + m_box.setSelected(statebox); + int nbSons= -1; + if(slideBody.getType()== OSMSlide.NORMAL ||slideBody.getType()== OSMSlide.TITLE){ + nbSons =slideBody.getElement().getChildCount(); + } + + if(OSMApplication.SlideEditor.getCurrentSlide()== OSMApplication.getPresentation().getFirstPage()){ + nbSons=1; + } + if(OSMApplication.SlideEditor.getCurrentSlide()== OSMApplication.getPresentation().getSummaryPage()){ + if(OSMApplication.getPresentation().getNumberOfPages()-2 > 0) + nbSons=1; + else + nbSons=0; + } + if(nbSons== 0) + slideEditorNavPanel.m_box.setEnabled(false); + if(nbSons> 0){ + slideEditorNavPanel.m_box.setEnabled(true); + if (statebox) { + slideBody.setTextBody(); + m_textBody = slideBody.getTextBody(); + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + + // To remove all the lines of the body + slideEditorNavPanel.m_box.setEnabled(true); + slideBody.removeAllLines(); + + // To refresh the body + slideBody.repaint(); + + // To disable the Notes panel + slideEditorNotesWritePanel.setEnabled(false); + slideEditorNotesWritePanel.removeToListener(); + if(OSMApplication.SlideEditor.getCurrentSlide().getElement().isOnTheLine()==false){ + slideEditorNavPanel.m_box.setSelected(false); + slideEditorNavPanel.m_box.setEnabled(false); + } + } + + else { + if(slideBody.getSlideBodyLineList().size()== 0){ + + if(!slideEditorNotesWritePanel.m_TextArea.isEnabled()) + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + slideBody.addTextChipsList(textChipsList); + slideBody.refreshText(); + } + else { + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + } + } + } + } else ! if("GO_LAST".equals(e.getActionCommand())){ OSMApplication.SlideEditor.onGoLast(); + boolean statebox = OSMApplication.SlideEditor.getCurrentSlide().getStateBox(); + OSMSlideBody slideBody = OSMApplication.SlideEditor.getBodyComponent(); + Vector textChipsList = slideBody.getSlideBodyLineList(); + OSMSlideEditorNotesWritePanel slideEditorNotesWritePanel = OSMApplication.SlideEditor.getFrame().getNotesPanel().getNotesWritePanel(); + OSMSlideEditorNavPanel slideEditorNavPanel =OSMApplication.SlideEditor.getFrame().getEditorNavPanel(); + m_box.setSelected(statebox); + int nbSons=-1; + if(slideBody.getType()== OSMSlide.NORMAL ||slideBody.getType()== OSMSlide.TITLE){ + nbSons =slideBody.getElement().getChildCount(); + } + if(OSMApplication.SlideEditor.getCurrentSlide()== OSMApplication.getPresentation().getFirstPage()){ + nbSons=1; + } + if(OSMApplication.SlideEditor.getCurrentSlide()== OSMApplication.getPresentation().getSummaryPage()){ + if(OSMApplication.getPresentation().getNumberOfPages()-2 > 0) + nbSons=1; + else + nbSons=0; + } + if(nbSons== 0) + slideEditorNavPanel.m_box.setEnabled(false); + if(nbSons> 0){ + slideEditorNavPanel.m_box.setEnabled(true); + if (statebox) { + slideBody.setTextBody(); + m_textBody = slideBody.getTextBody(); + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + + // To remove all the lines of the body + slideBody.removeAllLines(); + + // To refresh the body + slideBody.repaint(); + + // To disable the Notes panel + slideEditorNotesWritePanel.setEnabled(false); + slideEditorNotesWritePanel.removeToListener(); + + if(OSMApplication.SlideEditor.getCurrentSlide().getElement().isOnTheLine()==false){ + slideEditorNavPanel.m_box.setSelected(false); + slideEditorNavPanel.m_box.setEnabled(false); + + } + } + + else { + if(slideBody.getSlideBodyLineList().size()== 0){ + + if(!slideEditorNotesWritePanel.m_TextArea.isEnabled()) + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + slideBody.addTextChipsList(textChipsList); + slideBody.refreshText(); + } + else { + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + } + } + } + } else ! if("DEF_MODEL".equals(e.getActionCommand())){ OSMApplication.SlideEditor.onDefaultModelValues(); + } else ! if("GO_TITLE".equals(e.getActionCommand())){ OSMApplication.SlideEditor.onGoTitle(); + boolean statebox = OSMApplication.SlideEditor.getCurrentSlide().getStateBox(); + OSMSlideBody slideBody = OSMApplication.SlideEditor.getBodyComponent(); + Vector textChipsList = slideBody.getSlideBodyLineList(); + OSMSlideEditorNotesWritePanel slideEditorNotesWritePanel = OSMApplication.SlideEditor.getFrame().getNotesPanel().getNotesWritePanel(); + OSMSlideEditorNavPanel slideEditorNavPanel =OSMApplication.SlideEditor.getFrame().getEditorNavPanel(); + m_box.setSelected(statebox); + slideEditorNavPanel.m_box.setEnabled(true); + if (statebox) { + slideBody.setTextBody(); + m_textBody = slideBody.getTextBody(); + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + + // To remove all the lines of the body + slideBody.removeAllLines(); + + // To refresh the body + slideBody.repaint(); + + // To disable the Notes panel + slideEditorNotesWritePanel.setEnabled(false); + slideEditorNotesWritePanel.removeToListener(); + } + + else { + if(slideBody.getSlideBodyLineList().size()== 0){ + + if(!slideEditorNotesWritePanel.m_TextArea.isEnabled()) + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + slideBody.addTextChipsList(textChipsList); + slideBody.refreshText(); + } + else { + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + } + } + } else ! if("GO_SUMMARY".equals(e.getActionCommand())){ OSMApplication.SlideEditor.onGoSummary(); + boolean statebox = OSMApplication.SlideEditor.getCurrentSlide().getStateBox(); + OSMSlideBody slideBody = OSMApplication.SlideEditor.getBodyComponent(); + Vector textChipsList = slideBody.getSlideBodyLineList(); + OSMSlideEditorNotesWritePanel slideEditorNotesWritePanel = OSMApplication.SlideEditor.getFrame().getNotesPanel().getNotesWritePanel(); + OSMSlideEditorNavPanel slideEditorNavPanel =OSMApplication.SlideEditor.getFrame().getEditorNavPanel(); + slideEditorNavPanel.m_box.setEnabled(true); + if (statebox) { + slideBody.setTextBody(); + m_textBody = slideBody.getTextBody(); + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + + // To remove all the lines of the body + slideBody.removeAllLines(); + + // To refresh the body + slideBody.repaint(); + + // To disable the Notes panel + slideEditorNotesWritePanel.setEnabled(false); + slideEditorNotesWritePanel.removeToListener(); + } + + else { + if(slideBody.getSlideBodyLineList().size()== 0){ + + if(!slideEditorNotesWritePanel.m_TextArea.isEnabled()) + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + slideBody.addTextChipsList(textChipsList); + slideBody.refreshText(); + } + else { + slideEditorNotesWritePanel.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(m_textBody,OSMApplication.SlideEditor.getCurrentSlide(),statebox); + } + } + } } /** * To go to next slide. Index: OSMSlideEditorNotesPanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/slideeditor/OSMSlideEditorNotesPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMSlideEditorNotesPanel.java 3 Oct 2007 21:31:15 -0000 1.2 --- OSMSlideEditorNotesPanel.java 17 Feb 2008 22:11:51 -0000 1.3 *************** *** 80,83 **** --- 80,84 ---- this.m_WritePanel.removeToListener(); this.m_OralPanel.setEnabled(false); + } } *************** *** 86,89 **** --- 87,91 ---- this.m_WritePanel.removeToListener(); this.m_OralPanel.setEnabled(false); + } this.m_WritePanel.updateNotes(slide); *************** *** 91,94 **** --- 93,102 ---- } + /** + * Return the written notes panel + */ + public OSMSlideEditorNotesWritePanel getNotesWritePanel(){ + return m_WritePanel; + } /** Index: OSMSlideEditorPanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/slideeditor/OSMSlideEditorPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMSlideEditorPanel.java 17 Nov 2005 22:18:15 -0000 1.2 --- OSMSlideEditorPanel.java 17 Feb 2008 22:11:51 -0000 1.3 *************** *** 206,211 **** - - /** * To be notified when an element is selected. --- 206,209 ---- *************** *** 315,391 **** */ public void onComponentSelected(OSMTreeEditorEvent e) { ! OSMTreeEditorPanel editor = (OSMTreeEditorPanel)e.getSource(); ! Vector v = editor.getSelectedElement(); ! if(v.size() == 1) /* Only one component must be selected*/ { ! OSMElement elt = (OSMElement)v.get(0); ! OSMElement parentOnLine = elt.getParentOnTheLine(); ! ! ! // Component is above the line, we select the summary. ! if(elt.getPage().getType() != OSMSlide.SUMMARY && elt.getPage().getType() != OSMSlide.TITLE && OSMTreeEditorPanel.isAboveTheLine(elt.getComponent())) { ! int nbSonOnLine = elt.getSonsOnTheLine().size(); ! if(!this.equals(e.getOriginator()) && (nbSonOnLine > 0)) { ! this.monitorNewSlide((OSMSlide)elt.getPage()); //OSMApplication.getPresentation().getSummaryPage()); ! if(!this.equals(e.getOriginator())) { ! ! ! // Refresh body to sort by x position ! m_Body.refresh(); ! Vector vslide = OSMApplication.getPresentation().getPageList(); ! m_Number.setNumber(vslide.indexOf(m_Slide) + 1); ! this.unselectAllComponent(); ! m_Number.selectByElement(elt); ! this.m_Title.selectByElement(elt); ! this.m_Body.selectByElement(elt); ! this.m_Medias.selectByElement(elt); ! } ! } ! else ! if(nbSonOnLine == 0) ! { ! this.monitorNewSlide(null); ! (m_SlideEditorFrame.getNotesPanel()).onComponentSlideSelected( ( ! OSMSlide) elt.getPage(), false); ! } ! } ! ! ! // else, if a father is on the line, select this father ! else ! if((parentOnLine != null) || elt.getPage().getType() == OSMSlide.SUMMARY || elt.getPage().getType() == OSMSlide.TITLE) { ! ! ! // this.monitorNewSlide( (OSMSlide) parentOnLine.getPage()); //*/ ! if(!this.equals(e.getOriginator())) ! { ! if(parentOnLine != null) ! this.monitorNewSlide((OSMSlide)parentOnLine.getPage()); ! else if(elt.getPage().getType() == OSMSlide.SUMMARY) ! this.monitorNewSlide((OSMSlide)elt.getPage()); ! else if(elt.getPage().getType() == OSMSlide.TITLE) ! this.monitorNewSlide((OSMSlide)elt.getPage()); ! ! // Refresh body to sort by x position ! m_Body.refresh(); ! Vector vslide = OSMApplication.getPresentation().getPageList(); ! m_Number.setNumber(vslide.indexOf(m_Slide) + 1); ! this.unselectAllComponent(); ! m_Number.selectByElement(elt); ! this.m_Title.selectByElement(elt); ! this.m_Body.selectByElement(elt); ! this.m_Medias.selectByElement(elt); ! } ! } ! - // Else, no selection... - else - this.monitorNewSlide(null); - } - else - this.monitorNewSlide(null); - } /** --- 313,450 ---- */ public void onComponentSelected(OSMTreeEditorEvent e) { ! OSMTreeEditorPanel editor = (OSMTreeEditorPanel)e.getSource(); ! Vector v = editor.getSelectedElement(); ! if(v.size() == 1) /* Only one component must be selected*/ { ! OSMElement elt = (OSMElement)v.get(0); ! OSMElement parentOnLine = elt.getParentOnTheLine(); ! boolean statebox = false; ! // Component is above the line, we select the summary. ! if(elt.getPage().getType() != OSMSlide.SUMMARY && elt.getPage().getType() != OSMSlide.TITLE && OSMTreeEditorPanel.isAboveTheLine(elt.getComponent())) { ! int nbSonOnLine = elt.getSonsOnTheLine().size(); ! if(!this.equals(e.getOriginator()) && (nbSonOnLine > 0)) { ! this.monitorNewSlide((OSMSlide)elt.getPage()); //OSMApplication.getPresentation().getSummaryPage()); ! m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(false); ! if(!this.equals(e.getOriginator())) { ! statebox = elt.getPage().getStateBox(); ! // Refresh body to sort by x position ! Vector textChipsList = this.m_Body.getSlideBodyLineList(); ! if(textChipsList.size() == 0) ! m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(false); ! if(textChipsList.size() > 0){ ! m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(true); ! m_SlideEditorFrame.getEditorNavPanel().m_box.setSelected(statebox); ! } ! ! m_Body.refresh(); ! if(statebox== true){ ! m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(true); ! m_Body.removeAllLines(); ! m_Body.repaint(); ! } ! else{ ! m_SlideEditorFrame.getEditorNavPanel().m_box.setSelected(false); ! m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(false); ! } ! if( elt.isOnTheLine()==false){ ! m_SlideEditorFrame.getEditorNavPanel().m_box.setSelected(false); ! m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(false); ! } ! Vector vslide = OSMApplication.getPresentation().getPageList(); ! m_Number.setNumber(vslide.indexOf(m_Slide) + 1); ! this.unselectAllComponent(); ! m_Number.selectByElement(elt); ! this.m_Title.selectByElement(elt); ! this.m_Body.selectByElement(elt); ! this.m_Medias.selectByElement(elt); ! ! } ! } ! else ! if(nbSonOnLine == 0) ! { ! this.monitorNewSlide(null); ! (m_SlideEditorFrame.getNotesPanel()).onComponentSlideSelected( ( ! OSMSlide) elt.getPage(), false); ! this.m_Body.setElement(null); ! m_SlideEditorFrame.getEditorNavPanel().m_box.setSelected(false); ! m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(false); ! ! ! } ! } + // else, if a father is on the line, select this father + else + if((parentOnLine != null) || elt.getPage().getType() == OSMSlide.SUMMARY || elt.getPage().getType() == OSMSlide.TITLE) { + + // this.monitorNewSlide( (OSMSlide) parentOnLine.getPage()); //*/ + if(!this.equals(e.getOriginator())) + { + if(parentOnLine != null){ + statebox = parentOnLine.getPage().getStateBox(); + this.monitorNewSlide((OSMSlide)parentOnLine.getPage()); + } + else if(elt.getPage().getType() == OSMSlide.SUMMARY){ + statebox =elt.getPage().getStateBox(); + this.monitorNewSlide((OSMSlide)elt.getPage()); + } + else if(elt.getPage().getType() == OSMSlide.TITLE){ + statebox = elt.getPage().getStateBox(); + this.monitorNewSlide((OSMSlide)elt.getPage()); + + } + // Refresh body to sort by x position + + m_SlideEditorFrame.getEditorNavPanel().m_box.setSelected(statebox); + OSMSlideEditorNotesWritePanel slideEditorNotesWritePanel = m_SlideEditorFrame.getNotesPanel().getNotesWritePanel(); + Vector textChipsList = this.m_Body.getSlideBodyLineList(); + if(textChipsList.size() == 0) + m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(false); + if(textChipsList.size() > 0){ + m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(true); + m_SlideEditorFrame.getEditorNavPanel().m_box.setSelected(statebox); + } + m_Body.refresh(); + if(statebox== true){ + String textBody = m_Body.getTextBody(); + m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(true); + slideEditorNotesWritePanel.addToListener(); + slideEditorNotesWritePanel.updateTextArea(textBody,this.m_Slide,statebox); + m_Body.removeAllLines(); + m_Body.repaint(); + m_Body.setTextBody(); + slideEditorNotesWritePanel.setEnabled(false); + slideEditorNotesWritePanel.removeToListener(); + } + else{ + m_SlideEditorFrame.getEditorNavPanel().m_box.setSelected(statebox); + } + Vector vslide = OSMApplication.getPresentation().getPageList(); + m_Number.setNumber(vslide.indexOf(m_Slide) + 1); + this.unselectAllComponent(); + m_Number.selectByElement(elt); + this.m_Title.selectByElement(elt); + this.m_Body.selectByElement(elt); + this.m_Medias.selectByElement(elt); + } + } + // Else, no selection... + else{ + this.monitorNewSlide(null); + this.m_Body.setElement(null); + m_SlideEditorFrame.getEditorNavPanel().m_box.setSelected(false); + m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(false); + } + } + + else { + this.monitorNewSlide(null); + this.m_Body.setElement(null); + m_SlideEditorFrame.getEditorNavPanel().m_box.setSelected(false); + m_SlideEditorFrame.getEditorNavPanel().m_box.setEnabled(false); + } + } /** *************** *** 913,916 **** --- 972,976 ---- + /** * The body object in the slide editor. Index: OSMSlideEditorNotesWritePanel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/slideeditor/OSMSlideEditorNotesWritePanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMSlideEditorNotesWritePanel.java 3 Oct 2007 21:31:15 -0000 1.2 --- OSMSlideEditorNotesWritePanel.java 17 Feb 2008 22:11:51 -0000 1.3 *************** *** 21,25 **** --- 21,27 ---- import javax.swing.text.*; import osmose.application.*; + import osmose.application.common.slidecomponent.OSMSlideBodyLine; import osmose.application.data.*; + import java.util.*; *************** *** 95,105 **** public void updateNotes(OSMSlide slide) { this.m_Slide = slide; ! if(m_Slide != null) ! textAreaString = this.m_Slide.getWrittenNotes(); else textAreaString = ""; ! m_TextArea.setText(new String(textAreaString)); } /** --- 97,169 ---- public void updateNotes(OSMSlide slide) { this.m_Slide = slide; ! if(m_Slide != null){ ! textAreaString = this.m_Slide.getWrittenNotes(); ! } else textAreaString = ""; ! m_TextArea.setText(new String(textAreaString)); ! } ! ! /** ! * To update notes in the TextArea ! * @param slide The slide to update, the text of the body, a flag to know if the checkbox is checked ! */ ! public void updateTextArea(String bodyText, OSMSlide slide, boolean flag){ ! this.m_Slide = slide; ! if(m_Slide!= null){ ! if(flag==true){ ! this.m_bodyText = bodyText; ! m_state= true; ! if(textAreaString.trim().length()==0 ){ ! textAreaString = ""; ! m_TextArea.setText(new String(m_bodyText)); ! } ! else{ ! textAreaString = this.m_Slide.getWrittenNotes(); ! m_TextArea.setText(new String(m_bodyText)); ! } ! } ! else { ! m_state =false; ! textAreaString = this.m_Slide.getWrittenNotes(); ! m_TextArea.setText(new String(textAreaString)); ! } ! } ! else { ! textAreaString = ""; ! m_TextArea.setText(new String(textAreaString)); ! ! } ! ! m_TextArea.repaint(); ! m_TextArea.revalidate(); } + + /** + * Return the state of the checkbox + */ + public boolean getState(){ + return m_state; + } + + /** + * To keep the text of the body + */ + public String m_bodyText; + + + /** + * To keep the slideEditorNavPanel + */ + + public OSMSlideEditorNavPanel m_slideEditorNavPanel; + + /** + * To get state of the checkbox + */ + private boolean m_state; + + /** *************** *** 143,166 **** * Call when update are removed. * @param evt Associated event. ! */ ! public void removeUpdate(DocumentEvent evt) { ! Document doc = (Document)evt.getDocument(); ! try { ! if(doc.getLength() > 0) ! textAreaString = doc.getText(0, doc.getLength()); ! if(textAreaString != null) { ! if(m_Slide != null) ! m_Slide.setWrittenNotes(textAreaString); ! } ! } catch(Exception ex) { ex.printStackTrace(); } } public void changedUpdate(DocumentEvent evt) { } - /** * Call when an update is insert --- 207,245 ---- * Call when update are removed. * @param evt Associated event. ! */ ! public void removeUpdate(DocumentEvent evt) { ! Document doc = (Document)evt.getDocument(); ! boolean state = getState(); ! try { ! if(doc.getLength() > 0){ ! if(state == false){ ! textAreaString = doc.getText(0, doc.getLength()); ! if(textAreaString != null) { ! if(m_Slide != null) ! m_Slide.setWrittenNotes(textAreaString); ! } ! } ! } ! else{ ! if(state==false ){ ! if(textAreaString.equals(null)){ ! if(m_Slide!=null){ ! textAreaString =""; ! m_Slide.setWrittenNotes(textAreaString); ! } ! } ! } ! } ! } catch(Exception ex) { ex.printStackTrace(); } } + + public void changedUpdate(DocumentEvent evt) { } /** * Call when an update is insert *************** *** 168,184 **** */ public void insertUpdate(DocumentEvent evt) { ! Document doc = (Document)evt.getDocument(); ! try { ! if(doc.getLength() > 0) ! textAreaString = doc.getText(0, doc.getLength()); ! if(textAreaString != null) { ! if(m_Slide != null) ! m_Slide.setWrittenNotes(textAreaString); } } ! catch(Exception ex) { ! ex.printStackTrace(); ! } ! } } // end of MyDocListener class } // end of OSMSlideEditorNotesWritePanel class --- 247,279 ---- */ public void insertUpdate(DocumentEvent evt) { ! Document doc = (Document)evt.getDocument(); ! boolean state = getState(); ! try { ! if(doc.getLength() > 0){ ! if(state == false){ ! textAreaString = doc.getText(0, doc.getLength()); ! if(textAreaString != null) { ! if(m_Slide != null) ! m_Slide.setWrittenNotes(textAreaString); ! } ! } ! } ! else{ ! if(state==false ){ ! if(textAreaString.equals(null)){ ! if(m_Slide!=null){ ! textAreaString =""; ! m_Slide.setWrittenNotes(textAreaString); ! } ! } ! } ! } ! } ! catch(Exception ex) { ! ex.printStackTrace(); } } ! ! } // end of MyDocListener class } // end of OSMSlideEditorNotesWritePanel class |
