Menu
▾
▴
[Osmose-dev-devel] osmose/src/osmose/application/data OSMPage.java, 1.2, 1.3 OSMPageModel.java, 1.1.1.1, 1.2
|
From: Olivier G. <og...@us...> - 2008-02-17 22:11:47
|
Update of /cvsroot/osmose-dev/osmose/src/osmose/application/data In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6501/src/osmose/application/data Modified Files: OSMPage.java OSMPageModel.java Log Message: Added choice for putting bullet lists in notes (by Fatimatou) Index: OSMPage.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/data/OSMPage.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSMPage.java 3 Oct 2007 21:31:14 -0000 1.2 --- OSMPage.java 17 Feb 2008 22:11:50 -0000 1.3 *************** *** 32,37 **** --- 32,63 ---- public abstract class OSMPage implements Comparable { + + + /** + * to set the state of the checkbox + * @param statebox the boolean that corresponds to the OSMPage + */ + public void setStateBox(boolean statebox) { + m_StateBox = statebox; + } + + + /** + * to get the associated state of the checkbox + * @return the boolean corresponding to the checkbox + */ + public boolean getStateBox() { + return m_StateBox; + } + /** + * to get the Notes properties of this page + * @return the OSMPageItemProperties associated to the OSMPage + */ + public OSMPageItemProperties getTextProperties() { + return this.m_NotesProperties; + } + /** * to get the body properties of this page *************** *** 188,192 **** public Vector getMediaList() { - // First refresh the list refreshList(); --- 214,217 ---- *************** *** 217,220 **** --- 242,264 ---- + /** + * the constructor of an OSMPage from another page + * @param page the page to copy + * @param elt the OSMElement (to get the model) + * @param modelName the name of the model associated to the element + */ + /*public OSMPage(OSMPage page, OSMElement elt, String modelName) { + m_Element = elt; + m_Model = (OSMPageModel)elt.getDocument().getPresentation().getTheme().getModelByName(modelName); + m_TitleProperties = new OSMPageItemProperties(); + m_TitleProperties.setAll(page.m_TitleProperties.getX(), page.m_TitleProperties.getY(), page.m_TitleProperties.getW(), page.m_TitleProperties.getH()); + m_BodyProperties = new OSMPageItemProperties(); + m_BodyProperties.setAll(page.m_BodyProperties.getX(), page.m_BodyProperties.getY(), page.m_BodyProperties.getW(), page.m_BodyProperties.getH()); + m_NumberProperties = new OSMPageItemProperties(); + m_NumberProperties.setAll(page.m_NumberProperties.getX(), page.m_NumberProperties.getY(), page.m_NumberProperties.getW(), page.m_NumberProperties.getH()); + m_MediaList = new Vector(); + m_WrittenNotes = page.m_WrittenNotes; + m_OralNotesFilename = page.m_OralNotesFilename; + }*/ /** * the constructor of an OSMPage from another page *************** *** 230,241 **** m_BodyProperties = new OSMPageItemProperties(); m_BodyProperties.setAll(page.m_BodyProperties.getX(), page.m_BodyProperties.getY(), page.m_BodyProperties.getW(), page.m_BodyProperties.getH()); m_NumberProperties = new OSMPageItemProperties(); m_NumberProperties.setAll(page.m_NumberProperties.getX(), page.m_NumberProperties.getY(), page.m_NumberProperties.getW(), page.m_NumberProperties.getH()); m_MediaList = new Vector(); m_WrittenNotes = page.m_WrittenNotes; m_OralNotesFilename = page.m_OralNotesFilename; } - /** * to get the number properties of this page --- 274,290 ---- m_BodyProperties = new OSMPageItemProperties(); m_BodyProperties.setAll(page.m_BodyProperties.getX(), page.m_BodyProperties.getY(), page.m_BodyProperties.getW(), page.m_BodyProperties.getH()); + + m_NotesProperties = new OSMPageItemProperties(); + m_NotesProperties.setAll(m_Model.getText().getProperties().getX(),m_Model.getText().getProperties().getY(),m_Model.getText().getProperties().getW(),m_Model.getText().getProperties().getH()); + m_NumberProperties = new OSMPageItemProperties(); m_NumberProperties.setAll(page.m_NumberProperties.getX(), page.m_NumberProperties.getY(), page.m_NumberProperties.getW(), page.m_NumberProperties.getH()); + m_MediaList = new Vector(); m_WrittenNotes = page.m_WrittenNotes; m_OralNotesFilename = page.m_OralNotesFilename; + m_StateBox = page.m_StateBox; } /** * to get the number properties of this page *************** *** 277,280 **** --- 326,345 ---- * @param doc the OSMDocument */ + /*protected OSMPage(OSMDocument doc) { + m_Model = (OSMPageModel)doc.getPresentation().getTheme().getBaseModel(); + m_TitleProperties = new OSMPageItemProperties(); + m_TitleProperties.setAll(m_Model.getTitle().getProperties().getX(), m_Model.getTitle().getProperties().getY(), m_Model.getTitle().getProperties().getW(), m_Model.getTitle().getProperties().getH()); + m_BodyProperties = new OSMPageItemProperties(); + m_BodyProperties.setAll(m_Model.getBody().getProperties().getX(), m_Model.getBody().getProperties().getY(), m_Model.getBody().getProperties().getW(), m_Model.getBody().getProperties().getH()); + m_NumberProperties = new OSMPageItemProperties(); + m_NumberProperties.setAll(m_Model.getNumber().getProperties().getX(), m_Model.getNumber().getProperties().getY(), m_Model.getNumber().getProperties().getW(), m_Model.getNumber().getProperties().getH()); + m_MediaList = new Vector(); + m_WrittenNotes = new String(); + m_OralNotesFilename = new String(); + }*/ + /** + * the constructor of an OSMPage from an OSMDocument + * @param doc the OSMDocument + */ protected OSMPage(OSMDocument doc) { m_Model = (OSMPageModel)doc.getPresentation().getTheme().getBaseModel(); *************** *** 283,286 **** --- 348,355 ---- m_BodyProperties = new OSMPageItemProperties(); m_BodyProperties.setAll(m_Model.getBody().getProperties().getX(), m_Model.getBody().getProperties().getY(), m_Model.getBody().getProperties().getW(), m_Model.getBody().getProperties().getH()); + + m_NotesProperties = new OSMPageItemProperties(); + m_NotesProperties.setAll(m_Model.getText().getProperties().getX(),m_Model.getText().getProperties().getY(),m_Model.getText().getProperties().getW(),m_Model.getText().getProperties().getH()); + m_NumberProperties = new OSMPageItemProperties(); m_NumberProperties.setAll(m_Model.getNumber().getProperties().getX(), m_Model.getNumber().getProperties().getY(), m_Model.getNumber().getProperties().getW(), m_Model.getNumber().getProperties().getH()); *************** *** 288,291 **** --- 357,361 ---- m_WrittenNotes = new String(); m_OralNotesFilename = new String(); + m_StateBox=false; } *************** *** 384,387 **** --- 454,461 ---- } + /** + * The properties of notes in the page. + */ + private OSMPageItemProperties m_NotesProperties; /** *************** *** 413,418 **** */ final static String EXTENSION = ".wav"; ! /** * the associated written notes of the page --- 487,498 ---- */ final static String EXTENSION = ".wav"; + + + /** + * the associated state of the checkbox of the page + */ ! private boolean m_StateBox; ! /** * the associated written notes of the page Index: OSMPageModel.java =================================================================== RCS file: /cvsroot/osmose-dev/osmose/src/osmose/application/data/OSMPageModel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSMPageModel.java 30 Aug 2005 17:44:04 -0000 1.1.1.1 --- OSMPageModel.java 17 Feb 2008 22:11:50 -0000 1.2 *************** *** 141,145 **** * @param theme The model theme. */ ! public OSMPageModel(String name, OSMTheme theme) { super(name); m_BaseModel = (OSMPageModel)theme.getBaseModel(); --- 141,145 ---- * @param theme The model theme. */ ! /*public OSMPageModel(String name, OSMTheme theme) { super(name); m_BaseModel = (OSMPageModel)theme.getBaseModel(); *************** *** 163,170 **** m_Text.setFontSize((int)(11 * OSMThemeContraintsEditorPanel.THC_COEFF)); m_Text.getProperties().setAll(0, 0, 0, 0); ! } ! /** * To get true background. * @return The background. --- 163,198 ---- m_Text.setFontSize((int)(11 * OSMThemeContraintsEditorPanel.THC_COEFF)); m_Text.getProperties().setAll(0, 0, 0, 0); ! }*/ /** + * To create a new object. + * @param name The model name. + * @param theme The model theme. + */ + public OSMPageModel(String name, OSMTheme theme) { + super(name); + m_BaseModel = (OSMPageModel)theme.getBaseModel(); + m_Title = new OSMItemFormat(); + m_Body = new OSMItemFormat(); + m_Number = new OSMItemFormat(); + m_Text = new OSMItemFormat(); + m_Medias = new OSMItemFormat(); + m_Chips = new OSMItemChips(); + m_Background = new OSMItemBackground(); + m_Transition = new OSMItemTransition(); + m_Title.getProperties().setAll(50000, 50000, 1500000, 130000); + m_Body.getProperties().setAll(50000, 200000, 700000, 950000); + m_Medias.getProperties().setAll(800000, 200000, 750000, 750000); + m_Number.getProperties().setAll(1500000, 1050000, 100000, 150000); + m_Text.getProperties().setAll(10000,10000 ,1500000, 950000); + m_Title.setFontSize((int)(20 * OSMThemeContraintsEditorPanel.THC_COEFF)); + m_Title.setFontBold(true); + m_Body.setFontSize((int)(14 * OSMThemeContraintsEditorPanel.THC_COEFF)); + m_Number.setFontSize((int)(10 * OSMThemeContraintsEditorPanel.THC_COEFF)); + m_Number.setFontBold(true); + m_Text.setFontSize((int)(7* OSMThemeContraintsEditorPanel.THC_COEFF)); + m_Text.setFontBold(true); + } + /** * To get true background. * @return The background. |
